Merge branch 'main' into trevor/relayer-validator-metrics

hyperlane-xyz · Jan 2, 2024 · f05ef89 · f05ef89
2 parents b92095e + 0e60c22
commit f05ef89
Show file tree

Hide file tree

Showing 23 changed files with 110 additions and 52 deletions.
diff --git a/.changeset/five-spoons-complain.md b/.changeset/five-spoons-complain.md
diff --git a/.changeset/many-apes-invite.md b/.changeset/many-apes-invite.md
diff --git a/.changeset/tame-cougars-attack.md b/.changeset/tame-cougars-attack.md
diff --git a/rust/config/mainnet3_config.json b/rust/config/mainnet3_config.json
@@ -433,7 +433,7 @@
       "canonicalAsset": "untrn",
       "prefix": "neutron",
       "gasPrice": {
-        "amount": "0.5",
+        "amount": "0.57",
         "denom": "untrn"
       },
       "index": {

diff --git a/solidity/CHANGELOG.md b/solidity/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @hyperlane-xyz/core
 
+## 3.5.0
+
+### Patch Changes
+
+- @hyperlane-xyz/utils@3.5.0
+
 ## 3.4.0
 
 ### Patch Changes

diff --git a/solidity/package.json b/solidity/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@hyperlane-xyz/core",
   "description": "Core solidity contracts for Hyperlane",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "dependencies": {
     "@eth-optimism/contracts": "^0.6.0",
-    "@hyperlane-xyz/utils": "3.4.0",
+    "@hyperlane-xyz/utils": "3.5.0",
     "@openzeppelin/contracts": "^4.9.3",
     "@openzeppelin/contracts-upgradeable": "^v4.9.3"
   },

diff --git a/typescript/cli/CHANGELOG.md b/typescript/cli/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @hyperlane-xyz/cli
 
+## 3.5.0
+
+### Patch Changes
+
+- 05a943b4a: Skip mandatory balance check for remotes in send commands"
+- Updated dependencies [655b6a0cd]
+- Updated dependencies [08ba0d32b]
+- Updated dependencies [f7d285e3a]
+  - @hyperlane-xyz/sdk@3.5.0
+  - @hyperlane-xyz/utils@3.5.0
+
 ## 3.4.0
 
 ### Patch Changes

diff --git a/typescript/cli/package.json b/typescript/cli/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@hyperlane-xyz/cli",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "A command-line utility for common Hyperlane operations",
   "dependencies": {
-    "@hyperlane-xyz/sdk": "3.4.0",
-    "@hyperlane-xyz/utils": "3.4.0",
+    "@hyperlane-xyz/sdk": "3.5.0",
+    "@hyperlane-xyz/utils": "3.5.0",
     "@inquirer/prompts": "^3.0.0",
     "bignumber.js": "^9.1.1",
     "chalk": "^5.3.0",

diff --git a/typescript/cli/src/deploy/utils.ts b/typescript/cli/src/deploy/utils.ts
@@ -20,12 +20,14 @@ export async function runPreflightChecks({
   signer,
   multiProvider,
   minGas,
+  chainsToGasCheck,
 }: {
   origin: ChainName;
   remotes: ChainName[];
   signer: ethers.Signer;
   multiProvider: MultiProvider;
   minGas: string;
+  chainsToGasCheck?: ChainName[];
 }) {
   log('Running pre-flight checks...');
 
@@ -37,6 +39,7 @@ export async function runPreflightChecks({
     signer,
     multiProvider,
     minGas,
+    chainsToGasCheck,
   });
 }
 
@@ -45,11 +48,15 @@ export async function runPreflightChecksForChains({
   signer,
   multiProvider,
   minGas,
+  chainsToGasCheck,
 }: {
   chains: ChainName[];
   signer: ethers.Signer;
   multiProvider: MultiProvider;
   minGas: string;
+  // Chains for which to assert a native balance
+  // Defaults to all chains if not specified
+  chainsToGasCheck?: ChainName[];
 }) {
   log('Running pre-flight checks...');
 
@@ -65,7 +72,12 @@ export async function runPreflightChecksForChains({
   assertSigner(signer);
   logGreen('Signer is valid ✅');
 
-  await assertGasBalances(multiProvider, signer, chains, minGas);
+  await assertGasBalances(
+    multiProvider,
+    signer,
+    chainsToGasCheck ?? chains,
+    minGas,
+  );
   logGreen('Balances are sufficient ✅');
 }
 

diff --git a/typescript/cli/src/send/message.ts b/typescript/cli/src/send/message.ts
@@ -60,6 +60,7 @@ export async function sendTestMessage({
     multiProvider,
     signer,
     minGas: MINIMUM_TEST_SEND_GAS,
+    chainsToGasCheck: [origin],
   });
 
   await timeout(

diff --git a/typescript/cli/src/send/transfer.ts b/typescript/cli/src/send/transfer.ts
@@ -97,6 +97,7 @@ export async function sendTestTransfer({
     multiProvider,
     signer,
     minGas: MINIMUM_TEST_SEND_GAS,
+    chainsToGasCheck: [origin],
   });
 
   await timeout(

diff --git a/typescript/cli/src/version.ts b/typescript/cli/src/version.ts
@@ -1 +1 @@
-export const VERSION = '3.4.0';
+export const VERSION = '3.5.0';
diff --git a/typescript/helloworld/CHANGELOG.md b/typescript/helloworld/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @hyperlane-xyz/helloworld
 
+## 3.5.0
+
+### Patch Changes
+
+- Updated dependencies [655b6a0cd]
+- Updated dependencies [08ba0d32b]
+- Updated dependencies [f7d285e3a]
+  - @hyperlane-xyz/sdk@3.5.0
+  - @hyperlane-xyz/core@3.5.0
+
 ## 3.4.0
 
 ### Patch Changes

diff --git a/typescript/helloworld/package.json b/typescript/helloworld/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@hyperlane-xyz/helloworld",
   "description": "A basic skeleton of an Hyperlane app",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "dependencies": {
-    "@hyperlane-xyz/core": "3.4.0",
-    "@hyperlane-xyz/sdk": "3.4.0",
+    "@hyperlane-xyz/core": "3.5.0",
+    "@hyperlane-xyz/sdk": "3.5.0",
     "@openzeppelin/contracts-upgradeable": "^4.9.3",
     "ethers": "^5.7.2"
   },

diff --git a/typescript/infra/CHANGELOG.md b/typescript/infra/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @hyperlane-xyz/infra
 
+## 3.5.0
+
+### Minor Changes
+
+- 655b6a0cd: Redeploy Routing ISM Factories
+
+### Patch Changes
+
+- f7d285e3a: Adds Test Recipient addresses to the SDK artifacts
+- Updated dependencies [655b6a0cd]
+- Updated dependencies [08ba0d32b]
+- Updated dependencies [f7d285e3a]
+  - @hyperlane-xyz/sdk@3.5.0
+  - @hyperlane-xyz/helloworld@3.5.0
+  - @hyperlane-xyz/utils@3.5.0
+
 ## 3.4.0
 
 ### Patch Changes

diff --git a/typescript/infra/config/environments/mainnet3/agent.ts b/typescript/infra/config/environments/mainnet3/agent.ts
@@ -108,7 +108,7 @@ const neutron: RootAgentConfig = {
     rpcConsensusType: RpcConsensusType.Fallback,
     docker: {
       repo,
-      tag: '86b7f98-20231207-153805',
+      tag: '67585a2-20231220-223937',
     },
     gasPaymentEnforcement: [
       {

diff --git a/typescript/infra/package.json b/typescript/infra/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hyperlane-xyz/infra",
   "description": "Infrastructure utilities for the Hyperlane Network",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "dependencies": {
     "@arbitrum/sdk": "^3.0.0",
     "@aws-sdk/client-iam": "^3.74.0",
@@ -12,9 +12,9 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/hardware-wallets": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@hyperlane-xyz/helloworld": "3.4.0",
-    "@hyperlane-xyz/sdk": "3.4.0",
-    "@hyperlane-xyz/utils": "3.4.0",
+    "@hyperlane-xyz/helloworld": "3.5.0",
+    "@hyperlane-xyz/sdk": "3.5.0",
+    "@hyperlane-xyz/utils": "3.5.0",
     "@nomiclabs/hardhat-etherscan": "^3.0.3",
     "@safe-global/api-kit": "^1.3.0",
     "@safe-global/protocol-kit": "^1.2.0",

diff --git a/typescript/sdk/CHANGELOG.md b/typescript/sdk/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @hyperlane-xyz/sdk
 
+## 3.5.0
+
+### Minor Changes
+
+- 655b6a0cd: Redeploy Routing ISM Factories
+
+### Patch Changes
+
+- 08ba0d32b: Remove dead arbitrum goerli explorer link"
+- f7d285e3a: Adds Test Recipient addresses to the SDK artifacts
+  - @hyperlane-xyz/core@3.5.0
+  - @hyperlane-xyz/utils@3.5.0
+
 ## 3.4.0
 
 ### Minor Changes

diff --git a/typescript/sdk/package.json b/typescript/sdk/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@hyperlane-xyz/sdk",
   "description": "The official SDK for the Hyperlane Network",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "dependencies": {
     "@cosmjs/cosmwasm-stargate": "^0.31.3",
     "@cosmjs/stargate": "^0.31.3",
-    "@hyperlane-xyz/core": "3.4.0",
-    "@hyperlane-xyz/utils": "3.4.0",
+    "@hyperlane-xyz/core": "3.5.0",
+    "@hyperlane-xyz/utils": "3.5.0",
     "@solana/spl-token": "^0.3.8",
     "@solana/web3.js": "^1.78.0",
     "@types/coingecko-api": "^1.0.10",

diff --git a/typescript/sdk/src/core/HyperlaneCoreDeployer.ts b/typescript/sdk/src/core/HyperlaneCoreDeployer.ts
@@ -109,7 +109,10 @@ export class HyperlaneCoreDeployer extends HyperlaneDeployer<
       if (
         !e.message.includes('already initialized') &&
         // Some RPC providers dont return the revert reason (nor allow ethers to parse it), so we have to check the message
-        !e.message.includes('Reverted 0x08c379a')
+        !e.message.includes('Reverted 0x08c379a') &&
+        // Handle situation where the gas estimation fails on the call function,
+        // then the real error reason is not available in `e.message`, but rather in `e.error.reason`
+        !e.error?.reason?.includes('already initialized')
       ) {
         throw e;
       }

diff --git a/typescript/utils/CHANGELOG.md b/typescript/utils/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @hyperlane-xyz/utils
 
+## 3.5.0
+
 ## 3.4.0
 
 ### Patch Changes

diff --git a/typescript/utils/package.json b/typescript/utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hyperlane-xyz/utils",
   "description": "General utilities and types for the Hyperlane network",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "dependencies": {
     "@cosmjs/encoding": "^0.31.3",
     "@solana/web3.js": "^1.78.0",

diff --git a/yarn.lock b/yarn.lock
@@ -4235,8 +4235,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/cli@workspace:typescript/cli"
   dependencies:
-    "@hyperlane-xyz/sdk": "npm:3.4.0"
-    "@hyperlane-xyz/utils": "npm:3.4.0"
+    "@hyperlane-xyz/sdk": "npm:3.5.0"
+    "@hyperlane-xyz/utils": "npm:3.5.0"
     "@inquirer/prompts": "npm:^3.0.0"
     "@types/mocha": "npm:^10.0.1"
     "@types/node": "npm:^18.14.5"
@@ -4261,12 +4261,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@hyperlane-xyz/core@npm:3.4.0, @hyperlane-xyz/core@workspace:solidity":
+"@hyperlane-xyz/core@npm:3.5.0, @hyperlane-xyz/core@workspace:solidity":
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/core@workspace:solidity"
   dependencies:
     "@eth-optimism/contracts": "npm:^0.6.0"
-    "@hyperlane-xyz/utils": "npm:3.4.0"
+    "@hyperlane-xyz/utils": "npm:3.5.0"
     "@nomiclabs/hardhat-ethers": "npm:^2.2.1"
     "@nomiclabs/hardhat-waffle": "npm:^2.0.6"
     "@openzeppelin/contracts": "npm:^4.9.3"
@@ -4293,12 +4293,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@hyperlane-xyz/helloworld@npm:3.4.0, @hyperlane-xyz/helloworld@workspace:typescript/helloworld":
+"@hyperlane-xyz/helloworld@npm:3.5.0, @hyperlane-xyz/helloworld@workspace:typescript/helloworld":
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/helloworld@workspace:typescript/helloworld"
   dependencies:
-    "@hyperlane-xyz/core": "npm:3.4.0"
-    "@hyperlane-xyz/sdk": "npm:3.4.0"
+    "@hyperlane-xyz/core": "npm:3.5.0"
+    "@hyperlane-xyz/sdk": "npm:3.5.0"
     "@nomiclabs/hardhat-ethers": "npm:^2.2.1"
     "@nomiclabs/hardhat-waffle": "npm:^2.0.6"
     "@openzeppelin/contracts-upgradeable": "npm:^4.9.3"
@@ -4343,9 +4343,9 @@ __metadata:
     "@ethersproject/experimental": "npm:^5.7.0"
     "@ethersproject/hardware-wallets": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.2"
-    "@hyperlane-xyz/helloworld": "npm:3.4.0"
-    "@hyperlane-xyz/sdk": "npm:3.4.0"
-    "@hyperlane-xyz/utils": "npm:3.4.0"
+    "@hyperlane-xyz/helloworld": "npm:3.5.0"
+    "@hyperlane-xyz/sdk": "npm:3.5.0"
+    "@hyperlane-xyz/utils": "npm:3.5.0"
     "@nomiclabs/hardhat-ethers": "npm:^2.2.1"
     "@nomiclabs/hardhat-etherscan": "npm:^3.0.3"
     "@nomiclabs/hardhat-waffle": "npm:^2.0.6"
@@ -4393,14 +4393,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@hyperlane-xyz/sdk@npm:3.4.0, @hyperlane-xyz/sdk@workspace:typescript/sdk":
+"@hyperlane-xyz/sdk@npm:3.5.0, @hyperlane-xyz/sdk@workspace:typescript/sdk":
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/sdk@workspace:typescript/sdk"
   dependencies:
     "@cosmjs/cosmwasm-stargate": "npm:^0.31.3"
     "@cosmjs/stargate": "npm:^0.31.3"
-    "@hyperlane-xyz/core": "npm:3.4.0"
-    "@hyperlane-xyz/utils": "npm:3.4.0"
+    "@hyperlane-xyz/core": "npm:3.5.0"
+    "@hyperlane-xyz/utils": "npm:3.5.0"
     "@nomiclabs/hardhat-ethers": "npm:^2.2.1"
     "@nomiclabs/hardhat-waffle": "npm:^2.0.6"
     "@solana/spl-token": "npm:^0.3.8"
@@ -4437,7 +4437,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@hyperlane-xyz/utils@npm:3.4.0, @hyperlane-xyz/utils@workspace:typescript/utils":
+"@hyperlane-xyz/utils@npm:3.5.0, @hyperlane-xyz/utils@workspace:typescript/utils":
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/utils@workspace:typescript/utils"
   dependencies: