Bubbling up verification artifacts to verification.json (#2817)

hyperlane-xyz · Oct 19, 2023 · a330c71 · a330c71
1 parent b0870b1
commit a330c71
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 16 deletions.
diff --git a/typescript/sdk/src/core/HyperlaneCoreDeployer.ts b/typescript/sdk/src/core/HyperlaneCoreDeployer.ts
@@ -108,7 +108,11 @@ export class HyperlaneCoreDeployer extends HyperlaneDeployer<
       config,
       coreAddresses,
     );
-    this.addDeployedContracts(chain, hooks);
+    this.addDeployedContracts(
+      chain,
+      hooks,
+      this.hookDeployer.verificationInputs[chain],
+    );
     return hooks[config.type].address;
   }
 

diff --git a/typescript/sdk/src/deploy/HyperlaneDeployer.ts b/typescript/sdk/src/deploy/HyperlaneDeployer.ts
@@ -115,11 +115,26 @@ export abstract class HyperlaneDeployer<
   protected addDeployedContracts(
     chain: ChainName,
     contracts: HyperlaneContracts<any>,
-  ) {
+    verificationInputs?: ContractVerificationInput[],
+  ): void {
     this.deployedContracts[chain] = {
       ...this.deployedContracts[chain],
       ...contracts,
     };
+    if (verificationInputs)
+      this.addVerificationArtifacts(chain, verificationInputs);
+  }
+
+  protected addVerificationArtifacts(
+    chain: ChainName,
+    artifacts: ContractVerificationInput[],
+  ): void {
+    this.verificationInputs[chain] = this.verificationInputs[chain] || [];
+    artifacts.forEach((artifact) => {
+      this.verificationInputs[chain].push(artifact);
+    });
+
+    // TODO: deduplicate
   }
 
   protected async runIf<T>(
@@ -275,19 +290,11 @@ export abstract class HyperlaneDeployer<
       contract,
       factory.bytecode,
     );
-    this.addVerificationArtifact(chain, verificationInput);
+    this.addVerificationArtifacts(chain, [verificationInput]);
 
     return contract;
   }
 
-  protected addVerificationArtifact(
-    chain: ChainName,
-    artifact: ContractVerificationInput,
-  ) {
-    this.verificationInputs[chain] = this.verificationInputs[chain] || [];
-    this.verificationInputs[chain].push(artifact);
-  }
-
   async deployContract<K extends keyof Factories>(
     chain: ChainName,
     contractName: K,

diff --git a/typescript/sdk/src/deploy/HyperlaneProxyFactoryDeployer.ts b/typescript/sdk/src/deploy/HyperlaneProxyFactoryDeployer.ts
@@ -29,10 +29,14 @@ export class HyperlaneProxyFactoryDeployer extends HyperlaneDeployer<
       this.factories,
     ) as (keyof ProxyFactoryFactories)[]) {
       const factory = await this.deployContract(chain, factoryName, []);
-      this.addVerificationArtifact(chain, {
-        name: proxyFactoryImplementations[factoryName],
-        address: await factory.implementation(),
-      });
+      this.addVerificationArtifacts(chain, [
+        {
+          name: proxyFactoryImplementations[factoryName],
+          address: await factory.implementation(),
+          constructorArguments: '',
+          isProxy: true,
+        },
+      ]);
       contracts[factoryName] = factory;
     }
     return contracts as HyperlaneContracts<ProxyFactoryFactories>;

diff --git a/typescript/sdk/src/hook/HyperlaneHookDeployer.ts b/typescript/sdk/src/hook/HyperlaneHookDeployer.ts
@@ -93,7 +93,12 @@ export class HyperlaneHookDeployer extends HyperlaneDeployer<
       );
     }
     const igpContracts = await this.igpDeployer.deployContracts(chain, config);
-    this.addDeployedContracts(chain, igpContracts);
+    // bubbling up addresses and verification input artifacts
+    this.addDeployedContracts(
+      chain,
+      igpContracts,
+      this.igpDeployer.verificationInputs[chain],
+    );
     return igpContracts;
   }