Merge remote-tracking branch 'upstream/master' into subspace-v3

# Conflicts: # client/rpc/src/eth/execute.rs
autonomys · Sep 13, 2023 · 01b5619 · 01b5619
2 parents 068cb2e + 56477a7
commit 01b5619
Show file tree

Hide file tree

Showing 23 changed files with 480 additions and 237 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
@@ -25,11 +25,13 @@ rlp = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
 schnellru = "0.2.1"
 serde = { workspace = true }
+thiserror = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
 
 # Substrate
 prometheus-endpoint = { workspace = true }
 sc-client-api = { workspace = true }
+sc-consensus-aura = { workspace = true }
 sc-network = { workspace = true }
 sc-network-common = { workspace = true }
 sc-network-sync = { workspace = true }
@@ -38,24 +40,27 @@ sc-service = { workspace = true }
 sc-transaction-pool = { workspace = true }
 sc-transaction-pool-api = { workspace = true }
 sc-utils = { workspace = true }
-sp-api = { workspace = true }
-sp-block-builder = { workspace = true }
+sp-api = { workspace = true, features = ["default"] }
+sp-block-builder = { workspace = true, features = ["default"] }
 sp-blockchain = { workspace = true }
 sp-consensus = { workspace = true }
-sp-core = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
-sp-state-machine = { workspace = true }
-sp-storage = { workspace = true }
+sp-consensus-aura = { workspace = true, features = ["default"] }
+sp-core = { workspace = true, features = ["default"] }
+sp-inherents = { workspace = true, features = ["default"] }
+sp-io = { workspace = true, features = ["default"] }
+sp-runtime = { workspace = true, features = ["default"] }
+sp-state-machine = { workspace = true, features = ["default"] }
+sp-storage = { workspace = true, features = ["default"] }
+sp-timestamp = { workspace = true, features = ["default"] }
 # Frontier
 fc-api = { workspace = true }
 fc-mapping-sync = { workspace = true }
 fc-rpc-core = { workspace = true }
 fc-storage = { workspace = true }
-fp-evm = { workspace = true }
+fp-evm = { workspace = true, features = ["default"] }
 fp-rpc = { workspace = true, features = ["default"] }
 fp-storage = { workspace = true, features = ["default"] }
-pallet-evm = { workspace = true }
+pallet-evm = { workspace = true, features = ["default"] }
 
 [dev-dependencies]
 tempfile = "3.8.0"

diff --git a/client/rpc/src/eth/block.rs b/client/rpc/src/eth/block.rs
@@ -37,14 +37,15 @@ use crate::{
 	frontier_backend_client, internal_err,
 };
 
-impl<B, C, P, CT, BE, A: ChainApi, EC: EthConfig<B, C>> Eth<B, C, P, CT, BE, A, EC>
+impl<B, C, P, CT, BE, A, CIDP, EC> Eth<B, C, P, CT, BE, A, CIDP, EC>
 where
 	B: BlockT,
 	C: ProvideRuntimeApi<B>,
 	C::Api: EthereumRuntimeRPCApi<B>,
 	C: HeaderBackend<B> + StorageProvider<B, BE> + 'static,
 	BE: Backend<B> + 'static,
-	A: ChainApi<Block = B> + 'static,
+	A: ChainApi<Block = B>,
+	EC: EthConfig<B, C>,
 {
 	pub async fn block_by_hash(&self, hash: H256, full: bool) -> RpcResult<Option<RichBlock>> {
 		let BlockInfo {

diff --git a/client/rpc/src/eth/client.rs b/client/rpc/src/eth/client.rs
@@ -34,13 +34,15 @@ use crate::{
 	internal_err,
 };
 
-impl<B, C, P, CT, BE, A: ChainApi, EC: EthConfig<B, C>> Eth<B, C, P, CT, BE, A, EC>
+impl<B, C, P, CT, BE, A, CIDP, EC> Eth<B, C, P, CT, BE, A, CIDP, EC>
 where
 	B: BlockT,
 	C: ProvideRuntimeApi<B>,
 	C::Api: EthereumRuntimeRPCApi<B>,
 	C: HeaderBackend<B> + StorageProvider<B, BE> + 'static,
 	BE: Backend<B>,
+	A: ChainApi<Block = B>,
+	EC: EthConfig<B, C>,
 {
 	pub fn protocol_version(&self) -> RpcResult<u64> {
 		Ok(1)