fix(core): encode execute function for custom call

dittonetwork · Jul 5, 2024 · dabcbaf · dabcbaf
1 parent 1ed947f
commit dabcbaf
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 57 deletions.
diff --git a/examples/sandbox/index.html b/examples/sandbox/index.html
@@ -6,7 +6,8 @@
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg">
+    <link rel="icon" type="image/png" href="/favicon.png">
     <link rel="stylesheet" href="/src/styles.css" />
     <script>
       window.Browser = { T: () => undefined };

diff --git a/examples/sandbox/public/favicon.ico b/examples/sandbox/public/favicon.ico
diff --git a/examples/sandbox/public/favicon.png b/examples/sandbox/public/favicon.png
diff --git a/examples/sandbox/public/favicon.svg b/examples/sandbox/public/favicon.svg
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/src/lib/workflow/actions/custom-contract-call/custom-contract-call.ts b/packages/core/src/lib/workflow/actions/custom-contract-call/custom-contract-call.ts
@@ -12,6 +12,7 @@ export type CallItem = {
   method: string;
   abi: any;
   args: any[];
+  value?: string | number | bigint; // native amount to send with the call
 };
 
 type ActionConfig = {
@@ -20,69 +21,39 @@ type ActionConfig = {
 };
 
 export class CustomContractCall implements CallDataBuilder {
+  private vaultInterface: any;
+
   constructor(
     protected readonly config: ActionConfig,
     protected readonly commonCallDataBuilderConfig: CommonBuilderOptions
-  ) {}
+  ) {
+    this.vaultInterface = this.commonCallDataBuilderConfig.provider
+      .getContractFactory()
+      .getContractInterface(JSON.stringify(VaultABI));
+  }
 
   public async build(): Promise<CallDataBuilderReturnData> {
     const callData = new Set<CallData>();
 
     for (const item of this.config.items) {
       if (!item.contract || !item.method || !item.abi) continue;
 
-    const contractInterface = this.commonCallDataBuilderConfig.provider
-      .getContractFactory()
-      .getContractInterface(JSON.stringify(item.abi));
+      const contractInterface = this.commonCallDataBuilderConfig.provider
+        .getContractFactory()
+        .getContractInterface(JSON.stringify(item.abi));
+
+      const functionCallData = contractInterface.encodeFunctionData(item.method, item.args);
 
       callData.add({
         to: item.contract,
-        callData: contractInterface.encodeFunctionData(item.method, item.args),
+        callData: this.vaultInterface.encodeFunctionData("execute", [
+          item.contract,
+          item.value ? String(item.value) : "0",
+          functionCallData,
+        ]),
       });
     }
 
     return { callData, value: this.config.value || BigInt(0) };
   }
 }
-
-
-
-
-  // public encodeExecuteFunctionCallRaw(
-  //   pointer: string,
-  //   to: string,
-  //   callData: string,
-  //   nativeAmount?: string | number
-  // ): CallData {
-  //   return {
-  //     pointer: pointer,
-  //     callData: this.vaultInterface.encodeFunctionData("execute", [
-  //       to,
-  //       nativeAmount ?? "0",
-  //       callData
-  //     ]),
-  //     value: nativeAmount?.toString()
-  //   }
-  // }
-
-  // public encodeExecuteFunctionCall(
-  //   pointer: string,
-  //   callParams: {
-  //     functionName: string,
-  //     data: any[],
-  //     to: string,
-  //     nativeAmount?: string | number,
-  //     viewData?: string
-  //   }
-  // ): CallData {
-  //   const functionCall = this.encodeFunctionData(pointer, callParams.functionName, callParams.data, callParams.viewData)
-
-  //   return {
-  //     pointer,
-  //     callData: this.vaultInterface.encodeFunctionData("execute", [
-  //       callParams.to,
-  //       callParams.nativeAmount ?? "0",
-  //       functionCall.callData
-  //     ])
-  //   }
-  // }