chore: merge main to cli-2.0 (hyperlane-xyz#3964)

Tessellated-io · Jun 17, 2024 · ec5d43c · ec5d43c
1 parent 129bd87
commit ec5d43c
Show file tree

Hide file tree

Showing 61 changed files with 2,146 additions and 1,422 deletions.
diff --git a/rust/config/mainnet_config.json b/rust/config/mainnet_config.json
@@ -634,13 +634,18 @@
     },
     "injective": {
       "bech32Prefix": "inj",
+      "blockExplorers": [],
       "blocks": {
+        "confirmations": 1,
+        "estimateBlockTime": 1,
         "reorgPeriod": 10
       },
       "canonicalAsset": "inj",
       "chainId": "injective-1",
       "contractAddressBytes": 20,
-      "domainId": "6909546",
+      "displayName": "Injective",
+      "domainId": 6909546,
+      "gasCurrencyCoinGeckoId": "injective-protocol",
       "gasPrice": {
         "amount": "700000000",
         "denom": "inj"
@@ -658,12 +663,24 @@
       "mailbox": "0x0f7fb53961d70687e352aa55cb329ca76edc0c19",
       "merkleTreeHook": "0x568ad3638447f07def384969f4ea39fae3802962",
       "name": "injective",
+      "nativeToken": {
+        "decimals": 18,
+        "denom": "inj",
+        "name": "Injective",
+        "symbol": "INJ"
+      },
       "protocol": "cosmos",
+      "restUrls": [
+        {
+          "http": "https://sentry.lcd.injective.network:443"
+        }
+      ],
       "rpcUrls": [
         {
-          "http": "https://injective-rpc.polkachu.com"
+          "http": "https://sentry.tm.injective.network:443"
         }
       ],
+      "slip44": 118,
       "validatorAnnounce": "0x1fb225b2fcfbe75e614a1d627de97ff372242eed"
     },
     "mantapacific": {
@@ -837,13 +854,25 @@
     },
     "neutron": {
       "bech32Prefix": "neutron",
+      "blockExplorers": [
+        {
+          "apiUrl": "https://www.mintscan.io/neutron",
+          "family": "other",
+          "name": "Mintscan",
+          "url": "https://www.mintscan.io/neutron"
+        }
+      ],
       "blocks": {
+        "confirmations": 1,
+        "estimateBlockTime": 3,
         "reorgPeriod": 1
       },
       "canonicalAsset": "untrn",
       "chainId": "neutron-1",
       "contractAddressBytes": 32,
-      "domainId": "1853125230",
+      "displayName": "Neutron",
+      "domainId": 1853125230,
+      "gasCurrencyCoinGeckoId": "neutron-3",
       "gasPrice": {
         "amount": "0.0053",
         "denom": "untrn"
@@ -858,10 +887,22 @@
         "from": 4000000
       },
       "interchainGasPaymaster": "0x504ee9ac43ec5814e00c7d21869a90ec52becb489636bdf893b7df9d606b5d67",
+      "isTestnet": false,
       "mailbox": "0x848426d50eb2104d5c6381ec63757930b1c14659c40db8b8081e516e7c5238fc",
       "merkleTreeHook": "0xcd30a0001cc1f436c41ef764a712ebabc5a144140e3fd03eafe64a9a24e4e27c",
       "name": "neutron",
+      "nativeToken": {
+        "decimals": 6,
+        "denom": "untrn",
+        "name": "Neutron",
+        "symbol": "NTRN"
+      },
       "protocol": "cosmos",
+      "restUrls": [
+        {
+          "http": "https://rest-lb.neutron.org"
+        }
+      ],
       "rpcUrls": [
         {
           "http": "https://rpc-kralum.neutron-1.neutron.org"
@@ -872,6 +913,7 @@
         "prefix": "neutron",
         "type": "cosmosKey"
       },
+      "slip44": 118,
       "validatorAnnounce": "0xf3aa0d652226e21ae35cd9035c492ae41725edc9036edf0d6a48701b153b90a0"
     },
     "optimism": {
@@ -998,8 +1040,8 @@
       "name": "polygon",
       "nativeToken": {
         "decimals": 18,
-        "name": "Ether",
-        "symbol": "ETH"
+        "name": "Matic",
+        "symbol": "MATIC"
       },
       "pausableHook": "0x748040afB89B8FdBb992799808215419d36A0930",
       "pausableIsm": "0x6741e91fFDC31c7786E3684427c628dad06299B0",

diff --git a/rust/config/testnet_config.json b/rust/config/testnet_config.json
@@ -207,6 +207,56 @@
       "timelockController": "0x0000000000000000000000000000000000000000",
       "validatorAnnounce": "0x4f7179A691F8a684f56cF7Fed65171877d30739a"
     },
+    "holesky": {
+      "blockExplorers": [
+        {
+          "apiUrl": "https://api-holesky.etherscan.io/api",
+          "family": "etherscan",
+          "name": "Etherscan",
+          "url": "https://holesky.etherscan.io"
+        }
+      ],
+      "blocks": {
+        "confirmations": 1,
+        "estimateBlockTime": 13,
+        "reorgPeriod": 2
+      },
+      "chainId": 17000,
+      "displayName": "Holesky",
+      "domainId": 17000,
+      "domainRoutingIsmFactory": "0xDDcFEcF17586D08A5740B7D91735fcCE3dfe3eeD",
+      "fallbackRoutingHook": "0x07009DA2249c388aD0f416a235AfE90D784e1aAc",
+      "index": {
+        "from": 1543015
+      },
+      "interchainGasPaymaster": "0x5CBf4e70448Ed46c2616b04e9ebc72D29FF0cfA9",
+      "interchainSecurityModule": "0x751f2b684EeBb916dB777767CCb8fd793C8b2956",
+      "isTestnet": true,
+      "mailbox": "0x46f7C5D896bbeC89bE1B19e4485e59b4Be49e9Cc",
+      "merkleTreeHook": "0x98AAE089CaD930C64a76dD2247a2aC5773a4B8cE",
+      "name": "holesky",
+      "nativeToken": {
+        "decimals": 18,
+        "name": "Ether",
+        "symbol": "ETH"
+      },
+      "pausableHook": "0xF7561c34f17A32D5620583A3397C304e7038a7F6",
+      "protocol": "ethereum",
+      "protocolFee": "0x6b1bb4ce664Bb4164AEB4d3D2E7DE7450DD8084C",
+      "proxyAdmin": "0x33dB966328Ea213b0f76eF96CA368AB37779F065",
+      "rpcUrls": [
+        {
+          "http": "https://ethereum-holesky-rpc.publicnode.com"
+        }
+      ],
+      "staticAggregationHookFactory": "0x589C201a07c26b4725A4A829d772f24423da480B",
+      "staticAggregationIsmFactory": "0x54148470292C24345fb828B003461a9444414517",
+      "staticMerkleRootMultisigIsmFactory": "0xC2E36cd6e32e194EE11f15D9273B64461A4D49A2",
+      "staticMessageIdMultisigIsmFactory": "0x6966b0E55883d49BFB24539356a2f8A673E02039",
+      "storageGasOracle": "0x2b2a158B4059C840c7aC67399B153bb567D06303",
+      "testRecipient": "0x86fb9F1c124fB20ff130C41a79a432F770f67AFD",
+      "validatorAnnounce": "0xAb9B273366D794B7F80B4378bc8Aaca75C6178E2"
+    },
     "plumetestnet": {
       "aggregationHook": "0x31dF0EEE7Dc7565665468698a0da221225619a1B",
       "blockExplorers": [

diff --git a/solidity/lib/forge-std b/solidity/lib/forge-std
+1 −0		.gitattributes
+48 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+0 −3		.gitmodules
+1 −1		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+4 −3		src/Script.sol
+518 −225		src/StdAssertions.sol
+34 −13		src/StdChains.sol
+156 −15		src/StdCheats.sol
+25 −4		src/StdInvariant.sol
+25 −25		src/StdJson.sol
+244 −98		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+179 −0		src/StdToml.sol
+62 −34		src/StdUtils.sol
+7 −6		src/Test.sol
+1,623 −374		src/Vm.sol
+234 −0		src/mocks/MockERC20.sol
+231 −0		src/mocks/MockERC721.sol
+44 −898		test/StdAssertions.t.sol
+120 −57		test/StdChains.t.sol
+178 −67		test/StdCheats.t.sol
+13 −11		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+27 −12		test/StdMath.t.sol
+222 −42		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+66 −36		test/StdUtils.t.sol
+15 −0		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol