diff --git a/contract_manager/store/chains/EvmChains.yaml b/contract_manager/store/chains/EvmChains.yaml index 7e573d0c..4dca599c 100644 --- a/contract_manager/store/chains/EvmChains.yaml +++ b/contract_manager/store/chains/EvmChains.yaml @@ -53,10 +53,10 @@ rpcUrl: https://testnet.aurora.dev networkId: 1313161555 type: EvmChain -- id: mantle_testnet +- id: mantle_sepolia mainnet: false - rpcUrl: https://rpc.testnet.mantle.xyz/ - networkId: 5001 + rpcUrl: https://rpc.sepolia.mantle.xyz + networkId: 5003 type: EvmChain - id: gnosis mainnet: true @@ -483,3 +483,13 @@ rpcUrl: https://falling-small-wildflower.blast-mainnet.quiknode.pro/$ENV_BLAST_MAINNET_API_KEY networkId: 81457 type: EvmChain +- id: merlin_testnet + mainnet: false + rpcUrl: https://testnet-rpc.merlinchain.io/ + networkId: 686868 + type: EvmChain +- id: merlin + mainnet: true + rpcUrl: https://rpc.merlinchain.io + networkId: 4200 + type: EvmChain diff --git a/contract_manager/store/contracts/EvmPriceFeedContracts.yaml b/contract_manager/store/contracts/EvmPriceFeedContracts.yaml index 2146a1d4..dc998cdd 100644 --- a/contract_manager/store/contracts/EvmPriceFeedContracts.yaml +++ b/contract_manager/store/contracts/EvmPriceFeedContracts.yaml @@ -115,9 +115,6 @@ - chain: aurora_testnet address: "0x74f09cb3c7e2A01865f424FD14F6dc9A14E3e94E" type: EvmPriceFeedContract -- chain: mantle_testnet - address: "0xDd24F84d36BF92C65F92307595335bdFab5Bbd21" - type: EvmPriceFeedContract - chain: chiado address: "0x98046Bd286715D3B0BC227Dd7a956b83D8978603" type: EvmPriceFeedContract @@ -289,3 +286,12 @@ - chain: astar_zkevm address: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729" type: EvmPriceFeedContract +- chain: merlin_testnet + address: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729" + type: EvmPriceFeedContract +- chain: mantle_sepolia + address: "0x98046Bd286715D3B0BC227Dd7a956b83D8978603" + type: EvmPriceFeedContract +- chain: merlin + address: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729" + type: EvmPriceFeedContract 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 e602c35a..36db69bf 100644 --- a/governance/xc_admin/packages/xc_admin_common/src/chains.ts +++ b/governance/xc_admin/packages/xc_admin_common/src/chains.ts @@ -63,6 +63,7 @@ export const RECEIVER_CHAINS = { lightlink_phoenix: 60044, injective_inevm: 60045, blast: 60046, + merlin: 60047, // Testnets as a separate chain ids (to use stable data sources and governance for them) injective_testnet: 60013, @@ -80,7 +81,7 @@ export const RECEIVER_CHAINS = { canto_testnet: 50006, polygon_zkevm_testnet: 50007, aurora_testnet: 50008, - mantle_testnet: 50009, + mantle_sepolia: 50009, fantom_testnet: 50010, mumbai: 50011, // Polygon testnet neon_devnet: 50012, @@ -128,6 +129,7 @@ export const RECEIVER_CHAINS = { injective_inevm_testnet: 50054, idex_xchain_testnet: 50055, berachain_testnet: 50056, + merlin_testnet: 50057, }; // If there is any overlapping value the receiver chain will replace the wormhole diff --git a/package-lock.json b/package-lock.json index 3e41bba9..10e4401f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59193,7 +59193,7 @@ }, "target_chains/ethereum/sdk/js": { "name": "@pythnetwork/pyth-evm-js", - "version": "1.34.0", + "version": "1.35.0", "license": "Apache-2.0", "dependencies": { "@pythnetwork/price-service-client": "*", diff --git a/target_chains/ethereum/sdk/js/package.json b/target_chains/ethereum/sdk/js/package.json index 24d0d86d..16a3099c 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.34.0", + "version": "1.35.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 3029eb0f..760643d7 100644 --- a/target_chains/ethereum/sdk/js/src/index.ts +++ b/target_chains/ethereum/sdk/js/src/index.ts @@ -40,6 +40,7 @@ export const CONTRACT_ADDR: Record = { linea: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", manta: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", mantle: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", + merlin: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", meter: "0xbFe3f445653f2136b2FD1e6DdDb5676392E3AF16", mode: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", neon: "0x7f2dB085eFC3560AFF33865dD727225d91B4f9A5", @@ -86,7 +87,8 @@ export const CONTRACT_ADDR: Record = { lightlink_pegasus_testnet: "0x5D289Ad1CE59fCC25b6892e7A303dfFf3a9f7167", linea_goerli: "0xdF21D137Aadc95588205586636710ca2890538d5", manta_testnet: "0x41c9e39574F40Ad34c79f1C99B66A45eFB830d4c", - mantle_testnet: "0xDd24F84d36BF92C65F92307595335bdFab5Bbd21", + mantle_sepolia: "0x98046Bd286715D3B0BC227Dd7a956b83D8978603", + merlin_testnet: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", meter_testnet: "0x5a71C07a0588074443545eE0c08fb0375564c3E4", mode_testnet: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729", movement_evm_devnet: "0xA2aa501b19aff244D90cc15a4Cf739D2725B5729",