misc fixes

axelarnetwork · Sep 24, 2024 · 5cd9c9a · 5cd9c9a
1 parent 53a003a
commit 5cd9c9a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json
@@ -486,7 +486,7 @@
       "InterchainTokenService": {
         "adminAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9",
         "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9",
-        "codeId": 664,
+        "codeId": 738,
         "address": "axelar10jzzmv5m7da7dn2xsfac0yqe7zamy34uedx3e28laq0p6f3f8dzqp649fp"
       },
       "VotingVerifier": {

diff --git a/common/utils.js b/common/utils.js
@@ -409,14 +409,14 @@ async function getDomainSeparator(config, chain, options) {
     return expectedDomainSeparator;
 }
 
-const getChainConfig = (config, chainName) => {
+const getChainConfig = (config, chainName, options = {}) => {
     if (chainName === 'none') {
         return undefined;
     }
 
     const chainConfig = config.chains[chainName] || config[chainName];
 
-    if (!chainConfig) {
+    if (!options.skipCheck && !chainConfig) {
         throw new Error(`Chain ${chainName} not found in config`);
     }
 

diff --git a/evm/gateway.js b/evm/gateway.js
@@ -91,7 +91,10 @@ async function processCommand(config, chain, options) {
         return;
     }
 
-    const payload = options.payload || '0x';
+    let payload = options.payload || '0x';
+    if (!payload.startsWith('0x')) {
+        payload = '0x' + payload;
+    }
 
     if (!payload) {
         throw new Error('Missing GMP payload');
@@ -238,7 +241,7 @@ async function processCommand(config, chain, options) {
 
         // eslint-disable-next-line no-fallthrough
         case 'approveAndExecute': {
-            const payloadHash = payload.startsWith('0x') ? keccak256(arrayify(payload)) : id(payload);
+            const payloadHash = keccak256(arrayify(payload));
 
             const commandID = options.commandID.startsWith('0x') ? options.commandID : id(parseInt(options.commandID).toString());
 
@@ -277,15 +280,16 @@ async function processCommand(config, chain, options) {
 
         // eslint-disable-next-line no-duplicate-case,no-fallthrough
         case 'approveAndExecute': {
-            const payloadHash = payload.startsWith('0x') ? keccak256(arrayify(payload)) : id(payload);
+            const payloadHash = keccak256(arrayify(payload));
             const { sourceChain, sourceAddress } = options;
 
-            let commandID;
+            let commandId;
 
             if (options.messageId) {
-                commandID = id(`${sourceChain}_${options.messageId}`);
+                // Derive commandId for Amplifier gateway
+                commandId = id(`${sourceChain}_${options.messageId}`);
             } else {
-                commandID = options.commandID.startsWith('0x') ? options.commandID : id(parseInt(options.commandID).toString());
+                commandId = options.commandID.startsWith('0x') ? options.commandID : id(parseInt(options.commandID).toString());
             }
 
             if (!options.destination) {
@@ -297,7 +301,7 @@ async function processCommand(config, chain, options) {
 
             if (
                 !(await gateway.isContractCallApproved(
-                    commandID,
+                    commandId,
                     sourceChain,
                     sourceAddress,
                     options.destination,
@@ -310,7 +314,7 @@ async function processCommand(config, chain, options) {
 
             const appContract = new Contract(options.destination, IAxelarExecutable.abi, wallet);
 
-            const tx = await appContract.execute(commandID, sourceChain, sourceAddress, payload);
+            const tx = await appContract.execute(commandId, sourceChain, sourceAddress, payload);
             printInfo('Execute tx', tx.hash);
             await tx.wait(chain.confirmations);
 

diff --git a/evm/its.js b/evm/its.js
@@ -480,7 +480,7 @@ async function processCommand(config, chain, options) {
                 trustedChains = itsChains.map((chain) => chain.axelarId);
                 trustedAddresses = itsChains.map((_) => chain.contracts?.InterchainTokenService?.address);
             } else {
-                const trustedChain = getChainConfig(config, options.trustedChain.toLowerCase()).axelarId;
+                const trustedChain = getChainConfig(config, options.trustedChain.toLowerCase(), { skipCheck: true })?.axelarId || options.trustedChain.toLowerCase();
                 const trustedAddress =
                     options.trustedAddress || getChainConfig(config, options.trustedChain.toLowerCase())?.contracts?.InterchainTokenService?.address;