Skip to content

Commit 80b4581

Browse files
committed
support hermes 1.x
1 parent 307433f commit 80b4581

File tree

5 files changed

+37
-17
lines changed

5 files changed

+37
-17
lines changed

integration_tests/configs/ibc.jsonnet

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,22 @@ config {
8484
},
8585
},
8686
relayer: {
87-
global: {
88-
strategy: 'all',
87+
mode: {
88+
clients: {
89+
enabled: true,
90+
refresh: true,
91+
misbehaviour: true,
92+
},
93+
connections: {
94+
enabled: true,
95+
},
96+
channels: {
97+
enabled: true,
98+
},
99+
packets: {
100+
enabled: true,
101+
tx_confirmation: true,
102+
},
89103
},
90104
rest: {
91105
enabled: true,

integration_tests/ibc_utils.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,20 @@ def prepare_network(tmp_path, file):
2929
subprocess.check_call(
3030
[
3131
"hermes",
32-
"-c",
32+
"--config",
3333
hermes.configpath,
3434
"create",
3535
"channel",
36-
"cronos_777-1",
37-
"chainmain-1",
38-
"--port-a",
36+
"--a-port",
3937
"transfer",
40-
"--port-b",
38+
"--b-port",
4139
"transfer",
40+
"--a-chain",
41+
"cronos_777-1",
42+
"--b-chain",
43+
"chainmain-1",
44+
"--new-client-connection",
45+
"--yes",
4246
]
4347
)
4448
supervisorctl(cronos.base_dir / "../tasks.ini", "start", "relayer-demo")
@@ -65,9 +69,11 @@ def prepare(ibc):
6569
src_denom = "basecro"
6670
# dstchainid srcchainid srcportid srchannelid
6771
cmd = (
68-
f"hermes -c {ibc.hermes.configpath} tx raw ft-transfer "
69-
f"{my_ibc1} {my_ibc0} transfer {my_channel} {src_amount} "
70-
f"-o 1000 -n 1 -d {src_denom} -r {dst_addr} -k relayer"
72+
f"hermes --config {ibc.hermes.configpath} tx ft-transfer "
73+
f"--dst-chain {my_ibc1} --src-chain {my_ibc0} --src-port transfer "
74+
f"--src-channel {my_channel} --amount {src_amount} "
75+
f"--timeout-height-offset 1000 --number-msgs 1 "
76+
f"--denom {src_denom} --receiver {dst_addr} --key-name relayer"
7177
)
7278
subprocess.run(cmd, check=True, shell=True)
7379
return src_amount

integration_tests/poetry.lock

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

integration_tests/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ python-dateutil = "^2.8.1"
2020
web3 = "^5.20.1"
2121
eth-bloom = "^1.0.4"
2222
python-dotenv = "^0.19.2"
23-
pystarport = { git = "https://github.com/crypto-com/pystarport.git", branch = "main" }
23+
pystarport = { git = "https://github.com/mmsqe/pystarport.git", branch = "update-hermes" }
2424
websockets = "^9.1"
2525
toml = "^0.10.2"
2626
pysha3 = "^1.0.2"

nix/hermes.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{ pkgs ? import ./default.nix { } }:
22
let
3-
version = "v0.8.0";
3+
version = "v1.0.0-rc.2";
44
srcUrl = {
55
x86_64-linux = {
66
url =
77
"https://github.com/informalsystems/ibc-rs/releases/download/${version}/hermes-${version}-x86_64-unknown-linux-gnu.tar.gz";
8-
sha256 = "sha256-fhY+AKfT0UffIvpWOqLK80sQy+JV+QjP6Du6fdXCjd4=";
8+
sha256 = "sha256-ms+3Ka8Ijbx63OXQzzNZ1kLrwVJDIVnvyc1TG69bun0=";
99
};
1010
x86_64-darwin = {
1111
url =
1212
"https://github.com/informalsystems/ibc-rs/releases/download/${version}/hermes-${version}-x86_64-apple-darwin.tar.gz";
13-
sha256 = "sha256-dBAdPle81IBoOw5epr0NcPyIdYR/HNux1UKVYpAas2A=";
13+
sha256 = "sha256-ygp49IPTXKqK12gE8OiyXjXhkJvfUZNuXVnS14SVScQ=";
1414
};
1515
}.${pkgs.stdenv.system} or (throw
1616
"Unsupported system: ${pkgs.stdenv.system}");

0 commit comments

Comments
 (0)