From f0595afdd16cfa466262b5706caa05f7fabd76ba Mon Sep 17 00:00:00 2001 From: keyvan Date: Fri, 7 Feb 2025 10:31:36 -0800 Subject: [PATCH 1/2] feat:(contract-manager): add movement mainnet --- contract_manager/scripts/sync_wormhole_guardian_set.ts | 6 +++++- contract_manager/src/contracts/aptos.ts | 4 ++++ contract_manager/store/chains/AptosChains.yaml | 5 +++++ .../store/contracts/AptosPriceFeedContracts.yaml | 4 ++++ .../store/contracts/AptosWormholeContracts.yaml | 3 +++ governance/xc_admin/packages/xc_admin_common/src/chains.ts | 3 ++- 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/contract_manager/scripts/sync_wormhole_guardian_set.ts b/contract_manager/scripts/sync_wormhole_guardian_set.ts index cf6254d3b2..cf14a4af41 100644 --- a/contract_manager/scripts/sync_wormhole_guardian_set.ts +++ b/contract_manager/scripts/sync_wormhole_guardian_set.ts @@ -1,6 +1,7 @@ import yargs from "yargs"; import { hideBin } from "yargs/helpers"; import { + AptosWormholeContract, CosmWasmPriceFeedContract, DefaultStore, EvmPriceFeedContract, @@ -29,7 +30,10 @@ async function main() { const chains = argv.chain; for (const contract of Object.values(DefaultStore.wormhole_contracts)) { - if (contract instanceof SuiWormholeContract) { + if ( + contract instanceof SuiWormholeContract || + contract instanceof AptosWormholeContract + ) { if (chains && !chains.includes(contract.getChain().getId())) { continue; } diff --git a/contract_manager/src/contracts/aptos.ts b/contract_manager/src/contracts/aptos.ts index ab70dcd462..640105d99d 100644 --- a/contract_manager/src/contracts/aptos.ts +++ b/contract_manager/src/contracts/aptos.ts @@ -76,6 +76,10 @@ export class AptosWormholeContract extends WormholeContract { return Number(data.chain_id.number); } + public getChain(): AptosChain { + return this.chain; + } + async getGuardianSet(): Promise { const data = await this.getState(); const client = this.chain.getClient(); diff --git a/contract_manager/store/chains/AptosChains.yaml b/contract_manager/store/chains/AptosChains.yaml index b6c5af15a6..a3deee82d9 100644 --- a/contract_manager/store/chains/AptosChains.yaml +++ b/contract_manager/store/chains/AptosChains.yaml @@ -29,3 +29,8 @@ mainnet: false rpcUrl: https://aptos.testnet.bardock.movementlabs.xyz/v1 type: AptosChain +- id: movement_mainnet + wormholeChainName: movement_mainnet + mainnet: true + rpcUrl: https://mainnet.movementnetwork.xyz/v1 + type: AptosChain diff --git a/contract_manager/store/contracts/AptosPriceFeedContracts.yaml b/contract_manager/store/contracts/AptosPriceFeedContracts.yaml index d6e27ae569..d14c7c85f3 100644 --- a/contract_manager/store/contracts/AptosPriceFeedContracts.yaml +++ b/contract_manager/store/contracts/AptosPriceFeedContracts.yaml @@ -22,3 +22,7 @@ stateId: "0x9357e76fe965c9956a76181ee49f66d51b7f9c3800182a944ed96be86301e49f" wormholeStateId: "0x9236893d6444b208b7e0b3e8d4be4ace90b6d17817ab7d1584e46a33ef5c50c9" type: AptosPriceFeedContract +- chain: movement_mainnet + stateId: "0x9357e76fe965c9956a76181ee49f66d51b7f9c3800182a944ed96be86301e49f" + wormholeStateId: "0x9236893d6444b208b7e0b3e8d4be4ace90b6d17817ab7d1584e46a33ef5c50c9" + type: AptosPriceFeedContract diff --git a/contract_manager/store/contracts/AptosWormholeContracts.yaml b/contract_manager/store/contracts/AptosWormholeContracts.yaml index 68897fe260..ff4f69cfbf 100644 --- a/contract_manager/store/contracts/AptosWormholeContracts.yaml +++ b/contract_manager/store/contracts/AptosWormholeContracts.yaml @@ -16,3 +16,6 @@ - chain: movement_bardock_testnet address: "0x9236893d6444b208b7e0b3e8d4be4ace90b6d17817ab7d1584e46a33ef5c50c9" type: AptosWormholeContract +- chain: movement_mainnet + address: "0x9236893d6444b208b7e0b3e8d4be4ace90b6d17817ab7d1584e46a33ef5c50c9" + type: AptosWormholeContract 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 7d4cc2dd2e..c15a571274 100644 --- a/governance/xc_admin/packages/xc_admin_common/src/chains.ts +++ b/governance/xc_admin/packages/xc_admin_common/src/chains.ts @@ -107,6 +107,7 @@ export const RECEIVER_CHAINS = { threat_level_midnight: 60074, just_breathe: 60075, berachain_mainnet: 60076, + movement_mainnet: 60077, // Testnets as a separate chain ids (to use stable data sources and governance for them) injective_testnet: 60013, @@ -237,7 +238,7 @@ export const RECEIVER_CHAINS = { // value and that is an expected behavior. export const CHAINS = { ...WORMHOLE_CHAINS, ...RECEIVER_CHAINS }; export declare type ChainName = keyof typeof CHAINS; -export declare type ChainId = typeof CHAINS[ChainName]; +export declare type ChainId = (typeof CHAINS)[ChainName]; export function toChainId(chainName: ChainName): ChainId { return CHAINS[chainName]; From 9192df427106b94654c0b8416c2ee817a143121a Mon Sep 17 00:00:00 2001 From: keyvan Date: Fri, 7 Feb 2025 10:34:02 -0800 Subject: [PATCH 2/2] fix precommit --- governance/xc_admin/packages/xc_admin_common/src/chains.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c15a571274..c2df9b3f0a 100644 --- a/governance/xc_admin/packages/xc_admin_common/src/chains.ts +++ b/governance/xc_admin/packages/xc_admin_common/src/chains.ts @@ -238,7 +238,7 @@ export const RECEIVER_CHAINS = { // value and that is an expected behavior. export const CHAINS = { ...WORMHOLE_CHAINS, ...RECEIVER_CHAINS }; export declare type ChainName = keyof typeof CHAINS; -export declare type ChainId = (typeof CHAINS)[ChainName]; +export declare type ChainId = typeof CHAINS[ChainName]; export function toChainId(chainName: ChainName): ChainId { return CHAINS[chainName];