merge with v0.9.38

moonbeam-foundation · Mar 30, 2023 · ffc21be · ffc21be
1 parent f86199e
commit ffc21be
Show file tree

Hide file tree

Showing 55 changed files with 6,498 additions and 3,850 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ members = [
 	"client/rpc-core",
 	"client/rpc",
 	"client/db",
+	"client/storage",
 	"client/mapping-sync",
 	"primitives/consensus",
 	"primitives/dynamic-fee",
@@ -32,7 +33,7 @@ resolver = "2"
 [workspace.package]
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
-repository = "https://github.com/paritytech/frontier/"
+repository = "https://github.com/purestake/frontier/"
 
 [workspace.dependencies]
 bn = { package = "substrate-bn", version = "0.6", default-features = false }
@@ -121,6 +122,7 @@ fc-db = { version = "2.0.0-dev", path = "client/db" }
 fc-mapping-sync = { version = "2.0.0-dev", path = "client/mapping-sync" }
 fc-rpc = { version = "2.0.0-dev", path = "client/rpc" }
 fc-rpc-core = { version = "1.1.0-dev", path = "client/rpc-core" }
+fc-storage = { version = "1.0.0-dev", path = "client/storage" }
 # Frontier Primitive
 fp-consensus = { version = "2.0.0-dev", path = "primitives/consensus", default-features = false }
 fp-dynamic-fee = { version = "1.0.0", path = "primitives/dynamic-fee", default-features = false }

diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
@@ -22,8 +22,8 @@ sp-blockchain = { workspace = true }
 sp-runtime = { workspace = true }
 # Frontier
 fc-db = { workspace = true }
-fp-rpc = { workspace = true, features = ["std"] }
-fp-storage = { workspace = true, features = ["std"] }
+fp-rpc = { workspace = true, features = ["default"] }
+fp-storage = { workspace = true, features = ["default"] }
 
 [dev-dependencies]
 futures = "0.3.21"
@@ -36,4 +36,4 @@ sp-consensus = { workspace = true }
 sp-io = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
 # Frontier
-frontier-template-runtime = { workspace = true, features = ["std", "with-rocksdb-weights"] }
+frontier-template-runtime = { workspace = true, features = ["default"] }
diff --git a/client/cli/src/frontier_db_cmd/mapping_db.rs b/client/cli/src/frontier_db_cmd/mapping_db.rs
@@ -21,6 +21,8 @@ use std::sync::Arc;
 use ethereum_types::H256;
 use serde::Deserialize;
 // Substrate
+use sp_api::ProvideRuntimeApi;
+use sp_blockchain::HeaderBackend;
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 // Frontier
 use fp_rpc::EthereumRuntimeRPCApi;
@@ -46,9 +48,9 @@ pub struct MappingDb<'a, C, B: BlockT> {
 
 impl<'a, C, B: BlockT> MappingDb<'a, C, B>
 where
-	C: sp_api::ProvideRuntimeApi<B>,
+	C: ProvideRuntimeApi<B>,
 	C::Api: EthereumRuntimeRPCApi<B>,
-	C: sp_blockchain::HeaderBackend<B>,
+	C: HeaderBackend<B>,
 {
 	pub fn new(
 		cmd: &'a FrontierDbCmd,

diff --git a/client/cli/src/frontier_db_cmd/mod.rs b/client/cli/src/frontier_db_cmd/mod.rs
@@ -29,6 +29,8 @@ use ethereum_types::H256;
 use serde::Deserialize;
 // Substrate
 use sc_cli::{PruningParams, SharedParams};
+use sp_api::ProvideRuntimeApi;
+use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block as BlockT;
 
 use self::{
@@ -102,9 +104,9 @@ impl FrontierDbCmd {
 		backend: Arc<fc_db::kv::Backend<B>>,
 	) -> sc_cli::Result<()>
 	where
-		C: sp_api::ProvideRuntimeApi<B>,
+		C: ProvideRuntimeApi<B>,
 		C::Api: fp_rpc::EthereumRuntimeRPCApi<B>,
-		C: sp_blockchain::HeaderBackend<B>,
+		C: HeaderBackend<B>,
 	{
 		match self.column {
 			Column::Meta => {