diff --git a/hyperspace/core/src/packets.rs b/hyperspace/core/src/packets.rs index daa46714d..77f43ee9b 100644 --- a/hyperspace/core/src/packets.rs +++ b/hyperspace/core/src/packets.rs @@ -359,7 +359,7 @@ pub async fn query_ready_and_timed_out_packets( })?; if list.iter().any(|skiped_denom| decoded_dara.token.denom.base_denom.as_str() == skiped_denom) { - log::info!(target: "hyperspace", "Skipping packet as uosmo packet: {:?}", packet); + log::info!(target: "hyperspace", "Skipping packet with ignored token: {:?}", packet); return Ok(None) } diff --git a/hyperspace/cosmos/src/client.rs b/hyperspace/cosmos/src/client.rs index d9145a44f..0fce2c50b 100644 --- a/hyperspace/cosmos/src/client.rs +++ b/hyperspace/cosmos/src/client.rs @@ -240,7 +240,7 @@ pub struct CosmosClientConfig { /// Common client config #[serde(flatten)] pub common: CommonClientConfig, - /// List of tokens to skip uosmo etc + /// Skip transfer packets with the following tokens base denoms pub skip_tokens_list: Option>, } @@ -306,9 +306,7 @@ where initial_rpc_call_delay: rpc_call_delay, misbehaviour_client_msg_queue: Arc::new(AsyncMutex::new(vec![])), max_packets_to_process: config.common.max_packets_to_process as usize, - skip_tokens_list: config - .skip_tokens_list - .unwrap_or_else(|| vec!["uosmo".to_string()]), + skip_tokens_list: config.skip_tokens_list.unwrap_or_default(), }, join_handles: Arc::new(TokioMutex::new(vec![ws_driver_jh])), }) diff --git a/hyperspace/cosmos/src/provider.rs b/hyperspace/cosmos/src/provider.rs index f61829486..bf74afb72 100644 --- a/hyperspace/cosmos/src/provider.rs +++ b/hyperspace/cosmos/src/provider.rs @@ -815,7 +815,7 @@ where client_id: ClientId, client_height: Height, ) -> Result<(Height, Timestamp), Self::Error> { - log::debug!( + log::trace!( target: "hyperspace_cosmos", "Querying client update time and height for client {:?} at height {:?}", client_id, diff --git a/hyperspace/parachain/src/finality_protocol.rs b/hyperspace/parachain/src/finality_protocol.rs index 7e3cbb8ea..de8ee903f 100644 --- a/hyperspace/parachain/src/finality_protocol.rs +++ b/hyperspace/parachain/src/finality_protocol.rs @@ -456,7 +456,7 @@ where ::AccountId: Send + Sync, ::Address: Send + Sync, { - let _justification = match finality_event { + let latest_justification = match finality_event { FinalityEvent::Grandpa(justification) => justification, _ => panic!("Expected grandpa finality event"), }; @@ -635,7 +635,7 @@ where // checkpoints so we don't end up with a very large finality proof at the session end. let is_update_required = source .is_update_required( - justification.commit.target_number.into(), + latest_justification.commit.target_number.into(), client_state.latest_relay_height.into(), ) .await?; diff --git a/hyperspace/primitives/src/lib.rs b/hyperspace/primitives/src/lib.rs index a8daa3414..957c9219b 100644 --- a/hyperspace/primitives/src/lib.rs +++ b/hyperspace/primitives/src/lib.rs @@ -132,7 +132,6 @@ pub struct CommonClientState { pub initial_rpc_call_delay: Duration, pub misbehaviour_client_msg_queue: Arc>>, pub max_packets_to_process: usize, - pub skip_tokens_list: Vec, } @@ -146,7 +145,7 @@ impl Default for CommonClientState { initial_rpc_call_delay: rpc_call_delay, misbehaviour_client_msg_queue: Arc::new(Default::default()), max_packets_to_process: 100, - skip_tokens_list: vec!["uosmo".to_string()], + skip_tokens_list: Default::default(), } } } diff --git a/hyperspace/testsuite/tests/parachain_cosmos.rs b/hyperspace/testsuite/tests/parachain_cosmos.rs index 600bd8684..a15d04d3f 100644 --- a/hyperspace/testsuite/tests/parachain_cosmos.rs +++ b/hyperspace/testsuite/tests/parachain_cosmos.rs @@ -112,7 +112,7 @@ async fn setup_clients() -> (AnyChain, AnyChain) { skip_optional_client_updates: true, max_packets_to_process: 200, }, - skip_tokens_list: Some(vec!["uosmo".to_string()]), + skip_tokens_list: None, }; let chain_b = CosmosClient::::new(config_b.clone()).await.unwrap();