chore: add `mainnet` suffix to solana and eclipse (#4410)

### Description

Because we're doing a new core deployment that includes protocol fees

### Drive-by changes

<!--
Are there any minor or drive-by changes also included?
-->

### Related issues

<!--
- Fixes #[issue number here]
-->

### Backward compatibility

<!--
Are these changes backward compatible? Are there any infrastructure
implications, e.g. changes that would prohibit deploying older commits
using this infra tooling?

Yes/No
-->

### Testing

<!--
What kind of testing have these changes undergone?

None/Manual/Unit Tests
-->

.codespell/.codespellrc

@@ -1,5 +1,5 @@
 [codespell]
-skip = .git,node_modules,yarn.lock,Cargo.lock,./typescript/helloworld,./rust/config
+skip = .git,node_modules,yarn.lock,Cargo.lock,./typescript/helloworld,./rust/config,./rust/sealevel/environments/mainnet3/chain-config.json
 count =
 quiet-level = 3
 ignore-words = ./.codespell/ignore.txt

.codespell/ignore.txt

@@ -4,4 +4,4 @@ received
 receivedFrom
 ser
 readded
-re-use
+re-use

.registryrc

@@ -1 +1 @@
-f642dfefebb8578e2fdb7c732b816cd1bc945bb1
+a7ffbaa1722715bfff96cc2104d16aa48f8b386a

rust/agents/scraper/migration/src/m20230309_000001_create_table_domain.rs

@@ -263,7 +263,7 @@ const DOMAINS: &[RawDomain] = &[
         is_deprecated: false,
     },
     RawDomain {
-        name: "solana",
+        name: "solanamainnet",
         token: "SOL",
         domain: 1399811149,
         chain_id: 1399811149,
@@ -271,7 +271,7 @@ const DOMAINS: &[RawDomain] = &[
         is_deprecated: false,
     },
     RawDomain {
-        name: "eclipse",
+        name: "eclipsemainnet",
         token: "ETH",
         domain: 1408864445,
         chain_id: 1408864445,

rust/chains/hyperlane-cosmos/src/libs/address.rs

@@ -35,7 +35,7 @@ impl CosmosAddress {
         Self::from_pubkey(pubkey, prefix)
     }
 
-    /// Returns a Bitcoin style address calculated from Bech32 enconding
+    /// Returns a Bitcoin style address calculated from Bech32 encoding
     /// Source: `<https://github.com/cosmos/cosmos-sdk/blob/177e7f45959215b0b4e85babb7c8264eaceae052/crypto/keys/secp256k1/secp256k1.go#L154>`
     pub fn from_account_id(account_id: AccountId) -> ChainResult<Self> {
         // Hex digest

rust/config/mainnet_config.json

@@ -622,7 +622,8 @@
       "timelockController": "0x0000000000000000000000000000000000000000",
       "validatorAnnounce": "0x047ba6c9949baB22d13C347B40819b7A20C4C53a",
       "staticMerkleRootWeightedMultisigIsmFactory": "0x148CF67B8A242c1360bb2C93fCe203EC4d4f9B56",
-      "staticMessageIdWeightedMultisigIsmFactory": "0xcd849e612Aaa138f03698C3Edb42a34117BFF631"
+      "staticMessageIdWeightedMultisigIsmFactory": "0xcd849e612Aaa138f03698C3Edb42a34117BFF631",
+      "gnosisSafeTransactionServiceUrl": "https://prod.cheese.transaction.keypersafe.xyz/"
     },
     "cyber": {
       "aggregationHook": "0xF6C1769d5390Be0f77080eF7791fBbA7eF4D5659",
@@ -748,7 +749,7 @@
       "staticMerkleRootWeightedMultisigIsmFactory": "0x71388C9E25BE7b229B5d17Df7D4DB3F7DA7C962d",
       "staticMessageIdWeightedMultisigIsmFactory": "0x3E969bA938E6A993eeCD6F65b0dd8712B07dFe59"
     },
-    "eclipse": {
+    "eclipsemainnet": {
       "blockExplorers": [
         {
           "apiUrl": "https://mainnetbeta-rpc.eclipse.xyz",
@@ -777,7 +778,7 @@
       "interchainGasPaymaster": "AgjedtgQKTWGR77ULJ9j9AhLjNDk1D3BTtuxKmcZrJqE",
       "mailbox": "2bUk3zUFC6qBV3xigJiQrb2DzQJPC8aea6QUE7qqmpmZ",
       "merkleTreeHook": "2bUk3zUFC6qBV3xigJiQrb2DzQJPC8aea6QUE7qqmpmZ",
-      "name": "eclipse",
+      "name": "eclipsemainnet",
       "nativeToken": {
         "decimals": 9,
         "name": "Ether",
@@ -2720,7 +2721,7 @@
       "staticMerkleRootWeightedMultisigIsmFactory": "0xDf347f7602fFF536337c0B90cEC19CD6998427C4",
       "staticMessageIdWeightedMultisigIsmFactory": "0x816CF11aDFF6De498823F739eAfe350E82ee845D"
     },
-    "solana": {
+    "solanamainnet": {
       "blockExplorers": [
         {
           "apiUrl": "https://explorer.solana.com?cluster=mainnet-beta",
@@ -2750,7 +2751,7 @@
       "interchainGasPaymaster": "HkqbGqRX7Fi5pwqi8HkDaUhHK6mGWsy7Rt17fpgBrbP5",
       "mailbox": "4rRZgaC1DaCqtWYLzg14ftuXKPuHe1nGEM6ZtNpim3Wz",
       "merkleTreeHook": "4rRZgaC1DaCqtWYLzg14ftuXKPuHe1nGEM6ZtNpim3Wz",
-      "name": "solana",
+      "name": "solanamainnet",
       "nativeToken": {
         "decimals": 9,
         "name": "Solana",

rust/hyperlane-core/src/chain.rs

@@ -61,7 +61,7 @@ pub enum KnownHyperlaneDomain {
     Cheesechain = 383353,
     Cyber = 7560,
     DegenChain = 666666666,
-    Eclipse = 1408864445,
+    EclipseMainnet = 1408864445,
     Endurance = 648,
     Ethereum = 1,
     Fraxtal = 252,
@@ -90,7 +90,7 @@ pub enum KnownHyperlaneDomain {
     Redstone = 690,
     Sanko = 1996,
     Sei = 1329,
-    Solana = 1399811149,
+    SolanaMainnet = 1399811149,
     Taiko = 167000,
     Tangle = 5845,
     Viction = 88,
@@ -234,10 +234,10 @@ impl KnownHyperlaneDomain {
         many_to_one!(match self {
             Mainnet: [
                 Ancient8, Arbitrum, Avalanche, BinanceSmartChain, Blast, Bob, Celo, Cheesechain, Cyber,
-                DegenChain, Eclipse, Endurance, Ethereum, Fraxtal, FuseMainnet, Gnosis,
+                DegenChain, EclipseMainnet, Endurance, Ethereum, Fraxtal, FuseMainnet, Gnosis,
                 InEvm, Injective, Kroma, Linea, Lisk, Lukso, MantaPacific, Mantle, Merlin,
                 Metis, Mint, Mode, Moonbeam, Neutron, Optimism, Osmosis, Polygon, ProofOfPlay,
-                ReAl, Redstone, Sanko, Sei, Solana, Taiko, Tangle, Viction, Worldchain, Xai,
+                ReAl, Redstone, Sanko, Sei, SolanaMainnet, Taiko, Tangle, Viction, Worldchain, Xai,
                 Xlayer, Zetachain, Zircuit, ZoraMainnet,
             ],
             Testnet: [
@@ -271,7 +271,7 @@ impl KnownHyperlaneDomain {
 
             ],
             HyperlaneDomainProtocol::Fuel: [FuelTest1],
-            HyperlaneDomainProtocol::Sealevel: [Eclipse, Solana, SealevelTest1, SealevelTest2],
+            HyperlaneDomainProtocol::Sealevel: [EclipseMainnet, SolanaMainnet, SealevelTest1, SealevelTest2],
             HyperlaneDomainProtocol::Cosmos: [
                 Injective, Neutron, Osmosis,
 
@@ -292,10 +292,10 @@ impl KnownHyperlaneDomain {
                 ConnextSepolia, PlumeTestnet, SuperpositionTestnet
             ],
             HyperlaneDomainTechnicalStack::Other: [
-                Ancient8, Avalanche, BinanceSmartChain, Blast, Bob, Celo, Cyber, Eclipse, Endurance, Ethereum,
+                Ancient8, Avalanche, BinanceSmartChain, Blast, Bob, Celo, Cyber, EclipseMainnet, Endurance, Ethereum,
                 Fraxtal, Fuji, FuseMainnet, Gnosis, Injective, Kroma, Linea, Lisk, Lukso,
                 MantaPacific, Mantle, Merlin, Metis, Mint, Mode, Moonbeam, Neutron, Optimism, Osmosis,
-                Polygon, Redstone, Sei, Solana, Taiko, Tangle, Viction, Worldchain, Xlayer, Zetachain,
+                Polygon, Redstone, Sei, SolanaMainnet, Taiko, Tangle, Viction, Worldchain, Xlayer, Zetachain,
                 Zircuit, ZoraMainnet,
 
                 // Local chains

rust/sealevel/client/src/core.rs

@@ -20,7 +20,7 @@ use hyperlane_core::H256;
 use hyperlane_sealevel_igp::accounts::{SOL_DECIMALS, TOKEN_EXCHANGE_RATE_SCALE};
 
 pub(crate) fn adjust_gas_price_if_needed(chain_name: &str, ctx: &mut Context) {
-    if chain_name.eq("solana") {
+    if chain_name.eq("solanamainnet") {
         let mut initial_instructions = ctx.initial_instructions.borrow_mut();
         const PROCESS_DESIRED_PRIORITIZATION_FEE_LAMPORTS_PER_TX: u64 = 50_000_000;
         const MICRO_LAMPORT_FEE_PER_LIMIT: u64 =

rust/sealevel/environments/mainnet2/chain-config.json

@@ -329,9 +329,9 @@
     "gasCurrencyCoinGeckoId": "xdai",
     "gnosisSafeTransactionServiceUrl": "https://safe-transaction-gnosis-chain.safe.global/"
   },
-  "solana": {
+  "solanamainnet": {
     "chainId": 1399811149,
-    "name": "solana",
+    "name": "solanamainnet",
     "rpcUrls": [
       {
         "http": "https://api.mainnet-beta.solana.com"
@@ -347,4 +347,4 @@
       }
     ]
   }
-}
+}

rust/sealevel/environments/mainnet2/helloworld/hyperlane/helloworld-config.json

@@ -1,5 +1,5 @@
 {
-  "solana": {},
+  "solanamainnet": {},
   "bsc": {
     "foreignDeployment": "0xB97d3bF2fC296c2cAC4056bBC8A783ff39408e20"
   },
@@ -27,4 +27,4 @@
   "gnosis": {
     "foreignDeployment": "0x26f32245fCF5Ad53159E875d5Cae62aEcf19c2d4"
   }
-}
+}

rust/sealevel/environments/mainnet2/helloworld/hyperlane/program-ids.json

@@ -19,7 +19,7 @@
     "hex": "0x0000000000000000000000009311cee522a7c122b843b66cc31c6a63e2f92641",
     "base58": "11111111111133qb6DzNiJ7whNaYGud2WqqtjxFS"
   },
-  "solana": {
+  "solanamainnet": {
     "hex": "0x3797d0096b18b5b645c346a66d7f18c6c5738782c6bce24da57a3462bdef82b1",
     "base58": "4k1gruSdH1r57V9QQK4aunzfMYzLFfF83jdYkkEwyem6"
   },
@@ -39,4 +39,4 @@
     "hex": "0x00000000000000000000000026f32245fcf5ad53159e875d5cae62aecf19c2d4",
     "base58": "111111111111YURfyMRiiTWy8X6pYHAqmYPmBpf"
   }
-}
+}

rust/sealevel/environments/mainnet2/helloworld/rc/helloworld-config.json

@@ -1,5 +1,5 @@
 {
-  "solana": {
+  "solanamainnet": {
     "interchainSecurityModule": "BYTsxBuKVbwgsZFswzB91nrxveQySghwXzaKqn8exNnC"
   },
   "gnosis": {
@@ -29,4 +29,4 @@
   "moonbeam": {
     "foreignDeployment": "0x3eB9eE2CFC8DCB6F58B5869D33336CFcBf1dC354"
   }
-}
+}

rust/sealevel/environments/mainnet2/helloworld/rc/program-ids.json

@@ -1,5 +1,5 @@
 {
-  "solana": {
+  "solanamainnet": {
     "hex": "0x29dacc0e7124ea39b1fd43ab0fd30e038cf405c0229890229d0086d0b6516f9c",
     "base58": "3pPDp16iVTJFge2sm85Q61hW61UN5xNqeG24gqFhzLFV"
   },
@@ -39,4 +39,4 @@
     "hex": "0x000000000000000000000000fe29f6a4468536029fc9c97d3a9669b9fe38e114",
     "base58": "1111111111114YNh3uhCWh2NjyPttobeNRyuDHYo"
   }
-}
+}

rust/sealevel/environments/mainnet2/warp-routes/zbc/program-ids.json

@@ -1,5 +1,5 @@
 {
-  "solana": {
+  "solanamainnet": {
     "hex": "0xc5ba229fa2822fe65ac2bd0a93d8371d75292c3415dd381923c1088a3308528b",
     "base58": "EJqwFjvVJSAxH8Ur2PYuMfdvoJeutjmH6GkoEFQ4MdSa"
   },
@@ -7,4 +7,4 @@
     "hex": "0x0000000000000000000000004501bbe6e731a4bc5c60c03a77435b2f6d5e9fe7",
     "base58": "111111111111xm5qkrK7gZ8Cmjr4ggPLRxy2T8a"
   }
-}
+}

rust/sealevel/environments/mainnet2/warp-routes/zbc/token-config.json

@@ -1,16 +1,16 @@
 {
-    "solana": {
-        "type": "collateral",
-        "decimals": 9,
-        "remoteDecimals": 9,
-        "token": "wzbcJyhGhQDLTV1S99apZiiBdE4jmYfbw99saMMdP59",
-        "splTokenProgram": "token",
-        "interchainSecurityModule": "9k74DkJvS2x9QhG4XfnKsLkqaCDyVfaj8s6FyJyhAeEP",
-        "owner": "EzppBFV2taxWw8kEjxNYvby6q7W1biJEqwP3iC7YgRe3"
-    },
-    "nautilus": {
-        "type": "native",
-        "decimals": 18,
-        "foreignDeployment": "0x4501bBE6e731A4bC5c60C03A77435b2f6d5e9Fe7"
-    }
+  "solanamainnet": {
+    "type": "collateral",
+    "decimals": 9,
+    "remoteDecimals": 9,
+    "token": "wzbcJyhGhQDLTV1S99apZiiBdE4jmYfbw99saMMdP59",
+    "splTokenProgram": "token",
+    "interchainSecurityModule": "9k74DkJvS2x9QhG4XfnKsLkqaCDyVfaj8s6FyJyhAeEP",
+    "owner": "EzppBFV2taxWw8kEjxNYvby6q7W1biJEqwP3iC7YgRe3"
+  },
+  "nautilus": {
+    "type": "native",
+    "decimals": 18,
+    "foreignDeployment": "0x4501bBE6e731A4bC5c60C03A77435b2f6d5e9Fe7"
+  }
 }

rust/sealevel/environments/mainnet3/multisig-ism-message-id/eclipse/hyperlane/multisig-config.json

@@ -80,9 +80,7 @@
   },
   "cheesechain": {
     "threshold": 1,
-    "validators": [
-      "0x478fb53c6860ae8fc35235ba0d38d49b13128226"
-    ],
+    "validators": ["0x478fb53c6860ae8fc35235ba0d38d49b13128226"],
     "type": 3
   },
   "endurance": {
@@ -227,9 +225,7 @@
   },
   "osmosis": {
     "threshold": 1,
-    "validators": [
-      "0xea483af11c19fa41b16c31d1534c2a486a92bcac"
-    ],
+    "validators": ["0xea483af11c19fa41b16c31d1534c2a486a92bcac"],
     "type": 3
   },
   "polygon": {
@@ -277,11 +273,9 @@
     ],
     "type": 3
   },
-  "solana": {
+  "solanamainnet": {
     "threshold": 1,
-    "validators": [
-      "0x0621eaf2e4dc6f5aa193532e6ec8b71d3d529415"
-    ],
+    "validators": ["0x0621eaf2e4dc6f5aa193532e6ec8b71d3d529415"],
     "type": 3
   },
   "taiko": {
@@ -304,16 +298,12 @@
   },
   "worldchain": {
     "threshold": 1,
-    "validators": [
-      "0x31048785845325b22817448b68d08f8a8fe36854"
-    ],
+    "validators": ["0x31048785845325b22817448b68d08f8a8fe36854"],
     "type": 3
   },
   "xlayer": {
     "threshold": 1,
-    "validators": [
-      "0xa2ae7c594703e988f23d97220717c513db638ea3"
-    ],
+    "validators": ["0xa2ae7c594703e988f23d97220717c513db638ea3"],
     "type": 3
   },
   "zetachain": {

rust/sealevel/environments/mainnet3/multisig-ism-message-id/solana/hyperlane/multisig-config.json

@@ -80,9 +80,7 @@
   },
   "cheesechain": {
     "threshold": 1,
-    "validators": [
-      "0x478fb53c6860ae8fc35235ba0d38d49b13128226"
-    ],
+    "validators": ["0x478fb53c6860ae8fc35235ba0d38d49b13128226"],
     "type": 3
   },
   "endurance": {
@@ -227,9 +225,7 @@
   },
   "osmosis": {
     "threshold": 1,
-    "validators": [
-      "0xea483af11c19fa41b16c31d1534c2a486a92bcac"
-    ],
+    "validators": ["0xea483af11c19fa41b16c31d1534c2a486a92bcac"],
     "type": 3
   },
   "polygon": {
@@ -277,11 +273,9 @@
     ],
     "type": 3
   },
-  "eclipse": {
+  "eclipsemainnet": {
     "threshold": 1,
-    "validators": [
-      "0x54c96aa1666596c043b07d694da552aa4b596306"
-    ],
+    "validators": ["0x54c96aa1666596c043b07d694da552aa4b596306"],
     "type": 3
   },
   "taiko": {
@@ -304,16 +298,12 @@
   },
   "worldchain": {
     "threshold": 1,
-    "validators": [
-      "0x31048785845325b22817448b68d08f8a8fe36854"
-    ],
+    "validators": ["0x31048785845325b22817448b68d08f8a8fe36854"],
     "type": 3
   },
   "xlayer": {
     "threshold": 1,
-    "validators": [
-      "0xa2ae7c594703e988f23d97220717c513db638ea3"
-    ],
+    "validators": ["0xa2ae7c594703e988f23d97220717c513db638ea3"],
     "type": 3
   },
   "zetachain": {

rust/sealevel/environments/mainnet3/warp-routes/eclipsesol/program-ids.json

@@ -1,10 +1,10 @@
 {
-  "eclipse": {
+  "eclipsemainnet": {
     "hex": "0x6d8f3a8e68449b4c5fa5f09f9f9bf82607f6b2b1b6052260bf7c5c66aa5a5684",
     "base58": "8Ng7TLE223sWcRjH7rEdUPoR3seaugqPw1djdQRRZ6Gj"
   },
-  "solana": {
+  "solanamainnet": {
     "hex": "0x6903def7c07b2844eb549e7037651c07f508884e0c962345c8bb2b9834633e15",
     "base58": "84wESfpyisKVYwkpaJpkHS6XxkLPC5bLZrTD1jQw1TrL"
   }
-}
+}

rust/sealevel/environments/mainnet3/warp-routes/eclipsesol/token-config.json

@@ -1,10 +1,10 @@
 {
-  "solana": {
+  "solanamainnet": {
     "type": "native",
     "decimals": 9,
     "interchainGasPaymaster": "HkqbGqRX7Fi5pwqi8HkDaUhHK6mGWsy7Rt17fpgBrbP5"
   },
-  "eclipse": {
+  "eclipsemainnet": {
     "type": "synthetic",
     "decimals": 9,
     "name": "Solana",

rust/sealevel/environments/mainnet3/warp-routes/pzeth/program-ids.json

@@ -1,5 +1,5 @@
 {
-  "solana": {
+  "solanamainnet": {
     "hex": "0xe9792265ec273ffc17731af890d3e9963e9d744e7b99f02491911ce1bb75b8cb",
     "base58": "GiP8GwN1GsscVJvmKSD4muDEihRzZRa9mxnS1Toi64pa"
   },
@@ -7,4 +7,4 @@
     "hex": "0x0000000000000000000000001d622da2ce4c4d9d4b0611718cb3bcdcad008dd4",
     "base58": "111111111111Qk6NeeudaXPNPB2XfB1yQ9furMh"
   }
-}
+}

rust/sealevel/environments/mainnet3/warp-routes/pzeth/token-config.json

@@ -1,5 +1,5 @@
 {
-  "solana": {
+  "solanamainnet": {
     "type": "synthetic",
     "decimals": 9,
     "name": "Renzo Restaked LST",
@@ -15,4 +15,4 @@
     "foreignDeployment": "0x1D622da2ce4C4D9D4B0611718cb3BcDcAd008DD4",
     "destinationGas": 200000
   }
-}
+}

typescript/infra/config/environments/mainnet3/agent.ts

@@ -70,7 +70,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     cyber: true,
     degenchain: true,
     dogechain: true,
-    eclipse: false,
+    eclipsemainnet: true,
     endurance: true,
     ethereum: true,
     flare: true,
@@ -103,7 +103,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     scroll: true,
     sei: true,
     shibarium: true,
-    solana: false,
+    solanamainnet: true,
     taiko: true,
     tangle: true,
     viction: true,
@@ -131,7 +131,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     cyber: true,
     degenchain: true,
     dogechain: true,
-    eclipse: false,
+    eclipsemainnet: true,
     endurance: true,
     ethereum: true,
     flare: true,
@@ -165,7 +165,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     scroll: true,
     sei: true,
     shibarium: true,
-    solana: false,
+    solanamainnet: true,
     taiko: true,
     tangle: true,
     viction: true,
@@ -194,7 +194,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     degenchain: true,
     dogechain: true,
     // Cannot scrape non-EVM chains
-    eclipse: false,
+    eclipsemainnet: false,
     endurance: true,
     ethereum: true,
     flare: true,
@@ -233,7 +233,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig<
     sei: false,
     shibarium: true,
     // Cannot scrape non-EVM chains
-    solana: false,
+    solanamainnet: false,
     taiko: true,
     tangle: true,
     // Has RPC non-compliance that breaks scraping.

typescript/infra/config/environments/mainnet3/aw-validators/hyperlane.json

@@ -67,6 +67,9 @@
   "dogechain": {
     "validators": ["0xe43f742c37858746e6d7e458bc591180d0cba440"]
   },
+  "eclipsemainnet": {
+    "validators": ["0xebb52d7eaa3ff7a5a6260bfe5111ce52d57401d0"]
+  },
   "endurance": {
     "validators": ["0x28c5b322da06f184ebf68693c5d19df4d4af13e5"]
   },
@@ -203,6 +206,9 @@
   "shibarium": {
     "validators": ["0xfa33391ee38597cbeef72ccde8c9e13e01e78521"]
   },
+  "solanamainnet": {
+    "validators": ["0x28464752829b3ea59a497fca0bdff575c534c3ff"]
+  },
   "taiko": {
     "validators": ["0xa930073c8f2d0b2f7423ea32293e0d1362e65d79"]
   },

typescript/infra/config/environments/mainnet3/aw-validators/rc.json

@@ -49,7 +49,7 @@
   "degenchain": {
     "validators": ["0xac3734bb61e7ddda947b718b930c4067f0ccde7e"]
   },
-  "eclipse": {
+  "eclipsemainnet": {
     "validators": ["0xd188fbe099e2db077f4ebc1bf39bb22798500bfb"]
   },
   "ethereum": {
@@ -164,7 +164,7 @@
   "sei": {
     "validators": ["0x846e48a7e85e5403cc690a347e1ad3c3dca11b6e"]
   },
-  "solana": {
+  "solanamainnet": {
     "validators": ["0xca84b665ab3fed784baf120909c54497c14c93c8"]
   },
   "tangle": {

typescript/infra/config/environments/mainnet3/funding.ts

@@ -84,8 +84,8 @@ export const keyFunderConfig: KeyFunderConfig<
     injective: '0',
     neutron: '0',
     osmosis: '0',
-    solana: '0',
-    eclipse: '0',
+    solanamainnet: '0',
+    eclipsemainnet: '0',
   },
   // if not set, keyfunder defaults to 0
   desiredKathyBalancePerChain: {
@@ -139,8 +139,8 @@ export const keyFunderConfig: KeyFunderConfig<
     injective: '0',
     neutron: '0',
     osmosis: '0',
-    eclipse: '0',
-    solana: '0',
+    eclipsemainnet: '0',
+    solanamainnet: '0',
   },
   // if not set, keyfunder defaults to using desired balance * 0.2 as the threshold
   igpClaimThresholdPerChain: {
@@ -194,7 +194,7 @@ export const keyFunderConfig: KeyFunderConfig<
     injective: '0',
     neutron: '0',
     osmosis: '0',
-    eclipse: '0',
-    solana: '0',
+    eclipsemainnet: '0',
+    solanamainnet: '0',
   },
 };

typescript/infra/config/environments/mainnet3/gasPrices.json

@@ -63,7 +63,7 @@
     "amount": "250.0",
     "decimals": 9
   },
-  "eclipse": {
+  "eclipsemainnet": {
     "amount": "0.001",
     "decimals": 9
   },
@@ -195,7 +195,7 @@
     "amount": "54.30595191",
     "decimals": 9
   },
-  "solana": {
+  "solanamainnet": {
     "amount": "0.5",
     "decimals": 1
   },

typescript/infra/config/environments/mainnet3/supportedChainNames.ts

@@ -17,7 +17,7 @@ export const mainnet3SupportedChainNames = [
   'cyber',
   'degenchain',
   'dogechain',
-  'eclipse',
+  'eclipsemainnet',
   'endurance',
   'ethereum',
   'flare',
@@ -50,7 +50,7 @@ export const mainnet3SupportedChainNames = [
   'scroll',
   'sei',
   'shibarium',
-  'solana',
+  'solanamainnet',
   'taiko',
   'tangle',
   'viction',

typescript/infra/config/environments/mainnet3/tokenPrices.json

@@ -15,7 +15,7 @@
   "cyber": "2620.58",
   "degenchain": "0.00398489",
   "dogechain": "0.104488",
-  "eclipse": "2620.58",
+  "eclipsemainnet": "2620.58",
   "endurance": "2.34",
   "ethereum": "2620.58",
   "flare": "0.01529346",
@@ -48,7 +48,7 @@
   "scroll": "2620.58",
   "sei": "0.325976",
   "shibarium": "0.418598",
-  "solana": "154.32",
+  "solanamainnet": "154.32",
   "taiko": "2620.58",
   "tangle": "0.999894",
   "viction": "0.380653",

typescript/infra/config/environments/mainnet3/validators.ts

@@ -400,28 +400,28 @@ export const validatorChainConfig = (
         'scroll',
       ),
     },
-    solana: {
+    solanamainnet: {
       interval: 5,
-      reorgPeriod: getReorgPeriod('solana'),
+      reorgPeriod: getReorgPeriod('solanamainnet'),
       validators: validatorsConfig(
         {
-          [Contexts.Hyperlane]: ['0x0621eaf2e4dc6f5aa193532e6ec8b71d3d529415'],
+          [Contexts.Hyperlane]: ['0x28464752829b3ea59a497fca0bdff575c534c3ff'],
           [Contexts.ReleaseCandidate]: [''],
           [Contexts.Neutron]: [],
         },
-        'solana',
+        'solanamainnet',
       ),
     },
-    eclipse: {
+    eclipsemainnet: {
       interval: 5,
-      reorgPeriod: getReorgPeriod('eclipse'),
+      reorgPeriod: getReorgPeriod('eclipsemainnet'),
       validators: validatorsConfig(
         {
-          [Contexts.Hyperlane]: ['0x54c96aa1666596c043b07d694da552aa4b596306'],
+          [Contexts.Hyperlane]: ['0xebb52d7eaa3ff7a5a6260bfe5111ce52d57401d0'],
           [Contexts.ReleaseCandidate]: [''],
           [Contexts.Neutron]: [],
         },
-        'eclipse',
+        'eclipsemainnet',
       ),
     },
     taiko: {

typescript/infra/scripts/helloworld/utils.ts

@@ -95,17 +95,17 @@ export async function getHelloWorldMultiProtocolApp(
 
   // if (
   //   coreConfig.environment === 'mainnet3' &&
-  //   !multiProtocolProvider.getKnownChainNames().includes('solana')
+  //   !multiProtocolProvider.getKnownChainNames().includes('solanamainnet')
   // ) {
   //   multiProvider.addChain(chainMetadata.solana);
   //   multiProtocolProvider.addChain(chainMetadata.solana);
-  //   keys['solana'] = getKeyForRole(
+  //   keys['solanamainnet'] = getKeyForRole(
   //     coreConfig.environment,
   //     context,
-  //     'solana',
+  //     'solanamainnet',
   //     keyRole,
   //   );
-  //   await keys['solana'].fetch();
+  //   await keys['solanamainnet'].fetch();
   // }
 
   const core = MultiProtocolCore.fromAddressesMap(

typescript/sdk/src/consts/multisigIsm.ts

@@ -175,9 +175,9 @@ export const defaultMultisigConfigs: ChainMap<MultisigConfig> = {
     validators: ['0xe43f742c37858746e6d7e458bc591180d0cba440'],
   },
 
-  eclipse: {
+  eclipsemainnet: {
     threshold: 1,
-    validators: ['0x54c96aa1666596c043b07d694da552aa4b596306'],
+    validators: ['0xebb52d7eaa3ff7a5a6260bfe5111ce52d57401d0'],
   },
 
   eclipsetestnet: {
@@ -522,11 +522,6 @@ export const defaultMultisigConfigs: ChainMap<MultisigConfig> = {
     validators: ['0xfa33391ee38597cbeef72ccde8c9e13e01e78521'],
   },
 
-  solana: {
-    threshold: 1,
-    validators: ['0x0621eaf2e4dc6f5aa193532e6ec8b71d3d529415'],
-  },
-
   solanadevnet: {
     threshold: 2,
     validators: [
@@ -536,6 +531,11 @@ export const defaultMultisigConfigs: ChainMap<MultisigConfig> = {
     ],
   },
 
+  solanamainnet: {
+    threshold: 1,
+    validators: ['0x28464752829b3ea59a497fca0bdff575c534c3ff'],
+  },
+
   solanatestnet: {
     threshold: 1,
     validators: ['0xd4ce8fa138d4e083fc0e480cca0dbfa4f5f30bd5'],