diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 294acd5f6ae..1eb7a58a64c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ variables:
CI_IMAGE: "paritytech/ci-linux:production"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.82"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.29"
.collect-artifacts:
artifacts:
diff --git a/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs b/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
index 0727ff96122..68bdb309725 100644
--- a/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
+++ b/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see .
-use std::{pin::Pin, str::FromStr};
+use std::pin::Pin;
use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult};
use cumulus_relay_chain_rpc_interface::RelayChainRpcClient;
@@ -24,12 +24,9 @@ use polkadot_overseer::RuntimeApiSubsystemClient;
use polkadot_service::{AuxStore, HeaderBackend};
use sc_authority_discovery::AuthorityDiscovery;
-use sc_network_common::config::MultiaddrWithPeerId;
use sp_api::{ApiError, RuntimeApiInfo};
use sp_blockchain::Info;
-const LOG_TARGET: &str = "blockchain-rpc-client";
-
#[derive(Clone)]
pub struct BlockChainRpcClient {
rpc_client: RelayChainRpcClient,
@@ -338,27 +335,6 @@ impl AuthorityDiscovery for BlockChainRpcClient {
}
impl BlockChainRpcClient {
- pub async fn local_listen_addresses(
- &self,
- ) -> Result, RelayChainError> {
- let addresses = self.rpc_client.system_local_listen_addresses().await?;
- tracing::debug!(target: LOG_TARGET, ?addresses, "Fetched listen address from RPC node.");
-
- let mut result_vec = Vec::new();
- for address in addresses {
- match MultiaddrWithPeerId::from_str(&address) {
- Ok(addr) => result_vec.push(addr),
- Err(err) =>
- return Err(RelayChainError::GenericError(format!(
- "Failed to parse a local listen addresses from the RPC node: {}",
- err
- ))),
- }
- }
-
- Ok(result_vec)
- }
-
pub async fn import_notification_stream(
&self,
) -> RelayChainResult + Send>>> {
diff --git a/client/relay-chain-minimal-node/src/lib.rs b/client/relay-chain-minimal-node/src/lib.rs
index eb255d0867b..e47b3c576e5 100644
--- a/client/relay-chain-minimal-node/src/lib.rs
+++ b/client/relay-chain-minimal-node/src/lib.rs
@@ -127,10 +127,6 @@ async fn new_minimal_relay_chain(
) -> Result {
let role = config.role.clone();
- // Use the given RPC node as bootnode, since we do not have a chain spec with valid boot nodes
- let mut boot_node_address = relay_chain_rpc_client.local_listen_addresses().await?;
- config.network.boot_nodes.append(&mut boot_node_address);
-
let task_manager = {
let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
TaskManager::new(config.tokio_handle.clone(), registry)?
diff --git a/client/relay-chain-rpc-interface/src/rpc_client.rs b/client/relay-chain-rpc-interface/src/rpc_client.rs
index 3d7e1c2c07f..6d3be6c4b32 100644
--- a/client/relay-chain-rpc-interface/src/rpc_client.rs
+++ b/client/relay-chain-rpc-interface/src/rpc_client.rs
@@ -179,11 +179,6 @@ impl RelayChainRpcClient {
.await
}
- /// Get local listen address of the node
- pub async fn system_local_listen_addresses(&self) -> Result, RelayChainError> {
- self.request("system_localListenAddresses", rpc_params![]).await
- }
-
/// Get system health information
pub async fn system_health(&self) -> Result {
self.request("system_health", rpc_params![]).await
diff --git a/zombienet/tests/0006-rpc_collator_builds_blocks.toml b/zombienet/tests/0006-rpc_collator_builds_blocks.toml
index 963b6f5d9e1..693ca578190 100644
--- a/zombienet/tests/0006-rpc_collator_builds_blocks.toml
+++ b/zombienet/tests/0006-rpc_collator_builds_blocks.toml
@@ -39,7 +39,7 @@ cumulus_based = true
validator = true
image = "{{COL_IMAGE}}"
command = "test-parachain"
- args = ["-lparachain=trace,blockchain-rpc-client=debug", "--relay-chain-rpc-urls {{'one'|zombie('wsUri')}} {{'two'|zombie('wsUri')}} {{'three'|zombie('wsUri')}}", "-- --bootnodes {{'one'|zombie('multiAddress')}} {{'two'|zombie('multiAddress')}} {{'three'|zombie('multiAddress')}}"]
+ args = ["-lparachain=trace,blockchain-rpc-client=debug", "--relay-chain-rpc-urls {{'one'|zombie('wsUri')}} {{'two'|zombie('wsUri')}} {{'three'|zombie('wsUri')}}", "--", "--bootnodes {{'one'|zombie('multiAddress')}} {{'two'|zombie('multiAddress')}} {{'three'|zombie('multiAddress')}}"]
# run eve as parachain full node
[[parachains.collators]]
@@ -47,4 +47,4 @@ cumulus_based = true
validator = true
image = "{{COL_IMAGE}}"
command = "test-parachain"
- args = ["-lparachain=trace,blockchain-rpc-client=debug", "--relay-chain-rpc-urls {{'one'|zombie('wsUri')}} {{'two'|zombie('wsUri')}} {{'three'|zombie('wsUri')}}", "-- --bootnodes {{'one'|zombie('multiAddress')}} {{'two'|zombie('multiAddress')}} {{'three'|zombie('multiAddress')}}"]
+ args = ["-lparachain=trace,blockchain-rpc-client=debug", "--relay-chain-rpc-urls {{'one'|zombie('wsUri')}} {{'two'|zombie('wsUri')}} {{'three'|zombie('wsUri')}}", "--", "--bootnodes {{'one'|zombie('multiAddress')}} {{'two'|zombie('multiAddress')}} {{'three'|zombie('multiAddress')}}"]