diff --git a/governance/remote_executor/programs/remote-executor/Cargo.toml b/governance/remote_executor/programs/remote-executor/Cargo.toml index 69a072b0c9..db20da538f 100644 --- a/governance/remote_executor/programs/remote-executor/Cargo.toml +++ b/governance/remote_executor/programs/remote-executor/Cargo.toml @@ -23,6 +23,7 @@ pythnet = [] pythtest = [] eclipse_devnet = [] eclipse_testnet = [] +eclipse_mainnet = [] [dependencies] anchor-lang = {version = "0.25.0", features = ["init-if-needed"]} diff --git a/governance/remote_executor/programs/remote-executor/src/state/governance_payload.rs b/governance/remote_executor/programs/remote-executor/src/state/governance_payload.rs index 84bda01748..494ab347d0 100644 --- a/governance/remote_executor/programs/remote-executor/src/state/governance_payload.rs +++ b/governance/remote_executor/programs/remote-executor/src/state/governance_payload.rs @@ -19,6 +19,7 @@ pub const CHAIN_ID_ARRAY: &[(&str, u16)] = &[ ("pythtest", 26), ("eclipse_devnet", 40001), ("eclipse_testnet", 40002), + ("eclipse_mainnet", 40003), ]; #[cfg(any(feature = "pythnet", feature = "pythtest"))] @@ -30,6 +31,9 @@ pub const CHAIN_ID: u16 = 40001; #[cfg(feature = "eclipse_testnet")] pub const CHAIN_ID: u16 = 40002; +#[cfg(feature = "eclipse_mainnet")] +pub const CHAIN_ID: u16 = 40003; + #[derive(AnchorDeserialize, AnchorSerialize, Debug, PartialEq, Eq)] pub struct ExecutorPayload { pub header: GovernanceHeader, diff --git a/governance/remote_executor/programs/remote-executor/src/state/posted_vaa.rs b/governance/remote_executor/programs/remote-executor/src/state/posted_vaa.rs index c94755b1b5..4e5e769957 100644 --- a/governance/remote_executor/programs/remote-executor/src/state/posted_vaa.rs +++ b/governance/remote_executor/programs/remote-executor/src/state/posted_vaa.rs @@ -20,7 +20,11 @@ impl Owner for AnchorVaa { Pubkey::from_str("EUrRARh92Cdc54xrDn6qzaqjA77NRrCcfbr8kPwoTL4z").unwrap() } - #[cfg(any(feature = "eclipse_devnet", feature = "eclipse_testnet"))] + #[cfg(any( + feature = "eclipse_devnet", + feature = "eclipse_testnet", + feature = "eclipse_mainnet" + ))] fn owner() -> Pubkey { Pubkey::from_str("HDwcJBJXjL9FpJ7UBsYBtaDjsBUhuLCUYoz3zr8SWWaQ").unwrap() } 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 e48ba2a13a..aaf37b1174 100644 --- a/governance/xc_admin/packages/xc_admin_common/src/chains.ts +++ b/governance/xc_admin/packages/xc_admin_common/src/chains.ts @@ -23,6 +23,11 @@ export const RECEIVER_CHAINS = { arbitrum: 23, optimism: 24, + // SVM chains + eclipse_devnet: 40001, + eclipse_testnet: 40002, + eclipse_mainnet: 40003, + cronos: 60001, kcc: 60002, zksync: 60003, diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/Proposal.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/Proposal.tsx index 1190629c1e..6d8f3ebdd1 100644 --- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/Proposal.tsx +++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/Proposal.tsx @@ -377,7 +377,7 @@ export const Proposal = ({ {uniqueTargetCluster ? `Target network: ${targetClusters[0]}` : targetClusters.length == 0 - ? 'No target network detected' + ? '' : `Multiple target networks detected ${targetClusters.join(' ')}`}