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.

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

relayer: scope config per endpoint #8

Merged
merged 45 commits into from
Oct 26, 2023
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
92ea480
wip: make config an endpoint-specific enum
hdevalence Oct 1, 2023
f315763
propagate changes into relayer-cli and add questions
hdevalence Oct 3, 2023
362f4a7
relayer-cli: propagate enum chain config changes
erwanor Oct 11, 2023
9b25ce6
relayer: add `ChainConfig::set_key_name`
erwanor Oct 11, 2023
4b6f769
test-framework: begin propagating config changes
erwanor Oct 11, 2023
71cf297
relayer-cli: momentarily allow irrefutable patterns
erwanor Oct 11, 2023
baad978
relayer: run cargo fmt
erwanor Oct 11, 2023
6b5f8fb
integration-tests: propagate config enum api changes
erwanor Oct 11, 2023
4457c2b
Merge remote-tracking branch 'upstream/master' into config-enum
erwanor Oct 12, 2023
02f9a87
integration-tests: fix errors with `ica` feature
erwanor Oct 12, 2023
c259910
integration-tests: fix errors with `ics29` feature
erwanor Oct 12, 2023
0a6baeb
integration-tests: fix errors with `fee-grant` feature
erwanor Oct 12, 2023
ed1ff5f
integration-tests: fix errors with `mbt` feature
erwanor Oct 13, 2023
25c7cf8
integration-tests: fix errors with `ordered` feature
erwanor Oct 13, 2023
a6eadc0
Merge remote-tracking branch 'upstream/master' into config-enum
erwanor Oct 13, 2023
e891697
relayer-cli: fix conflict introduced by merge
erwanor Oct 13, 2023
29b1bde
integration-test: fix simulation:
erwanor Oct 13, 2023
12c02de
hermes: various linting fixes
erwanor Oct 13, 2023
f28601b
hermes: include chain type in default config file
erwanor Oct 13, 2023
64083a3
hermes: add chain type to all config examples
erwanor Oct 13, 2023
8f02d10
ci: update misbehavior config
erwanor Oct 13, 2023
44032e5
relayer-rest(tests): add chain type to mock config
erwanor Oct 13, 2023
0a09a0c
ci(misbehavior): edit config of forked chain
erwanor Oct 13, 2023
b1a39d7
relayer(config): remove dead code
erwanor Oct 14, 2023
c158cba
relayer: lift keys to `ChainConfig::list_keys`
erwanor Oct 14, 2023
e7028fc
relayer: move config validation to `ibc_relayer::config`
erwanor Oct 14, 2023
3cb9db3
relayer: move cosmos config to `chain::cosmos::config`
erwanor Oct 17, 2023
33e2cf5
relayer: add `chain::cosmos::config` module
erwanor Oct 17, 2023
cddce8d
relayer-cli(chain-registry): update path to `CosmosSdkConfig`
erwanor Oct 17, 2023
db50666
Add `evidence` command for monitoring and reporting misbehavior evide…
romac Oct 18, 2023
458e5f3
Bump Swatinem/rust-cache from 1 to 2 (#3665)
dependabot[bot] Oct 18, 2023
5767001
Bump actions/checkout from 3 to 4 (#3664)
dependabot[bot] Oct 18, 2023
7bce263
Set CompatMode fallback to v0.34 when the version query fails (#3663)
ljoss17 Oct 19, 2023
1520594
Fix commented gas_price line in example config file (#3668)
ljoss17 Oct 19, 2023
3a41f69
Docs improvements (#3661)
seanchen1991 Oct 19, 2023
5417c47
Update to ibc-proto v0.38.0 and remove unneeded object-safe trait def…
romac Oct 20, 2023
ac916f5
Release Hermes 1.7.0 (#3639)
romac Oct 20, 2023
9a7ef31
Fix README badge (#3675)
romac Oct 21, 2023
7e2b14c
Fix a bug in `query_next_sequence_receive`, where if we didnt ask for…
romac Oct 21, 2023
3f8332c
Enable serde feature of ibc-proto (#3678)
romac Oct 23, 2023
4e7b5ee
Merge remote-tracking branch 'upstream/master' into config-enum
erwanor Oct 23, 2023
c42de92
ci(misbehavior-ics): add chain type to config file
erwanor Oct 23, 2023
e588311
relayer(evidence): exit early if chain type is not cosmos sdk
erwanor Oct 23, 2023
979cef4
relayer(cosmos): refactor cosmos-specific config validation
erwanor Oct 23, 2023
d7f8674
Add changelog entries
romac Oct 24, 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
Prev Previous commit
Next Next commit
test-framework: begin propagating config changes
erwanor committed Oct 11, 2023
commit 4b6f769472311a72c15cae04a5291c1601af59d1
7 changes: 3 additions & 4 deletions tools/test-framework/src/types/single/node.rs
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@ use core::str::FromStr;
use core::time::Duration;
use eyre::eyre;
use eyre::Report as Error;
use ibc_relayer::chain::ChainType;
use ibc_relayer::config;
use ibc_relayer::config::gas_multiplier::GasMultiplier;
use ibc_relayer::config::CosmosSdkConfig;
use ibc_relayer::keyring::Store;
use ibc_relayer_types::core::ics24_host::identifier::ChainId;
use std::sync::{Arc, RwLock};
@@ -134,9 +134,8 @@ impl FullNode {
.display()
.to_string();

Ok(config::ChainConfig {
Ok(config::ChainConfig::CosmosSdk(CosmosSdkConfig {
id: self.chain_driver.chain_id.clone(),
r#type: ChainType::CosmosSdk,
rpc_addr: Url::from_str(&self.chain_driver.rpc_address())?,
grpc_addr: Url::from_str(&self.chain_driver.grpc_address())?,
event_source: config::EventSourceMode::Push {
@@ -171,7 +170,7 @@ impl FullNode {
proof_specs: Default::default(),
extension_options: Default::default(),
sequential_batch_tx: false,
})
}))
}

/**
16 changes: 13 additions & 3 deletions tools/test-framework/src/util/interchain_security.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
use std::str::FromStr;

use ibc_relayer::config::ChainConfig;
use itertools::chain;

use crate::chain::config::set_voting_period;
use crate::prelude::*;

@@ -19,9 +24,14 @@ pub fn update_relayer_config_for_consumer_chain(config: &mut Config) {
// specified in the Consumer chain proposal. The test framework uses 100s in
// the proposal.
for chain_config in config.chains.iter_mut() {
if chain_config.id == ChainId::from_string("ibcconsumer") {
chain_config.ccv_consumer_chain = true;
chain_config.trusting_period = Some(Duration::from_secs(99));
match chain_config {
ChainConfig::CosmosSdk(chain_config)
if chain_config.id == ChainId::from_string("ibcconsumer") =>
{
chain_config.ccv_consumer_chain = true;
chain_config.trusting_period = Some(Duration::from_secs(99));
},
ChainConfig::CosmosSdk(_) => {},
}
}
}