Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hyperlane #2906

Merged
merged 2 commits into from
Nov 9, 2023
Merged

hyperlane #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4948ce
hyperlane
byeongsu-hong Nov 9, 2023
a1b7e1d
rename
byeongsu-hong Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ ripemd = "0.1.3"
hyper = "0.14"
hyper-tls = "0.5.0"
hex = "0.4.3"
tendermint-rpc = { version = "0.32.0", features = ["http-client", "tokio"]}
hpl-interface = "0.0.6-rc5"
tendermint-rpc = { version = "0.32.0", features = ["http-client", "tokio"] }
hpl-interface = "=0.0.6-rc3"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how come this is using rc3 but run-locally uses rc6?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a hacky approach to make runnable with this - the reason of doing like this is i realized payload in rc6 is not up to date with rc6 contract binary, so i published new version in empty slot temporarily.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, I'll merge it like this but let's open a follow-up PR to address when it's fixed

elliptic-curve = "0.12.3"

## TODO: remove this
Expand Down
18 changes: 14 additions & 4 deletions rust/utils/run-locally/src/cosmos/deploy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,26 @@ pub fn deploy_cw_hyperlane(
);

// deploy igp set
#[cw_serde]
pub struct GasOracleInitMsg {
pub hrp: String,
pub owner: String,
pub gas_token: String,
pub beneficiary: String,
pub default_gas_usage: String,
}

let igp = cli.wasm_init(
&endpoint,
&deployer,
Some(deployer_addr),
codes.hpl_igp,
igp::core::InstantiateMsg {
GasOracleInitMsg {
hrp: PREFIX.to_string(),
owner: deployer_addr.clone(),
gas_token: "uosmo".to_string(),
beneficiary: deployer_addr.clone(),
hrp: PREFIX.to_string(),
default_gas_usage: "250000".to_string(),
},
"hpl_igp",
);
Expand All @@ -72,10 +82,10 @@ pub fn deploy_cw_hyperlane(
&deployer,
Some(deployer_addr),
codes.hpl_igp_oracle,
IGPOracleInstantiateMsg {
igp::oracle::InstantiateMsg {
owner: deployer_addr.clone(),
},
"hpl_igp_gas_oracle",
"hpl_igp_oracle",
);

// deploy ism - routing ism with empty routes
Expand Down
11 changes: 4 additions & 7 deletions rust/utils/run-locally/src/cosmos/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ fn default_keys<'a>() -> [(&'a str, &'a str); 6] {
KEY_ACCOUNTS3,
]
}
const CW_HYPERLANE_GIT: &str = "https://github.com/many-things/cw-hyperlane";

const CW_HYPERLANE_VERSION: &str = "0.0.6-rc3";
const CW_HYPERLANE_GIT: &str = "https://github.com/many-things/cw-hyperlane";
const CW_HYPERLANE_VERSION: &str = "0.0.6-rc6";

fn make_target() -> String {
let os = if cfg!(target_os = "linux") {
Expand Down Expand Up @@ -140,7 +140,7 @@ pub fn install_cosmos(
version: OSMOSIS_CLI_VERSION.to_string(),
})
.install(cli_dir);
let codes = install_codes(codes_dir, true);
let codes = install_codes(codes_dir, false);

(osmosisd, codes)
}
Expand Down Expand Up @@ -315,10 +315,7 @@ fn run_locally() {
.unwrap_or_default(),
);

let path_buf =
PathBuf::from("/Users/eric/many-things/mitosis/cw-hyperlane/artifacts/dist/wasm");

let (osmosisd, codes) = install_cosmos(None, cli_src, Some(path_buf), code_src);
let (osmosisd, codes) = install_cosmos(None, cli_src, None, code_src);
let addr_base = "tcp://0.0.0.0";
let default_config = CosmosConfig {
cli_path: osmosisd.clone(),
Expand Down
Loading