chore: releasing v6.3.1 (#280)

* refactor: add gas options to gateway upgrade test (#277) * refactor: add gas options to gateway upgrade test * fix(ci): pinning slither version (#278) * fix(ci): ignore unused imports in bytecode frozen contracts * fix(ci): ignore unused imports in bytecode frozen contracts * fix(ci): pinning the slither version to 0.10.1 * fix(ci): pinning the slither version to 0.10.1 --------- Co-authored-by: re1ro <rma4ok@gmail.com> * feat(GasService): updated estimation dependency (#279) * feat(GasService): updated estimation dependency * chore(npm): version bump * test(GasService): fixing gas info format * chore(npm): GMP SDK version bump --------- Co-authored-by: Blockchain Guy <ayusht11@outlook.com>
axelarnetwork · Apr 17, 2024 · c4b295c · c4b295c
1 parent 2da444a
commit c4b295c
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 20 deletions.
diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml
@@ -21,3 +21,6 @@ jobs:
         uses: crytic/slither-action@v0.3.1
         env:
           NO_OVERRIDES: true
+        with:
+          node-version: 18
+          slither-version: 0.10.1
diff --git a/contracts/gas-service/AxelarGasService.sol b/contracts/gas-service/AxelarGasService.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 
 import { IERC20 } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IERC20.sol';
 import { IAxelarGasService } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGasService.sol';
-import { InterchainGasEstimation } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/gas-estimation/InterchainGasEstimation.sol';
+import { InterchainGasEstimation, GasInfo } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/gas-estimation/InterchainGasEstimation.sol';
 import { Upgradable } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/upgradable/Upgradable.sol';
 import { SafeTokenTransfer, SafeTokenTransferFrom } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/SafeTransfer.sol';
 import { SafeNativeTransfer } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/libs/SafeNativeTransfer.sol';
@@ -20,8 +20,6 @@ contract AxelarGasService is InterchainGasEstimation, Upgradable, IAxelarGasServ
     using SafeTokenTransferFrom for IERC20;
     using SafeNativeTransfer for address payable;
 
-    error InvalidParams();
-
     address public immutable gasCollector;
 
     /**

diff --git a/contracts/test/gmp/SourceChainSwapCaller.sol b/contracts/test/gmp/SourceChainSwapCaller.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.0;
 
+import { IAxelarGasService } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGasService.sol';
 import { IERC20 } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IERC20.sol';
 import { IAxelarGateway } from '../../interfaces/IAxelarGateway.sol';
-import { IAxelarGasService } from '../../interfaces/IAxelarGasService.sol';
 
 contract SourceChainSwapCaller {
     IAxelarGateway public gateway;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@axelar-network/axelar-cgp-solidity",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "description": "EVM Smart Contracts for Axelar Network",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/axelarnetwork/axelar-cgp-solidity#readme",
   "dependencies": {
-    "@axelar-network/axelar-gmp-sdk-solidity": "5.7.0"
+    "@axelar-network/axelar-gmp-sdk-solidity": "5.8.0"
   },
   "devDependencies": {
     "@0xpolygonhermez/zkevm-commonjs": "github:0xpolygonhermez/zkevm-commonjs#v1.0.0",

diff --git a/test/AxelarGatewayUpgrade.js b/test/AxelarGatewayUpgrade.js
@@ -180,7 +180,7 @@ describe('AxelarGatewayUpgrade', () => {
 
         await waitFor(timeDelay);
 
-        const tx = await interchainGovernance.executeProposal(target, calldata, nativeValue);
+        const tx = await interchainGovernance.executeProposal(target, calldata, nativeValue, getGasOptions());
         const receipt = await tx.wait();
         const executionTimestamp = (await ethers.provider.getBlock(receipt.blockNumber)).timestamp;
 

diff --git a/test/gmp/AxelarGasService.js b/test/gmp/AxelarGasService.js
@@ -631,11 +631,32 @@ describe('AxelarGasService', () => {
         });
 
         describe('Gas Estimation', () => {
-            const chains = ['ethereum', 'optimism', 'base'];
+            const chains = ['ethereum', 'optimism', 'arbitrum'];
             const gasUpdates = [
-                [0, '110227069355211', '278470919016084', '3800724', '1395265596'],
-                [1, '110898281163494', '278128885876991', '3066', '0'],
-                [1, '123127735536005', '279194214965138', '30593', '0'],
+                {
+                    gasEstimationType: 0,
+                    l1FeeScalar: 0,
+                    axelarBaseFee: 90000000000,
+                    relativeGasPrice: 50000000000,
+                    relativeBlobBaseFee: 1,
+                    expressFee: 190000000000,
+                },
+                {
+                    gasEstimationType: 1,
+                    l1FeeScalar: 1500,
+                    axelarBaseFee: 90000,
+                    relativeGasPrice: 5000,
+                    relativeBlobBaseFee: 0,
+                    expressFee: 190000,
+                },
+                {
+                    gasEstimationType: 3,
+                    l1FeeScalar: 0,
+                    axelarBaseFee: 90000,
+                    relativeGasPrice: 5000,
+                    relativeBlobBaseFee: 0,
+                    expressFee: 190000,
+                },
             ];
 
             it('should allow the collector to update gas info', async () => {
@@ -653,15 +674,15 @@ describe('AxelarGasService', () => {
 
                 await expect(gasService.connect(ownerWallet).updateGasInfo(chains, gasUpdates))
                     .to.emit(gasService, 'GasInfoUpdated')
-                    .withArgs(chains[0], gasUpdates[0]);
+                    .withArgs(chains[0], Object.values(gasUpdates[0]));
 
                 for (let i = 0; i < chains.length; i++) {
                     const chain = chains[i];
                     const gasInfo = gasUpdates[i];
 
                     let result = await gasService.getGasInfo(chain);
                     result = Array.from(result).map((x) => (x.toNumber ? x.toNumber().toString() : x));
-                    expect(result).to.be.deep.equal(gasInfo);
+                    expect(result).to.be.deep.equal(Object.values(gasInfo));
                 }
             });
 
@@ -715,7 +736,7 @@ describe('AxelarGasService', () => {
                     params,
                 );
 
-                expect(gasEstimate).to.be.equal(111288142881657);
+                expect(gasEstimate).to.be.equal(374600090277);
 
                 await expectRevert(
                     (gasOptions) =>