From 28ffddfca0778c795a57a6ef617ec130ec5076cf Mon Sep 17 00:00:00 2001 From: Foivos Date: Thu, 7 Dec 2023 18:10:09 +0200 Subject: [PATCH] feat: updated its once more (#102) * updated its once more * update version * fix sui --- package-lock.json | 36 ++++++++++++++----- .../move/sample/Move.toml | 2 +- packages/axelar-local-dev-sui/package.json | 4 +-- packages/axelar-local-dev/package.json | 2 +- packages/axelar-local-dev/src/Network.ts | 14 ++++---- .../axelar-local-dev/src/contracts/ITS.sol | 2 +- .../axelar-local-dev/src/contracts/index.ts | 4 +-- 7 files changed, 42 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a14e238..9c4eb90f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,7 +70,7 @@ }, "node_modules/@axelar-network/axelar-cgp-sui": { "version": "0.0.0", - "resolved": "git+ssh://git@github.com/axelarnetwork/axelar-cgp-sui.git#a220badf4ff5837a8393dfb681a403d01592bd1b", + "resolved": "git+ssh://git@github.com/axelarnetwork/axelar-cgp-sui.git#fbbc0fbd9c439dd07f6e5984b2a3432c4cb4a718", "license": "MIT", "dependencies": { "@mysten/sui.js": "^0.42.0", @@ -166,6 +166,26 @@ "resolved": "packages/axelar-local-dev-sui", "link": true }, + "node_modules/@axelar-network/interchain-token-service": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@axelar-network/interchain-token-service/-/interchain-token-service-1.0.0.tgz", + "integrity": "sha512-BK9zaaio9hVsNiIeSJZmdCK7nVfbxtZFjIeT2+GPB6m1yYoIWwGYCzTX7pl/f5P04kSuM02qbra63i1uKphhmA==", + "dependencies": { + "@axelar-network/axelar-cgp-solidity": "6.2.0", + "@axelar-network/axelar-gmp-sdk-solidity": "5.6.3" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@axelar-network/interchain-token-service/node_modules/@axelar-network/axelar-gmp-sdk-solidity": { + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/@axelar-network/axelar-gmp-sdk-solidity/-/axelar-gmp-sdk-solidity-5.6.3.tgz", + "integrity": "sha512-w6Sp88H0nb0GFJMq73eUuymEcUdfX6evMObwfUVu+lZLA3Y5IyBfwbQftkLUMp8MFR6MStLjiTkMXRmz8xV9yg==", + "engines": { + "node": ">=16" + } + }, "node_modules/@babel/code-frame": { "version": "7.23.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", @@ -30876,7 +30896,7 @@ "@axelar-network/axelar-cgp-solidity": "^6.1.0", "@axelar-network/axelar-chains-config": "^0.1.0", "@axelar-network/axelar-gmp-sdk-solidity": "^5.3.0", - "@axelar-network/interchain-token-service": "^1.0.0-beta.4", + "@axelar-network/interchain-token-service": "^1.0.0", "ethers": "^5.6.5", "fs-extra": "^10.1.0", "ganache": "^7.1.0", @@ -30919,11 +30939,11 @@ }, "packages/axelar-local-dev-aptos": { "name": "@axelar-network/axelar-local-dev-aptos", - "version": "2.2.0-alpha.21", + "version": "2.1.8", "license": "ISC", "dependencies": { "@axelar-network/axelar-cgp-aptos": "^1.0.5", - "@axelar-network/axelar-local-dev": "2.2.0-alpha.21", + "@axelar-network/axelar-local-dev": "2.1.8", "aptos": "1.3.16" } }, @@ -30970,20 +30990,20 @@ }, "packages/axelar-local-dev-near": { "name": "@axelar-network/axelar-local-dev-near", - "version": "2.2.0-alpha.21", + "version": "2.1.8", "license": "ISC", "dependencies": { "@axelar-network/axelar-cgp-near": "^1.0.0", - "@axelar-network/axelar-local-dev": "2.2.0-alpha.21" + "@axelar-network/axelar-local-dev": "2.1.8" } }, "packages/axelar-local-dev-sui": { "name": "@axelar-network/axelar-local-dev-sui", - "version": "2.1.7", + "version": "2.1.8", "license": "ISC", "dependencies": { "@axelar-network/axelar-cgp-sui": "https://github.com/axelarnetwork/axelar-cgp-sui.git", - "@axelar-network/axelar-local-dev": "2.1.7", + "@axelar-network/axelar-local-dev": "2.1.8", "@mysten/sui.js": "^0.41.0" } }, diff --git a/packages/axelar-local-dev-sui/move/sample/Move.toml b/packages/axelar-local-dev-sui/move/sample/Move.toml index 2f1df436..553c147e 100644 --- a/packages/axelar-local-dev-sui/move/sample/Move.toml +++ b/packages/axelar-local-dev-sui/move/sample/Move.toml @@ -3,7 +3,7 @@ name = "Test" version = "0.0.1" [dependencies] -Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "framework/testnet" } +Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "framework/mainnet" } Axelar = { local = "../../../../node_modules/@axelar-network/axelar-cgp-sui/move/axelar" } [addresses] diff --git a/packages/axelar-local-dev-sui/package.json b/packages/axelar-local-dev-sui/package.json index f607edf6..84b60f86 100644 --- a/packages/axelar-local-dev-sui/package.json +++ b/packages/axelar-local-dev-sui/package.json @@ -1,6 +1,6 @@ { "name": "@axelar-network/axelar-local-dev-sui", - "version": "2.1.7", + "version": "2.1.8", "main": "dist/index.js", "files": [ "dist/", @@ -18,7 +18,7 @@ }, "dependencies": { "@axelar-network/axelar-cgp-sui": "https://github.com/axelarnetwork/axelar-cgp-sui.git", - "@axelar-network/axelar-local-dev": "2.1.7", + "@axelar-network/axelar-local-dev": "2.1.8", "@mysten/sui.js": "^0.41.0" }, "author": "euro@axelar.network", diff --git a/packages/axelar-local-dev/package.json b/packages/axelar-local-dev/package.json index f1a2e260..c7d4e40f 100644 --- a/packages/axelar-local-dev/package.json +++ b/packages/axelar-local-dev/package.json @@ -36,7 +36,7 @@ "@axelar-network/axelar-cgp-solidity": "^6.1.0", "@axelar-network/axelar-chains-config": "^0.1.0", "@axelar-network/axelar-gmp-sdk-solidity": "^5.3.0", - "@axelar-network/interchain-token-service": "^1.0.0-beta.4", + "@axelar-network/interchain-token-service": "^1.0.0", "ethers": "^5.6.5", "fs-extra": "^10.1.0", "ganache": "^7.1.0", diff --git a/packages/axelar-local-dev/src/Network.ts b/packages/axelar-local-dev/src/Network.ts index 7b2a6b1c..39a8980b 100644 --- a/packages/axelar-local-dev/src/Network.ts +++ b/packages/axelar-local-dev/src/Network.ts @@ -5,11 +5,11 @@ import http from 'http'; import { logger } from './utils'; import { getSignedExecuteInput, getRandomID, deployContract } from './utils'; import { - AxelarGatewayProxy, + AxelarGasReceiverProxy, Auth, TokenDeployer, BurnableMintableCappedERC20, - AxelarGasReceiverProxy, + AxelarGatewayProxy, ConstAddressDeployer, Create3Deployer, TokenManagerDeployer, @@ -19,7 +19,7 @@ import { TokenHandler, InterchainTokenService as InterchainTokenServiceContract, InterchainTokenFactory as InterchainTokenFactoryContract, - Proxy, + InterchainProxy, } from './contracts'; import { AxelarGateway__factory as AxelarGatewayFactory } from './types/factories/@axelar-network/axelar-cgp-solidity/contracts/AxelarGateway__factory'; import { AxelarGateway } from './types/@axelar-network/axelar-cgp-solidity/contracts/AxelarGateway'; @@ -182,10 +182,10 @@ export class Network { async deployGasReceiver(): Promise { logger.log(`Deploying the Axelar Gas Receiver for ${this.name}... `); const gasService = await deployContract(this.ownerWallet, AxelarGasServiceFactory, [this.ownerWallet.address]); - const gasReceiverProxy = await deployContract(this.ownerWallet, AxelarGasReceiverProxy); - await gasReceiverProxy.init(gasService.address, this.ownerWallet.address, '0x'); + const gasReceiverInterchainProxy = await deployContract(this.ownerWallet, AxelarGasReceiverProxy); + await gasReceiverInterchainProxy.init(gasService.address, this.ownerWallet.address, '0x'); - this.gasService = AxelarGasServiceFactory.connect(gasReceiverProxy.address, this.provider); + this.gasService = AxelarGasServiceFactory.connect(gasReceiverInterchainProxy.address, this.provider); logger.log(`Deployed at ${this.gasService.address}`); return this.gasService; } @@ -247,7 +247,7 @@ export class Network { tokenManager.address, tokenHandler.address, ]); - const factory = new ContractFactory(Proxy.abi, Proxy.bytecode); + const factory = new ContractFactory(InterchainProxy.abi, InterchainProxy.bytecode); let bytecode = factory.getDeployTransaction( implementation.address, wallet.address, diff --git a/packages/axelar-local-dev/src/contracts/ITS.sol b/packages/axelar-local-dev/src/contracts/ITS.sol index 21be4676..40ddc5d5 100644 --- a/packages/axelar-local-dev/src/contracts/ITS.sol +++ b/packages/axelar-local-dev/src/contracts/ITS.sol @@ -9,5 +9,5 @@ import { InterchainTokenDeployer } from '@axelar-network/interchain-token-servic import { TokenManager } from '@axelar-network/interchain-token-service/contracts/token-manager/TokenManager.sol'; import { TokenHandler } from '@axelar-network/interchain-token-service/contracts/TokenHandler.sol'; import { InterchainTokenService } from '@axelar-network/interchain-token-service/contracts/InterchainTokenService.sol'; -import { Proxy } from '@axelar-network/interchain-token-service/contracts/proxies/Proxy.sol'; +import { InterchainProxy } from '@axelar-network/interchain-token-service/contracts/proxies/InterchainProxy.sol'; import { InterchainTokenFactory } from '@axelar-network/interchain-token-service/contracts/InterchainTokenFactory.sol'; diff --git a/packages/axelar-local-dev/src/contracts/index.ts b/packages/axelar-local-dev/src/contracts/index.ts index d975b9f8..e123b856 100644 --- a/packages/axelar-local-dev/src/contracts/index.ts +++ b/packages/axelar-local-dev/src/contracts/index.ts @@ -18,7 +18,7 @@ import TokenManager from '../artifacts/@axelar-network/interchain-token-service/ import TokenHandler from '../artifacts/@axelar-network/interchain-token-service/contracts/TokenHandler.sol/TokenHandler.json'; import InterchainTokenService from '../artifacts/@axelar-network/interchain-token-service/contracts/InterchainTokenService.sol/InterchainTokenService.json'; import InterchainTokenFactory from '../artifacts/@axelar-network/interchain-token-service/contracts/InterchainTokenFactory.sol/InterchainTokenFactory.json'; -import Proxy from '../artifacts/@axelar-network/axelar-gmp-sdk-solidity/contracts/upgradable/Proxy.sol/Proxy.json'; +import InterchainProxy from '../artifacts/@axelar-network/interchain-token-service/contracts/proxies/InterchainProxy.sol/InterchainProxy.json'; import IInterchainTokenService from '../artifacts/@axelar-network/interchain-token-service/contracts/interfaces/IInterchainTokenService.sol/IInterchainTokenService.json'; import IInterchainTokenFactory from '../artifacts/@axelar-network/interchain-token-service/contracts/interfaces/IInterchainTokenFactory.sol/IInterchainTokenFactory.json'; @@ -41,7 +41,7 @@ export { TokenManager, TokenHandler, InterchainTokenService, - Proxy, + InterchainProxy, InterchainTokenFactory, IInterchainTokenService, IInterchainTokenFactory,