chore: update express contract deployment

axelarnetwork · Jun 21, 2023 · 87f2887 · 87f2887
1 parent ade31c3
commit 87f2887
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/axelar-local-dev/src/Network.ts b/packages/axelar-local-dev/src/Network.ts
@@ -153,7 +153,7 @@ export class Network {
         const implementationCode = await this.provider.getCode(gateway.address);
         const implementationCodeHash = keccak256(implementationCode);
         for (let i = 0; i < oldThreshold; i++) {
-            await (await this.ownerWallet.sendTransaction({to: adminWallets[i]._address, value: BigInt(1e18)})).wait();
+            await (await this.ownerWallet.sendTransaction({ to: adminWallets[i]._address, value: BigInt(1e18) })).wait();
             await (await this.gateway.connect(adminWallets[i]).upgrade(gateway.address, implementationCodeHash, params)).wait();
         }
         await (await auth.transferOwnership(this.gateway.address)).wait();
@@ -208,7 +208,6 @@ export class Network {
         const expressProxyDeployer = await deployContract(this.ownerWallet, GMPExpressProxyDeployer, [this.gateway.address]);
         const expressService = await deployContract(this.ownerWallet, GMPExpressService, [
             this.gateway.address,
-            this.gasService.address,
             expressProxyDeployer.address,
             this.ownerWallet.address,
         ]);

diff --git a/packages/axelar-local-dev/src/__tests__/relay.spec.ts b/packages/axelar-local-dev/src/__tests__/relay.spec.ts
@@ -261,14 +261,16 @@ describe('relay', () => {
             ]);
 
             // get bytecode with constructor data
+            const expressWithToken = await deployContract(chain2.ownerWallet, ExpressWithToken, [
+                chain2.gateway.address,
+                chain2.gasService.address,
+            ]);
             const salt = ethers.utils.id(Date.now().toString());
-            const factory = new ContractFactory(ExpressWithToken.abi, ExpressWithToken.bytecode);
-            const bytecode = factory.getDeployTransaction(chain2.gateway.address, chain2.gasService.address).data;
 
             // deploy the express proxy + implementation contracts
             await chain2.expressService
                 .connect(chain2.ownerWallet)
-                .deployExpressExecutable(salt, bytecode, chain2.ownerWallet.address, '0x')
+                .deployExpressProxy(salt, expressWithToken.address, chain2.ownerWallet.address, '0x')
                 .then((tx: ContractTransaction) => tx.wait());
 
             // get the proxy address