make dispatcher reinitializable + add initilization to upgrade specs

contracts/core/Dispatcher.sol

@@ -77,7 +77,12 @@ contract Dispatcher is OwnableUpgradeable, UUPSUpgradeable, ReentrancyGuard, IDi
      * @dev This method should be called only once during contract deployment.
      * @dev For contract upgarades, which need to reinitialize the contract, use the reinitializer modifier.
      */
-    function initialize(string memory initPortPrefix, IFeeVault _feeVault) public virtual initializer nonReentrant {
+    function initialize(string memory initPortPrefix, IFeeVault _feeVault)
+        external
+        virtual
+        reinitializer(2)
+        nonReentrant
+    {
         if (bytes(initPortPrefix).length == 0) {
             revert IBCErrors.invalidPortPrefix();
         }

src/deploy.ts

@@ -48,18 +48,8 @@ const getDeployData = (
     );
   }
 
-  // var encodedInitData = "";
-  let initData = "";
-
-  if (init) {
-    const initArgs = init.args.map((arg: any) => {
-      return typeof arg === "string" ? renderString(arg, env) : arg;
-    });
-    const iFace = new ethers.Interface([`function ${init.signature}`]);
-    initData = iFace.encodeFunctionData(init.signature, initArgs);
-  }
   return {
-    args: renderArgs(deployArgs, initData, env),
+    args: renderArgs(deployArgs, init, env),
     libraries: libs,
     factory,
     contractFactoryConstructor,

src/evm/schemas/tx.ts

@@ -11,6 +11,12 @@ const TxItemSchema = z.object({
   address: z.string().nullish(),
   factoryName: z.optional(z.string()),
   args: z.optional(z.array(z.any())),
+  init: z.optional(
+    z.object({
+      signature: z.string().min(1),
+      args: z.array(z.string().min(1)),
+    })
+  ),
 });
 
 type TxItem = z.infer<typeof TxItemSchema>;

src/tx.ts

@@ -75,14 +75,15 @@ export async function sendTxToChain(
       const deployer = accountRegistry.mustGet(
         tx.deployer ? tx.deployer : DEFAULT_DEPLOYER
       );
-      const deployedContractAddress = renderArgs([tx.address], "", env)[0];
+
+      const deployedContractAddress = renderArgs([tx.address], tx.init, env)[0];
 
       const ethersContract = new ethers.Contract(
         deployedContractAddress,
         deployedContractAbi,
         deployer
       );
-      const args = renderArgs(tx.args, "", env);
+      const args = renderArgs(tx.args, tx.init, env);
       logger.info(
         `calling ${tx.signature} on ${tx.name} @:${deployedContractAddress} with args: \n [${args}]`
       );

src/utils/io.ts

@@ -24,6 +24,7 @@ import {
 import yargs from "yargs/yargs";
 import { hideBin } from "yargs/helpers";
 import { AccountRegistry } from "../evm/account";
+import { ethers } from "ethers";
 
 export interface StringToStringMap {
   [key: string]: string | null | undefined;
@@ -257,21 +258,41 @@ export async function readFromDeploymentFile(
   }
 }
 
+const compileInitArgs = (
+  init: { args: any[]; signature: string } | undefined,
+  env: StringToStringMap
+) => {
+  if (!init) {
+    return "";
+  }
+  const initArgs = init.args.map((arg: any) => {
+    return typeof arg === "string" ? renderString(arg, env) : arg;
+  });
+  const iFace = new ethers.Interface([`function ${init.signature}`]);
+  return iFace.encodeFunctionData(init.signature, initArgs);
+};
+
 /**
  *
  * @param args Render the args for the contract deployment through looking them up in environment
  * @param init replace initArgs with the init string
  * @param env to look up the args in
  * @returns
  */
-export const renderArgs = (args: any[] | undefined, init: string, env: any) => {
+export const renderArgs = (
+  args: any[] | undefined,
+  init: { args: any[]; signature: string } | undefined,
+  env: any
+) => {
+  const initData = compileInitArgs(init, env);
+
   return args
     ? args.map((arg: any) => {
         if (typeof arg !== "string") return arg;
         if (arg === "$INITARGS") {
-          if (init === "")
+          if (initData === "")
             throw new Error(`Found $INITARGS but no args to replace it with.`);
-          return init;
+          return initData;
         }
         return renderString(arg, env);
       })

test/upgradeableProxy/upgrades/DispatcherV2Initializable.sol

@@ -30,7 +30,7 @@ import {IBCErrors} from "../../../contracts/libs/IbcErrors.sol";
  *     which can be relayed to a rollup module on the Polymerase chain
  */
 contract DispatcherV2Initializable is DispatcherV2 {
-    function initialize(string memory initPortPrefix, IFeeVault _feeVault) public override reinitializer(2) {
+    function initialize(string memory initPortPrefix, IFeeVault _feeVault) public override reinitializer(3) {
         __Ownable_init();
         portPrefix = initPortPrefix;
         portPrefixLen = uint32(bytes(initPortPrefix).length);