Merge branch 'master' into temp/polkadot-v0.9.40

Cargo.toml

@@ -12,6 +12,8 @@ members = [
 	"pallets/*",
 	"precompiles/*",
 
+	"primitives",
+
 	"chain-extensions/dapps-staking",
 	"chain-extensions/pallet-assets",
 	"chain-extensions/xvm",
@@ -273,7 +275,7 @@ pallet-xc-asset-config = { path = "./pallets/xc-asset-config", default-features
 pallet-xvm = { path = "./pallets/pallet-xvm", default-features = false }
 pallet-xcm = { path = "./pallets/pallet-xcm", default-features = false }
 
-xcm-primitives = { path = "./primitives/xcm", default-features = false }
+astar-primitives = { path = "./primitives", default-features = false }
 
 pallet-evm-precompile-assets-erc20 = { path = "./precompiles/assets-erc20", default-features = false }
 pallet-evm-precompile-sr25519 = { path = "./precompiles/sr25519", default-features = false }

bin/collator/Cargo.toml

@@ -93,6 +93,7 @@ shibuya-runtime = { workspace = true, features = ["std"] }
 shiden-runtime = { workspace = true, features = ["std"] }
 
 # astar pallets dependencies
+astar-primitives = { workspace = true }
 pallet-block-reward = { workspace = true }
 
 # frame dependencies
@@ -162,6 +163,7 @@ runtime-benchmarks = [
 	"sp-keyring",
 	"cumulus-test-relay-sproof-builder",
 	"polkadot-runtime-common",
+	"astar-primitives/runtime-benchmarks",
 ]
 cli = ["try-runtime-cli"]
 try-runtime = ["local-runtime/try-runtime", "try-runtime-cli/try-runtime"]

bin/collator/res/shibuya.json

@@ -3,11 +3,12 @@
   "id": "shibuya",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/3.114.212.146/tcp/30333/p2p/12D3KooWEHWUJ3Rzf8RLRihohbgXafz3Y4LnnKSzFDeZ1sXnopJs",
-    "/ip4/20.40.146.211/tcp/30333/ws/p2p/12D3KooWBVXQ1WgLjHhWMn8mVEdpwF6uepMT1sYkDvAhYAomZvvx",
-    "/ip4/34.168.19.219/tcp/30333/ws/p2p/12D3KooWBwxyvhLfMLLBaC4umejNUZu2C1RiyCRAJSTxnNDzywQ4",
-    "/dns/wss-bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWBVXQ1WgLjHhWMn8mVEdpwF6uepMT1sYkDvAhYAomZvvx",
-    "/dns/wss-bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWBwxyvhLfMLLBaC4umejNUZu2C1RiyCRAJSTxnNDzywQ4"
+    "/ip4/65.108.46.114/tcp/38333/ws/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
+    "/ip4/103.243.173.186/tcp/30333/ws/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
+    "/ip4/80.253.161.89/tcp/30333/ws/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk",
+    "/dns/wss-bootnode-01.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
+    "/dns/wss-bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
+    "/dns/wss-bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk"
   ],
   "telemetryEndpoints": null,
   "protocolId": "shibuya",

bin/collator/res/shibuya.raw.json

@@ -3,11 +3,12 @@
   "id": "shibuya",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/3.114.212.146/tcp/30333/p2p/12D3KooWEHWUJ3Rzf8RLRihohbgXafz3Y4LnnKSzFDeZ1sXnopJs",
-    "/ip4/20.40.146.211/tcp/30333/ws/p2p/12D3KooWBVXQ1WgLjHhWMn8mVEdpwF6uepMT1sYkDvAhYAomZvvx",
-    "/ip4/34.168.19.219/tcp/30333/ws/p2p/12D3KooWBwxyvhLfMLLBaC4umejNUZu2C1RiyCRAJSTxnNDzywQ4",
-    "/dns/wss-bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWBVXQ1WgLjHhWMn8mVEdpwF6uepMT1sYkDvAhYAomZvvx",
-    "/dns/wss-bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWBwxyvhLfMLLBaC4umejNUZu2C1RiyCRAJSTxnNDzywQ4"
+    "/ip4/65.108.46.114/tcp/38333/ws/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
+    "/ip4/103.243.173.186/tcp/30333/ws/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
+    "/ip4/80.253.161.89/tcp/30333/ws/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk",
+    "/dns/wss-bootnode-01.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWLBLYreWVnWUvV5xvTgbhr5zSPn33LQhexGW28zj83GjH",
+    "/dns/wss-bootnode-02.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWDuAQkahaTsN8XHg4k7qe8rttoXrTW5jpJke275S2YA1a",
+    "/dns/wss-bootnode-03.shibuya.astar.network/tcp/443/wss/p2p/12D3KooWNfADqVKZFtiTDvR4CYF6pro5KVXeBEKYBHh5ohLAHrqk"
   ],
   "telemetryEndpoints": null,
   "protocolId": "shibuya",

bin/collator/src/benchmarking.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Astar. If not, see <http://www.gnu.org/licenses/>.
 
-use crate::primitives::{AccountId, Balance, Block};
+use astar_primitives::{AccountId, Balance, Block};
 use cumulus_primitives_core::PersistedValidationData;
 use cumulus_primitives_parachain_inherent::{ParachainInherentData, INHERENT_IDENTIFIER};
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;

bin/collator/src/command.rs

@@ -24,8 +24,8 @@ use crate::{
         self, astar, chain_spec, service::AdditionalConfig, shibuya, shiden, start_astar_node,
         start_shibuya_node, start_shiden_node,
     },
-    primitives::Block,
 };
+use astar_primitives::*;
 use cumulus_client_cli::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
 use log::{error, info};

bin/collator/src/lib.rs

@@ -32,7 +32,6 @@ mod benchmarking;
 mod cli;
 mod command;
 mod evm_tracing_types;
-mod primitives;
 mod rpc;
 
 pub use cli::*;

bin/collator/src/local/service.rs

@@ -32,7 +32,7 @@ use std::{collections::BTreeMap, sync::Arc, time::Duration};
 
 pub use local_runtime::RuntimeApi;
 
-use crate::primitives::*;
+use astar_primitives::*;
 
 /// Local runtime native executor.
 pub struct Executor;

bin/collator/src/parachain/chain_spec/mod.rs

@@ -20,7 +20,7 @@ use sc_chain_spec::ChainSpecExtension;
 use serde::{Deserialize, Serialize};
 use sp_core::{Pair, Public};
 
-use crate::primitives::Block;
+use astar_primitives::Block;
 
 pub mod astar;
 pub mod shibuya;

bin/collator/src/parachain/service.rs

@@ -17,6 +17,8 @@
 // along with Astar. If not, see <http://www.gnu.org/licenses/>.
 
 //! Parachain Service and ServiceFactory implementation.
+
+use astar_primitives::*;
 use cumulus_client_cli::CollatorOptions;
 use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};
 use cumulus_client_consensus_common::{ParachainBlockImport, ParachainConsensus};
@@ -52,7 +54,6 @@ use super::shell_upgrade::*;
 #[cfg(feature = "evm-tracing")]
 use crate::evm_tracing_types::{EthApi as EthApiCmd, EvmTracingConfig};
 
-use crate::primitives::*;
 #[cfg(feature = "evm-tracing")]
 use crate::rpc::tracing;
 

bin/collator/src/parachain/shell_upgrade.rs

@@ -18,6 +18,7 @@
 
 ///! Special [`ParachainConsensus`] implementation that waits for the upgrade from
 ///! shell to a parachain runtime that implements Aura.
+use astar_primitives::*;
 use cumulus_client_consensus_common::{ParachainCandidate, ParachainConsensus};
 use cumulus_primitives_core::relay_chain::{Hash as PHash, PersistedValidationData};
 use futures::lock::Mutex;
@@ -27,8 +28,6 @@ use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi};
 use sp_runtime::traits::Header as HeaderT;
 use std::sync::Arc;
 
-use crate::primitives::*;
-
 pub enum BuildOnAccess<R> {
     Uninitialized(Option<Box<dyn FnOnce() -> R + Send + Sync>>),
     Initialized(R),

bin/collator/src/rpc.rs

@@ -48,7 +48,7 @@ use moonbeam_rpc_trace::{Trace, TraceServer};
 #[cfg(feature = "evm-tracing")]
 use moonbeam_rpc_txpool::{TxPool, TxPoolServer};
 
-use crate::primitives::*;
+use astar_primitives::*;
 
 #[cfg(feature = "evm-tracing")]
 pub mod tracing;

chain-extensions/dapps-staking/src/lib.rs

@@ -17,10 +17,7 @@
 // along with Astar. If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-use sp_runtime::{
-    traits::{Saturating, Zero},
-    DispatchError,
-};
+use sp_runtime::{traits::Zero, DispatchError};
 
 use dapps_staking_chain_extension_types::{
     DSError, DappsStakingAccountInput, DappsStakingEraInput, DappsStakingNominationInput,

pallets/block-reward/Cargo.toml

@@ -12,6 +12,7 @@ repository.workspace = true
 parity-scale-codec = { workspace = true }
 serde = { workspace = true }
 
+astar-primitives = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 scale-info = { workspace = true }
@@ -38,11 +39,13 @@ std = [
 	"frame-system/std",
 	"pallet-timestamp/std",
 	"pallet-balances/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]

pallets/block-reward/src/lib.rs

@@ -77,6 +77,7 @@
 
 pub use pallet::*;
 
+use astar_primitives::Balance;
 use frame_support::pallet_prelude::*;
 use frame_support::{
     log,
@@ -107,10 +108,6 @@ pub mod pallet {
     #[pallet::pallet]
     pub struct Pallet<T>(PhantomData<T>);
 
-    /// The balance type of this pallet.
-    pub(crate) type BalanceOf<T> =
-        <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
-
     // Negative imbalance type of this pallet.
     pub(crate) type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
         <T as frame_system::Config>::AccountId,
@@ -119,17 +116,17 @@ pub mod pallet {
     #[pallet::config]
     pub trait Config: frame_system::Config {
         /// The currency trait.
-        type Currency: Currency<Self::AccountId>;
+        type Currency: Currency<Self::AccountId, Balance = Balance>;
 
         /// Provides information about how much value is locked by dapps staking
-        type DappsStakingTvlProvider: Get<BalanceOf<Self>>;
+        type DappsStakingTvlProvider: Get<Balance>;
 
         /// Used to payout rewards
         type BeneficiaryPayout: BeneficiaryPayout<NegativeImbalanceOf<Self>>;
 
         /// The amount of issuance for each block.
         #[pallet::constant]
-        type RewardAmount: Get<BalanceOf<Self>>;
+        type RewardAmount: Get<Balance>;
 
         /// The overarching event type.
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

pallets/block-reward/src/tests.rs

@@ -18,7 +18,7 @@
 
 use super::{pallet::Error, Event, *};
 use frame_support::{assert_noop, assert_ok, traits::OnTimestampSet};
-use mock::*;
+use mock::{Balance, *};
 use sp_runtime::{
     traits::{AccountIdConversion, BadOrigin, Zero},
     Perbill,

pallets/dapps-staking/Cargo.toml

@@ -13,6 +13,7 @@ frame-system = { workspace = true }
 num-traits = { workspace = true }
 parity-scale-codec = { workspace = true }
 
+astar-primitives = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true, optional = true }
 sp-arithmetic = { workspace = true }
@@ -48,11 +49,13 @@ std = [
 	"pallet-timestamp/std",
 	"sp-staking/std",
 	"frame-benchmarking?/std",
+	"astar-primitives/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
+	"astar-primitives/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]

pallets/dapps-staking/src/benchmarking.rs

@@ -24,7 +24,7 @@ use crate::Pallet as DappsStaking;
 use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};
 use frame_support::traits::{Get, OnFinalize, OnInitialize};
 use frame_system::{Pallet as System, RawOrigin};
-use sp_runtime::traits::{Bounded, One, TrailingZeroInput};
+use sp_runtime::traits::{One, TrailingZeroInput};
 
 const SEED: u32 = 9000;
 const STAKER_BLOCK_REWARD: u32 = 1234u32;
@@ -94,7 +94,7 @@ fn register_contract<T: Config>(
 ) -> Result<(T::AccountId, T::SmartContract), &'static str> {
     let developer: T::AccountId = account("developer", index.into(), SEED);
     let smart_contract = smart_contract::<T>(index);
-    T::Currency::make_free_balance_be(&developer, BalanceOf::<T>::max_value());
+    T::Currency::make_free_balance_be(&developer, Balance::max_value());
     DappsStaking::<T>::register(
         RawOrigin::Root.into(),
         developer.clone(),
@@ -119,7 +119,7 @@ fn prepare_bond_and_stake<T: Config>(
     for id in 0..number_of_stakers {
         let staker_acc: T::AccountId = account("pre_staker", id, seed);
         stakers.push(staker_acc.clone());
-        T::Currency::make_free_balance_be(&staker_acc, BalanceOf::<T>::max_value());
+        T::Currency::make_free_balance_be(&staker_acc, Balance::max_value());
 
         DappsStaking::<T>::bond_and_stake(
             RawOrigin::Signed(staker_acc).into(),
@@ -137,7 +137,7 @@ benchmarks! {
         initialize::<T>();
         let developer_id = whitelisted_caller();
         let contract_id = T::SmartContract::default();
-        T::Currency::make_free_balance_be(&developer_id, BalanceOf::<T>::max_value());
+        T::Currency::make_free_balance_be(&developer_id, Balance::max_value());
     }: _(RawOrigin::Root, developer_id.clone(), contract_id.clone())
     verify {
         assert_last_event::<T>(Event::<T>::NewContract(developer_id, contract_id).into());
@@ -158,7 +158,7 @@ benchmarks! {
         let (developer, contract_id) = register_contract::<T>(1)?;
         let stakers = prepare_bond_and_stake::<T>(1, &contract_id, SEED)?;
         let staker = stakers[0].clone();
-        let stake_amount = BalanceOf::<T>::max_value() / 2u32.into();
+        let stake_amount = Balance::max_value() / 2u128;
 
         DappsStaking::<T>::bond_and_stake(RawOrigin::Signed(staker.clone()).into(), contract_id.clone(), stake_amount)?;
         DappsStaking::<T>::unregister(RawOrigin::Root.into(), contract_id.clone())?;
@@ -174,8 +174,8 @@ benchmarks! {
         let (_, contract_id) = register_contract::<T>(1)?;
 
         let staker = whitelisted_caller();
-        let _ = T::Currency::make_free_balance_be(&staker, BalanceOf::<T>::max_value());
-        let amount = BalanceOf::<T>::max_value() / 2u32.into();
+        let _ = T::Currency::make_free_balance_be(&staker, Balance::max_value());
+        let amount = Balance::max_value() / 2u128;
 
     }: _(RawOrigin::Signed(staker.clone()), contract_id.clone(), amount)
     verify {
@@ -188,8 +188,8 @@ benchmarks! {
         let (_, contract_id) = register_contract::<T>(1)?;
 
         let staker = whitelisted_caller();
-        let _ = T::Currency::make_free_balance_be(&staker, BalanceOf::<T>::max_value());
-        let amount = BalanceOf::<T>::max_value() / 2u32.into();
+        let _ = T::Currency::make_free_balance_be(&staker, Balance::max_value());
+        let amount = Balance::max_value() / 2u128;
 
         DappsStaking::<T>::bond_and_stake(RawOrigin::Signed(staker.clone()).into(), contract_id.clone(), amount)?;
 
@@ -204,9 +204,9 @@ benchmarks! {
         let (_, contract_id) = register_contract::<T>(1)?;
 
         let staker = whitelisted_caller();
-        let _ = T::Currency::make_free_balance_be(&staker, BalanceOf::<T>::max_value());
-        let stake_amount = BalanceOf::<T>::max_value() / 2u32.into();
-        let unstake_amount = stake_amount / 2u32.into();
+        let _ = T::Currency::make_free_balance_be(&staker, Balance::max_value());
+        let stake_amount = Balance::max_value() / 2u128;
+        let unstake_amount = stake_amount / 2u128;
 
         DappsStaking::<T>::bond_and_stake(RawOrigin::Signed(staker.clone()).into(), contract_id.clone(), stake_amount)?;
         DappsStaking::<T>::unbond_and_unstake(RawOrigin::Signed(staker.clone()).into(), contract_id, unstake_amount)?;