From 089df8bf0e1db7dcae775a53d2591e343d27dfbd Mon Sep 17 00:00:00 2001 From: Andrew Soon <77280201+andrewsoon@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:32:35 +0800 Subject: [PATCH 1/5] Update mainnet.json --- configs/mainnet.json | 53 +++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/configs/mainnet.json b/configs/mainnet.json index 21292ce..b1b4adf 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -17,31 +17,34 @@ "usdc.1.6.e70e14" ], "transfer_options": { - "Osmosis": 0, - "Noble": 1, - "Cosmos Hub": 2, - "Evmos": 3, - "Axelar": 4, - "Juno": 5, - "Stride": 6, - "Kujira": 7, - "Terra": 8, - "Comdex": 9, - "Stafihub": 10, - "Persistence Core": 11, - "Stargaze": 12, - "Canto": 13, - "Sommelier": 14, - "IRIS Hub": 15, - "Ethereum": 16, - "Arbitrum": 17, - "Polygon": 18, - "OKC": 19, - "Binance Smart Chain": 20, - "Carbon": 21, - "Neo": 22, - "Neo3": 23, - "Zilliqa": 24 + "Mantle": 0, + "OP": 1, + "Base": 2, + "Osmosis": 3, + "Noble": 4, + "Cosmos Hub": 5, + "Evmos": 6, + "Axelar": 7, + "Juno": 8, + "Stride": 9, + "Kujira": 10, + "Terra": 11, + "Comdex": 12, + "Stafihub": 13, + "Persistence Core": 14, + "Stargaze": 15, + "Canto": 16, + "Sommelier": 17, + "IRIS Hub": 18, + "Ethereum": 19, + "Arbitrum": 20, + "Polygon": 21, + "OKC": 22, + "Binance Smart Chain": 23, + "Carbon": 24, + "Neo": 25, + "Neo3": 26, + "Zilliqa": 27 }, "network_fees": { "swth": 0, From 850b0fee32d02c6ad741c948ba1c173964e3f34a Mon Sep 17 00:00:00 2001 From: Thong Yuan Yu Sarah Date: Fri, 11 Oct 2024 10:14:14 +0800 Subject: [PATCH 2/5] Upgrade carbon-sdk --- package.json | 2 +- yarn.lock | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index f116d1c..ae79c43 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@cosmjs/tendermint-rpc": "~0.31.3", "@types/node": "^18.11.9", "@types/node-fetch": "^2.6.2", - "carbon-js-sdk": "^0.11.6", + "carbon-js-sdk": "^0.11.23", "long": "^4.0.0", "node-fetch": "^2.6.1", "pajv": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 2b3c67d..be0f2d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -851,12 +851,11 @@ axios "^0.27.2" long "^4.0.0" -"@keplr-wallet/types@^0.11.64": - version "0.11.64" - resolved "https://registry.yarnpkg.com/@keplr-wallet/types/-/types-0.11.64.tgz#5a308c8c019b4e18f894e0f35f0904b60134d605" - integrity sha512-GgzeLDHHfZFyne3O7UIfFHj/uYqVbxAZI31RbBwt460OBbvwQzjrlZwvJW3vieWRAgxKSITjzEDBl2WneFTQdQ== +"@keplr-wallet/types@^0.12.107": + version "0.12.130" + resolved "https://registry.yarnpkg.com/@keplr-wallet/types/-/types-0.12.130.tgz#1179a5daf2fabaa5d2f3c068b3c816502f7b8cba" + integrity sha512-bUJ6JGpMYUAbPu6SdSG9HjAApgZirMnX4x+1Y9fwC5BCRP2zImYoleTSp+FNbG26iwfN+hUdM0uAcPWsKsfENg== dependencies: - axios "^0.27.2" long "^4.0.0" "@keplr-wallet/unit@0.11.16": @@ -2252,14 +2251,10 @@ callsite@1.0.0: resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" integrity sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ== -camelcase@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -carbon-js-sdk@^0.11.6: - version "0.11.6" - resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.11.6.tgz#24ed05ba75107b7e60e763bcb03305a58773369d" - integrity sha512-DRk2yHMOEIUfeMIqxHEnML4qT6xXCqYCb0SHlk+NLZEwFPFT0e4LWKbfIez0fj4Y7kSaozfzz7zBHZVz5ab61w== +carbon-js-sdk@^0.11.23: + version "0.11.23" + resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.11.23.tgz#8c35301bbc958df5b08ac1065d170dd34fe0e9c1" + integrity sha512-ngAB7JLb3U+KLjFy+AYiL3tXKRGZrtWGpoFfejkvJoIBko1i25KVIH16G+9HvUqdYlUVU02BgTm80jPKxfX72w== dependencies: "@cityofzion/neon-api" "^4.9.0" "@cityofzion/neon-core" "^4.9.0" @@ -2269,7 +2264,7 @@ carbon-js-sdk@^0.11.6: "@cosmos-kit/leap" "^0.15.12" "@improbable-eng/grpc-web" "^0.15.0" "@improbable-eng/grpc-web-node-http-transport" "^0.15.0" - "@keplr-wallet/types" "^0.11.64" + "@keplr-wallet/types" "^0.12.107" "@ledgerhq/hw-transport-webhid" "^6.20.0" "@ledgerhq/hw-transport-webusb" "^6.20.0" "@metamask/detect-provider" "^2.0.0" From b0d30fb02b5c8abef8649831f34939f979e8e594 Mon Sep 17 00:00:00 2001 From: Thong Yuan Yu Sarah Date: Fri, 11 Oct 2024 10:20:24 +0800 Subject: [PATCH 3/5] Resolve conflicts --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index f21abbb..ae79c43 100644 --- a/package.json +++ b/package.json @@ -18,11 +18,7 @@ "@cosmjs/tendermint-rpc": "~0.31.3", "@types/node": "^18.11.9", "@types/node-fetch": "^2.6.2", -<<<<<<< HEAD "carbon-js-sdk": "^0.11.23", -======= - "carbon-js-sdk": "^0.11.20", ->>>>>>> master "long": "^4.0.0", "node-fetch": "^2.6.1", "pajv": "^1.2.0", From 02441bcdfd4e4366eadc78926b2ab3d8de408a0d Mon Sep 17 00:00:00 2001 From: Thong Yuan Yu Sarah Date: Fri, 11 Oct 2024 10:23:12 +0800 Subject: [PATCH 4/5] Update check_configs file with axelar blockchain names --- scripts/check_configs.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/check_configs.ts b/scripts/check_configs.ts index 1ce4225..2d1c507 100644 --- a/scripts/check_configs.ts +++ b/scripts/check_configs.ts @@ -419,7 +419,9 @@ async function main() { const transferOptionsArr = Object.keys(jsonData.transfer_options) const ibcBridgeNames = sdk.token.getIbcBlockchainNames(); if (!ibcBridgeNames.includes("Carbon")) ibcBridgeNames.push("Carbon"); - const validTransferOptionChains = sdk.token.getPolynetworkBlockchainNames().concat(ibcBridgeNames); + const validTransferOptionChains = sdk.token.getPolynetworkBlockchainNames() + .concat(sdk.token.getAxelarBlockchainNames()) + .concat(ibcBridgeNames); const hasInvalidChains = checkValidEntries(transferOptionsArr, validTransferOptionChains); if (hasInvalidChains.status && hasInvalidChains.entry) { From 538a6c98162c5a3f8f94c574709772db2ff05284 Mon Sep 17 00:00:00 2001 From: Thong Yuan Yu Sarah Date: Fri, 11 Oct 2024 10:25:13 +0800 Subject: [PATCH 5/5] Remove Optimism chain which is not added to Carbon chain --- configs/mainnet.json | 53 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/configs/mainnet.json b/configs/mainnet.json index 74e61fd..8190dd6 100644 --- a/configs/mainnet.json +++ b/configs/mainnet.json @@ -18,33 +18,32 @@ ], "transfer_options": { "Mantle": 0, - "OP": 1, - "Base": 2, - "Osmosis": 3, - "Noble": 4, - "Cosmos Hub": 5, - "Evmos": 6, - "Axelar": 7, - "Juno": 8, - "Stride": 9, - "Kujira": 10, - "Terra": 11, - "Comdex": 12, - "Stafihub": 13, - "Persistence Core": 14, - "Stargaze": 15, - "Canto": 16, - "Sommelier": 17, - "IRIS Hub": 18, - "Ethereum": 19, - "Arbitrum": 20, - "Polygon": 21, - "OKC": 22, - "Binance Smart Chain": 23, - "Carbon": 24, - "Neo": 25, - "Neo3": 26, - "Zilliqa": 27 + "Base": 1, + "Osmosis": 2, + "Noble": 3, + "Cosmos Hub": 4, + "Evmos": 5, + "Axelar": 6, + "Juno": 7, + "Stride": 8, + "Kujira": 9, + "Terra": 10, + "Comdex": 11, + "Stafihub": 12, + "Persistence Core": 13, + "Stargaze": 14, + "Canto": 15, + "Sommelier": 16, + "IRIS Hub": 17, + "Ethereum": 18, + "Arbitrum": 19, + "Polygon": 20, + "OKC": 21, + "Binance Smart Chain": 22, + "Carbon": 23, + "Neo": 24, + "Neo3": 25, + "Zilliqa": 26 }, "network_fees": { "swth": 0,