chore: migrate `test1` from `13371` to `133711` (#4252)

- chore: migrate `test1` from `13371` to `133711`
- due to clash with immutablezkevm
- drive-by registry update + agent config update

---------

Signed-off-by: pbio <10051819+paulbalaji@users.noreply.github.com>
pull/4290/head
Paul Balaji 3 months ago committed by GitHub
parent a7ab950246
commit ff3c9897ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      .registryrc
  2. 4
      rust/agents/relayer/src/settings/matching_list.rs
  3. 14
      rust/agents/scraper/migration/src/m20230309_000001_create_table_domain.rs
  4. 6
      rust/config/mainnet_config.json
  5. 5
      rust/config/testnet_config.json
  6. 2
      rust/hyperlane-base/src/settings/mod.rs
  7. 6
      rust/hyperlane-core/src/chain.rs
  8. 2
      rust/utils/run-locally/src/solana.rs
  9. 12
      typescript/sdk/src/consts/testChains.ts

@ -1 +1 @@
d9fea91f16949a51b2c8e776bac26712ba1fef3d baba8f1ef13dfbe11ad1186b4c0fff980d44a5fa

@ -418,11 +418,11 @@ mod test {
#[test] #[test]
fn config_with_multiple_domains() { fn config_with_multiple_domains() {
let whitelist: MatchingList = let whitelist: MatchingList =
serde_json::from_str(r#"[{"destinationdomain": ["13372", "13373"]}]"#).unwrap(); serde_json::from_str(r#"[{"destinationdomain": ["9913372", "9913373"]}]"#).unwrap();
assert!(whitelist.0.is_some()); assert!(whitelist.0.is_some());
assert_eq!(whitelist.0.as_ref().unwrap().len(), 1); assert_eq!(whitelist.0.as_ref().unwrap().len(), 1);
let elem = &whitelist.0.as_ref().unwrap()[0]; let elem = &whitelist.0.as_ref().unwrap()[0];
assert_eq!(elem.destination_domain, Enumerated(vec![13372, 13373])); assert_eq!(elem.destination_domain, Enumerated(vec![9913372, 9913373]));
assert_eq!(elem.recipient_address, Wildcard); assert_eq!(elem.recipient_address, Wildcard);
assert_eq!(elem.origin_domain, Wildcard); assert_eq!(elem.origin_domain, Wildcard);
assert_eq!(elem.sender_address, Wildcard); assert_eq!(elem.sender_address, Wildcard);

@ -150,6 +150,14 @@ const DOMAINS: &[RawDomain] = &[
is_test_net: false, is_test_net: false,
is_deprecated: false, is_deprecated: false,
}, },
RawDomain {
name: "immutablezkevm",
token: "IMX",
domain: 13371,
chain_id: 13371,
is_test_net: false,
is_deprecated: false,
},
RawDomain { RawDomain {
name: "linea", name: "linea",
token: "ETH", token: "ETH",
@ -321,7 +329,7 @@ const DOMAINS: &[RawDomain] = &[
RawDomain { RawDomain {
name: "test1", name: "test1",
token: "ETH", token: "ETH",
domain: 13371, domain: 9913371,
chain_id: 0, chain_id: 0,
is_test_net: true, is_test_net: true,
is_deprecated: false, is_deprecated: false,
@ -329,7 +337,7 @@ const DOMAINS: &[RawDomain] = &[
RawDomain { RawDomain {
name: "test2", name: "test2",
token: "ETH", token: "ETH",
domain: 13372, domain: 9913372,
chain_id: 0, chain_id: 0,
is_test_net: true, is_test_net: true,
is_deprecated: false, is_deprecated: false,
@ -337,7 +345,7 @@ const DOMAINS: &[RawDomain] = &[
RawDomain { RawDomain {
name: "test3", name: "test3",
token: "ETH", token: "ETH",
domain: 13373, domain: 9913373,
chain_id: 0, chain_id: 0,
is_test_net: true, is_test_net: true,
is_deprecated: false, is_deprecated: false,

@ -558,7 +558,7 @@
"fallbackRoutingHook": "0x03E20381530F2D50A0c9Ef153C19E74695c03433", "fallbackRoutingHook": "0x03E20381530F2D50A0c9Ef153C19E74695c03433",
"gasCurrencyCoinGeckoId": "cheese-2", "gasCurrencyCoinGeckoId": "cheese-2",
"index": { "index": {
"from": 20390325 "from": 50650
}, },
"interchainGasPaymaster": "0x7E27456a839BFF31CA642c060a2b68414Cb6e503", "interchainGasPaymaster": "0x7E27456a839BFF31CA642c060a2b68414Cb6e503",
"interchainSecurityModule": "0xD3bd8f20e169364d14c7dBFE698258D780FC71e3", "interchainSecurityModule": "0xD3bd8f20e169364d14c7dBFE698258D780FC71e3",
@ -586,6 +586,7 @@
"staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC", "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
"staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE", "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
"storageGasOracle": "0xe4057c5B0c43Dc18E36b08C39B419F190D29Ac2d", "storageGasOracle": "0xe4057c5B0c43Dc18E36b08C39B419F190D29Ac2d",
"technicalStack": "arbitrumnitro",
"testRecipient": "0x4848d54987ffc732aD313827cdC25DF2eedD79d8", "testRecipient": "0x4848d54987ffc732aD313827cdC25DF2eedD79d8",
"validatorAnnounce": "0x047ba6c9949baB22d13C347B40819b7A20C4C53a" "validatorAnnounce": "0x047ba6c9949baB22d13C347B40819b7A20C4C53a"
}, },
@ -938,7 +939,7 @@
"fallbackRoutingHook": "0xA376b27212D608324808923Add679A2c9FAFe9Da", "fallbackRoutingHook": "0xA376b27212D608324808923Add679A2c9FAFe9Da",
"gasCurrencyCoinGeckoId": "injective-protocol", "gasCurrencyCoinGeckoId": "injective-protocol",
"index": { "index": {
"from": 18972465 "from": 37
}, },
"interchainAccountIsm": "0x31894E7a734540B343d67E491148EB4FC9f7A45B", "interchainAccountIsm": "0x31894E7a734540B343d67E491148EB4FC9f7A45B",
"interchainAccountRouter": "0x4E55aDA3ef1942049EA43E904EB01F4A0a9c39bd", "interchainAccountRouter": "0x4E55aDA3ef1942049EA43E904EB01F4A0a9c39bd",
@ -968,6 +969,7 @@
"staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC", "staticMerkleRootMultisigIsmFactory": "0x2C1FAbEcd7bFBdEBF27CcdB67baADB38b6Df90fC",
"staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE", "staticMessageIdMultisigIsmFactory": "0x8b83fefd896fAa52057798f6426E9f0B080FCCcE",
"storageGasOracle": "0x6119E37Bd66406A1Db74920aC79C15fB8411Ba76", "storageGasOracle": "0x6119E37Bd66406A1Db74920aC79C15fB8411Ba76",
"technicalStack": "arbitrumnitro",
"testRecipient": "0x28291a7062afA569104bEd52F7AcCA3dD2FafD11", "testRecipient": "0x28291a7062afA569104bEd52F7AcCA3dD2FafD11",
"timelockController": "0x0000000000000000000000000000000000000000", "timelockController": "0x0000000000000000000000000000000000000000",
"validatorAnnounce": "0x15ab173bDB6832f9b64276bA128659b0eD77730B" "validatorAnnounce": "0x15ab173bDB6832f9b64276bA128659b0eD77730B"

@ -366,7 +366,7 @@
], ],
"blocks": { "blocks": {
"confirmations": 1, "confirmations": 1,
"estimateBlockTime": 3, "estimateBlockTime": 5,
"reorgPeriod": 0 "reorgPeriod": 0
}, },
"chainId": 161221135, "chainId": 161221135,
@ -614,7 +614,7 @@
"domainRoutingIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37", "domainRoutingIsmFactory": "0x16B710b86CAd07E6F1C531861a16F5feC29dba37",
"fallbackRoutingHook": "0x98AAE089CaD930C64a76dD2247a2aC5773a4B8cE", "fallbackRoutingHook": "0x98AAE089CaD930C64a76dD2247a2aC5773a4B8cE",
"index": { "index": {
"from": 6317216 "from": 3111622
}, },
"interchainGasPaymaster": "0xeC7eb4196Bd601DEa7585A744FbFB4CF11278450", "interchainGasPaymaster": "0xeC7eb4196Bd601DEa7585A744FbFB4CF11278450",
"interchainSecurityModule": "0x5e6Fe18eC7D4b159bDC5Fa0C32bB1996277B3ddF", "interchainSecurityModule": "0x5e6Fe18eC7D4b159bDC5Fa0C32bB1996277B3ddF",
@ -643,6 +643,7 @@
"staticMerkleRootMultisigIsmFactory": "0x6E7b29CB2A7617405B4d30C6f84bBD51b4Bb4be8", "staticMerkleRootMultisigIsmFactory": "0x6E7b29CB2A7617405B4d30C6f84bBD51b4Bb4be8",
"staticMessageIdMultisigIsmFactory": "0xfc6e546510dC9d76057F1f76633FCFfC188CB213", "staticMessageIdMultisigIsmFactory": "0xfc6e546510dC9d76057F1f76633FCFfC188CB213",
"storageGasOracle": "0xF7561c34f17A32D5620583A3397C304e7038a7F6", "storageGasOracle": "0xF7561c34f17A32D5620583A3397C304e7038a7F6",
"technicalStack": "arbitrumnitro",
"testRecipient": "0xAb9B273366D794B7F80B4378bc8Aaca75C6178E2", "testRecipient": "0xAb9B273366D794B7F80B4378bc8Aaca75C6178E2",
"validatorAnnounce": "0xAD34A66Bf6dB18E858F6B686557075568c6E031C" "validatorAnnounce": "0xAD34A66Bf6dB18E858F6B686557075568c6E031C"
} }

@ -35,7 +35,7 @@
//! "signers": {}, //! "signers": {},
//! "chains": { //! "chains": {
//! "test2": { //! "test2": {
//! "domainId": "13372", //! "domainId": "9913372",
//! ... //! ...
//! }, //! },
//! ... //! ...

@ -87,9 +87,9 @@ pub enum KnownHyperlaneDomain {
// -- Local chains -- // -- Local chains --
// //
Test1 = 13371, Test1 = 9913371,
Test2 = 13372, Test2 = 9913372,
Test3 = 13373, Test3 = 9913373,
FuelTest1 = 13374, FuelTest1 = 13374,
SealevelTest1 = 13375, SealevelTest1 = 13375,
SealevelTest2 = 13376, SealevelTest2 = 13376,

@ -224,7 +224,7 @@ pub fn start_solana_test_validator(
.arg("local-domain", SOLANA_LOCAL_CHAIN_ID) .arg("local-domain", SOLANA_LOCAL_CHAIN_ID)
.arg( .arg(
"remote-domains", "remote-domains",
[SOLANA_REMOTE_CHAIN_ID, "13371", "13372", "13373"].join(","), [SOLANA_REMOTE_CHAIN_ID, "9913371", "9913372", "9913373"].join(","),
) )
.arg("chain", "sealeveltest1") .arg("chain", "sealeveltest1")
.run() .run()

@ -30,9 +30,9 @@ export const test1: ChainMetadata = {
estimateBlockTime: 3, estimateBlockTime: 3,
reorgPeriod: 0, reorgPeriod: 0,
}, },
chainId: 13371, chainId: 9913371,
displayName: 'Test 1', displayName: 'Test 1',
domainId: 13371, domainId: 9913371,
isTestnet: true, isTestnet: true,
name: 'test1', name: 'test1',
nativeToken: { decimals: 18, name: 'Ether', symbol: 'ETH' }, nativeToken: { decimals: 18, name: 'Ether', symbol: 'ETH' },
@ -47,9 +47,9 @@ export const test2: ChainMetadata = {
estimateBlockTime: 3, estimateBlockTime: 3,
reorgPeriod: 1, reorgPeriod: 1,
}, },
chainId: 13372, chainId: 9913372,
displayName: 'Test 2', displayName: 'Test 2',
domainId: 13372, domainId: 9913372,
name: 'test2', name: 'test2',
}; };
@ -60,9 +60,9 @@ export const test3: ChainMetadata = {
estimateBlockTime: 3, estimateBlockTime: 3,
reorgPeriod: 2, reorgPeriod: 2,
}, },
chainId: 13373, chainId: 9913373,
displayName: 'Test 3', displayName: 'Test 3',
domainId: 13373, domainId: 9913373,
name: 'test3', name: 'test3',
}; };

Loading…
Cancel
Save