Update multicall interface

alephium · Oct 1, 2024 · b2e6cbd · b2e6cbd
1 parent 99b8d4d
commit b2e6cbd
Show file tree

Hide file tree

Showing 23 changed files with 253 additions and 109 deletions.
diff --git a/artifacts/ts/Add.ts b/artifacts/ts/Add.ts
@@ -403,14 +403,15 @@ export class AddInstance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends AddTypes.MultiCallParams>(
+    calls: Calls
+  ): Promise<AddTypes.MultiCallResults<Calls>>;
   async multicall<Callss extends AddTypes.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<AddTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
-      Add,
-      this,
-      callss,
-      getContractByCodeHash
-    )) as AddTypes.MulticallReturnType<Callss>;
+    callss: Callss
+  ): Promise<AddTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends AddTypes.MultiCallParams | AddTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(Add, this, callss, getContractByCodeHash);
   }
 }
diff --git a/artifacts/ts/DeprecatedNFTTest1.ts b/artifacts/ts/DeprecatedNFTTest1.ts
@@ -166,14 +166,22 @@ export class DeprecatedNFTTest1Instance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends DeprecatedNFTTest1Types.MultiCallParams>(
+    calls: Calls
+  ): Promise<DeprecatedNFTTest1Types.MultiCallResults<Calls>>;
   async multicall<Callss extends DeprecatedNFTTest1Types.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<DeprecatedNFTTest1Types.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<DeprecatedNFTTest1Types.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | DeprecatedNFTTest1Types.MultiCallParams
+      | DeprecatedNFTTest1Types.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       DeprecatedNFTTest1,
       this,
       callss,
       getContractByCodeHash
-    )) as DeprecatedNFTTest1Types.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/DeprecatedNFTTest2.ts b/artifacts/ts/DeprecatedNFTTest2.ts
@@ -205,14 +205,22 @@ export class DeprecatedNFTTest2Instance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends DeprecatedNFTTest2Types.MultiCallParams>(
+    calls: Calls
+  ): Promise<DeprecatedNFTTest2Types.MultiCallResults<Calls>>;
   async multicall<Callss extends DeprecatedNFTTest2Types.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<DeprecatedNFTTest2Types.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<DeprecatedNFTTest2Types.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | DeprecatedNFTTest2Types.MultiCallParams
+      | DeprecatedNFTTest2Types.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       DeprecatedNFTTest2,
       this,
       callss,
       getContractByCodeHash
-    )) as DeprecatedNFTTest2Types.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/DeprecatedNFTTest3.ts b/artifacts/ts/DeprecatedNFTTest3.ts
@@ -205,14 +205,22 @@ export class DeprecatedNFTTest3Instance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends DeprecatedNFTTest3Types.MultiCallParams>(
+    calls: Calls
+  ): Promise<DeprecatedNFTTest3Types.MultiCallResults<Calls>>;
   async multicall<Callss extends DeprecatedNFTTest3Types.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<DeprecatedNFTTest3Types.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<DeprecatedNFTTest3Types.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | DeprecatedNFTTest3Types.MultiCallParams
+      | DeprecatedNFTTest3Types.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       DeprecatedNFTTest3,
       this,
       callss,
       getContractByCodeHash
-    )) as DeprecatedNFTTest3Types.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/DeprecatedNFTTest4.ts b/artifacts/ts/DeprecatedNFTTest4.ts
@@ -198,14 +198,22 @@ export class DeprecatedNFTTest4Instance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends DeprecatedNFTTest4Types.MultiCallParams>(
+    calls: Calls
+  ): Promise<DeprecatedNFTTest4Types.MultiCallResults<Calls>>;
   async multicall<Callss extends DeprecatedNFTTest4Types.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<DeprecatedNFTTest4Types.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<DeprecatedNFTTest4Types.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | DeprecatedNFTTest4Types.MultiCallParams
+      | DeprecatedNFTTest4Types.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       DeprecatedNFTTest4,
       this,
       callss,
       getContractByCodeHash
-    )) as DeprecatedNFTTest4Types.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/DeprecatedNFTTest5.ts b/artifacts/ts/DeprecatedNFTTest5.ts
@@ -212,14 +212,22 @@ export class DeprecatedNFTTest5Instance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends DeprecatedNFTTest5Types.MultiCallParams>(
+    calls: Calls
+  ): Promise<DeprecatedNFTTest5Types.MultiCallResults<Calls>>;
   async multicall<Callss extends DeprecatedNFTTest5Types.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<DeprecatedNFTTest5Types.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<DeprecatedNFTTest5Types.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | DeprecatedNFTTest5Types.MultiCallParams
+      | DeprecatedNFTTest5Types.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       DeprecatedNFTTest5,
       this,
       callss,
       getContractByCodeHash
-    )) as DeprecatedNFTTest5Types.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/DeprecatedNFTTest6.ts b/artifacts/ts/DeprecatedNFTTest6.ts
@@ -198,14 +198,22 @@ export class DeprecatedNFTTest6Instance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends DeprecatedNFTTest6Types.MultiCallParams>(
+    calls: Calls
+  ): Promise<DeprecatedNFTTest6Types.MultiCallResults<Calls>>;
   async multicall<Callss extends DeprecatedNFTTest6Types.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<DeprecatedNFTTest6Types.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<DeprecatedNFTTest6Types.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | DeprecatedNFTTest6Types.MultiCallParams
+      | DeprecatedNFTTest6Types.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       DeprecatedNFTTest6,
       this,
       callss,
       getContractByCodeHash
-    )) as DeprecatedNFTTest6Types.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/DeprecatedNFTTest7.ts b/artifacts/ts/DeprecatedNFTTest7.ts
@@ -212,14 +212,22 @@ export class DeprecatedNFTTest7Instance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends DeprecatedNFTTest7Types.MultiCallParams>(
+    calls: Calls
+  ): Promise<DeprecatedNFTTest7Types.MultiCallResults<Calls>>;
   async multicall<Callss extends DeprecatedNFTTest7Types.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<DeprecatedNFTTest7Types.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<DeprecatedNFTTest7Types.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | DeprecatedNFTTest7Types.MultiCallParams
+      | DeprecatedNFTTest7Types.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       DeprecatedNFTTest7,
       this,
       callss,
       getContractByCodeHash
-    )) as DeprecatedNFTTest7Types.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/FakeTokenTest.ts b/artifacts/ts/FakeTokenTest.ts
@@ -293,14 +293,22 @@ export class FakeTokenTestInstance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends FakeTokenTestTypes.MultiCallParams>(
+    calls: Calls
+  ): Promise<FakeTokenTestTypes.MultiCallResults<Calls>>;
   async multicall<Callss extends FakeTokenTestTypes.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<FakeTokenTestTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<FakeTokenTestTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | FakeTokenTestTypes.MultiCallParams
+      | FakeTokenTestTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       FakeTokenTest,
       this,
       callss,
       getContractByCodeHash
-    )) as FakeTokenTestTypes.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/Greeter.ts b/artifacts/ts/Greeter.ts
@@ -168,14 +168,15 @@ export class GreeterInstance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends GreeterTypes.MultiCallParams>(
+    calls: Calls
+  ): Promise<GreeterTypes.MultiCallResults<Calls>>;
   async multicall<Callss extends GreeterTypes.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<GreeterTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
-      Greeter,
-      this,
-      callss,
-      getContractByCodeHash
-    )) as GreeterTypes.MulticallReturnType<Callss>;
+    callss: Callss
+  ): Promise<GreeterTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends GreeterTypes.MultiCallParams | GreeterTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(Greeter, this, callss, getContractByCodeHash);
   }
 }
diff --git a/artifacts/ts/MapTest.ts b/artifacts/ts/MapTest.ts
@@ -263,14 +263,15 @@ export class MapTestInstance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends MapTestTypes.MultiCallParams>(
+    calls: Calls
+  ): Promise<MapTestTypes.MultiCallResults<Calls>>;
   async multicall<Callss extends MapTestTypes.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<MapTestTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
-      MapTest,
-      this,
-      callss,
-      getContractByCodeHash
-    )) as MapTestTypes.MulticallReturnType<Callss>;
+    callss: Callss
+  ): Promise<MapTestTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends MapTestTypes.MultiCallParams | MapTestTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(MapTest, this, callss, getContractByCodeHash);
   }
 }
diff --git a/artifacts/ts/NFTCollectionTest.ts b/artifacts/ts/NFTCollectionTest.ts
@@ -314,14 +314,22 @@ export class NFTCollectionTestInstance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends NFTCollectionTestTypes.MultiCallParams>(
+    calls: Calls
+  ): Promise<NFTCollectionTestTypes.MultiCallResults<Calls>>;
   async multicall<Callss extends NFTCollectionTestTypes.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<NFTCollectionTestTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<NFTCollectionTestTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | NFTCollectionTestTypes.MultiCallParams
+      | NFTCollectionTestTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       NFTCollectionTest,
       this,
       callss,
       getContractByCodeHash
-    )) as NFTCollectionTestTypes.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/NFTCollectionWithRoyaltyTest.ts b/artifacts/ts/NFTCollectionWithRoyaltyTest.ts
@@ -484,16 +484,26 @@ export class NFTCollectionWithRoyaltyTestInstance extends ContractInstance {
     },
   };
 
+  async multicall<
+    Calls extends NFTCollectionWithRoyaltyTestTypes.MultiCallParams
+  >(
+    calls: Calls
+  ): Promise<NFTCollectionWithRoyaltyTestTypes.MultiCallResults<Calls>>;
   async multicall<
     Callss extends NFTCollectionWithRoyaltyTestTypes.MultiCallParams[]
   >(
-    ...callss: Callss
-  ): Promise<NFTCollectionWithRoyaltyTestTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<NFTCollectionWithRoyaltyTestTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | NFTCollectionWithRoyaltyTestTypes.MultiCallParams
+      | NFTCollectionWithRoyaltyTestTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       NFTCollectionWithRoyaltyTest,
       this,
       callss,
       getContractByCodeHash
-    )) as NFTCollectionWithRoyaltyTestTypes.MulticallReturnType<Callss>;
+    );
   }
 }
diff --git a/artifacts/ts/NFTTest.ts b/artifacts/ts/NFTTest.ts
@@ -199,14 +199,15 @@ export class NFTTestInstance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends NFTTestTypes.MultiCallParams>(
+    calls: Calls
+  ): Promise<NFTTestTypes.MultiCallResults<Calls>>;
   async multicall<Callss extends NFTTestTypes.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<NFTTestTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
-      NFTTest,
-      this,
-      callss,
-      getContractByCodeHash
-    )) as NFTTestTypes.MulticallReturnType<Callss>;
+    callss: Callss
+  ): Promise<NFTTestTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends NFTTestTypes.MultiCallParams | NFTTestTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(NFTTest, this, callss, getContractByCodeHash);
   }
 }
diff --git a/artifacts/ts/NFTTestStd.ts b/artifacts/ts/NFTTestStd.ts
@@ -236,14 +236,22 @@ export class NFTTestStdInstance extends ContractInstance {
     },
   };
 
+  async multicall<Calls extends NFTTestStdTypes.MultiCallParams>(
+    calls: Calls
+  ): Promise<NFTTestStdTypes.MultiCallResults<Calls>>;
   async multicall<Callss extends NFTTestStdTypes.MultiCallParams[]>(
-    ...callss: Callss
-  ): Promise<NFTTestStdTypes.MulticallReturnType<Callss>> {
-    return (await multicallMethods(
+    callss: Callss
+  ): Promise<NFTTestStdTypes.MulticallReturnType<Callss>>;
+  async multicall<
+    Callss extends
+      | NFTTestStdTypes.MultiCallParams
+      | NFTTestStdTypes.MultiCallParams[]
+  >(callss: Callss): Promise<unknown> {
+    return await multicallMethods(
       NFTTestStd,
       this,
       callss,
       getContractByCodeHash
-    )) as NFTTestStdTypes.MulticallReturnType<Callss>;
+    );
   }
 }