diff --git a/bridges/bin/node/node/Cargo.toml b/bridges/bin/node/node/Cargo.toml
index 0b7b5ab6ab449..c0a2f936cd17d 100644
--- a/bridges/bin/node/node/Cargo.toml
+++ b/bridges/bin/node/node/Cargo.toml
@@ -20,110 +20,110 @@ bridge-node-runtime = { version = "0.1.0", path = "../runtime" }
 sp-bridge-eth-poa = { version = "0.1.0", path = "../../../primitives/ethereum-poa" }
 
 [dependencies.sc-cli]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-rpc]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-core]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-executor]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-service]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-inherents]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-transaction-pool]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-transaction-pool]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-network]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-consensus-aura]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-consensus-aura]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-consensus]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.grandpa]
 package = "sc-finality-grandpa"
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.grandpa-primitives]
 package = "sp-finality-grandpa"
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-consensus]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-client-api]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sc-basic-authorship]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.substrate-frame-rpc-system]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.frame-benchmarking]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.frame-benchmarking-cli]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [build-dependencies]
@@ -131,13 +131,13 @@ vergen = "3.1.0"
 
 [build-dependencies.build-script-utils]
 package = "substrate-build-script-utils"
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [build-dependencies.frame-benchmarking-cli]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [features]
diff --git a/bridges/bin/node/node/src/service.rs b/bridges/bin/node/node/src/service.rs
index 96728beb81bcd..b033ff5327da3 100644
--- a/bridges/bin/node/node/src/service.rs
+++ b/bridges/bin/node/node/src/service.rs
@@ -92,12 +92,14 @@ macro_rules! new_full_start {
 			},
 			)?
 		.with_rpc_extensions(|builder| -> Result<jsonrpc_core::IoHandler<sc_rpc::Metadata>, _> {
+			use sc_rpc::DenyUnsafe;
 			use substrate_frame_rpc_system::{FullSystem, SystemApi};
 
 			let mut io = jsonrpc_core::IoHandler::default();
 			io.extend_with(SystemApi::to_delegate(FullSystem::new(
 				builder.client().clone(),
 				builder.pool(),
+				DenyUnsafe::No,
 			)));
 			Ok(io)
 		})?;
@@ -124,7 +126,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
 			let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
 			Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
 		})?
-		.build()?;
+		.build_full()?;
 
 	if role.is_authority() {
 		let proposer = sc_basic_authorship::ProposerFactory::new(
@@ -153,7 +155,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
 
 		// the AURA authoring task is considered essential, i.e. if it
 		// fails we take down the service with it.
-		service.spawn_essential_task("aura", aura);
+		service.spawn_essential_task_handle().spawn_blocking("aura", aura);
 	}
 
 	// if the node isn't actively participating in consensus then it doesn't
@@ -195,7 +197,9 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
 
 		// the GRANDPA voter task is considered infallible, i.e.
 		// if it fails we take down the service with it.
-		service.spawn_essential_task("grandpa-voter", grandpa::run_grandpa_voter(grandpa_config)?);
+		service
+			.spawn_essential_task_handle()
+			.spawn_blocking("grandpa-voter", grandpa::run_grandpa_voter(grandpa_config)?);
 	} else {
 		grandpa::setup_disabled_grandpa(service.client(), &inherent_data_providers, service.network())?;
 	}
@@ -255,5 +259,5 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
 			let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
 			Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
 		})?
-		.build()
+		.build_light()
 }
diff --git a/bridges/bin/node/runtime/Cargo.toml b/bridges/bin/node/runtime/Cargo.toml
index 1d75dc3fecb7d..99b4389ce17c4 100644
--- a/bridges/bin/node/runtime/Cargo.toml
+++ b/bridges/bin/node/runtime/Cargo.toml
@@ -23,15 +23,15 @@ features = ["derive"]
 
 # Substrate Dependencies
 [dependencies.pallet-aura]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-balances]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-bridge-eth-poa]
@@ -45,76 +45,76 @@ default-features = false
 path = "../../../modules/currency-exchange"
 
 [dependencies.frame-support]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-grandpa]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-randomness-collective-flip]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-sudo]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-session]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-system]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-system-rpc-runtime-api]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-timestamp]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-transaction-payment]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-executive]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 # Substrate Primitives
 [dependencies.sp-api]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-block-builder]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-bridge-eth-poa]
@@ -128,76 +128,76 @@ default-features = false
 path = "../../../primitives/currency-exchange"
 
 [dependencies.sp-consensus-aura]
-version = "0.8.0-rc3"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-core]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-inherents]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-io]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-offchain]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-session]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-staking]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-std]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-transaction-pool]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-version]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-benchmarking]
 optional = true
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dev-dependencies.sp-bridge-eth-poa]
@@ -209,7 +209,6 @@ path = "../../../primitives/ethereum-poa"
 [build-dependencies.wasm-builder-runner]
 version = "1.0.5"
 package = "substrate-wasm-builder-runner"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [features]
diff --git a/bridges/bin/node/runtime/src/lib.rs b/bridges/bin/node/runtime/src/lib.rs
index a68ec33fa0e5b..7e0d2a10d1274 100644
--- a/bridges/bin/node/runtime/src/lib.rs
+++ b/bridges/bin/node/runtime/src/lib.rs
@@ -157,6 +157,8 @@ parameter_types! {
 }
 
 impl frame_system::Trait for Runtime {
+	/// The basic call filter to use in dispatchable.
+	type BaseCallFilter = ();
 	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
 	/// The aggregated dispatch type that is available for extrinsics.
diff --git a/bridges/modules/currency-exchange/Cargo.toml b/bridges/modules/currency-exchange/Cargo.toml
index b9a71150a18ea..ac45876a6b2a1 100644
--- a/bridges/modules/currency-exchange/Cargo.toml
+++ b/bridges/modules/currency-exchange/Cargo.toml
@@ -13,44 +13,44 @@ sp-currency-exchange = { path = "../../primitives/currency-exchange", default-fe
 
 # Substrate Based Dependencies
 [dependencies.frame-support]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-system]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-std]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-benchmarking]
 optional = true
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dev-dependencies.sp-core]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dev-dependencies.sp-io]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [features]
diff --git a/bridges/modules/currency-exchange/src/lib.rs b/bridges/modules/currency-exchange/src/lib.rs
index cfefd5b4adb37..6970fa18f4658 100644
--- a/bridges/modules/currency-exchange/src/lib.rs
+++ b/bridges/modules/currency-exchange/src/lib.rs
@@ -312,6 +312,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type BaseCallFilter = ();
 	}
 
 	impl Trait for TestRuntime {
diff --git a/bridges/modules/ethereum-contract/builtin/Cargo.toml b/bridges/modules/ethereum-contract/builtin/Cargo.toml
index d8f4cf8fb9f4d..5867e1176c9f9 100644
--- a/bridges/modules/ethereum-contract/builtin/Cargo.toml
+++ b/bridges/modules/ethereum-contract/builtin/Cargo.toml
@@ -19,29 +19,29 @@ finality-grandpa = "0.12.3"
 bridge-node-runtime = { path = "../../../bin/node/runtime" }
 
 [dependencies.sp-blockchain]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-finality-grandpa]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sc-finality-grandpa]
-version = "0.8.0-dev"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dev-dependencies]
 hex = "0.4"
 
 [dev-dependencies.sp-core]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
diff --git a/bridges/modules/ethereum/Cargo.toml b/bridges/modules/ethereum/Cargo.toml
index 32a5b997d1194..c22adb8490676 100644
--- a/bridges/modules/ethereum/Cargo.toml
+++ b/bridges/modules/ethereum/Cargo.toml
@@ -14,40 +14,40 @@ primitives = { package = "sp-bridge-eth-poa", path = "../../primitives/ethereum-
 
 # Substrate Based Dependencies
 [dependencies.frame-support]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-system]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-std]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-io]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-benchmarking]
 optional = true
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.libsecp256k1]
diff --git a/bridges/modules/ethereum/src/mock.rs b/bridges/modules/ethereum/src/mock.rs
index 94986d3d5815d..6c68d927586be 100644
--- a/bridges/modules/ethereum/src/mock.rs
+++ b/bridges/modules/ethereum/src/mock.rs
@@ -68,6 +68,7 @@ impl frame_system::Trait for TestRuntime {
 	type AccountData = ();
 	type OnNewAccount = ();
 	type OnKilledAccount = ();
+	type BaseCallFilter = ();
 }
 
 parameter_types! {
diff --git a/bridges/modules/substrate/Cargo.toml b/bridges/modules/substrate/Cargo.toml
index 605d70231f7c6..fefacdd458d0e 100644
--- a/bridges/modules/substrate/Cargo.toml
+++ b/bridges/modules/substrate/Cargo.toml
@@ -14,57 +14,57 @@ hash-db = { version = "0.15.2", default-features = false }
 
 # Substrate Based Dependencies
 [dependencies.frame-support]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.frame-system]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-session]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-core]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-finality-grandpa]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-trie]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 # Dev Dependencies
 [dev-dependencies.sp-io]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate/"
 
 [dev-dependencies.sp-state-machine]
-version = "0.8.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "0.8.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [features]
diff --git a/bridges/modules/substrate/src/lib.rs b/bridges/modules/substrate/src/lib.rs
index 148ebd5ef9866..61d50d6fdd556 100644
--- a/bridges/modules/substrate/src/lib.rs
+++ b/bridges/modules/substrate/src/lib.rs
@@ -273,6 +273,7 @@ mod tests {
 		type AccountData = ();
 		type OnNewAccount = ();
 		type OnKilledAccount = ();
+		type BaseCallFilter = ();
 	}
 
 	impl Trait for Test {}
diff --git a/bridges/primitives/currency-exchange/Cargo.toml b/bridges/primitives/currency-exchange/Cargo.toml
index 1bbfac6a61344..432a1ae9e82a8 100644
--- a/bridges/primitives/currency-exchange/Cargo.toml
+++ b/bridges/primitives/currency-exchange/Cargo.toml
@@ -12,15 +12,15 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 # Substrate Based Dependencies
 
 [dependencies.sp-std]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.frame-support]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate.git"
 
 [features]
diff --git a/bridges/primitives/ethereum-poa/Cargo.toml b/bridges/primitives/ethereum-poa/Cargo.toml
index 0ccabfaa592b4..945752bc348aa 100644
--- a/bridges/primitives/ethereum-poa/Cargo.toml
+++ b/bridges/primitives/ethereum-poa/Cargo.toml
@@ -23,27 +23,27 @@ plain_hasher = { version = "0.2.2", default-features = false }
 
 # Substrate Based Dependencies
 [dependencies.sp-api]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-std]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-io]
-version = "2.0.0-rc3"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 default-features = false
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.libsecp256k1]
diff --git a/bridges/relays/ethereum/Cargo.toml b/bridges/relays/ethereum/Cargo.toml
index 6619a3ca7ea75..743f2793c0342 100644
--- a/bridges/relays/ethereum/Cargo.toml
+++ b/bridges/relays/ethereum/Cargo.toml
@@ -40,40 +40,35 @@ features = ["http"]
 
 # Substrate Based Dependencies
 [dependencies.frame-system]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.pallet-transaction-payment]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
-# I think this is used for sr-io and stuff
 [dependencies.node-primitives]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
-# Branch used for keccack256 hasher code
-# Could probably move the keccack hasher stuff to our own primitives
 [dependencies.sp-core]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-keyring]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
 [dependencies.sp-runtime]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate.git"
 
-# This should get moved to our `bin` folder
 [dependencies.bridge-node-runtime]
 version = "0.1.0"
 path = "../../bin/node/runtime"
-# node-runtime = { git = "https://github.com/svyatonik/substrate.git", branch = "bridge_runtime" }
diff --git a/bridges/relays/substrate/Cargo.toml b/bridges/relays/substrate/Cargo.toml
index e391a18901b36..7d51a35cff6cc 100644
--- a/bridges/relays/substrate/Cargo.toml
+++ b/bridges/relays/substrate/Cargo.toml
@@ -18,16 +18,16 @@ serde_json = "1.0.56"
 url = "2.1.0"
 
 [dependencies.sp-core]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.sp-rpc]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"
 
 [dependencies.node-primitives]
-version = "2.0.0-rc3"
-rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
+version = "2.0.0-rc4"
+tag = 'v2.0.0-rc4'
 git = "https://github.com/paritytech/substrate/"