From f3c3c8d5e82d68ad384a346343fde33fa44349d7 Mon Sep 17 00:00:00 2001 From: daoauth <57783762+daoauth@users.noreply.github.com> Date: Fri, 10 May 2024 16:27:48 +0900 Subject: [PATCH 1/8] fix isTransferCompleted (sui, aptos) --- platforms/aptos/protocols/tokenBridge/src/tokenBridge.ts | 3 ++- platforms/sui/protocols/tokenBridge/src/tokenBridge.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platforms/aptos/protocols/tokenBridge/src/tokenBridge.ts b/platforms/aptos/protocols/tokenBridge/src/tokenBridge.ts index f7002a26c..1bb72c3cc 100644 --- a/platforms/aptos/protocols/tokenBridge/src/tokenBridge.ts +++ b/platforms/aptos/protocols/tokenBridge/src/tokenBridge.ts @@ -12,6 +12,7 @@ import { UniversalAddress, encoding, isNative, + keccak256, serialize, sha3_256, toChain, @@ -135,7 +136,7 @@ export class AptosTokenBridge await this.connection.getTableItem(handle, { key_type: "vector", value_type: "u8", - key: vaa.hash, + key: `0x${Buffer.from(keccak256(vaa.hash)).toString('hex')}`, }); return true; } catch { diff --git a/platforms/sui/protocols/tokenBridge/src/tokenBridge.ts b/platforms/sui/protocols/tokenBridge/src/tokenBridge.ts index 198c9690b..620e48914 100644 --- a/platforms/sui/protocols/tokenBridge/src/tokenBridge.ts +++ b/platforms/sui/protocols/tokenBridge/src/tokenBridge.ts @@ -21,6 +21,7 @@ import { canonicalAddress, encoding, isNative, + keccak256, nativeChainIds, serialize, toChain, @@ -191,7 +192,7 @@ export class SuiTokenBridge implements T name: { type: keyType, value: { - data: [...vaa.hash], + data: [...keccak256(vaa.hash)], }, }, }); From 398f4d98cb63bae045426c0a55e3727cd50a6ac0 Mon Sep 17 00:00:00 2001 From: daoauth <57783762+daoauth@users.noreply.github.com> Date: Fri, 10 May 2024 20:46:57 +0900 Subject: [PATCH 2/8] Update index.ts --- core/base/src/constants/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/core/base/src/constants/index.ts b/core/base/src/constants/index.ts index d01862c3a..a05bf781b 100644 --- a/core/base/src/constants/index.ts +++ b/core/base/src/constants/index.ts @@ -13,4 +13,5 @@ export * as rpc from "./rpc.js"; export * as nativeChainIds from "./nativeChainIds.js"; export * as circle from "./circle.js"; export * as contracts from "./contracts/index.js"; +export * as tokens from "./tokens/index.js"; export * as guardians from "./guardians.js"; From 4efcaa5a3adf85b6115e23285323fba623303920 Mon Sep 17 00:00:00 2001 From: daoauth <57783762+daoauth@users.noreply.github.com> Date: Sat, 11 May 2024 10:06:52 +0900 Subject: [PATCH 3/8] Revert "Update index.ts" This reverts commit 398f4d98cb63bae045426c0a55e3727cd50a6ac0. --- core/base/src/constants/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/core/base/src/constants/index.ts b/core/base/src/constants/index.ts index a05bf781b..d01862c3a 100644 --- a/core/base/src/constants/index.ts +++ b/core/base/src/constants/index.ts @@ -13,5 +13,4 @@ export * as rpc from "./rpc.js"; export * as nativeChainIds from "./nativeChainIds.js"; export * as circle from "./circle.js"; export * as contracts from "./contracts/index.js"; -export * as tokens from "./tokens/index.js"; export * as guardians from "./guardians.js"; From b7d5479fcb1a287877c07c00e1cacd2af8189070 Mon Sep 17 00:00:00 2001 From: daoauth <57783762+daoauth@users.noreply.github.com> Date: Sat, 11 May 2024 10:15:02 +0900 Subject: [PATCH 4/8] Update rpc.ts --- core/base/src/constants/rpc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/base/src/constants/rpc.ts b/core/base/src/constants/rpc.ts index ab8722c88..683121811 100644 --- a/core/base/src/constants/rpc.ts +++ b/core/base/src/constants/rpc.ts @@ -45,7 +45,7 @@ const rpcConfig = [[ ]], [ "Testnet", [ ["Ethereum", "https://rpc.ankr.com/eth_goerli"], - ["Polygon", "https://polygon-mumbai-bor.publicnode.com"], + ["Polygon", "https://rpc-mumbai.polygon.technology"], ["Bsc", "https://data-seed-prebsc-1-s3.binance.org:8545"], ["Avalanche", "https://api.avax-test.network/ext/bc/C/rpc"], ["Fantom", "https://rpc.ankr.com/fantom_testnet"], From afa93156c47ecee331e5dc444560bed132828b09 Mon Sep 17 00:00:00 2001 From: daoauth <57783762+daoauth@users.noreply.github.com> Date: Sat, 11 May 2024 10:41:26 +0900 Subject: [PATCH 5/8] Update rpc.ts --- core/base/src/constants/rpc.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/base/src/constants/rpc.ts b/core/base/src/constants/rpc.ts index 683121811..d600869a5 100644 --- a/core/base/src/constants/rpc.ts +++ b/core/base/src/constants/rpc.ts @@ -44,7 +44,7 @@ const rpcConfig = [[ ["Rootstock", "https://public-node.rsk.co"], ]], [ "Testnet", [ - ["Ethereum", "https://rpc.ankr.com/eth_goerli"], + ["Ethereum", "https://eth-goerli.public.blastapi.io"], ["Polygon", "https://rpc-mumbai.polygon.technology"], ["Bsc", "https://data-seed-prebsc-1-s3.binance.org:8545"], ["Avalanche", "https://api.avax-test.network/ext/bc/C/rpc"], @@ -55,9 +55,9 @@ const rpcConfig = [[ ["Sui", "https://fullnode.testnet.sui.io"], ["Aptos", "https://fullnode.testnet.aptoslabs.com/v1"], ["Sei", "https://sei-testnet-rpc.polkachu.com"], - ["Arbitrum", "https://arbitrum-goerli.publicnode.com"], - ["Optimism", "https://optimism-goerli.publicnode.com"], - ["Base", "https://goerli.base.org"], + ["Arbitrum", "https://arbitrum-goerli.public.blastapi.io"], + ["Optimism", "https://optimism-goerli.public.blastapi.io"], + ["Base", "https://base-goerli.public.blastapi.io"], ["Injective", "https://testnet.sentry.tm.injective.network"], ["Osmosis", "https://rpc.testnet.osmosis.zone"], ["Cosmoshub", "https://rpc.sentry-02.theta-testnet.polypore.xyz"], From 2526b01c467774a927b468bdf1d6a7f290ee1b36 Mon Sep 17 00:00:00 2001 From: Lim Jet <57783762+daoauth@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:58:19 +0900 Subject: [PATCH 6/8] update solana genesis hash --- core/base/src/constants/nativeChainIds.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/base/src/constants/nativeChainIds.ts b/core/base/src/constants/nativeChainIds.ts index e3791fdaa..29ada7f95 100644 --- a/core/base/src/constants/nativeChainIds.ts +++ b/core/base/src/constants/nativeChainIds.ts @@ -23,7 +23,7 @@ const chainNetworkNativeChainIdEntries = [ ["Wormchain", "wormchain"], ["Xpla", "dimension_37-1"], ["Kujira", "kaiyo-1"], - ["Solana", "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d"], + ["Solana", "4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY"], ["Sui", "35834a8a"], ["Acala", 787n], ["Arbitrum", 42161n], From 9a9ac4430691c70c1e0b90ea6a30ba13de86c556 Mon Sep 17 00:00:00 2001 From: Lim Jet <57783762+daoauth@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:12:55 +0900 Subject: [PATCH 7/8] Update nativeChainIds.ts --- core/base/src/constants/nativeChainIds.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/base/src/constants/nativeChainIds.ts b/core/base/src/constants/nativeChainIds.ts index 29ada7f95..935471710 100644 --- a/core/base/src/constants/nativeChainIds.ts +++ b/core/base/src/constants/nativeChainIds.ts @@ -23,7 +23,7 @@ const chainNetworkNativeChainIdEntries = [ ["Wormchain", "wormchain"], ["Xpla", "dimension_37-1"], ["Kujira", "kaiyo-1"], - ["Solana", "4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY"], + ["Solana", "5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d"], ["Sui", "35834a8a"], ["Acala", 787n], ["Arbitrum", 42161n], @@ -71,7 +71,7 @@ const chainNetworkNativeChainIdEntries = [ ["Wormchain", "wormchain-testnet-0"], ["Xpla", "cube_47-5"], ["Kujira", "harpoon-4"], - ["Solana", "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG"], + ["Solana", "4uhcVJyU9pJkvQyS88uRDiswHXSCkY3zQawwpjk2NsNY"], ["Sui", "4c78adac"], ["Acala", 597n], ["Arbitrum", 421613n], @@ -117,7 +117,7 @@ const chainNetworkNativeChainIdEntries = [ ["Bsc", 1397n], ["Ethereum", 1337n], ["Injective","injective_devnet_fake"], - ["Solana", "8wF6jKV3cKwyaVkWcoV9KpDqmkjvEYno9hKZrKx8TbZn"], + ["Solana", "EtWTRABZaYq6iMfeYKouRu166VU2xqa1wcaWoxPkrZBG"], ], ], ] as const satisfies MapLevels<[Network, Chain, bigint | string]>; From d663c1c53c7fdeda3428b18dc0a9f3ee2b173ea9 Mon Sep 17 00:00:00 2001 From: Lim Jet <57783762+daoauth@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:53:48 +0900 Subject: [PATCH 8/8] Update rpc.ts --- core/base/src/constants/rpc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/base/src/constants/rpc.ts b/core/base/src/constants/rpc.ts index ce0c2b5b2..b1299ef04 100644 --- a/core/base/src/constants/rpc.ts +++ b/core/base/src/constants/rpc.ts @@ -53,7 +53,7 @@ const rpcConfig = [[ ["Avalanche", "https://api.avax-test.network/ext/bc/C/rpc"], ["Fantom", "https://rpc.ankr.com/fantom_testnet"], ["Celo", "https://alfajores-forno.celo-testnet.org"], - ["Solana", "https://api.devnet.solana.com"], + ["Solana", "https://api.testnet.solana.com"], ["Oasis", "https://testnet.emerald.oasis.io"], ["Moonbeam", "https://rpc.api.moonbase.moonbeam.network"], ["Sui", "https://fullnode.testnet.sui.io"],