Skip to content

Commit 0ff3e2b

Browse files
yorhodesjmrossyTrevor Porterdaniel-savunambrot
authored
Deploy injective and inEVM (#3140)
### Description - Deploy core to injective and inEVM networks ### Drive-by changes - Update cw-hyperlane dependency ### Backward compatibility Yes ### Testing - Fork tests - e2e tests --------- Co-authored-by: J M Rossy <[email protected]> Co-authored-by: Trevor Porter <[email protected]> Co-authored-by: Daniel Savu <[email protected]> Co-authored-by: Nam Chu Hoai <[email protected]>
1 parent 634873f commit 0ff3e2b

File tree

29 files changed

+455
-139
lines changed

29 files changed

+455
-139
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,16 @@ jobs:
244244
needs: [yarn-build]
245245
strategy:
246246
matrix:
247-
environment: [testnet4, mainnet3]
248-
module: [core, igp, helloworld]
249247
include:
250248
- environment: testnet4
251249
chain: sepolia
250+
module: core
252251
- environment: mainnet3
253252
chain: arbitrum
253+
module: core
254+
- environment: mainnet3
255+
chain: inevm
256+
module: core
254257
- environment: mainnet3
255258
chain: viction
256259
module: core

rust/Cargo.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ bech32 = "0.9.1"
9191
elliptic-curve = "0.12.3"
9292
getrandom = { version = "0.2", features = ["js"] }
9393
hex = "0.4.3"
94-
hpl-interface = "=0.0.6-rc3"
9594
http = "*"
9695
hyper = "0.14"
9796
hyper-tls = "0.5.0"
97+
hyperlane-cosmwasm-interface = "=0.0.6-rc6"
9898
injective-protobuf = "0.2.2"
9999
injective-std = "0.1.5"
100100
itertools = "*"

rust/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ cargo run --release --bin run-locally
9494
This will automatically build the agents, start a local node, build and deploy the contracts, and run a relayer and
9595
validator. By default, this test will run indefinitely, but can be stopped with `ctrl-c`.
9696

97+
To run the tests for a specific VM, use the `--features` flag.
98+
99+
```bash
100+
cargo test --release --package run-locally --bin run-locally --features cosmos -- cosmos::test --nocapture
101+
```
102+
97103
### Building Agent Docker Images
98104

99105
There exists a docker build for the agent binaries. These docker images are used for deploying the agents in a

rust/chains/hyperlane-cosmos/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ bech32 = { workspace = true }
1616
cosmrs = { workspace = true, features = ["cosmwasm", "tokio", "grpc", "rpc"] }
1717
derive-new = { workspace = true }
1818
hex = { workspace = true }
19-
hpl-interface.workspace = true
2019
http = { workspace = true }
20+
hyperlane-cosmwasm-interface.workspace = true
2121
hyper = { workspace = true }
2222
hyper-tls = { workspace = true }
2323
injective-protobuf = { workspace = true }

rust/chains/hyperlane-cosmos/src/interchain_security_module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl InterchainSecurityModule for CosmosInterchainSecurityModule {
8282
.await?;
8383

8484
let module_type_response =
85-
serde_json::from_slice::<hpl_interface::ism::ModuleTypeResponse>(&data)?;
85+
serde_json::from_slice::<hyperlane_cosmwasm_interface::ism::ModuleTypeResponse>(&data)?;
8686
Ok(IsmType(module_type_response.typ).into())
8787
}
8888

rust/chains/hyperlane-cosmos/src/payloads/ism_routes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ pub struct QueryIsmModuleTypeRequest {
3939
#[derive(Serialize, Deserialize, Debug)]
4040
pub struct QueryIsmModuleTypeResponse {
4141
#[serde(rename = "type")]
42-
pub typ: hpl_interface::ism::IsmType,
42+
pub typ: hyperlane_cosmwasm_interface::ism::IsmType,
4343
}

rust/chains/hyperlane-cosmos/src/types.rs

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,31 @@
11
use cosmrs::proto::cosmos::base::abci::v1beta1::TxResponse;
22
use hyperlane_core::{ChainResult, ModuleType, TxOutcome, H256, U256};
33

4-
pub struct IsmType(pub hpl_interface::ism::IsmType);
4+
pub struct IsmType(pub hyperlane_cosmwasm_interface::ism::IsmType);
55

6-
impl From<hpl_interface::ism::IsmType> for IsmType {
7-
fn from(value: hpl_interface::ism::IsmType) -> Self {
6+
impl From<hyperlane_cosmwasm_interface::ism::IsmType> for IsmType {
7+
fn from(value: hyperlane_cosmwasm_interface::ism::IsmType) -> Self {
88
IsmType(value)
99
}
1010
}
1111

1212
impl From<IsmType> for ModuleType {
1313
fn from(value: IsmType) -> Self {
1414
match value.0 {
15-
hpl_interface::ism::IsmType::Unused => ModuleType::Unused,
16-
hpl_interface::ism::IsmType::Routing => ModuleType::Routing,
17-
hpl_interface::ism::IsmType::Aggregation => ModuleType::Aggregation,
18-
hpl_interface::ism::IsmType::LegacyMultisig => ModuleType::MessageIdMultisig,
19-
hpl_interface::ism::IsmType::MerkleRootMultisig => ModuleType::MerkleRootMultisig,
20-
hpl_interface::ism::IsmType::MessageIdMultisig => ModuleType::MessageIdMultisig,
21-
hpl_interface::ism::IsmType::Null => ModuleType::Null,
22-
hpl_interface::ism::IsmType::CcipRead => ModuleType::CcipRead,
15+
hyperlane_cosmwasm_interface::ism::IsmType::Unused => ModuleType::Unused,
16+
hyperlane_cosmwasm_interface::ism::IsmType::Routing => ModuleType::Routing,
17+
hyperlane_cosmwasm_interface::ism::IsmType::Aggregation => ModuleType::Aggregation,
18+
hyperlane_cosmwasm_interface::ism::IsmType::LegacyMultisig => {
19+
ModuleType::MessageIdMultisig
20+
}
21+
hyperlane_cosmwasm_interface::ism::IsmType::MerkleRootMultisig => {
22+
ModuleType::MerkleRootMultisig
23+
}
24+
hyperlane_cosmwasm_interface::ism::IsmType::MessageIdMultisig => {
25+
ModuleType::MessageIdMultisig
26+
}
27+
hyperlane_cosmwasm_interface::ism::IsmType::Null => ModuleType::Null,
28+
hyperlane_cosmwasm_interface::ism::IsmType::CcipRead => ModuleType::CcipRead,
2329
}
2430
}
2531
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"sealeveltest1": {
3-
"hex": "0xa77b4e2ed231894cc8cb8eee21adcc705d8489bccc6b2fcf40a358de23e60b7b",
4-
"base58": "CGn8yNtSD3aTTqJfYhUb6s1aVTN75NzwtsFKo1e83aga"
5-
},
62
"sealeveltest2": {
73
"hex": "0x2317f9615d4ebc2419ad4b88580e2a80a03b2c7a60bc960de7d6934dbc37a87e",
84
"base58": "3MzUPjP5LEkiHH82nEAe28Xtz9ztuMqWc8UmuKxrpVQH"
5+
},
6+
"sealeveltest1": {
7+
"hex": "0xa77b4e2ed231894cc8cb8eee21adcc705d8489bccc6b2fcf40a358de23e60b7b",
8+
"base58": "CGn8yNtSD3aTTqJfYhUb6s1aVTN75NzwtsFKo1e83aga"
99
}
1010
}

rust/utils/run-locally/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ureq = { workspace = true, default-features = false }
2929
which.workspace = true
3030
macro_rules_attribute.workspace = true
3131
regex.workspace = true
32-
hpl-interface.workspace = true
32+
hyperlane-cosmwasm-interface.workspace = true
3333
cosmwasm-schema.workspace = true
3434

3535
[features]

0 commit comments

Comments
 (0)