From 74002f3c730e06d64c8d716197b7c38082333b72 Mon Sep 17 00:00:00 2001 From: Aditya Arora Date: Thu, 19 Sep 2024 14:45:19 +0800 Subject: [PATCH 1/2] (chore) Add flow and fantom --- contract_manager/store/chains/EvmChains.yaml | 12 +++++++++++- .../store/contracts/EvmEntropyContracts.yaml | 3 --- .../store/contracts/EvmPriceFeedContracts.yaml | 9 ++++++--- .../store/contracts/EvmWormholeContracts.yaml | 9 ++++++--- .../xc_admin/packages/xc_admin_common/src/chains.ts | 2 ++ target_chains/ethereum/sdk/js/package.json | 2 +- target_chains/ethereum/sdk/js/src/index.ts | 6 +++--- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/contract_manager/store/chains/EvmChains.yaml b/contract_manager/store/chains/EvmChains.yaml index 581b0f949e..887d5ee725 100644 --- a/contract_manager/store/chains/EvmChains.yaml +++ b/contract_manager/store/chains/EvmChains.yaml @@ -491,7 +491,7 @@ type: EvmChain - id: fantom_sonic_testnet mainnet: false - rpcUrl: https://rpc.sonic.fantom.network/ + rpcUrl: https://rpc.testnet.soniclabs.com networkId: 64165 type: EvmChain - id: dela_deperp_testnet @@ -714,3 +714,13 @@ rpcUrl: https://apechain.calderachain.xyz/http networkId: 33139 type: EvmChain +- id: flow_mainnet + mainnet: true + rpcUrl: https://mainnet.evm.nodes.onflow.org + networkId: 747 + type: EvmChain +- id: unichain_testnet + mainnet: false + rpcUrl: http://beta-u-TxIng-LzVa4ZEfbwt7-214653587.us-east-2.elb.amazonaws.com:8545 + networkId: 2332 + type: EvmChain diff --git a/contract_manager/store/contracts/EvmEntropyContracts.yaml b/contract_manager/store/contracts/EvmEntropyContracts.yaml index 7768c145d7..5f5440c1ea 100644 --- a/contract_manager/store/contracts/EvmEntropyContracts.yaml +++ b/contract_manager/store/contracts/EvmEntropyContracts.yaml @@ -13,9 +13,6 @@ - chain: arbitrum_sepolia address: "0x549Ebba8036Ab746611B4fFA1423eb0A4Df61440" type: EvmEntropyContract -- chain: fantom_sonic_testnet - address: "0xb27e5ca259702f209a29225d0eDdC131039C9933" - type: EvmEntropyContract - chain: blast_s2_testnet address: "0x98046Bd286715D3B0BC227Dd7a956b83D8978603" type: EvmEntropyContract diff --git a/contract_manager/store/contracts/EvmPriceFeedContracts.yaml b/contract_manager/store/contracts/EvmPriceFeedContracts.yaml index ff626c97e1..b19f6ff9f6 100644 --- a/contract_manager/store/contracts/EvmPriceFeedContracts.yaml +++ b/contract_manager/store/contracts/EvmPriceFeedContracts.yaml @@ -241,9 +241,6 @@ - chain: lightlink_pegasus_testnet address: "0x5D289Ad1CE59fCC25b6892e7A303dfFf3a9f7167" type: EvmPriceFeedContract -- chain: fantom_sonic_testnet - address: "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320" - type: EvmPriceFeedContract - chain: dela_deperp_testnet address: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729" type: EvmPriceFeedContract @@ -397,3 +394,9 @@ - chain: apechain_mainnet address: "0x2880aB155794e7179c9eE2e38200202908C17B43" type: EvmPriceFeedContract +- chain: flow_mainnet + address: "0x2880aB155794e7179c9eE2e38200202908C17B43" + type: EvmPriceFeedContract +- chain: fantom_sonic_testnet + address: "0x96124d1F6E44FfDf1fb5D6d74BB2DE1B7Fbe7376" + type: EvmPriceFeedContract diff --git a/contract_manager/store/contracts/EvmWormholeContracts.yaml b/contract_manager/store/contracts/EvmWormholeContracts.yaml index ac82a6f4f3..874042deaa 100644 --- a/contract_manager/store/contracts/EvmWormholeContracts.yaml +++ b/contract_manager/store/contracts/EvmWormholeContracts.yaml @@ -202,9 +202,6 @@ - chain: lightlink_pegasus_testnet address: "0x5f3c61944CEb01B3eAef861251Fb1E0f14b848fb" type: EvmWormholeContract -- chain: fantom_sonic_testnet - address: "0x74f09cb3c7e2A01865f424FD14F6dc9A14E3e94E" - type: EvmWormholeContract - chain: dela_deperp_testnet address: "0xb27e5ca259702f209a29225d0eDdC131039C9933" type: EvmWormholeContract @@ -385,3 +382,9 @@ - chain: apechain_mainnet address: "0xb27e5ca259702f209a29225d0eDdC131039C9933" type: EvmWormholeContract +- chain: flow_mainnet + address: "0xb27e5ca259702f209a29225d0eDdC131039C9933" + type: EvmWormholeContract +- chain: fantom_sonic_testnet + address: "0xb700C2f6D14e2cfbD0845Bb102701dBDFf5d1bC4" + type: EvmWormholeContract diff --git a/governance/xc_admin/packages/xc_admin_common/src/chains.ts b/governance/xc_admin/packages/xc_admin_common/src/chains.ts index ffcfc9291a..29921b3aeb 100644 --- a/governance/xc_admin/packages/xc_admin_common/src/chains.ts +++ b/governance/xc_admin/packages/xc_admin_common/src/chains.ts @@ -83,6 +83,7 @@ export const RECEIVER_CHAINS = { cronos_zkevm_mainnet: 60059, idex_xchain_mainnet: 60060, apechain_mainnet: 60061, + flow_mainnet: 60062, // Testnets as a separate chain ids (to use stable data sources and governance for them) injective_testnet: 60013, @@ -187,6 +188,7 @@ export const RECEIVER_CHAINS = { flow_testnet: 50094, apechain_testnet: 50095, soneium_minato_testnet: 50096, + unichain_testnet: 50099, }; // If there is any overlapping value the receiver chain will replace the wormhole diff --git a/target_chains/ethereum/sdk/js/package.json b/target_chains/ethereum/sdk/js/package.json index 8c626226ac..fe93b75569 100644 --- a/target_chains/ethereum/sdk/js/package.json +++ b/target_chains/ethereum/sdk/js/package.json @@ -1,6 +1,6 @@ { "name": "@pythnetwork/pyth-evm-js", - "version": "1.67.0", + "version": "1.68.0", "description": "Pyth Network EVM Utils in JS", "homepage": "https://pyth.network", "author": { diff --git a/target_chains/ethereum/sdk/js/src/index.ts b/target_chains/ethereum/sdk/js/src/index.ts index 47db174853..e65b2e8f87 100644 --- a/target_chains/ethereum/sdk/js/src/index.ts +++ b/target_chains/ethereum/sdk/js/src/index.ts @@ -34,7 +34,7 @@ export const CONTRACT_ADDR: Record = { etherlink: "0x2880aB155794e7179c9eE2e38200202908C17B43", fantom: "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C", filecoin: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", - flow_previewnet: "0x2880aB155794e7179c9eE2e38200202908C17B43", + flow_mainnet: "0x2880aB155794e7179c9eE2e38200202908C17B43", gnosis: "0x2880aB155794e7179c9eE2e38200202908C17B43", gravity: "0x2880aB155794e7179c9eE2e38200202908C17B43", hedera: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", @@ -95,10 +95,10 @@ export const CONTRACT_ADDR: Record = { etherlink_testnet: "0x2880aB155794e7179c9eE2e38200202908C17B43", eos_testnet: "0x0708325268dF9F66270F1401206434524814508b", evmos_testnet: "0x74f09cb3c7e2A01865f424FD14F6dc9A14E3e94E", - fantom_sonic_testnet: "0x36825bf3Fbdf5a29E2d5148bfe7Dcf7B5639e320", + fantom_sonic_testnet: "0x96124d1F6E44FfDf1fb5D6d74BB2DE1B7Fbe7376", fantom_testnet: "0x5744Cbf430D99456a0A8771208b674F27f8EF0Fb", filecoin_calibration: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", - flow_testnet: "0x2880aB155794e7179c9eE2e38200202908C17B43", + flow_previewnet: "0x2880aB155794e7179c9eE2e38200202908C17B43", fuji: "0x23f0e8FAeE7bbb405E7A7C3d60138FCfd43d7509", hedera_testnet: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", idex_xchain_testnet: "0x2880aB155794e7179c9eE2e38200202908C17B43", From 44eb183411cf794b6a2826c34e2741ce2fb8863d Mon Sep 17 00:00:00 2001 From: Aditya Arora Date: Thu, 19 Sep 2024 16:48:22 +0800 Subject: [PATCH 2/2] fix --- contract_manager/store/chains/EvmChains.yaml | 5 ----- governance/xc_admin/packages/xc_admin_common/src/chains.ts | 1 - 2 files changed, 6 deletions(-) diff --git a/contract_manager/store/chains/EvmChains.yaml b/contract_manager/store/chains/EvmChains.yaml index 887d5ee725..44172cede2 100644 --- a/contract_manager/store/chains/EvmChains.yaml +++ b/contract_manager/store/chains/EvmChains.yaml @@ -719,8 +719,3 @@ rpcUrl: https://mainnet.evm.nodes.onflow.org networkId: 747 type: EvmChain -- id: unichain_testnet - mainnet: false - rpcUrl: http://beta-u-TxIng-LzVa4ZEfbwt7-214653587.us-east-2.elb.amazonaws.com:8545 - networkId: 2332 - type: EvmChain diff --git a/governance/xc_admin/packages/xc_admin_common/src/chains.ts b/governance/xc_admin/packages/xc_admin_common/src/chains.ts index 29921b3aeb..907a93011d 100644 --- a/governance/xc_admin/packages/xc_admin_common/src/chains.ts +++ b/governance/xc_admin/packages/xc_admin_common/src/chains.ts @@ -188,7 +188,6 @@ export const RECEIVER_CHAINS = { flow_testnet: 50094, apechain_testnet: 50095, soneium_minato_testnet: 50096, - unichain_testnet: 50099, }; // If there is any overlapping value the receiver chain will replace the wormhole