From 11a4e95cafc9148b8bb7ffebf8b9320c2273d27a Mon Sep 17 00:00:00 2001 From: Danil Nemirovsky Date: Thu, 16 Jan 2025 14:43:25 +0000 Subject: [PATCH 1/4] fix: Upgrade Cosmos dependencies (#5189) ### Description Upgrade Cosmos dependencies ### Related issues - Contributes into https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/5098 ### Backward compatibility Yes ### Testing Manual testing against Injective, Neutron and Stride Co-authored-by: Danil Nemirovsky <4614623+ameten@users.noreply.github.com> --- rust/main/Cargo.lock | 120 ++++++++++++++---- rust/main/Cargo.toml | 18 +-- rust/main/chains/hyperlane-cosmos/Cargo.toml | 1 + .../main/chains/hyperlane-cosmos/src/error.rs | 7 +- .../src/providers/cosmos/provider/parse.rs | 5 +- 5 files changed, 108 insertions(+), 43 deletions(-) diff --git a/rust/main/Cargo.lock b/rust/main/Cargo.lock index da153bf564..f13ac028c5 100644 --- a/rust/main/Cargo.lock +++ b/rust/main/Cargo.lock @@ -1607,21 +1607,20 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cosmos-sdk-proto" -version = "0.23.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2f63ab112b8c8e7b8a29c891adc48f43145beb21c0bfbf562957072c1e0beb" +checksum = "462e1f6a8e005acc8835d32d60cbd7973ed65ea2a8d8473830e675f050956427" dependencies = [ "prost 0.13.4", - "prost-types 0.13.4", "tendermint-proto", "tonic 0.12.3", ] [[package]] name = "cosmrs" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f21bb63ec6a903510a3d01f44735dd4914724e5eccbe409e6da6833d17c7829" +checksum = "210fbe6f98594963b46cc980f126a9ede5db9a3848ca65b71303bebdb01afcd9" dependencies = [ "cosmos-sdk-proto", "ecdsa 0.16.9", @@ -1706,7 +1705,20 @@ version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b4cd28147a66eba73720b47636a58097a979ad8c8bfdb4ed437ebcbfe362576" dependencies = [ - "cosmwasm-schema-derive", + "cosmwasm-schema-derive 1.5.7", + "schemars", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cosmwasm-schema" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9a7b56d154870ec4b57b224509854f706c9744449548d8a3bf91ac75c59192" +dependencies = [ + "cosmwasm-schema-derive 2.2.0", "schemars", "serde", "serde_json", @@ -1724,6 +1736,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "cosmwasm-schema-derive" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd3d80310cd7b86b09dbe886f4f2ca235a5ddb8d478493c6e50e720a3b38a42" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + [[package]] name = "cosmwasm-std" version = "1.5.7" @@ -2015,7 +2038,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c4a657e5caacc3a0d00ee96ca8618745d050b8f757c709babafb81208d4239c" dependencies = [ - "cosmwasm-schema", + "cosmwasm-schema 1.5.7", "cosmwasm-std 1.5.7", "cw2", "schemars", @@ -2030,7 +2053,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c120b24fbbf5c3bedebb97f2cc85fbfa1c3287e09223428e7e597b5293c1fa" dependencies = [ - "cosmwasm-schema", + "cosmwasm-schema 1.5.7", "cosmwasm-std 1.5.7", "cw-storage-plus", "schemars", @@ -2045,7 +2068,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "526e39bb20534e25a1cd0386727f0038f4da294e5e535729ba3ef54055246abd" dependencies = [ - "cosmwasm-schema", + "cosmwasm-schema 1.5.7", "cosmwasm-std 1.5.7", "cw-utils", "schemars", @@ -2058,7 +2081,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ad79e86ea3707229bf78df94e08732e8f713207b4a77b2699755596725e7d9" dependencies = [ - "cosmwasm-schema", + "cosmwasm-schema 1.5.7", "cosmwasm-std 1.5.7", "cw-storage-plus", "cw2", @@ -4623,7 +4646,7 @@ version = "0.1.0" dependencies = [ "async-trait", "base64 0.21.7", - "bech32 0.9.1", + "bech32 0.11.0", "cosmrs", "cosmwasm-std 2.1.3", "crypto", @@ -4635,6 +4658,7 @@ dependencies = [ "hyper-tls", "hyperlane-core", "hyperlane-cosmwasm-interface", + "ibc-proto", "injective-protobuf", "injective-std", "itertools 0.12.1", @@ -4663,7 +4687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5e622014ab94f1e7f0acbe71df7c1384224261e2c76115807aaf24215970942" dependencies = [ "bech32 0.9.1", - "cosmwasm-schema", + "cosmwasm-schema 1.5.7", "cosmwasm-std 1.5.7", "cosmwasm-storage", "cw-storage-plus", @@ -4884,6 +4908,38 @@ dependencies = [ "cc", ] +[[package]] +name = "ibc-proto" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b70f517162e74e2d35875b8b94bf4d1e45f2c69ef3de452dc855944455d33ca" +dependencies = [ + "base64 0.22.1", + "bytes", + "cosmos-sdk-proto", + "flex-error", + "ics23", + "informalsystems-pbjson", + "prost 0.13.4", + "subtle-encoding", + "tendermint-proto", + "tonic 0.12.3", +] + +[[package]] +name = "ics23" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12" +dependencies = [ + "anyhow", + "bytes", + "hex 0.4.3", + "informalsystems-pbjson", + "prost 0.13.4", + "serde", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -5070,6 +5126,16 @@ dependencies = [ "regex", ] +[[package]] +name = "informalsystems-pbjson" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d" +dependencies = [ + "base64 0.21.7", + "serde", +] + [[package]] name = "injective-protobuf" version = "0.2.2" @@ -5088,8 +5154,9 @@ dependencies = [ [[package]] name = "injective-std" -version = "1.13.2-hyperlane-2025-01-09-11-28" -source = "git+https://github.com/hyperlane-xyz/cw-injective.git?tag=1.13.2-hyperlane-2025-01-09-11-28#d3e5bf33f8374026e696749dd54b041a69887cbd" +version = "1.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8769c5d05b3124245276fbd693282c0bfaab81536d12881d06ba74a992a55c2" dependencies = [ "chrono", "cosmwasm-std 2.1.3", @@ -5103,8 +5170,9 @@ dependencies = [ [[package]] name = "injective-std-derive" -version = "1.13.0" -source = "git+https://github.com/hyperlane-xyz/cw-injective.git?tag=1.13.2-hyperlane-2025-01-09-11-28#d3e5bf33f8374026e696749dd54b041a69887cbd" +version = "1.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cfe3fc8519277af8e09e51b8987435e401d345d4466402e6a5b991143fdfa53" dependencies = [ "cosmwasm-std 2.1.3", "itertools 0.10.5", @@ -7345,7 +7413,7 @@ name = "run-locally" version = "0.1.0" dependencies = [ "anyhow", - "cosmwasm-schema", + "cosmwasm-schema 2.2.0", "ctrlc", "ethers", "ethers-contract", @@ -9595,9 +9663,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97" +checksum = "d9703e34d940c2a293804752555107f8dbe2b84ec4c6dd5203831235868105d2" dependencies = [ "bytes", "digest 0.10.7", @@ -9609,7 +9677,6 @@ dependencies = [ "num-traits", "once_cell", "prost 0.13.4", - "prost-types 0.13.4", "ripemd", "serde", "serde_bytes", @@ -9626,9 +9693,9 @@ dependencies = [ [[package]] name = "tendermint-config" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f" +checksum = "89cc3ea9a39b7ee34eefcff771cc067ecaa0c988c1c5ac08defd878471a06f76" dependencies = [ "flex-error", "serde", @@ -9640,14 +9707,13 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e" +checksum = "9ae9e1705aa0fa5ecb2c6aa7fb78c2313c4a31158ea5f02048bf318f849352eb" dependencies = [ "bytes", "flex-error", "prost 0.13.4", - "prost-types 0.13.4", "serde", "serde_bytes", "subtle-encoding", @@ -9656,9 +9722,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.38.1" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63" +checksum = "835a52aa504c63ec05519e31348d3f4ba2fe79493c588e2cad5323d5e81b161a" dependencies = [ "async-trait", "bytes", diff --git a/rust/main/Cargo.toml b/rust/main/Cargo.toml index 832bee0c42..d6e9cc7b11 100644 --- a/rust/main/Cargo.toml +++ b/rust/main/Cargo.toml @@ -46,7 +46,7 @@ color-eyre = "0.6" config = "0.13.3" console-subscriber = "0.2.0" convert_case = "0.6" -cosmrs = { version = "0.18.0", default-features = false, features = [ +cosmrs = { version = "0.21.0", default-features = false, features = [ "cosmwasm", "rpc", "tokio", @@ -69,7 +69,7 @@ futures = "0.3" futures-util = "0.3" generic-array = { version = "0.14", features = ["serde", "more_lengths"] } # Required for WASM support https://docs.rs/getrandom/latest/getrandom/#webassembly-support -bech32 = "0.9.1" +bech32 = "0.11.0" elliptic-curve = "0.13.8" getrandom = { version = "0.2", features = ["js"] } hex = "0.4.3" @@ -77,8 +77,9 @@ http = "1.2.0" hyper = "0.14" hyper-tls = "0.5.0" hyperlane-cosmwasm-interface = "=0.0.6-rc6" +ibc-proto = "0.51.1" injective-protobuf = "0.2.2" -injective-std = "1.13.2-hyperlane-2025-01-09-11-28" +injective-std = "1.13.6" itertools = "*" jobserver = "=0.1.26" jsonrpc-core = "18.0" @@ -134,8 +135,8 @@ static_assertions = "1.1" strum = "0.26.2" strum_macros = "0.26.2" tempfile = "3.3" -tendermint = "0.38.1" -tendermint-rpc = { version = "0.38.1", features = ["http-client", "tokio"] } +tendermint = "0.40.1" +tendermint-rpc = { version = "0.40.1", features = ["http-client", "tokio"] } thiserror = "1.0" time = "0.3" tiny-keccak = "2.0.2" @@ -159,7 +160,7 @@ which = "4.3" ya-gcp = { version = "0.11.3", features = ["storage"] } ## TODO: remove this -cosmwasm-schema = "1.2.7" +cosmwasm-schema = "2.2.0" [profile.release.package.access-control] overflow-checks = true @@ -299,8 +300,3 @@ version = "=0.5.0" version = "=0.1.0" git = "https://github.com/hyperlane-xyz/solana-program-library.git" branch = "hyperlane" - -[patch.crates-io.injective-std] -version = "1.13.2-hyperlane-2025-01-09-11-28" -git = "https://github.com/hyperlane-xyz/cw-injective.git" -tag = "1.13.2-hyperlane-2025-01-09-11-28" diff --git a/rust/main/chains/hyperlane-cosmos/Cargo.toml b/rust/main/chains/hyperlane-cosmos/Cargo.toml index ecfccbcb7d..06cb6c2e97 100644 --- a/rust/main/chains/hyperlane-cosmos/Cargo.toml +++ b/rust/main/chains/hyperlane-cosmos/Cargo.toml @@ -23,6 +23,7 @@ hyperlane-core = { path = "../../hyperlane-core", features = ["async"] } hyperlane-cosmwasm-interface.workspace = true hyper = { workspace = true } hyper-tls = { workspace = true } +ibc-proto = { workspace = true } injective-protobuf = { workspace = true } injective-std = { workspace = true } itertools = { workspace = true } diff --git a/rust/main/chains/hyperlane-cosmos/src/error.rs b/rust/main/chains/hyperlane-cosmos/src/error.rs index de5e2f019f..cf41fda891 100644 --- a/rust/main/chains/hyperlane-cosmos/src/error.rs +++ b/rust/main/chains/hyperlane-cosmos/src/error.rs @@ -14,9 +14,12 @@ pub enum HyperlaneCosmosError { /// base64 error #[error("{0}")] Base64(#[from] base64::DecodeError), - /// bech32 error + /// bech32 decode error #[error("{0}")] - Bech32(#[from] bech32::Error), + Bech32Decode(#[from] bech32::DecodeError), + /// bech32 encode error + #[error("{0}")] + Bech32Encode(#[from] bech32::EncodeError), /// gRPC error #[error("{0}")] GrpcError(#[from] tonic::Status), diff --git a/rust/main/chains/hyperlane-cosmos/src/providers/cosmos/provider/parse.rs b/rust/main/chains/hyperlane-cosmos/src/providers/cosmos/provider/parse.rs index a2212f6128..d648e716f9 100644 --- a/rust/main/chains/hyperlane-cosmos/src/providers/cosmos/provider/parse.rs +++ b/rust/main/chains/hyperlane-cosmos/src/providers/cosmos/provider/parse.rs @@ -1,6 +1,6 @@ -use cosmrs::proto::ibc::core::channel::v1::MsgRecvPacket; use cosmrs::proto::prost::Message; use cosmrs::Any; +use ibc_proto::ibc::core::channel::v1::MsgRecvPacket; use serde::{Deserialize, Serialize}; use crate::HyperlaneCosmosError; @@ -40,10 +40,9 @@ impl TryFrom for PacketData { #[cfg(test)] mod tests { - use cosmrs::proto::ibc::core::channel::v1::MsgRecvPacket; - use cosmrs::proto::ibc::core::channel::v1::Packet; use cosmrs::proto::prost::Message; use cosmrs::Any; + use ibc_proto::ibc::core::channel::v1::{MsgRecvPacket, Packet}; use crate::providers::cosmos::provider::parse::PacketData; use crate::HyperlaneCosmosError; From 123d3ca0ebae40f3b39c480938e11cc2f0d81c0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:32:57 +0000 Subject: [PATCH 2/4] Version Packages (#5177) This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @hyperlane-xyz/cli@8.2.0 ### Minor Changes - 9eb19cac7: Add explorer link to warp send and send message commands - aad2c2d1e: Fixing the chain resolver checks and handling for argv.chain ### Patch Changes - 1536ea570: Print displayName instead of chain name in signer validity logs. - Updated dependencies [69a684869] - @hyperlane-xyz/sdk@8.2.0 - @hyperlane-xyz/utils@8.2.0 ## @hyperlane-xyz/sdk@8.2.0 ### Minor Changes - 69a684869: Don't try to build signers for non-EVM chains in MultiProtocolSignerManager ### Patch Changes - @hyperlane-xyz/utils@8.2.0 - @hyperlane-xyz/core@5.9.2 ## @hyperlane-xyz/core@5.9.2 ### Patch Changes - @hyperlane-xyz/utils@8.2.0 ## @hyperlane-xyz/helloworld@8.2.0 ### Patch Changes - Updated dependencies [69a684869] - @hyperlane-xyz/sdk@8.2.0 - @hyperlane-xyz/core@5.9.2 ## @hyperlane-xyz/widgets@8.2.0 ### Patch Changes - Updated dependencies [69a684869] - @hyperlane-xyz/sdk@8.2.0 - @hyperlane-xyz/utils@8.2.0 ## @hyperlane-xyz/utils@8.2.0 ## @hyperlane-xyz/infra@8.2.0 ### Minor Changes - 28becff74: Add Artela/Base USDC and WETH warp route config ### Patch Changes - Updated dependencies [69a684869] - @hyperlane-xyz/sdk@8.2.0 - @hyperlane-xyz/helloworld@8.2.0 - @hyperlane-xyz/utils@8.2.0 ## @hyperlane-xyz/ccip-server@8.2.0 ## @hyperlane-xyz/github-proxy@8.2.0 --------- Co-authored-by: github-actions[bot] --- .changeset/flat-lamps-deliver.md | 5 ---- .changeset/green-schools-attack.md | 5 ---- .changeset/real-actors-grow.md | 5 ---- .changeset/three-walls-count.md | 5 ---- .changeset/violet-knives-drop.md | 5 ---- solidity/CHANGELOG.md | 6 +++++ solidity/contracts/PackageVersioned.sol | 2 +- solidity/package.json | 4 ++-- typescript/ccip-server/CHANGELOG.md | 2 ++ typescript/ccip-server/package.json | 2 +- typescript/cli/CHANGELOG.md | 14 +++++++++++ typescript/cli/package.json | 6 ++--- typescript/cli/src/version.ts | 2 +- typescript/github-proxy/CHANGELOG.md | 2 ++ typescript/github-proxy/package.json | 2 +- typescript/helloworld/CHANGELOG.md | 8 +++++++ typescript/helloworld/package.json | 6 ++--- typescript/infra/CHANGELOG.md | 13 ++++++++++ typescript/infra/package.json | 8 +++---- typescript/sdk/CHANGELOG.md | 11 +++++++++ typescript/sdk/package.json | 6 ++--- typescript/utils/CHANGELOG.md | 2 ++ typescript/utils/package.json | 2 +- typescript/widgets/CHANGELOG.md | 8 +++++++ typescript/widgets/package.json | 6 ++--- yarn.lock | 32 ++++++++++++------------- 26 files changed, 105 insertions(+), 64 deletions(-) delete mode 100644 .changeset/flat-lamps-deliver.md delete mode 100644 .changeset/green-schools-attack.md delete mode 100644 .changeset/real-actors-grow.md delete mode 100644 .changeset/three-walls-count.md delete mode 100644 .changeset/violet-knives-drop.md diff --git a/.changeset/flat-lamps-deliver.md b/.changeset/flat-lamps-deliver.md deleted file mode 100644 index bca1b390b8..0000000000 --- a/.changeset/flat-lamps-deliver.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@hyperlane-xyz/infra': minor ---- - -Add Artela/Base USDC and WETH warp route config diff --git a/.changeset/green-schools-attack.md b/.changeset/green-schools-attack.md deleted file mode 100644 index e795b807f0..0000000000 --- a/.changeset/green-schools-attack.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@hyperlane-xyz/cli': patch ---- - -Print displayName instead of chain name in signer validity logs. diff --git a/.changeset/real-actors-grow.md b/.changeset/real-actors-grow.md deleted file mode 100644 index b7764b2bc2..0000000000 --- a/.changeset/real-actors-grow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@hyperlane-xyz/sdk': minor ---- - -Don't try to build signers for non-EVM chains in MultiProtocolSignerManager diff --git a/.changeset/three-walls-count.md b/.changeset/three-walls-count.md deleted file mode 100644 index 37145b9838..0000000000 --- a/.changeset/three-walls-count.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@hyperlane-xyz/cli': minor ---- - -Add explorer link to warp send and send message commands diff --git a/.changeset/violet-knives-drop.md b/.changeset/violet-knives-drop.md deleted file mode 100644 index 24320605a0..0000000000 --- a/.changeset/violet-knives-drop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@hyperlane-xyz/cli': minor ---- - -Fixing the chain resolver checks and handling for argv.chain diff --git a/solidity/CHANGELOG.md b/solidity/CHANGELOG.md index 7e701d003e..6c62444946 100644 --- a/solidity/CHANGELOG.md +++ b/solidity/CHANGELOG.md @@ -1,5 +1,11 @@ # @hyperlane-xyz/core +## 5.9.2 + +### Patch Changes + +- @hyperlane-xyz/utils@8.2.0 + ## 5.9.1 ### Patch Changes diff --git a/solidity/contracts/PackageVersioned.sol b/solidity/contracts/PackageVersioned.sol index 4f94e4415d..9125a85e57 100644 --- a/solidity/contracts/PackageVersioned.sol +++ b/solidity/contracts/PackageVersioned.sol @@ -7,5 +7,5 @@ pragma solidity >=0.6.11; **/ abstract contract PackageVersioned { // GENERATED CODE - DO NOT EDIT - string public constant PACKAGE_VERSION = "5.9.1"; + string public constant PACKAGE_VERSION = "5.9.2"; } diff --git a/solidity/package.json b/solidity/package.json index 775fa20aac..50986a878a 100644 --- a/solidity/package.json +++ b/solidity/package.json @@ -1,11 +1,11 @@ { "name": "@hyperlane-xyz/core", "description": "Core solidity contracts for Hyperlane", - "version": "5.9.1", + "version": "5.9.2", "dependencies": { "@arbitrum/nitro-contracts": "^1.2.1", "@eth-optimism/contracts": "^0.6.0", - "@hyperlane-xyz/utils": "8.1.0", + "@hyperlane-xyz/utils": "8.2.0", "@layerzerolabs/lz-evm-oapp-v2": "2.0.2", "@openzeppelin/contracts": "^4.9.3", "@openzeppelin/contracts-upgradeable": "^4.9.3", diff --git a/typescript/ccip-server/CHANGELOG.md b/typescript/ccip-server/CHANGELOG.md index 3688d5e885..cc7e66f9fc 100644 --- a/typescript/ccip-server/CHANGELOG.md +++ b/typescript/ccip-server/CHANGELOG.md @@ -1,5 +1,7 @@ # @hyperlane-xyz/ccip-server +## 8.2.0 + ## 8.1.0 ## 8.0.0 diff --git a/typescript/ccip-server/package.json b/typescript/ccip-server/package.json index c217320a71..696d522892 100644 --- a/typescript/ccip-server/package.json +++ b/typescript/ccip-server/package.json @@ -1,6 +1,6 @@ { "name": "@hyperlane-xyz/ccip-server", - "version": "8.1.0", + "version": "8.2.0", "description": "CCIP server", "typings": "dist/index.d.ts", "typedocMain": "src/index.ts", diff --git a/typescript/cli/CHANGELOG.md b/typescript/cli/CHANGELOG.md index 13195ee0f4..d2ca5e2242 100644 --- a/typescript/cli/CHANGELOG.md +++ b/typescript/cli/CHANGELOG.md @@ -1,5 +1,19 @@ # @hyperlane-xyz/cli +## 8.2.0 + +### Minor Changes + +- 9eb19cac7: Add explorer link to warp send and send message commands +- aad2c2d1e: Fixing the chain resolver checks and handling for argv.chain + +### Patch Changes + +- 1536ea570: Print displayName instead of chain name in signer validity logs. +- Updated dependencies [69a684869] + - @hyperlane-xyz/sdk@8.2.0 + - @hyperlane-xyz/utils@8.2.0 + ## 8.1.0 ### Minor Changes diff --git a/typescript/cli/package.json b/typescript/cli/package.json index 184f92b94f..e82cfc5b64 100644 --- a/typescript/cli/package.json +++ b/typescript/cli/package.json @@ -1,13 +1,13 @@ { "name": "@hyperlane-xyz/cli", - "version": "8.1.0", + "version": "8.2.0", "description": "A command-line utility for common Hyperlane operations", "dependencies": { "@aws-sdk/client-kms": "^3.577.0", "@aws-sdk/client-s3": "^3.577.0", "@hyperlane-xyz/registry": "6.6.0", - "@hyperlane-xyz/sdk": "8.1.0", - "@hyperlane-xyz/utils": "8.1.0", + "@hyperlane-xyz/sdk": "8.2.0", + "@hyperlane-xyz/utils": "8.2.0", "@inquirer/core": "9.0.10", "@inquirer/figures": "1.0.5", "@inquirer/prompts": "3.3.2", diff --git a/typescript/cli/src/version.ts b/typescript/cli/src/version.ts index daf763c533..047e32b00a 100644 --- a/typescript/cli/src/version.ts +++ b/typescript/cli/src/version.ts @@ -1 +1 @@ -export const VERSION = '8.1.0'; +export const VERSION = '8.2.0'; diff --git a/typescript/github-proxy/CHANGELOG.md b/typescript/github-proxy/CHANGELOG.md index 8e4066e1d4..541c2f54f7 100644 --- a/typescript/github-proxy/CHANGELOG.md +++ b/typescript/github-proxy/CHANGELOG.md @@ -1,5 +1,7 @@ # @hyperlane-xyz/github-proxy +## 8.2.0 + ## 8.1.0 ## 8.0.0 diff --git a/typescript/github-proxy/package.json b/typescript/github-proxy/package.json index f3b15e75e0..f729b28c4c 100644 --- a/typescript/github-proxy/package.json +++ b/typescript/github-proxy/package.json @@ -1,7 +1,7 @@ { "name": "@hyperlane-xyz/github-proxy", "description": "Github proxy that adds the API key to requests", - "version": "8.1.0", + "version": "8.2.0", "private": true, "scripts": { "deploy": "wrangler deploy", diff --git a/typescript/helloworld/CHANGELOG.md b/typescript/helloworld/CHANGELOG.md index 4cd55fc086..b062c87d2f 100644 --- a/typescript/helloworld/CHANGELOG.md +++ b/typescript/helloworld/CHANGELOG.md @@ -1,5 +1,13 @@ # @hyperlane-xyz/helloworld +## 8.2.0 + +### Patch Changes + +- Updated dependencies [69a684869] + - @hyperlane-xyz/sdk@8.2.0 + - @hyperlane-xyz/core@5.9.2 + ## 8.1.0 ### Patch Changes diff --git a/typescript/helloworld/package.json b/typescript/helloworld/package.json index ad64eab492..8db5c68f1c 100644 --- a/typescript/helloworld/package.json +++ b/typescript/helloworld/package.json @@ -1,11 +1,11 @@ { "name": "@hyperlane-xyz/helloworld", "description": "A basic skeleton of an Hyperlane app", - "version": "8.1.0", + "version": "8.2.0", "dependencies": { - "@hyperlane-xyz/core": "5.9.1", + "@hyperlane-xyz/core": "5.9.2", "@hyperlane-xyz/registry": "6.6.0", - "@hyperlane-xyz/sdk": "8.1.0", + "@hyperlane-xyz/sdk": "8.2.0", "@openzeppelin/contracts-upgradeable": "^4.9.3", "ethers": "^5.7.2" }, diff --git a/typescript/infra/CHANGELOG.md b/typescript/infra/CHANGELOG.md index 6f18e737c5..a7810b698b 100644 --- a/typescript/infra/CHANGELOG.md +++ b/typescript/infra/CHANGELOG.md @@ -1,5 +1,18 @@ # @hyperlane-xyz/infra +## 8.2.0 + +### Minor Changes + +- 28becff74: Add Artela/Base USDC and WETH warp route config + +### Patch Changes + +- Updated dependencies [69a684869] + - @hyperlane-xyz/sdk@8.2.0 + - @hyperlane-xyz/helloworld@8.2.0 + - @hyperlane-xyz/utils@8.2.0 + ## 8.1.0 ### Minor Changes diff --git a/typescript/infra/package.json b/typescript/infra/package.json index b938d3a429..d101047359 100644 --- 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": "8.1.0", + "version": "8.2.0", "dependencies": { "@arbitrum/sdk": "^4.0.0", "@aws-sdk/client-iam": "^3.74.0", @@ -13,10 +13,10 @@ "@ethersproject/hardware-wallets": "^5.7.0", "@ethersproject/providers": "*", "@google-cloud/secret-manager": "^5.5.0", - "@hyperlane-xyz/helloworld": "8.1.0", + "@hyperlane-xyz/helloworld": "8.2.0", "@hyperlane-xyz/registry": "6.6.0", - "@hyperlane-xyz/sdk": "8.1.0", - "@hyperlane-xyz/utils": "8.1.0", + "@hyperlane-xyz/sdk": "8.2.0", + "@hyperlane-xyz/utils": "8.2.0", "@inquirer/prompts": "3.3.2", "@nomiclabs/hardhat-etherscan": "^3.0.3", "@safe-global/api-kit": "1.3.0", diff --git a/typescript/sdk/CHANGELOG.md b/typescript/sdk/CHANGELOG.md index 52c9bf5a95..70e744bc74 100644 --- a/typescript/sdk/CHANGELOG.md +++ b/typescript/sdk/CHANGELOG.md @@ -1,5 +1,16 @@ # @hyperlane-xyz/sdk +## 8.2.0 + +### Minor Changes + +- 69a684869: Don't try to build signers for non-EVM chains in MultiProtocolSignerManager + +### Patch Changes + +- @hyperlane-xyz/utils@8.2.0 +- @hyperlane-xyz/core@5.9.2 + ## 8.1.0 ### Minor Changes diff --git a/typescript/sdk/package.json b/typescript/sdk/package.json index 966369a475..9c0b130684 100644 --- a/typescript/sdk/package.json +++ b/typescript/sdk/package.json @@ -1,15 +1,15 @@ { "name": "@hyperlane-xyz/sdk", "description": "The official SDK for the Hyperlane Network", - "version": "8.1.0", + "version": "8.2.0", "dependencies": { "@arbitrum/sdk": "^4.0.0", "@aws-sdk/client-s3": "^3.577.0", "@chain-registry/types": "^0.50.14", "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "^0.32.4", - "@hyperlane-xyz/core": "5.9.1", - "@hyperlane-xyz/utils": "8.1.0", + "@hyperlane-xyz/core": "5.9.2", + "@hyperlane-xyz/utils": "8.2.0", "@safe-global/api-kit": "1.3.0", "@safe-global/protocol-kit": "1.3.0", "@safe-global/safe-deployments": "1.37.8", diff --git a/typescript/utils/CHANGELOG.md b/typescript/utils/CHANGELOG.md index 232c213369..ecddf9e23e 100644 --- a/typescript/utils/CHANGELOG.md +++ b/typescript/utils/CHANGELOG.md @@ -1,5 +1,7 @@ # @hyperlane-xyz/utils +## 8.2.0 + ## 8.1.0 ## 8.0.0 diff --git a/typescript/utils/package.json b/typescript/utils/package.json index a1c461a1de..be8c55f665 100644 --- 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": "8.1.0", + "version": "8.2.0", "dependencies": { "@cosmjs/encoding": "^0.32.4", "@solana/web3.js": "^1.95.4", diff --git a/typescript/widgets/CHANGELOG.md b/typescript/widgets/CHANGELOG.md index 60c3b63817..86f2f30c81 100644 --- a/typescript/widgets/CHANGELOG.md +++ b/typescript/widgets/CHANGELOG.md @@ -1,5 +1,13 @@ # @hyperlane-xyz/widgets +## 8.2.0 + +### Patch Changes + +- Updated dependencies [69a684869] + - @hyperlane-xyz/sdk@8.2.0 + - @hyperlane-xyz/utils@8.2.0 + ## 8.1.0 ### Patch Changes diff --git a/typescript/widgets/package.json b/typescript/widgets/package.json index 11d0aad02c..2db355e56e 100644 --- a/typescript/widgets/package.json +++ b/typescript/widgets/package.json @@ -1,7 +1,7 @@ { "name": "@hyperlane-xyz/widgets", "description": "Common react components for Hyperlane projects", - "version": "8.1.0", + "version": "8.2.0", "peerDependencies": { "react": "^18", "react-dom": "^18" @@ -9,8 +9,8 @@ "dependencies": { "@cosmos-kit/react": "^2.18.0", "@headlessui/react": "^2.1.8", - "@hyperlane-xyz/sdk": "8.1.0", - "@hyperlane-xyz/utils": "8.1.0", + "@hyperlane-xyz/sdk": "8.2.0", + "@hyperlane-xyz/utils": "8.2.0", "@interchain-ui/react": "^1.23.28", "@rainbow-me/rainbowkit": "^2.2.0", "@solana/wallet-adapter-react": "^0.15.32", diff --git a/yarn.lock b/yarn.lock index 471c94f7ab..bef5c6d94d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7321,8 +7321,8 @@ __metadata: "@ethersproject/abi": "npm:*" "@ethersproject/providers": "npm:*" "@hyperlane-xyz/registry": "npm:6.6.0" - "@hyperlane-xyz/sdk": "npm:8.1.0" - "@hyperlane-xyz/utils": "npm:8.1.0" + "@hyperlane-xyz/sdk": "npm:8.2.0" + "@hyperlane-xyz/utils": "npm:8.2.0" "@inquirer/core": "npm:9.0.10" "@inquirer/figures": "npm:1.0.5" "@inquirer/prompts": "npm:3.3.2" @@ -7361,13 +7361,13 @@ __metadata: languageName: unknown linkType: soft -"@hyperlane-xyz/core@npm:5.9.1, @hyperlane-xyz/core@workspace:solidity": +"@hyperlane-xyz/core@npm:5.9.2, @hyperlane-xyz/core@workspace:solidity": version: 0.0.0-use.local resolution: "@hyperlane-xyz/core@workspace:solidity" dependencies: "@arbitrum/nitro-contracts": "npm:^1.2.1" "@eth-optimism/contracts": "npm:^0.6.0" - "@hyperlane-xyz/utils": "npm:8.1.0" + "@hyperlane-xyz/utils": "npm:8.2.0" "@layerzerolabs/lz-evm-oapp-v2": "npm:2.0.2" "@layerzerolabs/solidity-examples": "npm:^1.1.0" "@nomiclabs/hardhat-ethers": "npm:^2.2.3" @@ -7418,14 +7418,14 @@ __metadata: languageName: unknown linkType: soft -"@hyperlane-xyz/helloworld@npm:8.1.0, @hyperlane-xyz/helloworld@workspace:typescript/helloworld": +"@hyperlane-xyz/helloworld@npm:8.2.0, @hyperlane-xyz/helloworld@workspace:typescript/helloworld": version: 0.0.0-use.local resolution: "@hyperlane-xyz/helloworld@workspace:typescript/helloworld" dependencies: "@eslint/js": "npm:^9.15.0" - "@hyperlane-xyz/core": "npm:5.9.1" + "@hyperlane-xyz/core": "npm:5.9.2" "@hyperlane-xyz/registry": "npm:6.6.0" - "@hyperlane-xyz/sdk": "npm:8.1.0" + "@hyperlane-xyz/sdk": "npm:8.2.0" "@nomiclabs/hardhat-ethers": "npm:^2.2.3" "@nomiclabs/hardhat-waffle": "npm:^2.0.6" "@openzeppelin/contracts-upgradeable": "npm:^4.9.3" @@ -7474,10 +7474,10 @@ __metadata: "@ethersproject/hardware-wallets": "npm:^5.7.0" "@ethersproject/providers": "npm:*" "@google-cloud/secret-manager": "npm:^5.5.0" - "@hyperlane-xyz/helloworld": "npm:8.1.0" + "@hyperlane-xyz/helloworld": "npm:8.2.0" "@hyperlane-xyz/registry": "npm:6.6.0" - "@hyperlane-xyz/sdk": "npm:8.1.0" - "@hyperlane-xyz/utils": "npm:8.1.0" + "@hyperlane-xyz/sdk": "npm:8.2.0" + "@hyperlane-xyz/utils": "npm:8.2.0" "@inquirer/prompts": "npm:3.3.2" "@nomiclabs/hardhat-ethers": "npm:^2.2.3" "@nomiclabs/hardhat-etherscan": "npm:^3.0.3" @@ -7547,7 +7547,7 @@ __metadata: languageName: node linkType: hard -"@hyperlane-xyz/sdk@npm:8.1.0, @hyperlane-xyz/sdk@workspace:typescript/sdk": +"@hyperlane-xyz/sdk@npm:8.2.0, @hyperlane-xyz/sdk@workspace:typescript/sdk": version: 0.0.0-use.local resolution: "@hyperlane-xyz/sdk@workspace:typescript/sdk" dependencies: @@ -7557,8 +7557,8 @@ __metadata: "@cosmjs/cosmwasm-stargate": "npm:^0.32.4" "@cosmjs/stargate": "npm:^0.32.4" "@eslint/js": "npm:^9.15.0" - "@hyperlane-xyz/core": "npm:5.9.1" - "@hyperlane-xyz/utils": "npm:8.1.0" + "@hyperlane-xyz/core": "npm:5.9.2" + "@hyperlane-xyz/utils": "npm:8.2.0" "@nomiclabs/hardhat-ethers": "npm:^2.2.3" "@nomiclabs/hardhat-waffle": "npm:^2.0.6" "@safe-global/api-kit": "npm:1.3.0" @@ -7601,7 +7601,7 @@ __metadata: languageName: unknown linkType: soft -"@hyperlane-xyz/utils@npm:8.1.0, @hyperlane-xyz/utils@workspace:typescript/utils": +"@hyperlane-xyz/utils@npm:8.2.0, @hyperlane-xyz/utils@workspace:typescript/utils": version: 0.0.0-use.local resolution: "@hyperlane-xyz/utils@workspace:typescript/utils" dependencies: @@ -7643,8 +7643,8 @@ __metadata: "@eslint/js": "npm:^9.15.0" "@headlessui/react": "npm:^2.1.8" "@hyperlane-xyz/registry": "npm:6.6.0" - "@hyperlane-xyz/sdk": "npm:8.1.0" - "@hyperlane-xyz/utils": "npm:8.1.0" + "@hyperlane-xyz/sdk": "npm:8.2.0" + "@hyperlane-xyz/utils": "npm:8.2.0" "@interchain-ui/react": "npm:^1.23.28" "@rainbow-me/rainbowkit": "npm:^2.2.0" "@solana/wallet-adapter-react": "npm:^0.15.32" From 31c89a3c10bb7a39b87e0891f97a3975f49068bf Mon Sep 17 00:00:00 2001 From: Lee <6251863+ltyu@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:00:59 -0500 Subject: [PATCH 3/4] feat: Add support for ART config (#5161) ### Description Add support for ART config ### Drive-by changes ### Related issues ### Backward compatibility ### Testing --------- Co-authored-by: Trevor Porter --- .changeset/thirty-apricots-eat.md | 5 ++ .registryrc | 2 +- .../hyperlane/multisig-config.json | 9 ++++ .../ART-artela-base-solana/program-ids.json | 14 +++++ .../ART-artela-base-solana/token-config.json | 23 ++++++++ .../getArtelaBaseSolanaARTWarpConfig.ts | 52 +++++++++++++++++++ .../environments/mainnet3/warp/warpIds.ts | 1 + typescript/infra/config/warp.ts | 2 + typescript/infra/src/warp/helm.ts | 2 +- 9 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 .changeset/thirty-apricots-eat.md create mode 100644 rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/program-ids.json create mode 100644 rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/token-config.json create mode 100644 typescript/infra/config/environments/mainnet3/warp/configGetters/getArtelaBaseSolanaARTWarpConfig.ts diff --git a/.changeset/thirty-apricots-eat.md b/.changeset/thirty-apricots-eat.md new file mode 100644 index 0000000000..2d48e803cc --- /dev/null +++ b/.changeset/thirty-apricots-eat.md @@ -0,0 +1,5 @@ +--- +'@hyperlane-xyz/infra': minor +--- + +Add support for Artela config diff --git a/.registryrc b/.registryrc index 07fa36dc52..5bb469839e 100644 --- a/.registryrc +++ b/.registryrc @@ -1 +1 @@ -5e7227c712cca3d2b576fe7e67a434294fcc0a7f +89bbb568c97e3225c7dccbfa51cfd87863ddbe82 diff --git a/rust/sealevel/environments/mainnet3/multisig-ism-message-id/solanamainnet/hyperlane/multisig-config.json b/rust/sealevel/environments/mainnet3/multisig-ism-message-id/solanamainnet/hyperlane/multisig-config.json index b95441b72e..b743b5326d 100644 --- a/rust/sealevel/environments/mainnet3/multisig-ism-message-id/solanamainnet/hyperlane/multisig-config.json +++ b/rust/sealevel/environments/mainnet3/multisig-ism-message-id/solanamainnet/hyperlane/multisig-config.json @@ -56,6 +56,15 @@ "0x4f977a59fdc2d9e39f6d780a84d5b4add1495a36" ] }, + "artela": { + "type": "messageIdMultisigIsm", + "threshold": 2, + "validators": [ + "0x8fcc1ebd4c0b463618db13f83e4565af3e166b00", + "0xcf0211fafbb91fd9d06d7e306b30032dc3a1934f", + "0x4f977a59fdc2d9e39f6d780a84d5b4add1495a36" + ] + }, "arthera": { "type": "messageIdMultisigIsm", "threshold": 2, diff --git a/rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/program-ids.json b/rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/program-ids.json new file mode 100644 index 0000000000..baa4f171f0 --- /dev/null +++ b/rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/program-ids.json @@ -0,0 +1,14 @@ +{ + "solanamainnet": { + "hex": "0xc6107c9cf08b0db99f769c6a018436b0bd320d8157258202d32e8b24ab6cb065", + "base58": "ELAJhVNCRfipNT99YTfPBGTAgyD5x9mEv3DYr9fvRM2C" + }, + "artela": { + "hex": "0x0000000000000000000000000a78bc3cbbc79c4c6e5d4e5b2bbd042e58e93484", + "base58": "1111111111119TmN2t4nnJH8EEnUFNsDnjsgpmy" + }, + "base": { + "hex": "0x000000000000000000000000228c5101b2c63b9d620a3e8fea7ec14263f82569", + "base58": "111111111111Uv8zXKBsksc1P6CmAF2LSGhTeGY" + } +} \ No newline at end of file diff --git a/rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/token-config.json b/rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/token-config.json new file mode 100644 index 0000000000..b9ad937551 --- /dev/null +++ b/rust/sealevel/environments/mainnet3/warp-routes/ART-artela-base-solana/token-config.json @@ -0,0 +1,23 @@ +{ + "solanamainnet": { + "type": "synthetic", + "decimals": 9, + "name": "Artela", + "symbol": "ART", + "uri": "https://raw.githubusercontent.com/hyperlane-xyz/hyperlane-registry/98722745395495f9a5780fa268da3971abbc6642/deployments/warp_routes/ART/metadata.json", + "interchainGasPaymaster": "AkeHBbE5JkwVppujCQQ6WuxsVsJtruBAjUo6fDCFp6fF", + "remoteDecimals": 18 + }, + "artela": { + "type": "native", + "decimals": 18, + "foreignDeployment": "0x0a78BC3CBBC79C4C6E5d4e5b2bbD042E58e93484" + }, + "base": { + "type": "synthetic", + "name": "Artela", + "symbol": "ART", + "decimals": 18, + "foreignDeployment": "0x228c5101b2C63b9d620a3e8FEa7eC14263F82569" + } +} \ No newline at end of file diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArtelaBaseSolanaARTWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArtelaBaseSolanaARTWarpConfig.ts new file mode 100644 index 0000000000..15e1e71034 --- /dev/null +++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArtelaBaseSolanaARTWarpConfig.ts @@ -0,0 +1,52 @@ +import { ethers } from 'ethers'; + +import { + ChainMap, + HypTokenRouterConfig, + OwnableConfig, + TokenType, +} from '@hyperlane-xyz/sdk'; + +import { RouterConfigWithoutOwner } from '../../../../../src/config/warp.js'; +import { SEALEVEL_WARP_ROUTE_HANDLER_GAS_AMOUNT } from '../consts.js'; + +// Artela MPC wallt +const EVM_OWNER = '0x801e8135867D65e742eb070A9fC0aD9c2f69B4cd'; +// Artela Squad vault +const SOLANA_OWNER = 'G4ekReWuTheawZ2DNw5k5iA8pGACt7auKwQeEcGi6GWj'; + +// Default ISM +const ISM_CONFIG = ethers.constants.AddressZero; + +export const getArtelaBaseSolanaARTWarpConfig = async ( + routerConfig: ChainMap, + _abacusWorksEnvOwnerConfig: ChainMap, +): Promise> => { + const artela: HypTokenRouterConfig = { + mailbox: routerConfig.artela.mailbox, + owner: EVM_OWNER, + type: TokenType.native, + interchainSecurityModule: ISM_CONFIG, + }; + + const base: HypTokenRouterConfig = { + mailbox: routerConfig.base.mailbox, + owner: EVM_OWNER, + type: TokenType.synthetic, + interchainSecurityModule: ISM_CONFIG, + }; + + const solanamainnet: HypTokenRouterConfig = { + mailbox: routerConfig.solanamainnet.mailbox, + type: TokenType.synthetic, + owner: SOLANA_OWNER, + foreignDeployment: 'ELAJhVNCRfipNT99YTfPBGTAgyD5x9mEv3DYr9fvRM2C', + gas: SEALEVEL_WARP_ROUTE_HANDLER_GAS_AMOUNT, + }; + + return { + artela, + base, + solanamainnet, + }; +}; diff --git a/typescript/infra/config/environments/mainnet3/warp/warpIds.ts b/typescript/infra/config/environments/mainnet3/warp/warpIds.ts index 98cc569ce4..2a7cb941db 100644 --- a/typescript/infra/config/environments/mainnet3/warp/warpIds.ts +++ b/typescript/infra/config/environments/mainnet3/warp/warpIds.ts @@ -6,6 +6,7 @@ export enum WarpRouteIds { ArbitrumNeutronEclip = 'ECLIP/arbitrum-neutron', ArbitrumNeutronTIA = 'TIA/arbitrum-neutron', ArbitrumTreasureMAGIC = 'MAGIC/arbitrum-treasure', + ArtelaBaseSolanaART = 'ART/artela-base-solanamainnet', BscEthereumLumiaPrismPNDR = 'PNDR/bsc-ethereum-lumiaprism', BaseSolanamainnetTONY = 'TONY/base-solanamainnet', EclipseEthereumApxEth = 'APXETH/eclipsemainnet-ethereum', diff --git a/typescript/infra/config/warp.ts b/typescript/infra/config/warp.ts index e9a6fc3401..690e62e9df 100644 --- a/typescript/infra/config/warp.ts +++ b/typescript/infra/config/warp.ts @@ -20,6 +20,7 @@ import { getArbitrumEthereumMantleModePolygonScrollZeroNetworkUSDTWarpConfig } f import { getArbitrumEthereumZircuitAmphrETHWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumEthereumZircuitAmphrETHWarpConfig.js'; import { getArbitrumNeutronEclipWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumNeutronEclipWarpConfig.js'; import { getArbitrumNeutronTiaWarpConfig } from './environments/mainnet3/warp/configGetters/getArbitrumNeutronTiaWarpConfig.js'; +import { getArtelaBaseSolanaARTWarpConfig } from './environments/mainnet3/warp/configGetters/getArtelaBaseSolanaARTWarpConfig.js'; import { getArtelaBaseUSDCWarpConfig } from './environments/mainnet3/warp/configGetters/getArtelaBaseUSDCWarpConfig.js'; import { getArtelaBaseWETHWarpConfig } from './environments/mainnet3/warp/configGetters/getArtelaBaseWETHWarpConfig.js'; import { getBaseFormAIXBTWarpConfig } from './environments/mainnet3/warp/configGetters/getBaseFormAIXBTWarpConfig.js'; @@ -101,6 +102,7 @@ export const warpConfigGetterMap: Record = { getArbitrumBaseEthereumOptimismPolygonZeroNetworkUSDC, [WarpRouteIds.ArbitrumBaseBlastBscEthereumGnosisLiskMantleModeOptimismPolygonScrollZeroNetworkZoraMainnet]: getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig, + [WarpRouteIds.ArtelaBaseSolanaART]: getArtelaBaseSolanaARTWarpConfig, [WarpRouteIds.EclipseStrideTIA]: getEclipseStrideTiaWarpConfig, [WarpRouteIds.EclipseStrideSTTIA]: getEclipseStrideStTiaWarpConfig, [WarpRouteIds.AppchainBaseUSDC]: getAppChainBaseUSDCWarpConfig, diff --git a/typescript/infra/src/warp/helm.ts b/typescript/infra/src/warp/helm.ts index a773d4462a..25b7ffde21 100644 --- a/typescript/infra/src/warp/helm.ts +++ b/typescript/infra/src/warp/helm.ts @@ -28,7 +28,7 @@ export class WarpRouteMonitorHelmManager extends HelmManager { return { image: { repository: 'gcr.io/abacus-labs-dev/hyperlane-monorepo', - tag: '700e53a-20250115-183228', + tag: 'c080878-20250116-173913', }, warpRouteId: this.warpRouteId, fullnameOverride: this.helmReleaseName, From fed42c32541a8523ad9b7d58946c4a5244a9a836 Mon Sep 17 00:00:00 2001 From: xeno097 Date: Fri, 17 Jan 2025 14:50:47 -0400 Subject: [PATCH 4/4] fix: update zero eth route config getter (#5197) ### Description Updates the zero ETH config getter to reflect updated ownership ### Drive-by changes - NO ### Related issues - ### Backward compatibility - YES ### Testing - Manual --- .changeset/many-llamas-count.md | 5 + ...rollZeroNetworkZoraMainnetETHWarpConfig.ts | 91 +++++-------------- 2 files changed, 26 insertions(+), 70 deletions(-) create mode 100644 .changeset/many-llamas-count.md diff --git a/.changeset/many-llamas-count.md b/.changeset/many-llamas-count.md new file mode 100644 index 0000000000..1353d335d1 --- /dev/null +++ b/.changeset/many-llamas-count.md @@ -0,0 +1,5 @@ +--- +'@hyperlane-xyz/infra': minor +--- + +updated zero ETH warp route config getter diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts index 3f2a52b221..2e9a0f80a5 100644 --- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts +++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig.ts @@ -8,11 +8,15 @@ import { TokenType, } from '@hyperlane-xyz/sdk'; +import { getOwnerConfigForAddress } from '../../../../../src/config/environment.js'; import { RouterConfigWithoutOwner, tokens, } from '../../../../../src/config/warp.js'; +// Decent team wallet +const DECENT_OWNER = '0x5b234E48a3dD867f0DdA9DAd1DBd554eCE823cA0'; + export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrollZeroNetworkZoraMainnetETHWarpConfig = async ( routerConfig: ChainMap, @@ -22,44 +26,31 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol const arbitrum: HypTokenRouterConfig = { ...routerConfig.arbitrum, - ...abacusWorksEnvOwnerConfig.arbitrum, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.arbitrum, - address: '0x544BC0f2B619a6920650B0469EA3b6d6Ef3B0b10', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), + // TODO: remove once we transfer ownership of the proxy admin + ownerOverrides: abacusWorksEnvOwnerConfig.arbitrum.ownerOverrides, + // END TODO type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const base: HypTokenRouterConfig = { ...routerConfig.base, - ...abacusWorksEnvOwnerConfig.base, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.base, - address: '0x073235Fd88B04e3bA7fAC83146225c0de53E5c31', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const blast: HypTokenRouterConfig = { ...routerConfig.blast, - ...abacusWorksEnvOwnerConfig.blast, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.blast, - address: '0x9775Dd30480D545b9bEd2A6a1DC344Ffbad9B223', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const bsc: HypTokenRouterConfig = { ...routerConfig.bsc, - ...abacusWorksEnvOwnerConfig.bsc, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.bsc, - address: '0xa0B923456b08944bE30D0F237c041F191Eb0c9D0', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.collateral, token: tokens.bsc.WETH, interchainSecurityModule: ISM_CONFIG, @@ -67,22 +58,14 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol const ethereum: HypTokenRouterConfig = { ...routerConfig.ethereum, - ...abacusWorksEnvOwnerConfig.ethereum, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.ethereum, - address: '0x5E76be0F4e09057D75140216F70fd4cE3365bb29', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const gnosis: HypTokenRouterConfig = { ...routerConfig.gnosis, - ...abacusWorksEnvOwnerConfig.gnosis, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.gnosis, - address: '0xe516A113316cFdF8a44e125E4e3970dE6df0cC59', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.collateral, token: tokens.gnosis.WETH, interchainSecurityModule: ISM_CONFIG, @@ -90,11 +73,7 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol const mantle: HypTokenRouterConfig = { ...routerConfig.mantle, - ...abacusWorksEnvOwnerConfig.mantle, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.mantle, - address: '0xEaD68fD6e5A69136CD60De50bF22164658A8E04E', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.collateral, token: tokens.mantle.WETH, interchainSecurityModule: ISM_CONFIG, @@ -102,33 +81,21 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol const mode: HypTokenRouterConfig = { ...routerConfig.mode, - ...abacusWorksEnvOwnerConfig.mode, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.mode, - address: '0xEC1f2f8C42c8Ca4C8d15E6a0814667a379aB9b43', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const optimism: HypTokenRouterConfig = { ...routerConfig.optimism, - ...abacusWorksEnvOwnerConfig.optimism, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.optimism, - address: '0xA900858116D7605a01AfC7595450d8D78555Bc83', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const polygon: HypTokenRouterConfig = { ...routerConfig.polygon, - ...abacusWorksEnvOwnerConfig.polygon, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.polygon, - address: '0xcA11d580faaE3E6993aA230f437079ac21f3078a', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.collateral, token: tokens.polygon.WETH, interchainSecurityModule: ISM_CONFIG, @@ -136,44 +103,28 @@ export const getArbitrumBaseBlastBscEthereumGnosisMantleModeOptimismPolygonScrol const scroll: HypTokenRouterConfig = { ...routerConfig.scroll, - ...abacusWorksEnvOwnerConfig.scroll, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.scroll, - address: '0xA452bDb132Cdf8d11E070786D78907ddB95C5120', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const zeronetwork: HypTokenRouterConfig = { ...routerConfig.zeronetwork, - ...abacusWorksEnvOwnerConfig.zeronetwork, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.zeronetwork, - address: '0xc2caD038236ccDB113C9350EF2551633c65252eF', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const zoramainnet: HypTokenRouterConfig = { ...routerConfig.zoramainnet, - ...abacusWorksEnvOwnerConfig.zoramainnet, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.zoramainnet, - address: '0x9775Dd30480D545b9bEd2A6a1DC344Ffbad9B223', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.native, interchainSecurityModule: ISM_CONFIG, }; const lisk: HypTokenRouterConfig = { ...routerConfig.lisk, - ...abacusWorksEnvOwnerConfig.lisk, - proxyAdmin: { - ...abacusWorksEnvOwnerConfig.lisk, - address: '0x5E76be0F4e09057D75140216F70fd4cE3365bb29', - }, + ...getOwnerConfigForAddress(DECENT_OWNER), type: TokenType.synthetic, interchainSecurityModule: ISM_CONFIG, };