PolymeshAssociation · Neopallium · Jan 3, 2025 · Jan 3, 2025 · Sep 30, 2024 · Jan 6, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/integration/Cargo.lock b/integration/Cargo.lock
diff --git a/integration/tests/contract_permissions.rs b/integration/tests/contract_permissions.rs
@@ -49,7 +49,7 @@ async fn contract_as_secondary_key_change_identity() -> Result<()> {
         .polymesh_contracts()
         .instantiate_with_code_perms(
             0,
-            Weight::from_parts(10_000_000_000, 0),
+            Weight::from_parts(10_000_000_000, 20_000),
             None,
             call_runtime_bytes.to_vec(),
             vec![0x9b, 0xae, 0x9d, 0x5e], // Selector for `new` constructor.
@@ -134,7 +134,7 @@ async fn contract_as_secondary_key_change_identity() -> Result<()> {
         .call(
             contract.into(),
             0,
-            Weight::from_parts(10_000_000_000, 0),
+            Weight::from_parts(19_000_000_000, 40_000),
             None,
             encoded_call,
         )?

diff --git a/node-rpc/Cargo.toml b/node-rpc/Cargo.toml
@@ -12,29 +12,28 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 
-polymesh-primitives = { path = "../primitives", default-features = false }
-pallet-group-rpc = { path = "../pallets/group/rpc" }
-pallet-staking-rpc = { path = "../pallets/staking/rpc" }
-pallet-protocol-fee-rpc = {  path = "../pallets/protocol-fee/rpc" }
-node-rpc = { path = "../rpc" }
+polymesh-primitives = { workspace = true, default-features = false }
+pallet-group-rpc = { workspace = true }
+pallet-staking-rpc = { workspace = true }
+pallet-protocol-fee-rpc = {  workspace = true }
+node-rpc = { workspace = true }
 
-sc-chain-spec = { version = "4.0.0-dev" }
-sc-client-api = { version = "4.0.0-dev" }
-sc-consensus-babe = { version = "0.10.0-dev" }
-sc-consensus-babe-rpc = { version = "0.10.0-dev" }
-sc-consensus-epochs = { version = "0.10.0-dev" }
-sc-consensus-grandpa = { version = "0.10.0-dev" }
-sc-consensus-grandpa-rpc = { version = "0.10.0-dev" }
-sc-rpc = { version = "4.0.0-dev" }
-sc-rpc-api = { version = "0.10.0-dev" }
-sc-rpc-spec-v2 = { version = "0.10.0-dev" }
-sc-sync-state-rpc = { version = "0.10.0-dev" }
-sc-transaction-pool-api = { version = "4.0.0-dev" }
-sp-api = { version = "4.0.0-dev" }
-sp-block-builder = { version = "4.0.0-dev" }
-sp-blockchain = { version = "4.0.0-dev" }
-sp-consensus = { version = "0.10.0-dev" }
-sp-consensus-babe = { version = "0.10.0-dev" }
-sp-keystore = { version = "0.13.0" }
-sp-runtime = { version = "7.0.0" }
-substrate-frame-rpc-system = { version = "4.0.0-dev" }
+sc-chain-spec = { workspace = true }
+sc-client-api = { workspace = true }
+sc-consensus-babe = { workspace = true }
+sc-consensus-babe-rpc = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
+sc-consensus-grandpa-rpc = { workspace = true }
+sc-rpc = { workspace = true }
+sc-rpc-api = { workspace = true }
+sc-rpc-spec-v2 = { workspace = true }
+sc-sync-state-rpc = { workspace = true }
+sc-transaction-pool-api = { workspace = true }
+sp-api = { workspace = true }
+sp-block-builder = { workspace = true }
+sp-blockchain = { workspace = true }
+sp-consensus = { workspace = true }
+sp-consensus-babe = { workspace = true }
+sp-keystore = { workspace = true }
+sp-runtime = { workspace = true }
+substrate-frame-rpc-system = { workspace = true }
diff --git a/node-rpc/src/lib.rs b/node-rpc/src/lib.rs
@@ -33,10 +33,9 @@
 use std::sync::Arc;
 
 use jsonrpsee::RpcModule;
-use polymesh_primitives::{AccountId, Block, BlockNumber, Hash, IdentityId, Index, Moment, Ticker};
+use polymesh_primitives::{AccountId, Block, BlockNumber, Hash, IdentityId, Moment, Nonce, Ticker};
 use sc_client_api::AuxStore;
-use sc_consensus_babe::{BabeConfiguration, Epoch};
-use sc_consensus_epochs::SharedEpochChanges;
+use sc_consensus_babe::BabeWorkerHandle;
 use sc_consensus_grandpa::{
     FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,
 };
@@ -48,16 +47,14 @@ use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_consensus::SelectChain;
 use sp_consensus_babe::BabeApi;
-use sp_keystore::SyncCryptoStorePtr;
+use sp_keystore::KeystorePtr;
 
 /// Extra dependencies for BABE.
 pub struct BabeDeps {
-    /// BABE protocol config.
-    pub babe_config: BabeConfiguration,
-    /// BABE pending epoch changes.
-    pub shared_epoch_changes: SharedEpochChanges<Block, Epoch>,
+    /// A handle to the BABE worker for issuing requests.
+    pub babe_worker_handle: BabeWorkerHandle<Block>,
     /// The keystore that manages the keys of the node.
-    pub keystore: SyncCryptoStorePtr,
+    pub keystore: KeystorePtr,
 }
 
 /// Extra dependencies for GRANDPA
@@ -90,12 +87,22 @@ pub struct FullDeps<C, P, SC, B> {
     pub babe: BabeDeps,
     /// GRANDPA specific dependencies.
     pub grandpa: GrandpaDeps<B>,
+    /// The backend used by the node.
+    pub backend: Arc<B>,
 }
 
 /// Instantiate all Full RPC extensions.
 pub fn create_full<C, P, SC, B>(
-    deps: FullDeps<C, P, SC, B>,
-    _backend: Arc<B>,
+    FullDeps {
+        client,
+        pool,
+        select_chain,
+        chain_spec,
+        deny_unsafe,
+        babe,
+        grandpa,
+        backend: _,
+    }: FullDeps<C, P, SC, B>,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
     C: ProvideRuntimeApi<Block>
@@ -106,7 +113,7 @@ where
         + Sync
         + Send
         + 'static,
-    C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
+    C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>,
     C::Api: node_rpc::transaction_payment::TransactionPaymentRuntimeApi<Block>,
     C::Api: pallet_staking_rpc::StakingRuntimeApi<Block>,
     C::Api: node_rpc::pips::PipsRuntimeApi<Block, AccountId>,
@@ -121,7 +128,7 @@ where
     P: TransactionPool + 'static,
     SC: SelectChain<Block> + 'static,
     B: sc_client_api::Backend<Block> + Send + Sync + 'static,
-    B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
+    B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashingFor<Block>>,
 {
     use node_rpc::{
         asset::{Asset, AssetApiServer},
@@ -142,20 +149,10 @@ where
     use substrate_frame_rpc_system::{System, SystemApiServer};
 
     let mut io = RpcModule::new(());
-    let FullDeps {
-        client,
-        pool,
-        select_chain,
-        chain_spec,
-        deny_unsafe,
-        babe,
-        grandpa,
-    } = deps;
 
     let BabeDeps {
         keystore,
-        babe_config,
-        shared_epoch_changes,
+        babe_worker_handle,
     } = babe;
     let GrandpaDeps {
         shared_voter_state,
@@ -179,9 +176,8 @@ where
     io.merge(
         Babe::new(
             client.clone(),
-            shared_epoch_changes.clone(),
+            babe_worker_handle.clone(),
             keystore,
-            babe_config,
             select_chain,
             deny_unsafe,
         )
@@ -203,7 +199,7 @@ where
             chain_spec,
             client.clone(),
             shared_authority_set,
-            shared_epoch_changes,
+            babe_worker_handle,
         )?
         .into_rpc(),
     )?;

diff --git a/pallets/asset/Cargo.toml b/pallets/asset/Cargo.toml
@@ -22,28 +22,28 @@ polymesh-runtime-common = { workspace = true, default-features = false }
 # Other
 serde = { version = "1.0.104", default-features = false }
 serde_derive = { version = "1.0.104", optional = true, default-features = false }
-serde_json = "1.0.48"
+serde_json = { version = "1.0.48", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 hex-literal = "0.2.1"
 arrayvec = { version = "0.7.1", default-features = false }
 log = "0.4"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 # Only in STD
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 default = ["std"]

diff --git a/pallets/asset/src/checkpoint/mod.rs b/pallets/asset/src/checkpoint/mod.rs
@@ -259,13 +259,15 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig {
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
         pub schedules_max_complexity: u64,
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(2));
 

diff --git a/pallets/asset/src/lib.rs b/pallets/asset/src/lib.rs
@@ -95,6 +95,7 @@ use frame_support::traits::{Currency, Get, UnixTime};
 use frame_support::weights::Weight;
 use frame_support::BoundedBTreeSet;
 use frame_system::ensure_root;
+use frame_system::pallet_prelude::*;
 use sp_io::hashing::blake2_128;
 use sp_runtime::traits::Zero;
 use sp_std::collections::btree_set::BTreeSet;
@@ -149,7 +150,6 @@ pub use pallet::*;
 pub mod pallet {
     use super::*;
     use frame_support::pallet_prelude::*;
-    use frame_system::pallet_prelude::*;
 
     #[pallet::config]
     pub trait Config:
@@ -571,15 +571,17 @@ pub mod pallet {
 
     #[pallet::genesis_config]
     #[derive(frame_support::DefaultNoBound)]
-    pub struct GenesisConfig {
+    pub struct GenesisConfig<T> {
         // TODO: Why is serde required here?
         pub ticker_registration_config: TickerRegistrationConfig<polymesh_primitives::Moment>,
         pub reserved_country_currency_codes: Vec<Ticker>,
         pub asset_metadata: Vec<(AssetMetadataName, AssetMetadataSpec)>,
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T>
     where
         T: AssetConfig,
     {
@@ -3101,7 +3103,7 @@ impl<T: AssetConfig> Pallet<T> {
     }
 
     pub fn generate_asset_id(caller_acc: T::AccountId, update: bool) -> AssetId {
-        let genesis_hash = frame_system::Pallet::<T>::block_hash(T::BlockNumber::zero());
+        let genesis_hash = frame_system::Pallet::<T>::block_hash(BlockNumberFor::<T>::zero());
         let nonce = Self::get_nonce(&caller_acc, update);
         blake2_128(&(b"modlpy/pallet_asset", genesis_hash, caller_acc, nonce).encode()).into()
     }

diff --git a/pallets/asset/src/types.rs b/pallets/asset/src/types.rs
@@ -1,8 +1,6 @@
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
-
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 
 use polymesh_primitives::asset::AssetType;
 use polymesh_primitives::{Balance, IdentityId};
@@ -64,7 +62,7 @@ pub struct TickerRegistration<T> {
 }
 
 /// struct to store the ticker registration config.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(
     Clone,
     Debug,