Adapt node and runtime to changes

Author: ales-otf

Cargo.lock

@@ -29,7 +29,6 @@ members = [
 	"precompiles",
 	"primitives/*",
 	"runtime",
-	"common",
 	"support/*",
 ]
 resolver = "2"
@@ -48,9 +47,11 @@ pallet-collective = { default-features = false, path = "pallets/collective" }
 pallet-commitments = { default-features = false, path = "pallets/commitments" }
 pallet-registry = { default-features = false, path = "pallets/registry" }
 pallet-subtensor = { default-features = false, path = "pallets/subtensor" }
+subtensor-custom-rpc = { default-features = false, path = "pallets/subtensor/rpc" }
 subtensor-custom-rpc-runtime-api = { default-features = false, path = "pallets/subtensor/runtime-api" }
 subtensor-precompiles = { default-features = false, path = "precompiles" }
 subtensor-runtime-common = { default-features = false, path = "common" }
+node-subtensor-runtime = { default-features = false, path = "runtime" }
 
 async-trait = "0.1"
 cargo-husky = { version = "1", default-features = false }

Cargo.toml

@@ -66,7 +66,7 @@ pallet-transaction-payment = { workspace = true }
 pallet-commitments = { path = "../pallets/commitments" }
 pallet-drand = { workspace = true }
 sp-crypto-ec-utils = { workspace = true }
-sp-keystore = { workspace = true,  default-features = false }
+sp-keystore = { workspace = true, default-features = false }
 
 
 # These dependencies are used for the subtensor's RPCs
@@ -105,9 +105,10 @@ thiserror = { workspace = true }
 num-traits = { version = "0.2", features = ["std"] }
 
 # Local Dependencies
-node-subtensor-runtime = { path = "../runtime" }
-subtensor-custom-rpc = { path = "../pallets/subtensor/rpc" }
-subtensor-custom-rpc-runtime-api = { path = "../pallets/subtensor/runtime-api" }
+node-subtensor-runtime = { workspace = true }
+subtensor-runtime-common = { workspace = true }
+subtensor-custom-rpc = { workspace = true }
+subtensor-custom-rpc-runtime-api = { workspace = true }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true }
@@ -133,7 +134,7 @@ runtime-benchmarks = [
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"pallet-commitments/runtime-benchmarks",
-	"pallet-drand/runtime-benchmarks"
+	"pallet-drand/runtime-benchmarks",
 ]
 pow-faucet = []
 
@@ -145,7 +146,7 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"sp-runtime/try-runtime",
 	"pallet-commitments/try-runtime",
-	"pallet-drand/try-runtime"
+	"pallet-drand/try-runtime",
 ]
 
 metadata-hash = ["node-subtensor-runtime/metadata-hash"]

node/Cargo.toml

@@ -7,13 +7,14 @@ use crate::client::FullClient;
 use node_subtensor_runtime as runtime;
 use node_subtensor_runtime::check_nonce;
 use node_subtensor_runtime::pallet_subtensor;
-use runtime::{AccountId, Balance, BalancesCall, SystemCall};
+use runtime::{BalancesCall, SystemCall};
 use sc_cli::Result;
 use sc_client_api::BlockBackend;
 use sp_core::{Encode, Pair};
 use sp_inherents::{InherentData, InherentDataProvider};
 use sp_keyring::Sr25519Keyring;
 use sp_runtime::{OpaqueExtrinsic, SaturatedConversion};
+use subtensor_runtime_common::{AccountId, Balance, Signature};
 
 use std::{sync::Arc, time::Duration};
 
@@ -161,7 +162,7 @@ pub fn create_benchmark_extrinsic(
     runtime::UncheckedExtrinsic::new_signed(
         call.clone(),
         sp_runtime::AccountId32::from(sender.public()).into(),
-        runtime::Signature::Sr25519(signature),
+        Signature::Sr25519(signature),
         extra.clone(),
     )
 }

node/src/benchmarking.rs

@@ -6,7 +6,7 @@ pub mod finney;
 pub mod localnet;
 pub mod testnet;
 
-use node_subtensor_runtime::{AccountId, Block, Signature, WASM_BINARY};
+use node_subtensor_runtime::{Block, WASM_BINARY};
 use sc_chain_spec_derive::ChainSpecExtension;
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -18,6 +18,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};
 use std::collections::HashSet;
 use std::env;
 use std::str::FromStr;
+use subtensor_runtime_common::{AccountId, Signature};
 
 // The URL for the telemetry server.
 // const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";

node/src/chain_spec/mod.rs

@@ -13,7 +13,6 @@ pub use fc_rpc::EthBlockDataCacheTask;
 pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 use fc_storage::StorageOverride;
 use jsonrpsee::RpcModule;
-use node_subtensor_runtime::Hash;
 use node_subtensor_runtime::opaque::Block;
 use sc_consensus_manual_seal::EngineCommand;
 use sc_network::service::traits::NetworkService;
@@ -24,6 +23,7 @@ use sc_transaction_pool_api::TransactionPool;
 use sp_core::H256;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::traits::Block as BlockT;
+use subtensor_runtime_common::Hash;
 
 use crate::{
     client::{FullBackend, FullClient},

node/src/rpc.rs

@@ -796,7 +796,7 @@ fn run_manual_seal_authorship(
         ) -> Result<(), sp_inherents::Error> {
             TIMESTAMP.with(|x| {
                 let mut x_ref = x.borrow_mut();
-                *x_ref = x_ref.saturating_add(node_subtensor_runtime::SLOT_DURATION);
+                *x_ref = x_ref.saturating_add(subtensor_runtime_common::time::SLOT_DURATION);
                 inherent_data.put_data(sp_timestamp::INHERENT_IDENTIFIER, &*x.borrow())
             })
         }

node/src/service.rs

@@ -20,7 +20,7 @@ where
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
-    <R as pallet_balances::Config>::Balance: From<U256>,
+    <R as pallet_balances::Config>::Balance: TryFrom<U256>,
 {
     const INDEX: u64 = 2048;
     const ADDRESS_SS58: [u8; 32] = [
@@ -41,7 +41,7 @@ where
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
-    <R as pallet_balances::Config>::Balance: From<U256>,
+    <R as pallet_balances::Config>::Balance: TryFrom<U256>,
 {
     #[precompile::public("transfer(bytes32)")]
     #[precompile::payable]

precompiles/src/balance_transfer.rs

@@ -55,7 +55,7 @@ where
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
-    <R as pallet_balances::Config>::Balance: From<U256>,
+    <R as pallet_balances::Config>::Balance: TryFrom<U256>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     fn default() -> Self {
@@ -79,7 +79,7 @@ where
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
-    <R as pallet_balances::Config>::Balance: From<U256>,
+    <R as pallet_balances::Config>::Balance: TryFrom<U256>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     pub fn new() -> Self {
@@ -120,7 +120,7 @@ where
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
-    <R as pallet_balances::Config>::Balance: From<U256>,
+    <R as pallet_balances::Config>::Balance: TryFrom<U256>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     fn execute(&self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {

precompiles/src/lib.rs

@@ -55,7 +55,7 @@ where
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
-    <R as pallet_balances::Config>::Balance: From<U256>,
+    <R as pallet_balances::Config>::Balance: TryFrom<U256>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     const INDEX: u64 = 2049;
@@ -81,7 +81,7 @@ where
         + GetDispatchInfo
         + Dispatchable<PostInfo = PostDispatchInfo>,
     <R as pallet_evm::Config>::AddressMapping: AddressMapping<R::AccountId>,
-    <R as pallet_balances::Config>::Balance: From<U256>,
+    <R as pallet_balances::Config>::Balance: TryFrom<U256>,
     <<R as frame_system::Config>::Lookup as StaticLookup>::Source: From<R::AccountId>,
 {
     #[precompile::public("addStake(bytes32,uint256)")]