encodeInitData as part of deploy function

ChainSafe · Jan 24, 2024 · 65a3aa0 · 65a3aa0
1 parent 52e87fe
commit 65a3aa0
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/packages/plugin/src/MultichainHardhatRuntimeEnvironmentField.ts b/packages/plugin/src/MultichainHardhatRuntimeEnvironmentField.ts
@@ -1,16 +1,12 @@
-import { Artifact, HardhatRuntimeEnvironment } from "hardhat/types";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { Config, Domain } from "@buildwithsygma/sygma-sdk-core";
 import Web3, {
   ContractAbi,
   Transaction,
-  Bytes,
   utils,
   PayableCallOptions,
-  ContractMethodInputParameters,
-  AbiFunctionFragment,
 } from "web3";
 import { vars } from "hardhat/config";
-import { HardhatPluginError } from "hardhat/internal/core/errors";
 import {
   getConfigEnvironmentVariable,
   getNetworkChainId,
@@ -53,32 +49,11 @@ export class MultichainHardhatRuntimeEnvironmentField {
     this.isValidated;
   }
 
-  public encodeInitData<Abi extends ContractAbi = any>(
-    artifact: Artifact,
-    initMethodName: string,
-    initMethodArgs: ContractMethodInputParameters<Abi>
-  ): Bytes {
-    const initMethodAbiFragment: AbiFunctionFragment | undefined =
-      artifact.abi.find(
-        (fragment: AbiFunctionFragment) => fragment.name === initMethodName
-      ) as AbiFunctionFragment | undefined;
-    if (!initMethodAbiFragment)
-      throw new HardhatPluginError(
-        "@chainsafe/hardhat-plugin-multichain-deploy",
-        `InitMethod ${initMethodName} not foud in ABI`
-      );
-
-    return this.web3!.eth.abi.encodeFunctionCall(
-      initMethodAbiFragment,
-      initMethodArgs
-    );
-  }
-
   /**
    * @param contractName name of the contract
    * @param networkArgs record key is name of the networks on which contract is being deployed
    * @param args contract contructor args
-   * @param initData optional encoded initilize method, can be encoded with encodeInitData
+   * @param initData optional init method details, method name and args required
    * @param salt optional or generated by default from randombytes(32)
    * @param isUniquePerChain optional
    * @param customNonPayableTxOptions non payable options for web3 deploy.method.send(), payable summed fees are always calculated by the method

diff --git a/packages/plugin/src/types.ts b/packages/plugin/src/types.ts
@@ -1,14 +1,18 @@
 import {
   ContractAbi,
   ContractConstructorArgs,
+  ContractMethodInputParameters,
   MatchPrimitiveType,
   NonPayableCallOptions,
 } from "web3";
 
 export interface NetworkArguments<Abi extends ContractAbi = any> {
   [network: string]: {
     args?: ContractConstructorArgs<Abi>;
-    initData?: string;
+    initData?: {
+      initMethodName: string;
+      initMethodArgs: ContractMethodInputParameters<Abi>;
+    };
   };
 }
 

diff --git a/packages/plugin/src/utils.ts b/packages/plugin/src/utils.ts
@@ -2,8 +2,10 @@ import assert from "assert";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { Domain, Environment } from "@buildwithsygma/sygma-sdk-core";
 import {
+  AbiFallbackFragment,
   Bytes,
   ContractAbi,
+  ContractMethodInputParameters,
   FMT_BYTES,
   FMT_NUMBER,
   HttpProvider,
@@ -49,6 +51,23 @@ export function sumedFees(fees: Numbers[]): string {
   return sumOfFees.toString();
 }
 
+export function encodeInitData<Abi extends ContractAbi>(
+  abi: Abi,
+  initMethodName: string,
+  initMethodArgs: ContractMethodInputParameters<Abi>
+): Bytes {
+  const initMethodAbiFragment = (
+    abi as unknown as Array<AbiFallbackFragment>
+  ).find((fragment) => fragment.name === initMethodName);
+  if (!initMethodAbiFragment)
+    throw new HardhatPluginError(
+      "@chainsafe/hardhat-plugin-multichain-deploy",
+      `InitMethod ${initMethodName} not foud in ABI`
+    );
+
+  return eth.abi.encodeFunctionCall(initMethodAbiFragment, initMethodArgs);
+}
+
 export function mapNetworkArgs<Abi extends ContractAbi = any>(
   contractAbi: Abi,
   networkArgs: NetworkArguments<Abi>,
@@ -111,9 +130,16 @@ export function mapNetworkArgs<Abi extends ContractAbi = any>(
       //no constructorAbi and no args
       constructorArgs.push("0x");
     }
+    const networkInitData = networkArgs[networkName].initData;
+    if (networkInitData !== undefined) {
+      const { initMethodName, initMethodArgs } = networkInitData;
+      const initData = encodeInitData(
+        contractAbi,
+        initMethodName,
+        initMethodArgs
+      );
 
-    if (networkArgs[networkName].initData) {
-      initDatas.push(networkArgs[networkName].initData as Bytes);
+      initDatas.push(initData);
     } else {
       initDatas.push(hexToBytes("0x"));
     }