NODE-65, deps: polkadot sdk migration

node/common/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bifrost-common-node"
 version = "1.0.0"
-description = "The common code shared between node specifications for Bifrost Node"
+description = "The common code shared between client implementations for Bifrost"
 authors = { workspace = true }
 homepage = { workspace = true }
 edition = { workspace = true }
@@ -27,6 +27,9 @@ sc-network-sync = { workspace = true }
 sc-service = { workspace = true }
 substrate-prometheus-endpoint = { workspace = true }
 
+# benchmarking dependencies
+frame-benchmarking = { workspace = true, features = ["std"] }
+
 # substrate primitives dependencies
 sp-core = { workspace = true, features = ["std"] }
 sp-runtime = { workspace = true, features = ["std"] }
@@ -36,13 +39,15 @@ sp-block-builder = { workspace = true, features = ["std"] }
 
 # Frontier dependencies
 fc-db = { workspace = true }
+fc-api = { workspace = true }
 fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] }
 fc-rpc-core = { workspace = true }
 fp-rpc-debug = { workspace = true }
 fp-storage = { workspace = true }
 fp-rpc = { workspace = true }
 fc-rpc-debug = { workspace = true }
 fc-rpc-trace = { workspace = true }
+fp-ext = { workspace = true, features = ["std"] }
 
 # Local Dependencies
 bp-core = { workspace = true }

node/common/src/rpc.rs

@@ -1,12 +1,12 @@
 use crate::cli_opt::EthApi as EthApiCmd;
-use bp_core::{BlockNumber, Hash, Header};
+
+use std::{collections::BTreeMap, sync::Arc};
+
 use fc_rpc::{
 	EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,
 	SchemaV2Override, SchemaV3Override, StorageOverride,
 };
 use fc_rpc_core::types::{FeeHistoryCache, FilterPool};
-use fp_rpc::{self, EthereumRuntimeRPCApi};
-use fp_storage::EthereumStorageSchema;
 use sc_client_api::{backend::Backend, StorageProvider};
 use sc_consensus_grandpa::{
 	FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,
@@ -18,14 +18,29 @@ use sc_rpc::SubscriptionTaskExecutor;
 use sc_rpc_api::DenyUnsafe;
 use sc_service::TaskManager;
 use sc_transaction_pool::{ChainApi, Pool};
+
+use bp_core::{BlockNumber, Hash, Header};
+use fp_rpc::{self, EthereumRuntimeRPCApi};
+use fp_storage::EthereumStorageSchema;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
 use sp_core::H256;
 use sp_runtime::{generic, traits::Block as BlockT, OpaqueExtrinsic as UncheckedExtrinsic};
-use std::{collections::BTreeMap, sync::Arc};
 
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
+pub struct DefaultEthConfig<C, BE>(std::marker::PhantomData<(C, BE)>);
+
+impl<C, BE> fc_rpc::EthConfig<Block, C> for DefaultEthConfig<C, BE>
+where
+	C: StorageProvider<Block, BE> + Sync + Send + 'static,
+	BE: Backend<Block> + 'static,
+{
+	type EstimateGasAdapter = ();
+	type RuntimeStorageOverride =
+		fc_rpc::frontier_backend_client::SystemAccountId20StorageOverride<Block, C, BE>;
+}
+
 /// Override storage
 pub fn overrides_handle<B, C, BE>(client: Arc<C>) -> Arc<OverrideHandle<B>>
 where
@@ -70,7 +85,9 @@ pub struct GrandpaDeps<B> {
 }
 
 /// Full client dependencies.
-pub struct FullDevDeps<C, P, BE, SC, A: ChainApi> {
+pub struct FullDevDeps<C, P, BE, SC, A: ChainApi, CIDP> {
+	/// Client version.
+	pub client_version: String,
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
@@ -94,7 +111,7 @@ pub struct FullDevDeps<C, P, BE, SC, A: ChainApi> {
 	/// List of optional RPC extensions.
 	pub ethapi_cmd: Vec<EthApiCmd>,
 	/// Frontier backend.
-	pub frontier_backend: Arc<dyn fc_db::BackendReader<Block> + Send + Sync>,
+	pub frontier_backend: Arc<dyn fc_api::Backend<Block> + Send + Sync>,
 	/// Backend.
 	pub backend: Arc<BE>,
 	/// Maximum fee history cache size.
@@ -115,10 +132,14 @@ pub struct FullDevDeps<C, P, BE, SC, A: ChainApi> {
 	pub forced_parent_hashes: Option<BTreeMap<H256, H256>>,
 	/// Chain syncing service
 	pub sync_service: Arc<SyncingService<Block>>,
+	/// Something that can create the inherent data providers for pending state
+	pub pending_create_inherent_data_providers: CIDP,
 }
 
 /// Mainnet/Testnet client dependencies.
-pub struct FullDeps<C, P, BE, SC, A: ChainApi> {
+pub struct FullDeps<C, P, BE, SC, A: ChainApi, CIDP> {
+	/// Client version.
+	pub client_version: String,
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
@@ -142,7 +163,7 @@ pub struct FullDeps<C, P, BE, SC, A: ChainApi> {
 	/// List of optional RPC extensions.
 	pub ethapi_cmd: Vec<EthApiCmd>,
 	/// Frontier backend.
-	pub frontier_backend: Arc<dyn fc_db::BackendReader<Block> + Send + Sync>,
+	pub frontier_backend: Arc<dyn fc_api::Backend<Block> + Send + Sync>,
 	/// Backend.
 	pub backend: Arc<BE>,
 	/// Maximum fee history cache size.
@@ -161,6 +182,8 @@ pub struct FullDeps<C, P, BE, SC, A: ChainApi> {
 	pub forced_parent_hashes: Option<BTreeMap<H256, H256>>,
 	/// Chain syncing service
 	pub sync_service: Arc<SyncingService<Block>>,
+	/// Something that can create the inherent data providers for pending state
+	pub pending_create_inherent_data_providers: CIDP,
 }
 
 pub struct SpawnTasksParams<'a, B: BlockT, C, BE> {

node/common/src/service.rs

@@ -1,16 +1,21 @@
-use bp_core::Block;
+use crate::cli_opt::{BackendTypeConfig, RpcConfig};
+
+use std::{path::Path, sync::Arc};
+
 use fc_db::DatabaseSource;
 use sc_client_api::{
 	backend::{Backend, StateBackend},
 	AuxStore, StorageProvider,
 };
 use sc_service::Configuration;
+
+use bp_core::Block;
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_runtime::traits::BlakeTwo256;
-use std::{path::Path, sync::Arc};
 
-use crate::cli_opt::{BackendTypeConfig, RpcConfig};
+pub type HostFunctions =
+	(frame_benchmarking::benchmarking::HostFunctions, fp_ext::bifrost_ext::HostFunctions);
 
 /// Configure frontier database.
 pub fn frontier_database_dir(config: &Configuration, path: &str) -> std::path::PathBuf {

node/core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bifrost-node"
-version = "1.2.5"
-description = "The node specification for Bifrost Node"
+version = "1.3.0"
+description = "The node client implementation for Bifrost"
 authors = { workspace = true }
 homepage = { workspace = true }
 edition = { workspace = true }

node/core/src/command.rs

@@ -3,7 +3,8 @@ use crate::cli::{Cli, Subcommand};
 use bifrost_common_node::cli_opt::{BackendType, BackendTypeConfig, RpcConfig};
 
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
-use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli};
+
+use sc_cli::SubstrateCli;
 use sc_service::PartialComponents;
 
 trait IdentifyChain {
@@ -54,7 +55,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn support_url() -> String {
-		"support.anonymous.an".into()
+		env!("CARGO_PKG_HOMEPAGE").into()
 	}
 
 	fn copyright_start_year() -> i32 {
@@ -77,18 +78,6 @@ impl SubstrateCli for Cli {
 			)?),
 		})
 	}
-
-	fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
-		if chain_spec.is_dev() {
-			&bifrost_dev_runtime::VERSION
-		} else if chain_spec.is_testnet() {
-			&bifrost_testnet_runtime::VERSION
-		} else if chain_spec.is_mainnet() {
-			&bifrost_mainnet_runtime::VERSION
-		} else {
-			&bifrost_dev_runtime::VERSION
-		}
-	}
 }
 
 /// Parse and run command line arguments
@@ -288,6 +277,8 @@ pub fn run() -> sc_cli::Result<()> {
 			}
 		},
 		Some(Subcommand::Benchmark(cmd)) => {
+			use bifrost_common_node::rpc::Block;
+
 			let runner = cli.create_runner(cmd)?;
 
 			runner.sync_run(|config| {
@@ -303,7 +294,7 @@ pub fn run() -> sc_cli::Result<()> {
 							);
 						}
 
-						cmd.run::<bifrost_dev_runtime::Block, bifrost_dev_node::service::dev::ExecutorDispatch>(config)
+						cmd.run::<Block, bifrost_common_node::service::HostFunctions>(config)
 					},
 					BenchmarkCmd::Block(cmd) => {
 						let PartialComponents { client, .. } =

node/dev/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "bifrost-dev-node"
 version = "1.0.0"
-description = "The node specification for Bifrost Node development"
+description = "The node client implementation for Bifrost dev chain"
 authors = { workspace = true }
-homepage = { workspace = true}
+homepage = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }
@@ -34,6 +34,7 @@ sc-rpc = { workspace = true }
 sc-rpc-api = { workspace = true }
 sc-chain-spec = { workspace = true }
 sc-basic-authorship = { workspace = true }
+sc-offchain = { workspace = true }
 
 # substrate primitives dependencies
 sp-core = { workspace = true, features = ["std"] }
@@ -46,6 +47,7 @@ sp-block-builder = { workspace = true, features = ["std"] }
 sp-timestamp = { workspace = true, features = ["std"] }
 sp-blockchain = { workspace = true }
 sp-consensus = { workspace = true }
+sp-inherents = { workspace = true }
 
 # FRAME dependencies
 pallet-bfc-staking = { workspace = true }
@@ -66,9 +68,10 @@ fp-storage = { workspace = true }
 fp-ext = { workspace = true, features = ["std"] }
 fp-rpc = { workspace = true, features = ["std"] }
 fp-rpc-txpool = { workspace = true, features = ["std"] }
-pallet-evm = { workspace = true, features = ["std"] }
-
-pallet-ethereum = { workspace = true, features = ["forbid-evm-reentrancy"] }
+pallet-ethereum = { workspace = true, features = [
+	"std",
+	"forbid-evm-reentrancy",
+] }
 
 # benchmarking dependencies
 frame-benchmarking-cli = { workspace = true }
@@ -82,6 +85,4 @@ bifrost-common-node = { workspace = true }
 
 [features]
 default = []
-runtime-benchmarks = [
-	"bifrost-dev-runtime/runtime-benchmarks",
-]
+runtime-benchmarks = ["bifrost-dev-runtime/runtime-benchmarks"]

node/dev/src/chain_spec.rs

@@ -16,7 +16,7 @@ use sp_runtime::{BoundedVec, Perbill};
 use hex_literal::hex;
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<devnet::GenesisConfig>;
+pub type ChainSpec = sc_service::GenericChainSpec<devnet::RuntimeGenesisConfig>;
 
 /// Generate a crypto pair from seed.
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
@@ -132,7 +132,6 @@ pub fn development_config() -> Result<ChainSpec, String> {
 					AccountId::from(hex!("f4fc2d9Be3D6e19cCAfd575dE7CB290A585A1a22")),
 					AccountId::from(hex!("962dBf2aecF6545f552373487127976fD5B55105")),
 				],
-				true,
 			)
 		},
 		// Bootnodes
@@ -170,17 +169,12 @@ fn development_genesis(
 	initial_tech_committee_members: Vec<AccountId>,
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
-	_enable_println: bool,
-) -> devnet::GenesisConfig {
-	// This is the simplest bytecode to revert without returning any data.
-	// We will pre-deploy it under all of our precompiles to ensure they can be called from
-	// within contracts.
-	// (PUSH1 0x00 PUSH1 0x00 REVERT)
-	let _revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD];
-	devnet::GenesisConfig {
+) -> devnet::RuntimeGenesisConfig {
+	devnet::RuntimeGenesisConfig {
 		system: devnet::SystemConfig {
 			// Add Wasm runtime to storage.
 			code: wasm_binary.to_vec(),
+			..Default::default()
 		},
 		balances: devnet::BalancesConfig {
 			balances: endowed_accounts