difftreelog
Merge commit '4359d76172511a9ab73cac61957cc6ddf47a2653' into feature/evm-call-sponsoring
in: master
31 files changed
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -196,6 +196,7 @@
const_on_chain_schema: vec![],
variable_on_chain_schema: vec![],
limits: CollectionLimits::default(),
+ transfers_enabled: true,
},
)],
nft_item_id: vec![],
pallets/inflation/src/tests.rsdiffbeforeafterboth--- a/pallets/inflation/src/tests.rs
+++ b/pallets/inflation/src/tests.rs
@@ -31,6 +31,8 @@
type ExistentialDeposit = ExistentialDeposit;
type WeightInfo = ();
type MaxLocks = MaxLocks;
+ type MaxReserves = ();
+ type ReserveIdentifier = ();
}
frame_support::construct_runtime!(
@@ -89,7 +91,6 @@
type InflationBlockInterval = InflationBlockInterval;
}
-// Build genesis storage according to the mock runtime.
pub fn new_test_ext() -> sp_io::TestExternalities {
frame_system::GenesisConfig::default()
.build_storage::<Test>()
@@ -108,7 +109,9 @@
// BlockInflation should be set after 1st block and
// first inflation deposit should be equal to BlockInflation
Inflation::on_initialize(1);
- assert!(Inflation::block_inflation() > 0);
+
+ // SBP M2 review: Verify expected block inflation for year 1
+ assert_eq!(Inflation::block_inflation(), 1901);
assert_eq!(
Balances::free_balance(1234) - initial_issuance,
Inflation::block_inflation()
@@ -155,11 +158,24 @@
Inflation::on_initialize(1);
let block_inflation_year_0 = Inflation::block_inflation();
+ // SBP M2 review: go through all the block inflations for year 1,
+ // total issuance will be updated accordingly
+ for block in (100..YEAR).step_by(100) {
+ Inflation::on_initialize(block);
+ }
+ assert_eq!(
+ initial_issuance + (1901 * (YEAR / 100)),
+ <Balances as Currency<_>>::total_issuance()
+ );
+
Inflation::on_initialize(YEAR);
let block_inflation_year_1 = Inflation::block_inflation();
+ // SBP M2 review: Verify expected block inflation for year 2
+ assert_eq!(block_inflation_year_1, 1952);
+ // SBP M2 review: this is actually not true
// Assert that year 1 inflation is less than year 0
- assert!(block_inflation_year_0 > block_inflation_year_1);
+ // assert!(block_inflation_year_0 > block_inflation_year_1);
});
}
@@ -177,6 +193,7 @@
Inflation::on_initialize(YEAR * year);
let block_inflation_year_after = Inflation::block_inflation();
+ // SBP M2 review: this is actually not true (not for the first few years)
// Assert that next year inflation is less than previous year inflation
assert!(block_inflation_year_before > block_inflation_year_after);
}
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -174,6 +174,8 @@
BadCreateRefungibleCall,
/// Gas limit exceeded
OutOfGas,
+ /// Collection settings not allowing items transferring
+ TransferNotAllowed,
}
}
@@ -526,6 +528,7 @@
variable_on_chain_schema: Vec::new(),
const_on_chain_schema: Vec::new(),
limits,
+ transfers_enabled: true,
};
// Add new collection to map
@@ -901,6 +904,32 @@
collection.submit_logs()
}
+ // TODO! transaction weight
+
+ /// Set transfers_enabled value for particular collection
+ ///
+ /// # Permissions
+ ///
+ /// * Collection Owner.
+ ///
+ /// # Arguments
+ ///
+ /// * collection_id: ID of the collection.
+ ///
+ /// * value: New flag value.
+ #[weight = <T as Config>::WeightInfo::burn_item()]
+ #[transactional]
+ pub fn set_transfers_enabled_flag(origin, collection_id: CollectionId, value: bool) -> DispatchResult {
+
+ let sender = ensure_signed(origin)?;
+ let mut target_collection = Self::get_collection(collection_id)?;
+
+ Self::check_owner_permissions(&target_collection, &sender)?;
+
+ target_collection.transfers_enabled = value;
+ target_collection.save()
+ }
+
/// Destroys a concrete instance of NFT.
///
/// # Permissions
@@ -1541,6 +1570,9 @@
Error::<T>::AccountTokenLimitExceeded
);
+ // preliminary transfer check
+ ensure!(collection.transfers_enabled, Error::<T>::TransferNotAllowed);
+
Ok(())
}
pallets/nft/src/mock.rsdiffbeforeafterboth--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -74,6 +74,8 @@
type ExistentialDeposit = ExistentialDeposit;
type WeightInfo = ();
type MaxLocks = MaxLocks;
+ type MaxReserves = ();
+ type ReserveIdentifier = [u8; 8];
}
parameter_types! {
@@ -99,41 +101,6 @@
type Timestamp = pallet_timestamp::Pallet<Test>;
type Randomness = pallet_randomness_collective_flip::Pallet<Test>;
-
-parameter_types! {
- pub const TombstoneDeposit: u64 = 1;
- pub const DepositPerContract: u64 = 1;
- pub const DepositPerStorageByte: u64 = 1;
- pub const DepositPerStorageItem: u64 = 1;
- pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * 24 * 60 * 10);
- pub const SurchargeReward: u64 = 1;
- pub const SignedClaimHandicap: u32 = 2;
- pub DeletionWeightLimit: u64 = u64::MAX;//Perbill::from_percent(10);
- pub DeletionQueueDepth: u32 = 10;
- pub Schedule: pallet_contracts::Schedule<Test> = Default::default();
-}
-
-impl pallet_contracts::Config for Test {
- type Time = Timestamp;
- type Randomness = Randomness;
- type Currency = pallet_balances::Pallet<Test>;
- type Event = ();
- type RentPayment = ();
- type SignedClaimHandicap = SignedClaimHandicap;
- type TombstoneDeposit = TombstoneDeposit;
- type DepositPerContract = DepositPerContract;
- type DepositPerStorageByte = DepositPerStorageByte;
- type DepositPerStorageItem = DepositPerStorageItem;
- type RentFraction = RentFraction;
- type SurchargeReward = SurchargeReward;
- type DeletionWeightLimit = DeletionWeightLimit;
- type DeletionQueueDepth = DeletionQueueDepth;
- type ChainExtension = ();
- type WeightPrice = ();
- type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
- type Schedule = Schedule;
- type CallStack = [pallet_contracts::Frame<Self>; 31];
-}
parameter_types! {
pub const CollectionCreationPrice: u32 = 0;
pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -2351,3 +2351,62 @@
);
});
}
+
+#[test]
+fn collection_transfer_flag_works() {
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let origin1 = Origin::signed(1);
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ assert_ok!(TemplateModule::set_transfers_enabled_flag(origin1, 1, true));
+
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+
+ let origin1 = Origin::signed(1);
+
+ // default scenario
+ assert_ok!(TemplateModule::transfer(origin1, account(2), 1, 1, 1000));
+ assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(2));
+ assert_eq!(TemplateModule::balance_count(1, 1), 0);
+ assert_eq!(TemplateModule::balance_count(1, 2), 1);
+
+ assert_eq!(TemplateModule::address_tokens(1, 2), [1]);
+ });
+}
+
+#[test]
+fn collection_transfer_flag_works_neg() {
+ new_test_ext().execute_with(|| {
+ default_limits();
+
+ let origin1 = Origin::signed(1);
+
+ let collection_id = create_test_collection(&CollectionMode::NFT, 1);
+ assert_ok!(TemplateModule::set_transfers_enabled_flag(
+ origin1, 1, false
+ ));
+
+ let data = default_nft_data();
+ create_test_item(collection_id, &data.into());
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+
+ let origin1 = Origin::signed(1);
+
+ // default scenario
+ assert_noop!(
+ TemplateModule::transfer(origin1, account(2), 1, 1, 1000),
+ Error::<Test>::TransferNotAllowed
+ );
+ assert_eq!(TemplateModule::nft_item_id(1, 1).unwrap().owner, account(1));
+ assert_eq!(TemplateModule::balance_count(1, 1), 1);
+ assert_eq!(TemplateModule::balance_count(1, 2), 0);
+
+ assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+ });
+}
pallets/scheduler/src/lib.rsdiffbeforeafterboth--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -947,900 +947,4 @@
fn root() -> OriginCaller {
system::RawOrigin::Root.into()
}
-
- #[test]
- fn basic_scheduling_works() {
- new_test_ext().execute_with(|| {
- let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
- &call
- ));
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- call
- ));
- run_to_block(3);
- assert!(logger::log().is_empty());
- run_to_block(4);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- });
- }
-
- #[test]
- fn schedule_after_works() {
- new_test_ext().execute_with(|| {
- run_to_block(2);
- let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
- &call
- ));
- // This will schedule the call 3 blocks after the next block... so block 3 + 3 = 6
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::After(3),
- None,
- 127,
- root(),
- call
- ));
- run_to_block(5);
- assert!(logger::log().is_empty());
- run_to_block(6);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- });
- }
-
- #[test]
- fn schedule_after_zero_works() {
- new_test_ext().execute_with(|| {
- run_to_block(2);
- let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
- &call
- ));
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::After(0),
- None,
- 127,
- root(),
- call
- ));
- // Will trigger on the next block.
- run_to_block(3);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- });
- }
-
- #[test]
- fn periodic_scheduling_works() {
- new_test_ext().execute_with(|| {
- // at #4, every 3 blocks, 3 times.
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- Some((3, 3)),
- 127,
- root(),
- Call::Logger(logger::Call::log(42, 1000))
- ));
- run_to_block(3);
- assert!(logger::log().is_empty());
- run_to_block(4);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- run_to_block(6);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- run_to_block(7);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
- run_to_block(9);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
- run_to_block(10);
- assert_eq!(
- logger::log(),
- vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
- );
- run_to_block(100);
- assert_eq!(
- logger::log(),
- vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
- );
- });
- }
-
- #[test]
- fn reschedule_works() {
- new_test_ext().execute_with(|| {
- let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
- &call
- ));
- assert_eq!(
- Scheduler::do_schedule(DispatchTime::At(4), None, 127, root(), call).unwrap(),
- (4, 0)
- );
-
- run_to_block(3);
- assert!(logger::log().is_empty());
-
- assert_eq!(
- Scheduler::do_reschedule((4, 0), DispatchTime::At(6)).unwrap(),
- (6, 0)
- );
-
- assert_noop!(
- Scheduler::do_reschedule((6, 0), DispatchTime::At(6)),
- Error::<Test>::RescheduleNoChange
- );
-
- run_to_block(4);
- assert!(logger::log().is_empty());
-
- run_to_block(6);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
-
- run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- });
- }
-
- #[test]
- fn reschedule_named_works() {
- new_test_ext().execute_with(|| {
- let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
- &call
- ));
- assert_eq!(
- Scheduler::do_schedule_named(
- 1u32.encode(),
- DispatchTime::At(4),
- None,
- 127,
- root(),
- call
- )
- .unwrap(),
- (4, 0)
- );
-
- run_to_block(3);
- assert!(logger::log().is_empty());
-
- assert_eq!(
- Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(),
- (6, 0)
- );
-
- assert_noop!(
- Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)),
- Error::<Test>::RescheduleNoChange
- );
-
- run_to_block(4);
- assert!(logger::log().is_empty());
-
- run_to_block(6);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
-
- run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- });
- }
-
- #[test]
- fn reschedule_named_perodic_works() {
- new_test_ext().execute_with(|| {
- let call = Call::Logger(logger::Call::log(42, 1000));
- assert!(!<Test as frame_system::Config>::BaseCallFilter::filter(
- &call
- ));
- assert_eq!(
- Scheduler::do_schedule_named(
- 1u32.encode(),
- DispatchTime::At(4),
- Some((3, 3)),
- 127,
- root(),
- call
- )
- .unwrap(),
- (4, 0)
- );
-
- run_to_block(3);
- assert!(logger::log().is_empty());
-
- assert_eq!(
- Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(5)).unwrap(),
- (5, 0)
- );
- assert_eq!(
- Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(6)).unwrap(),
- (6, 0)
- );
-
- run_to_block(5);
- assert!(logger::log().is_empty());
-
- run_to_block(6);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
-
- assert_eq!(
- Scheduler::do_reschedule_named(1u32.encode(), DispatchTime::At(10)).unwrap(),
- (10, 0)
- );
-
- run_to_block(9);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
-
- run_to_block(10);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 42u32)]);
-
- run_to_block(13);
- assert_eq!(
- logger::log(),
- vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
- );
-
- run_to_block(100);
- assert_eq!(
- logger::log(),
- vec![(root(), 42u32), (root(), 42u32), (root(), 42u32)]
- );
- });
- }
-
- #[test]
- fn cancel_named_scheduling_works_with_normal_cancel() {
- new_test_ext().execute_with(|| {
- // at #4.
- Scheduler::do_schedule_named(
- 1u32.encode(),
- DispatchTime::At(4),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(69, 1000)),
- )
- .unwrap();
- let i = Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(42, 1000)),
- )
- .unwrap();
- run_to_block(3);
- assert!(logger::log().is_empty());
- assert_ok!(Scheduler::do_cancel_named(None, 1u32.encode()));
- assert_ok!(Scheduler::do_cancel(None, i));
- run_to_block(100);
- assert!(logger::log().is_empty());
- });
- }
-
- #[test]
- fn cancel_named_periodic_scheduling_works() {
- new_test_ext().execute_with(|| {
- // at #4, every 3 blocks, 3 times.
- Scheduler::do_schedule_named(
- 1u32.encode(),
- DispatchTime::At(4),
- Some((3, 3)),
- 127,
- root(),
- Call::Logger(logger::Call::log(42, 1000)),
- )
- .unwrap();
- // same id results in error.
- assert!(Scheduler::do_schedule_named(
- 1u32.encode(),
- DispatchTime::At(4),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(69, 1000))
- )
- .is_err());
- // different id is ok.
- Scheduler::do_schedule_named(
- 2u32.encode(),
- DispatchTime::At(8),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(69, 1000)),
- )
- .unwrap();
- run_to_block(3);
- assert!(logger::log().is_empty());
- run_to_block(4);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- run_to_block(6);
- assert_ok!(Scheduler::do_cancel_named(None, 1u32.encode()));
- run_to_block(100);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 69u32)]);
- });
- }
-
- #[test]
- fn scheduler_respects_weight_limits() {
- new_test_ext().execute_with(|| {
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
- ));
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
- ));
- // 69 and 42 do not fit together
- run_to_block(4);
- assert_eq!(logger::log(), vec![(root(), 42u32)]);
- run_to_block(5);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 69u32)]);
- });
- }
-
- #[test]
- fn scheduler_respects_hard_deadlines_more() {
- new_test_ext().execute_with(|| {
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 0,
- root(),
- Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
- ));
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 0,
- root(),
- Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
- ));
- // With base weights, 69 and 42 should not fit together, but do because of hard deadlines
- run_to_block(4);
- assert_eq!(logger::log(), vec![(root(), 42u32), (root(), 69u32)]);
- });
- }
-
- #[test]
- fn scheduler_respects_priority_ordering() {
- new_test_ext().execute_with(|| {
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 1,
- root(),
- Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 2))
- ));
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 0,
- root(),
- Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
- ));
- run_to_block(4);
- assert_eq!(logger::log(), vec![(root(), 69u32), (root(), 42u32)]);
- });
- }
-
- #[test]
- fn scheduler_respects_priority_ordering_with_soft_deadlines() {
- new_test_ext().execute_with(|| {
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 255,
- root(),
- Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
- ));
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
- ));
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(4),
- None,
- 126,
- root(),
- Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))
- ));
-
- // 2600 does not fit with 69 or 42, but has higher priority, so will go through
- run_to_block(4);
- assert_eq!(logger::log(), vec![(root(), 2600u32)]);
- // 69 and 42 fit together
- run_to_block(5);
- assert_eq!(
- logger::log(),
- vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
- );
- });
- }
-
- #[test]
- fn on_initialize_weight_is_correct() {
- new_test_ext().execute_with(|| {
- let base_weight: Weight =
- <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
- let base_multiplier = 0;
- let named_multiplier = <Test as frame_system::Config>::DbWeight::get().writes(1);
- let periodic_multiplier =
- <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
-
- // Named
- assert_ok!(Scheduler::do_schedule_named(
- 1u32.encode(),
- DispatchTime::At(1),
- None,
- 255,
- root(),
- Call::Logger(logger::Call::log(3, MaximumSchedulerWeight::get() / 3))
- ));
- // Anon Periodic
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(1),
- Some((1000, 3)),
- 128,
- root(),
- Call::Logger(logger::Call::log(42, MaximumSchedulerWeight::get() / 3))
- ));
- // Anon
- assert_ok!(Scheduler::do_schedule(
- DispatchTime::At(1),
- None,
- 127,
- root(),
- Call::Logger(logger::Call::log(69, MaximumSchedulerWeight::get() / 2))
- ));
- // Named Periodic
- assert_ok!(Scheduler::do_schedule_named(
- 2u32.encode(),
- DispatchTime::At(1),
- Some((1000, 3)),
- 126,
- root(),
- Call::Logger(logger::Call::log(2600, MaximumSchedulerWeight::get() / 2))
- ));
-
- // Will include the named periodic only
- let actual_weight = Scheduler::on_initialize(1);
- let call_weight = MaximumSchedulerWeight::get() / 2;
- assert_eq!(
- actual_weight,
- call_weight
- + base_weight + base_multiplier
- + named_multiplier + periodic_multiplier
- );
- assert_eq!(logger::log(), vec![(root(), 2600u32)]);
-
- // Will include anon and anon periodic
- let actual_weight = Scheduler::on_initialize(2);
- let call_weight = MaximumSchedulerWeight::get() / 2 + MaximumSchedulerWeight::get() / 3;
- assert_eq!(
- actual_weight,
- call_weight + base_weight + base_multiplier * 2 + periodic_multiplier
- );
- assert_eq!(
- logger::log(),
- vec![(root(), 2600u32), (root(), 69u32), (root(), 42u32)]
- );
-
- // Will include named only
- let actual_weight = Scheduler::on_initialize(3);
- let call_weight = MaximumSchedulerWeight::get() / 3;
- assert_eq!(
- actual_weight,
- call_weight + base_weight + base_multiplier + named_multiplier
- );
- assert_eq!(
- logger::log(),
- vec![
- (root(), 2600u32),
- (root(), 69u32),
- (root(), 42u32),
- (root(), 3u32)
- ]
- );
-
- // Will contain none
- let actual_weight = Scheduler::on_initialize(4);
- assert_eq!(actual_weight, 0);
- });
- }
-
- #[test]
- fn root_calls_works() {
- new_test_ext().execute_with(|| {
- let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
- let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
- assert_ok!(Scheduler::schedule_named(
- Origin::root(),
- 1u32.encode(),
- 4,
- None,
- 127,
- call
- ));
- assert_ok!(Scheduler::schedule(Origin::root(), 4, None, 127, call2));
- run_to_block(3);
- // Scheduled calls are in the agenda.
- assert_eq!(Agenda::<Test>::get(4).len(), 2);
- assert!(logger::log().is_empty());
- assert_ok!(Scheduler::cancel_named(Origin::root(), 1u32.encode()));
- assert_ok!(Scheduler::cancel(Origin::root(), 4, 1));
- // Scheduled calls are made NONE, so should not effect state
- run_to_block(100);
- assert!(logger::log().is_empty());
- });
- }
-
- #[test]
- fn fails_to_schedule_task_in_the_past() {
- new_test_ext().execute_with(|| {
- run_to_block(3);
-
- let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
- let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
-
- assert_err!(
- Scheduler::schedule_named(Origin::root(), 1u32.encode(), 2, None, 127, call),
- Error::<Test>::TargetBlockNumberInPast,
- );
-
- assert_err!(
- Scheduler::schedule(Origin::root(), 2, None, 127, call2.clone()),
- Error::<Test>::TargetBlockNumberInPast,
- );
-
- assert_err!(
- Scheduler::schedule(Origin::root(), 3, None, 127, call2),
- Error::<Test>::TargetBlockNumberInPast,
- );
- });
- }
-
- #[test]
- fn should_use_orign() {
- new_test_ext().execute_with(|| {
- let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
- let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
- assert_ok!(Scheduler::schedule_named(
- system::RawOrigin::Signed(1).into(),
- 1u32.encode(),
- 4,
- None,
- 127,
- call
- ));
- assert_ok!(Scheduler::schedule(
- system::RawOrigin::Signed(1).into(),
- 4,
- None,
- 127,
- call2
- ));
- run_to_block(3);
- // Scheduled calls are in the agenda.
- assert_eq!(Agenda::<Test>::get(4).len(), 2);
- assert!(logger::log().is_empty());
- assert_ok!(Scheduler::cancel_named(
- system::RawOrigin::Signed(1).into(),
- 1u32.encode()
- ));
- assert_ok!(Scheduler::cancel(system::RawOrigin::Signed(1).into(), 4, 1));
- // Scheduled calls are made NONE, so should not effect state
- run_to_block(100);
- assert!(logger::log().is_empty());
- });
- }
-
- #[test]
- fn should_check_orign() {
- new_test_ext().execute_with(|| {
- let call = Box::new(Call::Logger(logger::Call::log(69, 1000)));
- let call2 = Box::new(Call::Logger(logger::Call::log(42, 1000)));
- assert_noop!(
- Scheduler::schedule_named(
- system::RawOrigin::Signed(2).into(),
- 1u32.encode(),
- 4,
- None,
- 127,
- call
- ),
- BadOrigin
- );
- assert_noop!(
- Scheduler::schedule(system::RawOrigin::Signed(2).into(), 4, None, 127, call2),
- BadOrigin
- );
- });
- }
-
- #[test]
- fn should_check_orign_for_cancel() {
- new_test_ext().execute_with(|| {
- let call = Box::new(Call::Logger(logger::Call::log_without_filter(69, 1000)));
- let call2 = Box::new(Call::Logger(logger::Call::log_without_filter(42, 1000)));
- assert_ok!(Scheduler::schedule_named(
- system::RawOrigin::Signed(1).into(),
- 1u32.encode(),
- 4,
- None,
- 127,
- call
- ));
- assert_ok!(Scheduler::schedule(
- system::RawOrigin::Signed(1).into(),
- 4,
- None,
- 127,
- call2
- ));
- run_to_block(3);
- // Scheduled calls are in the agenda.
- assert_eq!(Agenda::<Test>::get(4).len(), 2);
- assert!(logger::log().is_empty());
- assert_noop!(
- Scheduler::cancel_named(system::RawOrigin::Signed(2).into(), 1u32.encode()),
- BadOrigin
- );
- assert_noop!(
- Scheduler::cancel(system::RawOrigin::Signed(2).into(), 4, 1),
- BadOrigin
- );
- assert_noop!(
- Scheduler::cancel_named(system::RawOrigin::Root.into(), 1u32.encode()),
- BadOrigin
- );
- assert_noop!(
- Scheduler::cancel(system::RawOrigin::Root.into(), 4, 1),
- BadOrigin
- );
- run_to_block(5);
- assert_eq!(
- logger::log(),
- vec![
- (system::RawOrigin::Signed(1).into(), 69u32),
- (system::RawOrigin::Signed(1).into(), 42u32)
- ]
- );
- });
- }
-
- #[test]
- fn migration_to_v2_works() {
- new_test_ext().execute_with(|| {
- for i in 0..3u64 {
- let k = i.twox_64_concat();
- let old = vec![
- Some(ScheduledV1 {
- maybe_id: None,
- priority: i as u8 + 10,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- }),
- None,
- Some(ScheduledV1 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- }),
- ];
- frame_support::migration::put_storage_value(b"Scheduler", b"Agenda", &k, old);
- }
-
- assert_eq!(StorageVersion::get(), Releases::V1);
-
- assert!(Scheduler::migrate_v1_to_t2());
-
- assert_eq_uvec!(
- Agenda::<Test>::iter().collect::<Vec<_>>(),
- vec![
- (
- 0,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 10,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- ),
- (
- 1,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 11,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- ),
- (
- 2,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 12,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: root(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- )
- ]
- );
-
- assert_eq!(StorageVersion::get(), Releases::V2);
- });
- }
-
- #[test]
- fn test_migrate_origin() {
- new_test_ext().execute_with(|| {
- for i in 0..3u64 {
- let k = i.twox_64_concat();
- let old: Vec<Option<Scheduled<_, _, u32, u64>>> = vec![
- Some(Scheduled {
- maybe_id: None,
- priority: i as u8 + 10,
- call: Call::Logger(logger::Call::log(96, 100)),
- origin: 3u32,
- maybe_periodic: None,
- _phantom: Default::default(),
- }),
- None,
- Some(Scheduled {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- origin: 2u32,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- _phantom: Default::default(),
- }),
- ];
- frame_support::migration::put_storage_value(b"Scheduler", b"Agenda", &k, old);
- }
-
- impl From<u32> for OriginCaller {
- fn from(value: u32) -> Self {
- match value {
- 3 => system::RawOrigin::Root.into(),
- 2 => system::RawOrigin::None.into(),
- _ => unimplemented!(),
- }
- }
- }
-
- Scheduler::migrate_origin::<u32>();
-
- assert_eq_uvec!(
- Agenda::<Test>::iter().collect::<Vec<_>>(),
- vec![
- (
- 0,
- vec![
- Some(ScheduledV2::<_, _, OriginCaller, u64> {
- maybe_id: None,
- priority: 10,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: system::RawOrigin::Root.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: system::RawOrigin::None.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- ),
- (
- 1,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 11,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: system::RawOrigin::Root.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: system::RawOrigin::None.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- ),
- (
- 2,
- vec![
- Some(ScheduledV2 {
- maybe_id: None,
- priority: 12,
- call: Call::Logger(logger::Call::log(96, 100)),
- maybe_periodic: None,
- origin: system::RawOrigin::Root.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- None,
- Some(ScheduledV2 {
- maybe_id: Some(b"test".to_vec()),
- priority: 123,
- call: Call::Logger(logger::Call::log(69, 1000)),
- maybe_periodic: Some((456u64, 10)),
- origin: system::RawOrigin::None.into(),
- _phantom: PhantomData::<u64>::default(),
- }),
- ]
- )
- ]
- );
- });
- }
}
primitives/nft/src/lib.rsdiffbeforeafterboth--- a/primitives/nft/src/lib.rs
+++ b/primitives/nft/src/lib.rs
@@ -144,6 +144,7 @@
pub limits: CollectionLimits<T::BlockNumber>, // Collection private restrictions
pub variable_on_chain_schema: Vec<u8>, //
pub const_on_chain_schema: Vec<u8>, //
+ pub transfers_enabled: bool,
}
#[derive(Encode, Decode, Debug, Clone, PartialEq)]
runtime/src/lib.rsdiffbeforeafterboth1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.78#![cfg_attr(not(feature = "std"), no_std)]9// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.10#![recursion_limit = "1024"]11#![allow(clippy::from_over_into, clippy::identity_op)]12#![allow(clippy::fn_to_numeric_cast_with_truncation)]13// Make the WASM binary available.14#[cfg(feature = "std")]15include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1617use sp_api::impl_runtime_apis;18use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};19// #[cfg(any(feature = "std", test))]20// pub use sp_runtime::BuildStorage;2122use sp_runtime::{23 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,24 traits::{25 AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify,26 AccountIdConversion,27 },28 transaction_validity::{TransactionSource, TransactionValidity},29 ApplyExtrinsicResult, MultiSignature,30};3132use sp_std::prelude::*;3334#[cfg(feature = "std")]35use sp_version::NativeVersion;36use sp_version::RuntimeVersion;37pub use pallet_transaction_payment::{38 Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,39};40// A few exports that help ease life for downstream crates.41pub use pallet_balances::Call as BalancesCall;42pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};43pub use frame_support::{44 construct_runtime, match_type,45 dispatch::DispatchResult,46 PalletId, parameter_types, StorageValue, ConsensusEngineId,47 traits::{48 All, Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,49 OnUnbalanced, Randomness, FindAuthor,50 },51 weights::{52 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},53 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,54 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,55 },56};57use nft_data_structs::*;58// use pallet_contracts::weights::WeightInfo;59// #[cfg(any(feature = "std", test))]60use frame_system::{61 self as system, EnsureRoot, EnsureSigned,62 limits::{BlockWeights, BlockLength},63};64use sp_arithmetic::{65 traits::{BaseArithmetic, Unsigned},66};67use smallvec::smallvec;68use codec::{Encode, Decode};69use pallet_evm::{Account as EVMAccount, FeeCalculator, OnMethodCall};70use fp_rpc::TransactionStatus;71use sp_core::crypto::Public;72use sp_runtime::{73 traits::{Dispatchable},74};75// use pallet_contracts::chain_extension::UncheckedFrom;7677// pub use pallet_timestamp::Call as TimestampCall;78pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;7980// Polkadot imports81use pallet_xcm::XcmPassthrough;82use polkadot_parachain::primitives::Sibling;83use xcm::v0::Xcm;84use xcm::v0::{BodyId, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId};85use xcm_builder::{86 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,87 EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,88 ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative,89 SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,90 SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,91};92use xcm_executor::{Config, XcmExecutor};9394// mod chain_extension;95// use crate::chain_extension::{NFTExtension, Imbalance};9697/// An index to a block.98pub type BlockNumber = u32;99100/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.101pub type Signature = MultiSignature;102103/// Some way of identifying an account on the chain. We intentionally make it equivalent104/// to the public key of our transaction signing scheme.105pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;106107/// The type for looking up accounts. We don't expect more than 4 billion of them, but you108/// never know...109pub type AccountIndex = u32;110111/// Balance of an account.112pub type Balance = u128;113114/// Index of a transaction in the chain.115pub type Index = u32;116117/// A hash of some data used by the chain.118pub type Hash = sp_core::H256;119120/// Digest item type.121pub type DigestItem = generic::DigestItem<Hash>;122123mod nft_weights;124125/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know126/// the specifics of the runtime. They can then be made to be agnostic over specific formats127/// of data like extrinsics, allowing for them to continue syncing the network through upgrades128/// to even the core data structures.129pub mod opaque {130 use super::*;131132 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;133134 /// Opaque block type.135 pub type Block = generic::Block<Header, UncheckedExtrinsic>;136137 pub type SessionHandlers = ();138139 impl_opaque_keys! {140 pub struct SessionKeys {141 pub aura: Aura,142 }143 }144}145146/// This runtime version.147pub const VERSION: RuntimeVersion = RuntimeVersion {148 spec_name: create_runtime_str!("nft"),149 impl_name: create_runtime_str!("nft"),150 authoring_version: 1,151 spec_version: 3,152 impl_version: 1,153 apis: RUNTIME_API_VERSIONS,154 transaction_version: 1,155};156157pub const MILLISECS_PER_BLOCK: u64 = 12000;158159pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;160161// These time units are defined in number of blocks.162pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);163pub const HOURS: BlockNumber = MINUTES * 60;164pub const DAYS: BlockNumber = HOURS * 24;165166#[derive(codec::Encode, codec::Decode)]167pub enum XCMPMessage<XAccountId, XBalance> {168 /// Transfer tokens to the given account from the Parachain account.169 TransferToken(XAccountId, XBalance),170}171172/// The version information used to identify this runtime when compiled natively.173#[cfg(feature = "std")]174pub fn native_version() -> NativeVersion {175 NativeVersion {176 runtime_version: VERSION,177 can_author_with: Default::default(),178 }179}180181type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;182183pub struct DealWithFees;184impl OnUnbalanced<NegativeImbalance> for DealWithFees {185 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {186 if let Some(fees) = fees_then_tips.next() {187 // for fees, 100% to treasury188 let mut split = fees.ration(100, 0);189 if let Some(tips) = fees_then_tips.next() {190 // for tips, if any, 100% to treasury191 tips.ration_merge_into(100, 0, &mut split);192 }193 Treasury::on_unbalanced(split.0);194 // Author::on_unbalanced(split.1);195 }196 }197}198199/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.200/// This is used to limit the maximal weight of a single extrinsic.201const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);202/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used203/// by Operational extrinsics.204const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);205/// We allow for 2 seconds of compute with a 6 second average block time.206const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;207208parameter_types! {209 pub const BlockHashCount: BlockNumber = 2400;210 pub RuntimeBlockLength: BlockLength =211 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);212 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);213 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;214 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()215 .base_block(BlockExecutionWeight::get())216 .for_class(DispatchClass::all(), |weights| {217 weights.base_extrinsic = ExtrinsicBaseWeight::get();218 })219 .for_class(DispatchClass::Normal, |weights| {220 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);221 })222 .for_class(DispatchClass::Operational, |weights| {223 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);224 // Operational transactions have some extra reserved space, so that they225 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.226 weights.reserved = Some(227 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT228 );229 })230 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)231 .build_or_panic();232 pub const Version: RuntimeVersion = VERSION;233 pub const SS58Prefix: u8 = 42;234}235236parameter_types! {237 pub const ChainId: u64 = 8888;238}239240impl pallet_evm::Config for Runtime {241 type BlockGasLimit = BlockGasLimit;242 type FeeCalculator = ();243 type GasWeightMapping = ();244 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping;245 type CallOrigin = EnsureAddressTruncated;246 type WithdrawOrigin = EnsureAddressTruncated;247 type AddressMapping = HashedAddressMapping<Self::Hashing>;248 type Precompiles = ();249 type Currency = Balances;250 type Event = Event;251 type OnMethodCall = (252 pallet_nft::NftErcSupport<Self>,253 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,254 );255 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;256 type ChainId = ChainId;257 type Runner = pallet_evm::runner::stack::Runner<Self>;258 type OnChargeTransaction = pallet_evm_transaction_payment::OnChargeTransaction<Self>;259 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;260 type FindAuthor = EthereumFindAuthor<Aura>;261}262263pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);264impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {265 fn find_author<'a, I>(digests: I) -> Option<H160>266 where267 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,268 {269 if let Some(author_index) = F::find_author(digests) {270 let authority_id = Aura::authorities()[author_index as usize].clone();271 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));272 }273 None274 }275}276277parameter_types! {278 pub BlockGasLimit: U256 = U256::from(u32::max_value());279}280281impl pallet_ethereum::Config for Runtime {282 type Event = Event;283 type StateRoot = pallet_ethereum::IntermediateStateRoot;284 type EvmSubmitLog = pallet_evm::Pallet<Self>;285}286287impl pallet_randomness_collective_flip::Config for Runtime {}288289impl system::Config for Runtime {290 /// The data to be stored in an account.291 type AccountData = pallet_balances::AccountData<Balance>;292 /// The identifier used to distinguish between accounts.293 type AccountId = AccountId;294 /// The basic call filter to use in dispatchable.295 type BaseCallFilter = ();296 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).297 type BlockHashCount = BlockHashCount;298 /// The maximum length of a block (in bytes).299 type BlockLength = RuntimeBlockLength;300 /// The index type for blocks.301 type BlockNumber = BlockNumber;302 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.303 type BlockWeights = RuntimeBlockWeights;304 /// The aggregated dispatch type that is available for extrinsics.305 type Call = Call;306 /// The weight of database operations that the runtime can invoke.307 type DbWeight = RocksDbWeight;308 /// The ubiquitous event type.309 type Event = Event;310 /// The type for hashing blocks and tries.311 type Hash = Hash;312 /// The hashing algorithm used.313 type Hashing = BlakeTwo256;314 /// The header type.315 type Header = generic::Header<BlockNumber, BlakeTwo256>;316 /// The index type for storing how many extrinsics an account has signed.317 type Index = Index;318 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.319 type Lookup = AccountIdLookup<AccountId, ()>;320 /// What to do if an account is fully reaped from the system.321 type OnKilledAccount = ();322 /// What to do if a new account is created.323 type OnNewAccount = ();324 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;325 /// The ubiquitous origin type.326 type Origin = Origin;327 /// This type is being generated by `construct_runtime!`.328 type PalletInfo = PalletInfo;329 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.330 type SS58Prefix = SS58Prefix;331 /// Weight information for the extrinsics of this pallet.332 type SystemWeightInfo = system::weights::SubstrateWeight<Self>;333 /// Version of the runtime.334 type Version = Version;335}336337parameter_types! {338 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;339}340341impl pallet_timestamp::Config for Runtime {342 /// A timestamp: milliseconds since the unix epoch.343 type Moment = u64;344 type OnTimestampSet = ();345 type MinimumPeriod = MinimumPeriod;346 type WeightInfo = ();347}348349parameter_types! {350 // pub const ExistentialDeposit: u128 = 500;351 pub const ExistentialDeposit: u128 = 0;352 pub const MaxLocks: u32 = 50;353}354355impl pallet_balances::Config for Runtime {356 type MaxLocks = MaxLocks;357 type MaxReserves = ();358 type ReserveIdentifier = [u8; 8];359 /// The type for recording an account's balance.360 type Balance = Balance;361 /// The ubiquitous event type.362 type Event = Event;363 type DustRemoval = Treasury;364 type ExistentialDeposit = ExistentialDeposit;365 type AccountStore = System;366 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;367}368369pub const MICROUNIQUE: Balance = 1_000_000_000;370pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;371pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;372pub const UNIQUE: Balance = 100 * CENTIUNIQUE;373374pub const fn deposit(items: u32, bytes: u32) -> Balance {375 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE376}377378/*379parameter_types! {380 pub TombstoneDeposit: Balance = deposit(381 1,382 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,383 );384 pub DepositPerContract: Balance = TombstoneDeposit::get();385 pub const DepositPerStorageByte: Balance = deposit(0, 1);386 pub const DepositPerStorageItem: Balance = deposit(1, 0);387 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);388 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;389 pub const SignedClaimHandicap: u32 = 2;390 pub const MaxDepth: u32 = 32;391 pub const MaxValueSize: u32 = 16 * 1024;392 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb393 // The lazy deletion runs inside on_initialize.394 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *395 RuntimeBlockWeights::get().max_block;396 // The weight needed for decoding the queue should be less or equal than a fifth397 // of the overall weight dedicated to the lazy deletion.398 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (399 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -400 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)401 )) / 5) as u32;402 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();403}404405impl pallet_contracts::Config for Runtime {406 type Time = Timestamp;407 type Randomness = RandomnessCollectiveFlip;408 type Currency = Balances;409 type Event = Event;410 type RentPayment = ();411 type SignedClaimHandicap = SignedClaimHandicap;412 type TombstoneDeposit = TombstoneDeposit;413 type DepositPerContract = DepositPerContract;414 type DepositPerStorageByte = DepositPerStorageByte;415 type DepositPerStorageItem = DepositPerStorageItem;416 type RentFraction = RentFraction;417 type SurchargeReward = SurchargeReward;418 type WeightPrice = pallet_transaction_payment::Module<Self>;419 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;420 type ChainExtension = NFTExtension;421 type DeletionQueueDepth = DeletionQueueDepth;422 type DeletionWeightLimit = DeletionWeightLimit;423 type Schedule = Schedule;424 type CallStack = [pallet_contracts::Frame<Self>; 31];425}426*/427428parameter_types! {429 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer430}431432/// Linear implementor of `WeightToFeePolynomial`433pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);434435impl<T> WeightToFeePolynomial for LinearFee<T>436where437 T: BaseArithmetic + From<u32> + Copy + Unsigned,438{439 type Balance = T;440441 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {442 smallvec!(WeightToFeeCoefficient {443 coeff_integer: 146_700u32.into(), // Targeting 0.1 Unique per NFT transfer444 coeff_frac: Perbill::zero(),445 negative: false,446 degree: 1,447 })448 }449}450451impl pallet_transaction_payment::Config for Runtime {452 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;453 type TransactionByteFee = TransactionByteFee;454 type WeightToFee = LinearFee<Balance>;455 type FeeMultiplierUpdate = ();456}457458parameter_types! {459 pub const ProposalBond: Permill = Permill::from_percent(5);460 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;461 pub const SpendPeriod: BlockNumber = 5 * MINUTES;462 pub const Burn: Permill = Permill::from_percent(0);463 pub const TipCountdown: BlockNumber = 1 * DAYS;464 pub const TipFindersFee: Percent = Percent::from_percent(20);465 pub const TipReportDepositBase: Balance = 1 * UNIQUE;466 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;467 pub const BountyDepositBase: Balance = 1 * UNIQUE;468 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;469 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");470 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;471 pub const MaximumReasonLength: u32 = 16384;472 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);473 pub const BountyValueMinimum: Balance = 5 * UNIQUE;474 pub const MaxApprovals: u32 = 100;475}476477impl pallet_treasury::Config for Runtime {478 type PalletId = TreasuryModuleId;479 type Currency = Balances;480 type ApproveOrigin = EnsureRoot<AccountId>;481 type RejectOrigin = EnsureRoot<AccountId>;482 type Event = Event;483 type OnSlash = ();484 type ProposalBond = ProposalBond;485 type ProposalBondMinimum = ProposalBondMinimum;486 type SpendPeriod = SpendPeriod;487 type Burn = Burn;488 type BurnDestination = ();489 type SpendFunds = ();490 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;491 type MaxApprovals = MaxApprovals;492}493494impl pallet_sudo::Config for Runtime {495 type Event = Event;496 type Call = Call;497}498499parameter_types! {500 pub const MinVestedTransfer: Balance = 10 * UNIQUE;501}502503impl pallet_vesting::Config for Runtime {504 type Event = Event;505 type Currency = Balances;506 type BlockNumberToBalance = ConvertInto;507 type MinVestedTransfer = MinVestedTransfer;508 type WeightInfo = ();509}510511parameter_types! {512 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;513 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;514}515516impl cumulus_pallet_parachain_system::Config for Runtime {517 type Event = Event;518 type OnValidationData = ();519 type SelfParaId = parachain_info::Pallet<Self>;520 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<521 // MaxDownwardMessageWeight,522 // XcmExecutor<XcmConfig>,523 // Call,524 // >;525 type OutboundXcmpMessageSource = XcmpQueue;526 type DmpMessageHandler = DmpQueue;527 type ReservedDmpWeight = ReservedDmpWeight;528 type ReservedXcmpWeight = ReservedXcmpWeight;529 type XcmpMessageHandler = XcmpQueue;530}531532impl parachain_info::Config for Runtime {}533534impl cumulus_pallet_aura_ext::Config for Runtime {}535536parameter_types! {537 pub const RelayLocation: MultiLocation = X1(Parent);538 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;539 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();540 pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into()));541}542543/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used544/// when determining ownership of accounts for asset transacting and when attempting to use XCM545/// `Transact` in order to determine the dispatch Origin.546pub type LocationToAccountId = (547 // The parent (Relay-chain) origin converts to the default `AccountId`.548 ParentIsDefault<AccountId>,549 // Sibling parachain origins convert to AccountId via the `ParaId::into`.550 SiblingParachainConvertsVia<Sibling, AccountId>,551 // Straight up local `AccountId32` origins just alias directly to `AccountId`.552 AccountId32Aliases<RelayNetwork, AccountId>,553);554555/// Means for transacting assets on this chain.556pub type LocalAssetTransactor = CurrencyAdapter<557 // Use this currency:558 Balances,559 // Use this currency when it is a fungible asset matching the given location or name:560 IsConcrete<RelayLocation>,561 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:562 LocationToAccountId,563 // Our chain's account ID type (we can't get away without mentioning it explicitly):564 AccountId,565 // We don't track any teleports.566 (),567>;568569/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,570/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can571/// biases the kind of local `Origin` it will become.572pub type XcmOriginToTransactDispatchOrigin = (573 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location574 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for575 // foreign chains who want to have a local sovereign account on this chain which they control.576 SovereignSignedViaLocation<LocationToAccountId, Origin>,577 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when578 // recognised.579 RelayChainAsNative<RelayOrigin, Origin>,580 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when581 // recognised.582 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,583 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a584 // transaction from the Root origin.585 ParentAsSuperuser<Origin>,586 // Native signed account converter; this just converts an `AccountId32` origin into a normal587 // `Origin::Signed` origin of the same 32-byte value.588 SignedAccountId32AsNative<RelayNetwork, Origin>,589 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.590 XcmPassthrough<Origin>,591);592593parameter_types! {594 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.595 pub UnitWeightCost: Weight = 1_000_000;596 // 1200 UNIQUEs buy 1 second of weight.597 pub const WeightPrice: (MultiLocation, u128) = (X1(Parent), 1_200 * UNIQUE);598}599600match_type! {601 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {602 X1(Parent) | X2(Parent, Plurality { id: BodyId::Unit, .. })603 };604}605606pub type Barrier = (607 TakeWeightCredit,608 AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,609 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,610 // ^^^ Parent & its unit plurality gets free execution611);612613pub struct XcmConfig;614impl Config for XcmConfig {615 type Call = Call;616 type XcmSender = XcmRouter;617 // How to withdraw and deposit an asset.618 type AssetTransactor = LocalAssetTransactor;619 type OriginConverter = XcmOriginToTransactDispatchOrigin;620 type IsReserve = NativeAsset;621 type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of ROC622 type LocationInverter = LocationInverter<Ancestry>;623 type Barrier = Barrier;624 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;625 type Trader = UsingComponents<IdentityFee<Balance>, RelayLocation, AccountId, Balances, ()>;626 type ResponseHandler = (); // Don't handle responses for now.627}628629// parameter_types! {630// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;631// }632633/// No local origins on this chain are allowed to dispatch XCM sends/executions.634pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);635636/// The means for routing XCM messages which are not for local execution into the right message637/// queues.638pub type XcmRouter = (639 // Two routers - use UMP to communicate with the relay chain:640 cumulus_primitives_utility::ParentAsUmp<ParachainSystem>,641 // ..and XCMP to communicate with the sibling chains.642 XcmpQueue,643);644645impl pallet_evm_coder_substrate::Config for Runtime {646 type EthereumTransactionSender = pallet_ethereum::Module<Self>;647}648649impl pallet_xcm::Config for Runtime {650 type Event = Event;651 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;652 type XcmRouter = XcmRouter;653 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;654 type XcmExecuteFilter = All<(MultiLocation, Xcm<Call>)>;655 type XcmExecutor = XcmExecutor<XcmConfig>;656 type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;657 type XcmReserveTransferFilter = ();658 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;659}660661impl cumulus_pallet_xcm::Config for Runtime {662 type Event = Event;663 type XcmExecutor = XcmExecutor<XcmConfig>;664}665666impl cumulus_pallet_xcmp_queue::Config for Runtime {667 type Event = Event;668 type XcmExecutor = XcmExecutor<XcmConfig>;669 type ChannelInfo = ParachainSystem;670}671672impl cumulus_pallet_dmp_queue::Config for Runtime {673 type Event = Event;674 type XcmExecutor = XcmExecutor<XcmConfig>;675 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;676}677678impl pallet_aura::Config for Runtime {679 type AuthorityId = AuraId;680}681682parameter_types! {683 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();684 pub const CollectionCreationPrice: Balance = 100 * UNIQUE;685}686687/// Used for the pallet nft in `./nft.rs`688impl pallet_nft::Config for Runtime {689 type Event = Event;690 type WeightInfo = nft_weights::WeightInfo;691692 type EvmBackwardsAddressMapping = pallet_nft::MapBackwardsAddressTruncated;693 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;694 type CrossAccountId = pallet_nft::BasicCrossAccountId<Self>;695696 type Currency = Balances;697 type CollectionCreationPrice = CollectionCreationPrice;698 type TreasuryAccountId = TreasuryAccountId;699}700701parameter_types! {702 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied703}704705/// Used for the pallet inflation706impl pallet_inflation::Config for Runtime {707 type Currency = Balances;708 type TreasuryAccountId = TreasuryAccountId;709 type InflationBlockInterval = InflationBlockInterval;710}711712parameter_types! {713 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *714 RuntimeBlockWeights::get().max_block;715 pub const MaxScheduledPerBlock: u32 = 50;716}717718pub struct Sponsoring;719impl SponsoringResolve<AccountId, Call> for Sponsoring {720 fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>721 where722 Call: Dispatchable<Info = DispatchInfo>,723 AccountId: AsRef<[u8]>,724 {725 pallet_nft_transaction_payment::Module::<Runtime>::withdraw_type(who, call)726 }727}728729type SponsorshipHandler = (730 pallet_nft::NftSponsorshipHandler<Runtime>,731 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,732);733734impl pallet_scheduler::Config for Runtime {735 type Event = Event;736 type Origin = Origin;737 type PalletsOrigin = OriginCaller;738 type Call = Call;739 type MaximumWeight = MaximumSchedulerWeight;740 type ScheduleOrigin = EnsureSigned<AccountId>;741 type MaxScheduledPerBlock = MaxScheduledPerBlock;742 type SponsorshipHandler = SponsorshipHandler;743 type WeightInfo = ();744}745746impl pallet_nft_transaction_payment::Config for Runtime {747 type SponsorshipHandler = SponsorshipHandler;748}749750impl pallet_evm_transaction_payment::Config for Runtime {751 type SponsorshipHandler = (752 pallet_nft::NftEthSponsorshipHandler<Self>,753 pallet_evm_contract_helpers::HelpersContractSponsoring<Self>,754 );755 type Currency = Balances;756}757758impl pallet_nft_charge_transaction::Config for Runtime {}759760// impl pallet_contract_helpers::Config for Runtime {}761762parameter_types! {763 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049764 pub const HelpersContractAddress: H160 = H160([765 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,766 ]);767}768769impl pallet_evm_contract_helpers::Config for Runtime {770 type ContractAddress = HelpersContractAddress;771}772773construct_runtime!(774 pub enum Runtime where775 Block = Block,776 NodeBlock = opaque::Block,777 UncheckedExtrinsic = UncheckedExtrinsic778 {779 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>} = 20,780 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,781782 Aura: pallet_aura::{Pallet, Config<T>} = 22,783 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,784785 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,786 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,787 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,788 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,789 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,790 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,791 System: system::{Pallet, Call, Storage, Config, Event<T>} = 36,792 Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,793 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,794795 // XCM helpers.796 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,797 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,798 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,799 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,800801 // Unique Pallets802 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,803 Nft: pallet_nft::{Pallet, Call, Config<T>, Storage, Event<T>} = 61,804 Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 62,805 NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage} = 63,806 Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage } = 64,807 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,808809 // Frontier810 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,811 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, ValidateUnsigned} = 101,812813 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,814 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,815 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,816 }817);818819pub struct TransactionConverter;820821impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {822 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {823 UncheckedExtrinsic::new_unsigned(824 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),825 )826 }827}828829impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {830 fn convert_transaction(831 &self,832 transaction: pallet_ethereum::Transaction,833 ) -> opaque::UncheckedExtrinsic {834 let extrinsic = UncheckedExtrinsic::new_unsigned(835 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),836 );837 let encoded = extrinsic.encode();838 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])839 .expect("Encoded extrinsic is always valid")840 }841}842843/// The address format for describing accounts.844pub type Address = sp_runtime::MultiAddress<AccountId, ()>;845/// Block header type as expected by this runtime.846pub type Header = generic::Header<BlockNumber, BlakeTwo256>;847/// Block type as expected by this runtime.848pub type Block = generic::Block<Header, UncheckedExtrinsic>;849/// A Block signed with a Justification850pub type SignedBlock = generic::SignedBlock<Block>;851/// BlockId type as expected by this runtime.852pub type BlockId = generic::BlockId<Block>;853/// The SignedExtension to the basic transaction logic.854pub type SignedExtra = (855 system::CheckSpecVersion<Runtime>,856 // system::CheckTxVersion<Runtime>,857 system::CheckGenesis<Runtime>,858 system::CheckEra<Runtime>,859 system::CheckNonce<Runtime>,860 system::CheckWeight<Runtime>,861 pallet_nft_charge_transaction::ChargeTransactionPayment<Runtime>,862 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,863);864/// Unchecked extrinsic type as expected by this runtime.865pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;866/// Extrinsic type that has already been checked.867pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;868/// Executive: handles dispatch to the various modules.869pub type Executive = frame_executive::Executive<870 Runtime,871 Block,872 frame_system::ChainContext<Runtime>,873 Runtime,874 AllPallets,875>;876877impl_opaque_keys! {878 pub struct SessionKeys {879 pub aura: Aura,880 }881}882883impl_runtime_apis! {884 impl pallet_nft::NftApi<Block>885 for Runtime886 {887 fn eth_contract_code(account: H160) -> Option<Vec<u8>> {888 <pallet_nft::NftErcSupport<Runtime>>::get_code(&account)889 }890 }891892 impl sp_api::Core<Block> for Runtime {893 fn version() -> RuntimeVersion {894 VERSION895 }896897 fn execute_block(block: Block) {898 Executive::execute_block(block)899 }900901 fn initialize_block(header: &<Block as BlockT>::Header) {902 Executive::initialize_block(header)903 }904 }905906 impl sp_api::Metadata<Block> for Runtime {907 fn metadata() -> OpaqueMetadata {908 Runtime::metadata().into()909 }910 }911912 impl sp_block_builder::BlockBuilder<Block> for Runtime {913 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {914 Executive::apply_extrinsic(extrinsic)915 }916917 fn finalize_block() -> <Block as BlockT>::Header {918 Executive::finalize_block()919 }920921 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {922 data.create_extrinsics()923 }924925 fn check_inherents(926 block: Block,927 data: sp_inherents::InherentData,928 ) -> sp_inherents::CheckInherentsResult {929 data.check_extrinsics(&block)930 }931932 // fn random_seed() -> <Block as BlockT>::Hash {933 // RandomnessCollectiveFlip::random_seed().0934 // }935 }936937 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {938 fn validate_transaction(939 source: TransactionSource,940 tx: <Block as BlockT>::Extrinsic,941 hash: <Block as BlockT>::Hash,942 ) -> TransactionValidity {943 Executive::validate_transaction(source, tx, hash)944 }945 }946947 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {948 fn offchain_worker(header: &<Block as BlockT>::Header) {949 Executive::offchain_worker(header)950 }951 }952953 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {954 fn chain_id() -> u64 {955 <Runtime as pallet_evm::Config>::ChainId::get()956 }957958 fn account_basic(address: H160) -> EVMAccount {959 EVM::account_basic(&address)960 }961962 fn gas_price() -> U256 {963 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()964 }965966 fn account_code_at(address: H160) -> Vec<u8> {967 EVM::account_codes(address)968 }969970 fn author() -> H160 {971 <pallet_evm::Module<Runtime>>::find_author()972 }973974 fn storage_at(address: H160, index: U256) -> H256 {975 let mut tmp = [0u8; 32];976 index.to_big_endian(&mut tmp);977 EVM::account_storages(address, H256::from_slice(&tmp[..]))978 }979980 fn call(981 from: H160,982 to: H160,983 data: Vec<u8>,984 value: U256,985 gas_limit: U256,986 gas_price: Option<U256>,987 nonce: Option<U256>,988 estimate: bool,989 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {990 let config = if estimate {991 let mut config = <Runtime as pallet_evm::Config>::config().clone();992 config.estimate = true;993 Some(config)994 } else {995 None996 };997998 <Runtime as pallet_evm::Config>::Runner::call(999 from,1000 to,1001 data,1002 value,1003 gas_limit.low_u64(),1004 gas_price,1005 nonce,1006 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1007 ).map_err(|err| err.into())1008 }10091010 fn create(1011 from: H160,1012 data: Vec<u8>,1013 value: U256,1014 gas_limit: U256,1015 gas_price: Option<U256>,1016 nonce: Option<U256>,1017 estimate: bool,1018 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {1019 let config = if estimate {1020 let mut config = <Runtime as pallet_evm::Config>::config().clone();1021 config.estimate = true;1022 Some(config)1023 } else {1024 None1025 };10261027 <Runtime as pallet_evm::Config>::Runner::create(1028 from,1029 data,1030 value,1031 gas_limit.low_u64(),1032 gas_price,1033 nonce,1034 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1035 ).map_err(|err| err.into())1036 }10371038 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {1039 Ethereum::current_transaction_statuses()1040 }10411042 fn current_block() -> Option<pallet_ethereum::Block> {1043 Ethereum::current_block()1044 }10451046 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {1047 Ethereum::current_receipts()1048 }10491050 fn current_all() -> (1051 Option<pallet_ethereum::Block>,1052 Option<Vec<pallet_ethereum::Receipt>>,1053 Option<Vec<TransactionStatus>>1054 ) {1055 (1056 Ethereum::current_block(),1057 Ethereum::current_receipts(),1058 Ethereum::current_transaction_statuses()1059 )1060 }10611062 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {1063 xts.into_iter().filter_map(|xt| match xt.function {1064 Call::Ethereum(pallet_ethereum::Call::transact(t)) => Some(t),1065 _ => None1066 }).collect()1067 }1068 }10691070 impl sp_session::SessionKeys<Block> for Runtime {1071 fn decode_session_keys(1072 encoded: Vec<u8>,1073 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {1074 SessionKeys::decode_into_raw_public_keys(&encoded)1075 }10761077 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {1078 SessionKeys::generate(seed)1079 }1080 }10811082 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {1083 fn slot_duration() -> sp_consensus_aura::SlotDuration {1084 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())1085 }10861087 fn authorities() -> Vec<AuraId> {1088 Aura::authorities()1089 }1090 }10911092 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {1093 fn collect_collation_info() -> cumulus_primitives_core::CollationInfo {1094 ParachainSystem::collect_collation_info()1095 }1096 }10971098 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {1099 fn account_nonce(account: AccountId) -> Index {1100 System::account_nonce(account)1101 }1102 }11031104 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {1105 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {1106 TransactionPayment::query_info(uxt, len)1107 }1108 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {1109 TransactionPayment::query_fee_details(uxt, len)1110 }1111 }11121113 /*1114 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>1115 for Runtime1116 {1117 fn call(1118 origin: AccountId,1119 dest: AccountId,1120 value: Balance,1121 gas_limit: u64,1122 input_data: Vec<u8>,1123 ) -> pallet_contracts_primitives::ContractExecResult {1124 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)1125 }11261127 fn instantiate(1128 origin: AccountId,1129 endowment: Balance,1130 gas_limit: u64,1131 code: pallet_contracts_primitives::Code<Hash>,1132 data: Vec<u8>,1133 salt: Vec<u8>,1134 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>1135 {1136 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)1137 }11381139 fn get_storage(1140 address: AccountId,1141 key: [u8; 32],1142 ) -> pallet_contracts_primitives::GetStorageResult {1143 Contracts::get_storage(address, key)1144 }11451146 fn rent_projection(1147 address: AccountId,1148 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {1149 Contracts::rent_projection(address)1150 }1151 }1152 */11531154 #[cfg(feature = "runtime-benchmarks")]1155 impl frame_benchmarking::Benchmark<Block> for Runtime {1156 fn dispatch_benchmark(1157 config: frame_benchmarking::BenchmarkConfig1158 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {1159 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};11601161 let whitelist: Vec<TrackedStorageKey> = vec![1162 // Alice account1163 hex_literal::hex!("d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d").to_vec().into(),1164 // // Total Issuance1165 // hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),1166 // // Execution Phase1167 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),1168 // // Event Count1169 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),1170 // // System Events1171 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),1172 ];11731174 let mut batches = Vec::<BenchmarkBatch>::new();1175 let params = (&config, &whitelist);11761177 add_benchmark!(params, batches, pallet_nft, Nft);1178 add_benchmark!(params, batches, pallet_inflation, Inflation);11791180 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }1181 Ok(batches)1182 }1183 }1184}11851186struct CheckInherents;11871188impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1189 fn check_inherents(1190 block: &Block,1191 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1192 ) -> sp_inherents::CheckInherentsResult {1193 let relay_chain_slot = relay_state_proof1194 .read_slot()1195 .expect("Could not read the relay chain slot from the proof");11961197 let inherent_data =1198 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1199 relay_chain_slot,1200 sp_std::time::Duration::from_secs(6),1201 )1202 .create_inherent_data()1203 .expect("Could not create the timestamp inherent data");12041205 inherent_data.check_extrinsics(block)1206 }1207}12081209cumulus_pallet_parachain_system::register_validate_block!(1210 Runtime = Runtime,1211 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1212 CheckInherents = CheckInherents,1213);1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm.78#![cfg_attr(not(feature = "std"), no_std)]9// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.10#![recursion_limit = "1024"]11#![allow(clippy::from_over_into, clippy::identity_op)]12#![allow(clippy::fn_to_numeric_cast_with_truncation)]13// Make the WASM binary available.14#[cfg(feature = "std")]15include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));1617use sp_api::impl_runtime_apis;18use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};19// #[cfg(any(feature = "std", test))]20// pub use sp_runtime::BuildStorage;2122use sp_runtime::{23 Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,24 traits::{25 AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify,26 AccountIdConversion,27 },28 transaction_validity::{TransactionSource, TransactionValidity},29 ApplyExtrinsicResult, MultiSignature,30};3132use sp_std::prelude::*;3334#[cfg(feature = "std")]35use sp_version::NativeVersion;36use sp_version::RuntimeVersion;37pub use pallet_transaction_payment::{38 Multiplier, TargetedFeeAdjustment, FeeDetails, RuntimeDispatchInfo,39};40// A few exports that help ease life for downstream crates.41pub use pallet_balances::Call as BalancesCall;42pub use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping, Runner};43pub use frame_support::{44 construct_runtime, match_type,45 dispatch::DispatchResult,46 PalletId, parameter_types, StorageValue, ConsensusEngineId,47 traits::{48 All, Currency, ExistenceRequirement, Get, IsInVec, KeyOwnerProofSystem, LockIdentifier,49 OnUnbalanced, Randomness, FindAuthor,50 },51 weights::{52 constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},53 DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,54 WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,55 },56};57use nft_data_structs::*;58// use pallet_contracts::weights::WeightInfo;59// #[cfg(any(feature = "std", test))]60use frame_system::{61 self as system, EnsureRoot, EnsureSigned,62 limits::{BlockWeights, BlockLength},63};64use sp_arithmetic::{65 traits::{BaseArithmetic, Unsigned},66};67use smallvec::smallvec;68use codec::{Encode, Decode};69use pallet_evm::{Account as EVMAccount, FeeCalculator, OnMethodCall};70use fp_rpc::TransactionStatus;71use sp_core::crypto::Public;72use sp_runtime::{73 traits::{Dispatchable},74};75// use pallet_contracts::chain_extension::UncheckedFrom;7677// pub use pallet_timestamp::Call as TimestampCall;78pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;7980// Polkadot imports81use pallet_xcm::XcmPassthrough;82use polkadot_parachain::primitives::Sibling;83use xcm::v0::Xcm;84use xcm::v0::{BodyId, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId};85use xcm_builder::{86 AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter,87 EnsureXcmOrigin, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset,88 ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative,89 SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,90 SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,91};92use xcm_executor::{Config, XcmExecutor};9394// mod chain_extension;95// use crate::chain_extension::{NFTExtension, Imbalance};9697/// An index to a block.98pub type BlockNumber = u32;99100/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.101pub type Signature = MultiSignature;102103/// Some way of identifying an account on the chain. We intentionally make it equivalent104/// to the public key of our transaction signing scheme.105pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;106107/// The type for looking up accounts. We don't expect more than 4 billion of them, but you108/// never know...109pub type AccountIndex = u32;110111/// Balance of an account.112pub type Balance = u128;113114/// Index of a transaction in the chain.115pub type Index = u32;116117/// A hash of some data used by the chain.118pub type Hash = sp_core::H256;119120/// Digest item type.121pub type DigestItem = generic::DigestItem<Hash>;122123mod nft_weights;124125/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know126/// the specifics of the runtime. They can then be made to be agnostic over specific formats127/// of data like extrinsics, allowing for them to continue syncing the network through upgrades128/// to even the core data structures.129pub mod opaque {130 use super::*;131132 pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;133134 /// Opaque block type.135 pub type Block = generic::Block<Header, UncheckedExtrinsic>;136137 pub type SessionHandlers = ();138139 impl_opaque_keys! {140 pub struct SessionKeys {141 pub aura: Aura,142 }143 }144}145146/// This runtime version.147pub const VERSION: RuntimeVersion = RuntimeVersion {148 spec_name: create_runtime_str!("nft"),149 impl_name: create_runtime_str!("nft"),150 authoring_version: 1,151 spec_version: 3,152 impl_version: 1,153 apis: RUNTIME_API_VERSIONS,154 transaction_version: 1,155};156157pub const MILLISECS_PER_BLOCK: u64 = 1200;158159pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;160161// These time units are defined in number of blocks.162pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);163pub const HOURS: BlockNumber = MINUTES * 60;164pub const DAYS: BlockNumber = HOURS * 24;165166#[derive(codec::Encode, codec::Decode)]167pub enum XCMPMessage<XAccountId, XBalance> {168 /// Transfer tokens to the given account from the Parachain account.169 TransferToken(XAccountId, XBalance),170}171172/// The version information used to identify this runtime when compiled natively.173#[cfg(feature = "std")]174pub fn native_version() -> NativeVersion {175 NativeVersion {176 runtime_version: VERSION,177 can_author_with: Default::default(),178 }179}180181type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;182183pub struct DealWithFees;184impl OnUnbalanced<NegativeImbalance> for DealWithFees {185 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {186 if let Some(fees) = fees_then_tips.next() {187 // for fees, 100% to treasury188 let mut split = fees.ration(100, 0);189 if let Some(tips) = fees_then_tips.next() {190 // for tips, if any, 100% to treasury191 tips.ration_merge_into(100, 0, &mut split);192 }193 Treasury::on_unbalanced(split.0);194 // Author::on_unbalanced(split.1);195 }196 }197}198199/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.200/// This is used to limit the maximal weight of a single extrinsic.201const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);202/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used203/// by Operational extrinsics.204const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);205/// We allow for 2 seconds of compute with a 6 second average block time.206const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;207208parameter_types! {209 pub const BlockHashCount: BlockNumber = 2400;210 pub RuntimeBlockLength: BlockLength =211 BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);212 pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);213 pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;214 pub RuntimeBlockWeights: BlockWeights = BlockWeights::builder()215 .base_block(BlockExecutionWeight::get())216 .for_class(DispatchClass::all(), |weights| {217 weights.base_extrinsic = ExtrinsicBaseWeight::get();218 })219 .for_class(DispatchClass::Normal, |weights| {220 weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);221 })222 .for_class(DispatchClass::Operational, |weights| {223 weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);224 // Operational transactions have some extra reserved space, so that they225 // are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.226 weights.reserved = Some(227 MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT228 );229 })230 .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)231 .build_or_panic();232 pub const Version: RuntimeVersion = VERSION;233 pub const SS58Prefix: u8 = 42;234}235236parameter_types! {237 pub const ChainId: u64 = 8888;238}239240impl pallet_evm::Config for Runtime {241 type BlockGasLimit = BlockGasLimit;242 type FeeCalculator = ();243 type GasWeightMapping = ();244 type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping;245 type CallOrigin = EnsureAddressTruncated;246 type WithdrawOrigin = EnsureAddressTruncated;247 type AddressMapping = HashedAddressMapping<Self::Hashing>;248 type Precompiles = ();249 type Currency = Balances;250 type Event = Event;251 type OnMethodCall = (252 pallet_nft::NftErcSupport<Self>,253 pallet_evm_contract_helpers::HelpersOnMethodCall<Self>,254 );255 type OnCreate = pallet_evm_contract_helpers::HelpersOnCreate<Self>;256 type ChainId = ChainId;257 type Runner = pallet_evm::runner::stack::Runner<Self>;258 type OnChargeTransaction = pallet_evm_transaction_payment::OnChargeTransaction<Self>;259 type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;260 type FindAuthor = EthereumFindAuthor<Aura>;261}262263pub struct EthereumFindAuthor<F>(core::marker::PhantomData<F>);264impl<F: FindAuthor<u32>> FindAuthor<H160> for EthereumFindAuthor<F> {265 fn find_author<'a, I>(digests: I) -> Option<H160>266 where267 I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,268 {269 if let Some(author_index) = F::find_author(digests) {270 let authority_id = Aura::authorities()[author_index as usize].clone();271 return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));272 }273 None274 }275}276277parameter_types! {278 pub BlockGasLimit: U256 = U256::from(u32::max_value());279}280281impl pallet_ethereum::Config for Runtime {282 type Event = Event;283 type StateRoot = pallet_ethereum::IntermediateStateRoot;284 type EvmSubmitLog = pallet_evm::Pallet<Self>;285}286287impl pallet_randomness_collective_flip::Config for Runtime {}288289impl system::Config for Runtime {290 /// The data to be stored in an account.291 type AccountData = pallet_balances::AccountData<Balance>;292 /// The identifier used to distinguish between accounts.293 type AccountId = AccountId;294 /// The basic call filter to use in dispatchable.295 type BaseCallFilter = ();296 /// Maximum number of block number to block hash mappings to keep (oldest pruned first).297 type BlockHashCount = BlockHashCount;298 /// The maximum length of a block (in bytes).299 type BlockLength = RuntimeBlockLength;300 /// The index type for blocks.301 type BlockNumber = BlockNumber;302 /// The weight of the overhead invoked on the block import process, independent of the extrinsics included in that block.303 type BlockWeights = RuntimeBlockWeights;304 /// The aggregated dispatch type that is available for extrinsics.305 type Call = Call;306 /// The weight of database operations that the runtime can invoke.307 type DbWeight = RocksDbWeight;308 /// The ubiquitous event type.309 type Event = Event;310 /// The type for hashing blocks and tries.311 type Hash = Hash;312 /// The hashing algorithm used.313 type Hashing = BlakeTwo256;314 /// The header type.315 type Header = generic::Header<BlockNumber, BlakeTwo256>;316 /// The index type for storing how many extrinsics an account has signed.317 type Index = Index;318 /// The lookup mechanism to get account ID from whatever is passed in dispatchers.319 type Lookup = AccountIdLookup<AccountId, ()>;320 /// What to do if an account is fully reaped from the system.321 type OnKilledAccount = ();322 /// What to do if a new account is created.323 type OnNewAccount = ();324 type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;325 /// The ubiquitous origin type.326 type Origin = Origin;327 /// This type is being generated by `construct_runtime!`.328 type PalletInfo = PalletInfo;329 /// This is used as an identifier of the chain. 42 is the generic substrate prefix.330 type SS58Prefix = SS58Prefix;331 /// Weight information for the extrinsics of this pallet.332 type SystemWeightInfo = system::weights::SubstrateWeight<Self>;333 /// Version of the runtime.334 type Version = Version;335}336337parameter_types! {338 pub const MinimumPeriod: u64 = SLOT_DURATION / 2;339}340341impl pallet_timestamp::Config for Runtime {342 /// A timestamp: milliseconds since the unix epoch.343 type Moment = u64;344 type OnTimestampSet = ();345 type MinimumPeriod = MinimumPeriod;346 type WeightInfo = ();347}348349parameter_types! {350 // pub const ExistentialDeposit: u128 = 500;351 pub const ExistentialDeposit: u128 = 0;352 pub const MaxLocks: u32 = 50;353}354355impl pallet_balances::Config for Runtime {356 type MaxLocks = MaxLocks;357 type MaxReserves = ();358 type ReserveIdentifier = [u8; 8];359 /// The type for recording an account's balance.360 type Balance = Balance;361 /// The ubiquitous event type.362 type Event = Event;363 type DustRemoval = Treasury;364 type ExistentialDeposit = ExistentialDeposit;365 type AccountStore = System;366 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;367}368369pub const MICROUNIQUE: Balance = 1_000_000_000;370pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;371pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;372pub const UNIQUE: Balance = 100 * CENTIUNIQUE;373374pub const fn deposit(items: u32, bytes: u32) -> Balance {375 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE376}377378/*379parameter_types! {380 pub TombstoneDeposit: Balance = deposit(381 1,382 sp_std::mem::size_of::<pallet_contracts::Pallet<Runtime>> as u32,383 );384 pub DepositPerContract: Balance = TombstoneDeposit::get();385 pub const DepositPerStorageByte: Balance = deposit(0, 1);386 pub const DepositPerStorageItem: Balance = deposit(1, 0);387 pub RentFraction: Perbill = Perbill::from_rational(1u32, 30 * DAYS);388 pub const SurchargeReward: Balance = 150 * MILLIUNIQUE;389 pub const SignedClaimHandicap: u32 = 2;390 pub const MaxDepth: u32 = 32;391 pub const MaxValueSize: u32 = 16 * 1024;392 pub const MaxCodeSize: u32 = 1024 * 1024 * 25; // 25 Mb393 // The lazy deletion runs inside on_initialize.394 pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *395 RuntimeBlockWeights::get().max_block;396 // The weight needed for decoding the queue should be less or equal than a fifth397 // of the overall weight dedicated to the lazy deletion.398 pub DeletionQueueDepth: u32 = ((DeletionWeightLimit::get() / (399 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(1) -400 <Runtime as pallet_contracts::Config>::WeightInfo::on_initialize_per_queue_item(0)401 )) / 5) as u32;402 pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();403}404405impl pallet_contracts::Config for Runtime {406 type Time = Timestamp;407 type Randomness = RandomnessCollectiveFlip;408 type Currency = Balances;409 type Event = Event;410 type RentPayment = ();411 type SignedClaimHandicap = SignedClaimHandicap;412 type TombstoneDeposit = TombstoneDeposit;413 type DepositPerContract = DepositPerContract;414 type DepositPerStorageByte = DepositPerStorageByte;415 type DepositPerStorageItem = DepositPerStorageItem;416 type RentFraction = RentFraction;417 type SurchargeReward = SurchargeReward;418 type WeightPrice = pallet_transaction_payment::Module<Self>;419 type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;420 type ChainExtension = NFTExtension;421 type DeletionQueueDepth = DeletionQueueDepth;422 type DeletionWeightLimit = DeletionWeightLimit;423 type Schedule = Schedule;424 type CallStack = [pallet_contracts::Frame<Self>; 31];425}426*/427428parameter_types! {429 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer430}431432/// Linear implementor of `WeightToFeePolynomial`433pub struct LinearFee<T>(sp_std::marker::PhantomData<T>);434435impl<T> WeightToFeePolynomial for LinearFee<T>436where437 T: BaseArithmetic + From<u32> + Copy + Unsigned,438{439 type Balance = T;440441 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {442 smallvec!(WeightToFeeCoefficient {443 coeff_integer: 146_700u32.into(), // Targeting 0.1 Unique per NFT transfer444 coeff_frac: Perbill::zero(),445 negative: false,446 degree: 1,447 })448 }449}450451impl pallet_transaction_payment::Config for Runtime {452 type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;453 type TransactionByteFee = TransactionByteFee;454 type WeightToFee = LinearFee<Balance>;455 type FeeMultiplierUpdate = ();456}457458parameter_types! {459 pub const ProposalBond: Permill = Permill::from_percent(5);460 pub const ProposalBondMinimum: Balance = 1 * UNIQUE;461 pub const SpendPeriod: BlockNumber = 5 * MINUTES;462 pub const Burn: Permill = Permill::from_percent(0);463 pub const TipCountdown: BlockNumber = 1 * DAYS;464 pub const TipFindersFee: Percent = Percent::from_percent(20);465 pub const TipReportDepositBase: Balance = 1 * UNIQUE;466 pub const DataDepositPerByte: Balance = 1 * CENTIUNIQUE;467 pub const BountyDepositBase: Balance = 1 * UNIQUE;468 pub const BountyDepositPayoutDelay: BlockNumber = 1 * DAYS;469 pub const TreasuryModuleId: PalletId = PalletId(*b"py/trsry");470 pub const BountyUpdatePeriod: BlockNumber = 14 * DAYS;471 pub const MaximumReasonLength: u32 = 16384;472 pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);473 pub const BountyValueMinimum: Balance = 5 * UNIQUE;474 pub const MaxApprovals: u32 = 100;475}476477impl pallet_treasury::Config for Runtime {478 type PalletId = TreasuryModuleId;479 type Currency = Balances;480 type ApproveOrigin = EnsureRoot<AccountId>;481 type RejectOrigin = EnsureRoot<AccountId>;482 type Event = Event;483 type OnSlash = ();484 type ProposalBond = ProposalBond;485 type ProposalBondMinimum = ProposalBondMinimum;486 type SpendPeriod = SpendPeriod;487 type Burn = Burn;488 type BurnDestination = ();489 type SpendFunds = ();490 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;491 type MaxApprovals = MaxApprovals;492}493494impl pallet_sudo::Config for Runtime {495 type Event = Event;496 type Call = Call;497}498499parameter_types! {500 pub const MinVestedTransfer: Balance = 10 * UNIQUE;501}502503impl pallet_vesting::Config for Runtime {504 type Event = Event;505 type Currency = Balances;506 type BlockNumberToBalance = ConvertInto;507 type MinVestedTransfer = MinVestedTransfer;508 type WeightInfo = ();509}510511parameter_types! {512 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;513 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;514}515516impl cumulus_pallet_parachain_system::Config for Runtime {517 type Event = Event;518 type OnValidationData = ();519 type SelfParaId = parachain_info::Pallet<Self>;520 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<521 // MaxDownwardMessageWeight,522 // XcmExecutor<XcmConfig>,523 // Call,524 // >;525 type OutboundXcmpMessageSource = XcmpQueue;526 type DmpMessageHandler = DmpQueue;527 type ReservedDmpWeight = ReservedDmpWeight;528 type ReservedXcmpWeight = ReservedXcmpWeight;529 type XcmpMessageHandler = XcmpQueue;530}531532impl parachain_info::Config for Runtime {}533534impl cumulus_pallet_aura_ext::Config for Runtime {}535536parameter_types! {537 pub const RelayLocation: MultiLocation = X1(Parent);538 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;539 pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();540 pub Ancestry: MultiLocation = X1(Parachain(ParachainInfo::parachain_id().into()));541}542543/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used544/// when determining ownership of accounts for asset transacting and when attempting to use XCM545/// `Transact` in order to determine the dispatch Origin.546pub type LocationToAccountId = (547 // The parent (Relay-chain) origin converts to the default `AccountId`.548 ParentIsDefault<AccountId>,549 // Sibling parachain origins convert to AccountId via the `ParaId::into`.550 SiblingParachainConvertsVia<Sibling, AccountId>,551 // Straight up local `AccountId32` origins just alias directly to `AccountId`.552 AccountId32Aliases<RelayNetwork, AccountId>,553);554555/// Means for transacting assets on this chain.556pub type LocalAssetTransactor = CurrencyAdapter<557 // Use this currency:558 Balances,559 // Use this currency when it is a fungible asset matching the given location or name:560 IsConcrete<RelayLocation>,561 // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:562 LocationToAccountId,563 // Our chain's account ID type (we can't get away without mentioning it explicitly):564 AccountId,565 // We don't track any teleports.566 (),567>;568569/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,570/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can571/// biases the kind of local `Origin` it will become.572pub type XcmOriginToTransactDispatchOrigin = (573 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location574 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for575 // foreign chains who want to have a local sovereign account on this chain which they control.576 SovereignSignedViaLocation<LocationToAccountId, Origin>,577 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when578 // recognised.579 RelayChainAsNative<RelayOrigin, Origin>,580 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when581 // recognised.582 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,583 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a584 // transaction from the Root origin.585 ParentAsSuperuser<Origin>,586 // Native signed account converter; this just converts an `AccountId32` origin into a normal587 // `Origin::Signed` origin of the same 32-byte value.588 SignedAccountId32AsNative<RelayNetwork, Origin>,589 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.590 XcmPassthrough<Origin>,591);592593parameter_types! {594 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.595 pub UnitWeightCost: Weight = 1_000_000;596 // 1200 UNIQUEs buy 1 second of weight.597 pub const WeightPrice: (MultiLocation, u128) = (X1(Parent), 1_200 * UNIQUE);598}599600match_type! {601 pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {602 X1(Parent) | X2(Parent, Plurality { id: BodyId::Unit, .. })603 };604}605606pub type Barrier = (607 TakeWeightCredit,608 AllowTopLevelPaidExecutionFrom<All<MultiLocation>>,609 AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,610 // ^^^ Parent & its unit plurality gets free execution611);612613pub struct XcmConfig;614impl Config for XcmConfig {615 type Call = Call;616 type XcmSender = XcmRouter;617 // How to withdraw and deposit an asset.618 type AssetTransactor = LocalAssetTransactor;619 type OriginConverter = XcmOriginToTransactDispatchOrigin;620 type IsReserve = NativeAsset;621 type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of ROC622 type LocationInverter = LocationInverter<Ancestry>;623 type Barrier = Barrier;624 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;625 type Trader = UsingComponents<IdentityFee<Balance>, RelayLocation, AccountId, Balances, ()>;626 type ResponseHandler = (); // Don't handle responses for now.627}628629// parameter_types! {630// pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10;631// }632633/// No local origins on this chain are allowed to dispatch XCM sends/executions.634pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);635636/// The means for routing XCM messages which are not for local execution into the right message637/// queues.638pub type XcmRouter = (639 // Two routers - use UMP to communicate with the relay chain:640 cumulus_primitives_utility::ParentAsUmp<ParachainSystem>,641 // ..and XCMP to communicate with the sibling chains.642 XcmpQueue,643);644645impl pallet_evm_coder_substrate::Config for Runtime {646 type EthereumTransactionSender = pallet_ethereum::Module<Self>;647}648649impl pallet_xcm::Config for Runtime {650 type Event = Event;651 type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;652 type XcmRouter = XcmRouter;653 type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;654 type XcmExecuteFilter = All<(MultiLocation, Xcm<Call>)>;655 type XcmExecutor = XcmExecutor<XcmConfig>;656 type XcmTeleportFilter = All<(MultiLocation, Vec<MultiAsset>)>;657 type XcmReserveTransferFilter = ();658 type Weigher = FixedWeightBounds<UnitWeightCost, Call>;659}660661impl cumulus_pallet_xcm::Config for Runtime {662 type Event = Event;663 type XcmExecutor = XcmExecutor<XcmConfig>;664}665666impl cumulus_pallet_xcmp_queue::Config for Runtime {667 type Event = Event;668 type XcmExecutor = XcmExecutor<XcmConfig>;669 type ChannelInfo = ParachainSystem;670}671672impl cumulus_pallet_dmp_queue::Config for Runtime {673 type Event = Event;674 type XcmExecutor = XcmExecutor<XcmConfig>;675 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;676}677678impl pallet_aura::Config for Runtime {679 type AuthorityId = AuraId;680}681682parameter_types! {683 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account();684 pub const CollectionCreationPrice: Balance = 100 * UNIQUE;685}686687/// Used for the pallet nft in `./nft.rs`688impl pallet_nft::Config for Runtime {689 type Event = Event;690 type WeightInfo = nft_weights::WeightInfo;691692 type EvmBackwardsAddressMapping = pallet_nft::MapBackwardsAddressTruncated;693 type EvmAddressMapping = HashedAddressMapping<Self::Hashing>;694 type CrossAccountId = pallet_nft::BasicCrossAccountId<Self>;695696 type Currency = Balances;697 type CollectionCreationPrice = CollectionCreationPrice;698 type TreasuryAccountId = TreasuryAccountId;699}700701parameter_types! {702 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied703}704705/// Used for the pallet inflation706impl pallet_inflation::Config for Runtime {707 type Currency = Balances;708 type TreasuryAccountId = TreasuryAccountId;709 type InflationBlockInterval = InflationBlockInterval;710}711712parameter_types! {713 pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) *714 RuntimeBlockWeights::get().max_block;715 pub const MaxScheduledPerBlock: u32 = 50;716}717718pub struct Sponsoring;719impl SponsoringResolve<AccountId, Call> for Sponsoring {720 fn resolve(who: &AccountId, call: &Call) -> Option<AccountId>721 where722 Call: Dispatchable<Info = DispatchInfo>,723 AccountId: AsRef<[u8]>,724 {725 pallet_nft_transaction_payment::Module::<Runtime>::withdraw_type(who, call)726 }727}728729type SponsorshipHandler = (730 pallet_nft::NftSponsorshipHandler<Runtime>,731 //pallet_contract_helpers::ContractSponsorshipHandler<Runtime>,732);733734impl pallet_scheduler::Config for Runtime {735 type Event = Event;736 type Origin = Origin;737 type PalletsOrigin = OriginCaller;738 type Call = Call;739 type MaximumWeight = MaximumSchedulerWeight;740 type ScheduleOrigin = EnsureSigned<AccountId>;741 type MaxScheduledPerBlock = MaxScheduledPerBlock;742 type SponsorshipHandler = SponsorshipHandler;743 type WeightInfo = ();744}745746impl pallet_nft_transaction_payment::Config for Runtime {747 type SponsorshipHandler = SponsorshipHandler;748}749750impl pallet_evm_transaction_payment::Config for Runtime {751 type SponsorshipHandler = (752 pallet_nft::NftEthSponsorshipHandler<Self>,753 pallet_evm_contract_helpers::HelpersContractSponsoring<Self>,754 );755 type Currency = Balances;756}757758impl pallet_nft_charge_transaction::Config for Runtime {}759760// impl pallet_contract_helpers::Config for Runtime {}761762parameter_types! {763 // 0x842899ECF380553E8a4de75bF534cdf6fBF64049764 pub const HelpersContractAddress: H160 = H160([765 0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,766 ]);767}768769impl pallet_evm_contract_helpers::Config for Runtime {770 type ContractAddress = HelpersContractAddress;771}772773construct_runtime!(774 pub enum Runtime where775 Block = Block,776 NodeBlock = opaque::Block,777 UncheckedExtrinsic = UncheckedExtrinsic778 {779 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event<T>} = 20,780 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,781782 Aura: pallet_aura::{Pallet, Config<T>} = 22,783 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,784785 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,786 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,787 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,788 TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,789 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,790 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,791 System: system::{Pallet, Call, Storage, Config, Event<T>} = 36,792 Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,793 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,794795 // XCM helpers.796 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,797 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,798 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,799 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,800801 // Unique Pallets802 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,803 Nft: pallet_nft::{Pallet, Call, Config<T>, Storage, Event<T>} = 61,804 Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 62,805 NftPayment: pallet_nft_transaction_payment::{Pallet, Call, Storage} = 63,806 Charging: pallet_nft_charge_transaction::{Pallet, Call, Storage } = 64,807 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,808809 // Frontier810 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,811 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, ValidateUnsigned} = 101,812813 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,814 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,815 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,816 }817);818819pub struct TransactionConverter;820821impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {822 fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {823 UncheckedExtrinsic::new_unsigned(824 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),825 )826 }827}828829impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConverter {830 fn convert_transaction(831 &self,832 transaction: pallet_ethereum::Transaction,833 ) -> opaque::UncheckedExtrinsic {834 let extrinsic = UncheckedExtrinsic::new_unsigned(835 pallet_ethereum::Call::<Runtime>::transact(transaction).into(),836 );837 let encoded = extrinsic.encode();838 opaque::UncheckedExtrinsic::decode(&mut &encoded[..])839 .expect("Encoded extrinsic is always valid")840 }841}842843/// The address format for describing accounts.844pub type Address = sp_runtime::MultiAddress<AccountId, ()>;845/// Block header type as expected by this runtime.846pub type Header = generic::Header<BlockNumber, BlakeTwo256>;847/// Block type as expected by this runtime.848pub type Block = generic::Block<Header, UncheckedExtrinsic>;849/// A Block signed with a Justification850pub type SignedBlock = generic::SignedBlock<Block>;851/// BlockId type as expected by this runtime.852pub type BlockId = generic::BlockId<Block>;853/// The SignedExtension to the basic transaction logic.854pub type SignedExtra = (855 system::CheckSpecVersion<Runtime>,856 // system::CheckTxVersion<Runtime>,857 system::CheckGenesis<Runtime>,858 system::CheckEra<Runtime>,859 system::CheckNonce<Runtime>,860 system::CheckWeight<Runtime>,861 pallet_nft_charge_transaction::ChargeTransactionPayment<Runtime>,862 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,863);864/// Unchecked extrinsic type as expected by this runtime.865pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;866/// Extrinsic type that has already been checked.867pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;868/// Executive: handles dispatch to the various modules.869pub type Executive = frame_executive::Executive<870 Runtime,871 Block,872 frame_system::ChainContext<Runtime>,873 Runtime,874 AllPallets,875>;876877impl_opaque_keys! {878 pub struct SessionKeys {879 pub aura: Aura,880 }881}882883impl_runtime_apis! {884 impl pallet_nft::NftApi<Block>885 for Runtime886 {887 fn eth_contract_code(account: H160) -> Option<Vec<u8>> {888 <pallet_nft::NftErcSupport<Runtime>>::get_code(&account)889 }890 }891892 impl sp_api::Core<Block> for Runtime {893 fn version() -> RuntimeVersion {894 VERSION895 }896897 fn execute_block(block: Block) {898 Executive::execute_block(block)899 }900901 fn initialize_block(header: &<Block as BlockT>::Header) {902 Executive::initialize_block(header)903 }904 }905906 impl sp_api::Metadata<Block> for Runtime {907 fn metadata() -> OpaqueMetadata {908 Runtime::metadata().into()909 }910 }911912 impl sp_block_builder::BlockBuilder<Block> for Runtime {913 fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {914 Executive::apply_extrinsic(extrinsic)915 }916917 fn finalize_block() -> <Block as BlockT>::Header {918 Executive::finalize_block()919 }920921 fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {922 data.create_extrinsics()923 }924925 fn check_inherents(926 block: Block,927 data: sp_inherents::InherentData,928 ) -> sp_inherents::CheckInherentsResult {929 data.check_extrinsics(&block)930 }931932 // fn random_seed() -> <Block as BlockT>::Hash {933 // RandomnessCollectiveFlip::random_seed().0934 // }935 }936937 impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {938 fn validate_transaction(939 source: TransactionSource,940 tx: <Block as BlockT>::Extrinsic,941 hash: <Block as BlockT>::Hash,942 ) -> TransactionValidity {943 Executive::validate_transaction(source, tx, hash)944 }945 }946947 impl sp_offchain::OffchainWorkerApi<Block> for Runtime {948 fn offchain_worker(header: &<Block as BlockT>::Header) {949 Executive::offchain_worker(header)950 }951 }952953 impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {954 fn chain_id() -> u64 {955 <Runtime as pallet_evm::Config>::ChainId::get()956 }957958 fn account_basic(address: H160) -> EVMAccount {959 EVM::account_basic(&address)960 }961962 fn gas_price() -> U256 {963 <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price()964 }965966 fn account_code_at(address: H160) -> Vec<u8> {967 EVM::account_codes(address)968 }969970 fn author() -> H160 {971 <pallet_evm::Module<Runtime>>::find_author()972 }973974 fn storage_at(address: H160, index: U256) -> H256 {975 let mut tmp = [0u8; 32];976 index.to_big_endian(&mut tmp);977 EVM::account_storages(address, H256::from_slice(&tmp[..]))978 }979980 fn call(981 from: H160,982 to: H160,983 data: Vec<u8>,984 value: U256,985 gas_limit: U256,986 gas_price: Option<U256>,987 nonce: Option<U256>,988 estimate: bool,989 ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {990 let config = if estimate {991 let mut config = <Runtime as pallet_evm::Config>::config().clone();992 config.estimate = true;993 Some(config)994 } else {995 None996 };997998 <Runtime as pallet_evm::Config>::Runner::call(999 from,1000 to,1001 data,1002 value,1003 gas_limit.low_u64(),1004 gas_price,1005 nonce,1006 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1007 ).map_err(|err| err.into())1008 }10091010 fn create(1011 from: H160,1012 data: Vec<u8>,1013 value: U256,1014 gas_limit: U256,1015 gas_price: Option<U256>,1016 nonce: Option<U256>,1017 estimate: bool,1018 ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {1019 let config = if estimate {1020 let mut config = <Runtime as pallet_evm::Config>::config().clone();1021 config.estimate = true;1022 Some(config)1023 } else {1024 None1025 };10261027 <Runtime as pallet_evm::Config>::Runner::create(1028 from,1029 data,1030 value,1031 gas_limit.low_u64(),1032 gas_price,1033 nonce,1034 config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),1035 ).map_err(|err| err.into())1036 }10371038 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {1039 Ethereum::current_transaction_statuses()1040 }10411042 fn current_block() -> Option<pallet_ethereum::Block> {1043 Ethereum::current_block()1044 }10451046 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {1047 Ethereum::current_receipts()1048 }10491050 fn current_all() -> (1051 Option<pallet_ethereum::Block>,1052 Option<Vec<pallet_ethereum::Receipt>>,1053 Option<Vec<TransactionStatus>>1054 ) {1055 (1056 Ethereum::current_block(),1057 Ethereum::current_receipts(),1058 Ethereum::current_transaction_statuses()1059 )1060 }10611062 fn extrinsic_filter(xts: Vec<<Block as sp_api::BlockT>::Extrinsic>) -> Vec<pallet_ethereum::Transaction> {1063 xts.into_iter().filter_map(|xt| match xt.function {1064 Call::Ethereum(pallet_ethereum::Call::transact(t)) => Some(t),1065 _ => None1066 }).collect()1067 }1068 }10691070 impl sp_session::SessionKeys<Block> for Runtime {1071 fn decode_session_keys(1072 encoded: Vec<u8>,1073 ) -> Option<Vec<(Vec<u8>, KeyTypeId)>> {1074 SessionKeys::decode_into_raw_public_keys(&encoded)1075 }10761077 fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {1078 SessionKeys::generate(seed)1079 }1080 }10811082 impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {1083 fn slot_duration() -> sp_consensus_aura::SlotDuration {1084 sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())1085 }10861087 fn authorities() -> Vec<AuraId> {1088 Aura::authorities()1089 }1090 }10911092 impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {1093 fn collect_collation_info() -> cumulus_primitives_core::CollationInfo {1094 ParachainSystem::collect_collation_info()1095 }1096 }10971098 impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {1099 fn account_nonce(account: AccountId) -> Index {1100 System::account_nonce(account)1101 }1102 }11031104 impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {1105 fn query_info(uxt: <Block as BlockT>::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {1106 TransactionPayment::query_info(uxt, len)1107 }1108 fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> FeeDetails<Balance> {1109 TransactionPayment::query_fee_details(uxt, len)1110 }1111 }11121113 /*1114 impl pallet_contracts_rpc_runtime_api::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash>1115 for Runtime1116 {1117 fn call(1118 origin: AccountId,1119 dest: AccountId,1120 value: Balance,1121 gas_limit: u64,1122 input_data: Vec<u8>,1123 ) -> pallet_contracts_primitives::ContractExecResult {1124 Contracts::bare_call(origin, dest, value, gas_limit, input_data, false)1125 }11261127 fn instantiate(1128 origin: AccountId,1129 endowment: Balance,1130 gas_limit: u64,1131 code: pallet_contracts_primitives::Code<Hash>,1132 data: Vec<u8>,1133 salt: Vec<u8>,1134 ) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, BlockNumber>1135 {1136 Contracts::bare_instantiate(origin, endowment, gas_limit, code, data, salt, true, false)1137 }11381139 fn get_storage(1140 address: AccountId,1141 key: [u8; 32],1142 ) -> pallet_contracts_primitives::GetStorageResult {1143 Contracts::get_storage(address, key)1144 }11451146 fn rent_projection(1147 address: AccountId,1148 ) -> pallet_contracts_primitives::RentProjectionResult<BlockNumber> {1149 Contracts::rent_projection(address)1150 }1151 }1152 */11531154 #[cfg(feature = "runtime-benchmarks")]1155 impl frame_benchmarking::Benchmark<Block> for Runtime {1156 fn dispatch_benchmark(1157 config: frame_benchmarking::BenchmarkConfig1158 ) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {1159 use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey};11601161 let whitelist: Vec<TrackedStorageKey> = vec![1162 // Alice account1163 hex_literal::hex!("d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d").to_vec().into(),1164 // // Total Issuance1165 // hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),1166 // // Execution Phase1167 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),1168 // // Event Count1169 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),1170 // // System Events1171 // hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),1172 ];11731174 let mut batches = Vec::<BenchmarkBatch>::new();1175 let params = (&config, &whitelist);11761177 add_benchmark!(params, batches, pallet_nft, Nft);1178 add_benchmark!(params, batches, pallet_inflation, Inflation);11791180 if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }1181 Ok(batches)1182 }1183 }1184}11851186struct CheckInherents;11871188impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {1189 fn check_inherents(1190 block: &Block,1191 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,1192 ) -> sp_inherents::CheckInherentsResult {1193 let relay_chain_slot = relay_state_proof1194 .read_slot()1195 .expect("Could not read the relay chain slot from the proof");11961197 let inherent_data =1198 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(1199 relay_chain_slot,1200 sp_std::time::Duration::from_secs(6),1201 )1202 .create_inherent_data()1203 .expect("Could not create the timestamp inherent data");12041205 inherent_data.check_extrinsics(block)1206 }1207}12081209cumulus_pallet_parachain_system::register_validate_block!(1210 Runtime = Runtime,1211 BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,1212 CheckInherents = CheckInherents,1213);runtime_types.jsondiffbeforeafterboth--- a/runtime_types.json
+++ b/runtime_types.json
@@ -62,7 +62,8 @@
"Sponsorship": "SponsorshipState",
"Limits": "CollectionLimits",
"VariableOnChainSchema": "Vec<u8>",
- "ConstOnChainSchema": "Vec<u8>"
+ "ConstOnChainSchema": "Vec<u8>",
+ "TransfersEnabled": "bool"
},
"RawData": "Vec<u8>",
"Address": "MultiAddress",
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -1,12 +1,12 @@
{
- "name": "NftTests",
+ "name": "nfttests",
"version": "1.0.0",
"description": "Substrate Nft tests",
"main": "",
"devDependencies": {
"@polkadot/dev": "0.62.43",
"@polkadot/ts": "0.3.89",
- "@polkadot/typegen": "4.15.1",
+ "@polkadot/typegen": "5.0.1",
"@types/chai": "^4.2.17",
"@types/chai-as-promised": "^7.1.3",
"@types/mocha": "^8.2.2",
@@ -59,15 +59,15 @@
"testSetVariableMetadataSponsoringRateLimit": "mocha --timeout 9999999 -r ts-node/register ./**/setVariableMetadataSponsoringRateLimit.test.ts",
"testInflation": "mocha --timeout 9999999 -r ts-node/register ./**/inflation.test.ts",
"testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",
- "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts"
+ "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",
+ "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts"
},
"author": "",
"license": "SEE LICENSE IN ../LICENSE",
"homepage": "",
"dependencies": {
- "@polkadot/api": "4.15.1",
- "@polkadot/api-contract": "4.15.1",
- "@polkadot/util": "6.9.1",
+ "@polkadot/api": "5.0.1",
+ "@polkadot/api-contract": "5.0.1",
"bignumber.js": "^9.0.1",
"chai-as-promised": "^7.1.1",
"solc": "^0.8.6",
tests/src/addCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -22,7 +22,7 @@
const bob = privateKey('//Bob');
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(alice.address));
+ expect(collection.Owner).to.be.equal(alice.address);
const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(bob.address));
await submitTransactionAsync(alice, changeAdminTx);
@@ -40,7 +40,7 @@
const Charlie = privateKey('//CHARLIE');
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(Alice.address));
+ expect(collection.Owner).to.be.equal(Alice.address);
const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(Bob.address));
await submitTransactionAsync(Alice, changeAdminTx);
tests/src/addToContractWhiteList.test.tsdiffbeforeafterboth--- a/tests/src/addToContractWhiteList.test.ts
+++ b/tests/src/addToContractWhiteList.test.ts
@@ -17,7 +17,7 @@
chai.use(chaiAsPromised);
const expect = chai.expect;
-describe('Integration Test addToContractWhiteList', () => {
+describe.skip('Integration Test addToContractWhiteList', () => {
it('Add an address to a contract white list', async () => {
await usingApi(async api => {
@@ -56,7 +56,7 @@
});
});
-describe('Negative Integration Test addToContractWhiteList', () => {
+describe.skip('Negative Integration Test addToContractWhiteList', () => {
it('Add an address to a white list of a non-contract', async () => {
await usingApi(async api => {
tests/src/change-collection-owner.test.tsdiffbeforeafterboth--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -7,26 +7,26 @@
import chaiAsPromised from 'chai-as-promised';
import privateKey from './substrate/privateKey';
import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from './substrate/substrate-api';
-import { createCollectionExpectSuccess, normalizeAccountId } from './util/helpers';
+import { createCollectionExpectSuccess } from './util/helpers';
chai.use(chaiAsPromised);
const expect = chai.expect;
describe('Integration Test changeCollectionOwner(collection_id, new_owner):', () => {
- it('Changing owner changes owner.', async () => {
+ it('Changing owner changes owner address', async () => {
await usingApi(async api => {
const collectionId = await createCollectionExpectSuccess();
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(alice.address));
+ expect(collection.Owner).to.be.deep.eq(alice.address);
- const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address));
+ const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await submitTransactionAsync(alice, changeOwnerTx);
const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(normalizeAccountId(bob.address));
+ expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(bob.address);
});
});
});
@@ -38,23 +38,23 @@
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
- const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address));
+ const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await expect(submitTransactionExpectFailAsync(bob, changeOwnerTx)).to.be.rejected;
const collectionAfterOwnerChange: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(normalizeAccountId(alice.address));
+ expect(collectionAfterOwnerChange.Owner).to.be.deep.eq(alice.address);
// Verifying that nothing bad happened (network is live, new collections can be created, etc.)
await createCollectionExpectSuccess();
});
});
- it('Can\'t change owner of not existing collection.', async () => {
+ it('Can\'t change owner of a non-existing collection.', async () => {
await usingApi(async api => {
const collectionId = (1<<32) - 1;
const alice = privateKey('//Alice');
const bob = privateKey('//Bob');
- const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, normalizeAccountId(bob.address));
+ const changeOwnerTx = api.tx.nft.changeCollectionOwner(collectionId, bob.address);
await expect(submitTransactionExpectFailAsync(alice, changeOwnerTx)).to.be.rejected;
// Verifying that nothing bad happened (network is live, new collections can be created, etc.)
tests/src/confirmSponsorship.test.tsdiffbeforeafterboth--- a/tests/src/confirmSponsorship.test.ts
+++ b/tests/src/confirmSponsorship.test.ts
@@ -226,7 +226,7 @@
const result1 = getGenericResult(events1);
const AsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());
- await submitTransactionExpectFailAsync(zeroBalance, zeroToAlice);
+ await expect(submitTransactionExpectFailAsync(zeroBalance, zeroToAlice)).to.be.rejected;
const BsponsorBalance = new BigNumber((await api.query.system.account(bob.address)).data.free.toString());
// Try again after Zero gets some balance - now it should succeed
@@ -327,7 +327,7 @@
});
-describe('(!negative test!) integration test: ext. removeCollectionSponsor():', () => {
+describe('(!negative test!) integration test: ext. confirmSponsorship():', () => {
before(async () => {
await usingApi(async () => {
const keyring = new Keyring({ type: 'sr25519' });
tests/src/contracts.test.tsdiffbeforeafterboth--- a/tests/src/contracts.test.ts
+++ b/tests/src/contracts.test.ts
@@ -36,7 +36,7 @@
const gasLimit = 9000n * 1000000n;
const marketContractAddress = '5CYN9j3YvRkqxewoxeSvRbhAym4465C57uMmX5j4yz99L5H6';
-describe('Contracts', () => {
+describe.skip('Contracts', () => {
it('Can deploy smart contract Flipper, instantiate it and call it\'s get and flip messages.', async () => {
await usingApi(async api => {
const [contract, deployer] = await deployFlipper(api);
@@ -62,7 +62,7 @@
});
});
-describe.only('Chain extensions', () => {
+describe.skip('Chain extensions', () => {
it('Transfer CE', async () => {
await usingApi(async api => {
const alice = privateKey('//Alice');
tests/src/enableContractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/enableContractSponsoring.test.ts
+++ b/tests/src/enableContractSponsoring.test.ts
@@ -19,7 +19,7 @@
chai.use(chaiAsPromised);
const expect = chai.expect;
-describe('Integration Test enableContractSponsoring', () => {
+describe.skip('Integration Test enableContractSponsoring', () => {
it('ensure tx fee is paid from endowment', async () => {
await usingApi(async (api) => {
const user = await findUnusedAddress(api);
@@ -64,7 +64,7 @@
});
-describe('Negative Integration Test enableContractSponsoring', () => {
+describe.skip('Negative Integration Test enableContractSponsoring', () => {
let alice: IKeyringPair;
before(async () => {
tests/src/enableDisableTransfer.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/enableDisableTransfer.test.ts
@@ -0,0 +1,64 @@
+//
+// This file is subject to the terms and conditions defined in
+// file 'LICENSE', which is part of this source code package.
+//
+
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
+import privateKey from './substrate/privateKey';
+import usingApi from './substrate/substrate-api';
+import {
+ createItemExpectSuccess,
+ createCollectionExpectSuccess,
+ transferExpectSuccess,
+ transferExpectFailure,
+ setTransferFlagExpectSuccess,
+ setTransferFlagExpectFailure,
+} from './util/helpers';
+
+chai.use(chaiAsPromised);
+
+describe('Enable/Disable Transfers', () => {
+ it('User can transfer token with enabled transfer flag', async () => {
+ await usingApi(async () => {
+ const Alice = privateKey('//Alice');
+ const Bob = privateKey('//Bob');
+ // nft
+ const nftCollectionId = await createCollectionExpectSuccess();
+ const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
+
+ // explicitely set transfer flag
+ await setTransferFlagExpectSuccess(Alice, nftCollectionId, true);
+
+ await transferExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 1);
+ });
+ });
+
+ it('User can\'n transfer token with disabled transfer flag', async () => {
+ await usingApi(async () => {
+ const Alice = privateKey('//Alice');
+ const Bob = privateKey('//Bob');
+ // nft
+ const nftCollectionId = await createCollectionExpectSuccess();
+ const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
+
+ // explicitely set transfer flag
+ await setTransferFlagExpectSuccess(Alice, nftCollectionId, false);
+
+ await transferExpectFailure(nftCollectionId, newNftTokenId, Alice, Bob, 1);
+ });
+ });
+});
+
+describe('Negative Enable/Disable Transfers', () => {
+ it('Non-owner cannot change transfer flag', async () => {
+ await usingApi(async () => {
+ const Bob = privateKey('//Bob');
+ // nft
+ const nftCollectionId = await createCollectionExpectSuccess();
+
+ // Change transfer flag
+ await setTransferFlagExpectFailure(Bob, nftCollectionId, false);
+ });
+ });
+});
tests/src/overflow.test.tsdiffbeforeafterboth--- a/tests/src/overflow.test.ts
+++ b/tests/src/overflow.test.ts
@@ -8,7 +8,7 @@
import chaiAsPromised from 'chai-as-promised';
import privateKey from './substrate/privateKey';
import usingApi from './substrate/substrate-api';
-import { approveExpectFail, approveExpectSuccess, createCollectionExpectSuccess, createFungibleItemExpectSuccess, getAllowance, getFungibleBalance, transferExpectFail, transferExpectSuccess, transferFromExpectFail, transferFromExpectSuccess, U128_MAX } from './util/helpers';
+import { approveExpectFail, approveExpectSuccess, createCollectionExpectSuccess, createFungibleItemExpectSuccess, getAllowance, getFungibleBalance, transferExpectFailure, transferExpectSuccess, transferFromExpectFail, transferFromExpectSuccess, U128_MAX } from './util/helpers';
chai.use(chaiAsPromised);
const expect = chai.expect;
@@ -33,7 +33,7 @@
await transferExpectSuccess(fungibleCollectionId, 0, alice, bob, U128_MAX, 'Fungible');
await createFungibleItemExpectSuccess(alice, fungibleCollectionId, { Value: 1n });
- await transferExpectFail(fungibleCollectionId, 0, alice, bob, 1, 'Fungible');
+ await transferExpectFailure(fungibleCollectionId, 0, alice, bob, 1);
expect(await getFungibleBalance(fungibleCollectionId, alice.address)).to.equal(1n);
expect(await getFungibleBalance(fungibleCollectionId, bob.address)).to.equal(U128_MAX);
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -13,13 +13,33 @@
// Pallets that must always be present
const requiredPallets = [
- 'nft', 'inflation', 'balances', 'contracts', 'randomnesscollectiveflip', 'system', 'timestamp', 'transactionpayment', 'treasury', 'vesting', 'evm', 'ethereum',
- 'scheduler', 'nftpayment', 'charging',
+ 'balances',
+ 'randomnesscollectiveflip',
+ 'timestamp',
+ 'transactionpayment',
+ 'treasury',
+ 'system',
+ 'vesting',
+ 'parachainsystem',
+ 'parachaininfo',
+ 'evm',
+ 'ethereum',
+ 'xcmpqueue',
+ 'polkadotxcm',
+ 'cumulusxcm',
+ 'dmpqueue',
+ 'inflation',
+ 'nft',
+ 'scheduler',
+ 'nftpayment',
+ 'charging',
];
// Pallets that depend on consensus and governance configuration
const consensusPallets = [
- 'sudo', 'aura',
+ 'sudo',
+ 'aura',
+ 'auraext',
];
describe('Pallet presence', () => {
tests/src/removeCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionAdmin.test.ts
+++ b/tests/src/removeCollectionAdmin.test.ts
@@ -20,7 +20,7 @@
const Alice = privateKey('//Alice');
const Bob = privateKey('//Bob');
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(Alice.address));
+ expect(collection.Owner).to.be.deep.eq(Alice.address);
// first - add collection admin Bob
const addAdminTx = api.tx.nft.addCollectionAdmin(collectionId, normalizeAccountId(Bob.address));
await submitTransactionAsync(Alice, addAdminTx);
tests/src/removeCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/removeCollectionSponsor.test.ts
+++ b/tests/src/removeCollectionSponsor.test.ts
@@ -38,7 +38,7 @@
});
});
- it('Remove NFT collection sponsor stops sponsorship', async () => {
+ it('Removing NFT collection sponsor stops sponsorship', async () => {
const collectionId = await createCollectionExpectSuccess();
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await confirmSponsorshipExpectSuccess(collectionId, '//Bob');
tests/src/removeFromContractWhiteList.test.tsdiffbeforeafterboth--- a/tests/src/removeFromContractWhiteList.test.ts
+++ b/tests/src/removeFromContractWhiteList.test.ts
@@ -10,7 +10,7 @@
import { IKeyringPair } from '@polkadot/types/types';
import { expect } from 'chai';
-describe('Integration Test removeFromContractWhiteList', () => {
+describe.skip('Integration Test removeFromContractWhiteList', () => {
let bob: IKeyringPair;
before(async () => {
@@ -54,7 +54,7 @@
});
});
-describe('Negative Integration Test removeFromContractWhiteList', () => {
+describe.skip('Negative Integration Test removeFromContractWhiteList', () => {
let alice: IKeyringPair;
let bob: IKeyringPair;
tests/src/scheduler.test.tsdiffbeforeafterboth--- a/tests/src/scheduler.test.ts
+++ b/tests/src/scheduler.test.ts
@@ -28,7 +28,7 @@
await setCollectionSponsorExpectSuccess(nftCollectionId, Alice.address);
await confirmSponsorshipExpectSuccess(nftCollectionId);
- await scheduleTransferExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 1, 'NFT');
+ await scheduleTransferExpectSuccess(nftCollectionId, newNftTokenId, Alice, Bob, 1, 6000, 4);
});
});
});
tests/src/setConstOnChainSchema.test.tsdiffbeforeafterboth--- a/tests/src/setConstOnChainSchema.test.ts
+++ b/tests/src/setConstOnChainSchema.test.ts
@@ -11,7 +11,6 @@
import {
createCollectionExpectSuccess,
destroyCollectionExpectSuccess,
- normalizeAccountId,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -38,7 +37,7 @@
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(Alice.address));
+ expect(collection.Owner).to.be.eq(Alice.address);
const setShema = api.tx.nft.setConstOnChainSchema(collectionId, Shema);
await submitTransactionAsync(Alice, setShema);
});
@@ -88,7 +87,7 @@
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(Alice.address));
+ expect(collection.Owner).to.be.eq(Alice.address);
const setShema = api.tx.nft.setConstOnChainSchema(collectionId, Shema);
await expect(submitTransactionExpectFailAsync(Bob, setShema)).to.be.rejected;
});
tests/src/setContractSponsoringRateLimit.test.tsdiffbeforeafterboth--- a/tests/src/setContractSponsoringRateLimit.test.ts
+++ b/tests/src/setContractSponsoringRateLimit.test.ts
@@ -15,7 +15,7 @@
setContractSponsoringRateLimitExpectSuccess,
} from './util/helpers';
-describe('Integration Test setContractSponsoringRateLimit', () => {
+describe.skip('Integration Test setContractSponsoringRateLimit', () => {
it('ensure sponsored contract can\'t be called twice without pause for free', async () => {
await usingApi(async (api) => {
const user = await findUnusedAddress(api);
@@ -42,7 +42,7 @@
});
});
-describe('Negative Integration Test setContractSponsoringRateLimit', () => {
+describe.skip('Negative Integration Test setContractSponsoringRateLimit', () => {
let alice: IKeyringPair;
before(async () => {
tests/src/setVariableOnChainSchema.test.tsdiffbeforeafterboth--- a/tests/src/setVariableOnChainSchema.test.ts
+++ b/tests/src/setVariableOnChainSchema.test.ts
@@ -11,7 +11,6 @@
import {
createCollectionExpectSuccess,
destroyCollectionExpectSuccess,
- normalizeAccountId,
} from './util/helpers';
chai.use(chaiAsPromised);
@@ -38,7 +37,7 @@
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(Alice.address));
+ expect(collection.Owner).to.be.eq(Alice.address);
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, Schema);
await submitTransactionAsync(Alice, setSchema);
});
@@ -88,7 +87,7 @@
await usingApi(async (api) => {
const collectionId = await createCollectionExpectSuccess();
const collection: any = (await api.query.nft.collectionById(collectionId)).toJSON();
- expect(collection.Owner).to.be.deep.eq(normalizeAccountId(Alice.address));
+ expect(collection.Owner).to.be.eq(Alice.address);
const setSchema = api.tx.nft.setVariableOnChainSchema(collectionId, Schema);
await expect(submitTransactionExpectFailAsync(Bob, setSchema)).to.be.rejected;
});
tests/src/substrate/substrate-api.tsdiffbeforeafterboth--- a/tests/src/substrate/substrate-api.ts
+++ b/tests/src/substrate/substrate-api.ts
@@ -33,11 +33,20 @@
// TODO: Remove, this is temporary: Filter unneeded API output
// (Jaco promised it will be removed in the next version)
const consoleErr = console.error;
- console.error = (message: string) => {
- if (!message.includes('StorageChangeSet:: WebSocket is not connected') || message.includes('2021-'))
+ const consoleLog = console.log;
+ const consoleWarn = console.warn;
+
+ const outFn = (message: string) => {
+ if (!message.includes('StorageChangeSet:: WebSocket is not connected') &&
+ !message.includes('2021-') &&
+ !message.includes('StorageChangeSet:: Normal connection closure'))
consoleErr(message);
};
+ console.error = outFn;
+ console.log = outFn;
+ console.warn = outFn;
+
try {
await promisifySubstrate(api, async () => {
if (api) {
@@ -48,6 +57,8 @@
} finally {
await api.disconnect();
console.error = consoleErr;
+ console.log = consoleLog;
+ console.warn = consoleWarn;
}
return result as T;
}
tests/src/toggleContractWhiteList.test.tsdiffbeforeafterboth--- a/tests/src/toggleContractWhiteList.test.ts
+++ b/tests/src/toggleContractWhiteList.test.ts
@@ -21,7 +21,7 @@
const value = 0;
const gasLimit = 3000n * 1000000n;
-describe('Integration Test toggleContractWhiteList', () => {
+describe.skip('Integration Test toggleContractWhiteList', () => {
it('Enable white list contract mode', async () => {
await usingApi(async api => {
@@ -121,7 +121,7 @@
});
-describe('Negative Integration Test toggleContractWhiteList', () => {
+describe.skip('Negative Integration Test toggleContractWhiteList', () => {
it('Enable white list for a non-contract', async () => {
await usingApi(async api => {
tests/src/transfer.test.tsdiffbeforeafterboth--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -16,7 +16,7 @@
findUnusedAddress,
getCreateCollectionResult,
getCreateItemResult,
- transferExpectFail,
+ transferExpectFailure,
transferExpectSuccess,
} from './util/helpers';
@@ -103,13 +103,13 @@
await usingApi(async (api) => {
// nft
const nftCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
- await transferExpectFail(nftCollectionCount + 1, 1, Alice, Bob, 1);
+ await transferExpectFailure(nftCollectionCount + 1, 1, Alice, Bob, 1);
// fungible
const fungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
- await transferExpectFail(fungibleCollectionCount + 1, 1, Alice, Bob, 1);
+ await transferExpectFailure(fungibleCollectionCount + 1, 1, Alice, Bob, 1);
// reFungible
const reFungibleCollectionCount = await api.query.nft.createdCollectionCount() as unknown as number;
- await transferExpectFail(reFungibleCollectionCount + 1, 1, Alice, Bob, 1);
+ await transferExpectFailure(reFungibleCollectionCount + 1, 1, Alice, Bob, 1);
});
});
it('Transfer with deleted collection_id', async () => {
@@ -117,43 +117,41 @@
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
await destroyCollectionExpectSuccess(nftCollectionId);
- await transferExpectFail(nftCollectionId, newNftTokenId, Alice, Bob, 1, 'NFT');
+ await transferExpectFailure(nftCollectionId, newNftTokenId, Alice, Bob, 1);
// fungible
const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
await destroyCollectionExpectSuccess(fungibleCollectionId);
- await transferExpectFail(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1, 'Fungible');
+ await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1);
// reFungible
const reFungibleCollectionId = await
createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
await destroyCollectionExpectSuccess(reFungibleCollectionId);
- await transferExpectFail(
+ await transferExpectFailure(
reFungibleCollectionId,
newReFungibleTokenId,
Alice,
Bob,
1,
- 'ReFungible',
);
});
it('Transfer with not existed item_id', async () => {
// nft
const nftCollectionId = await createCollectionExpectSuccess();
- await transferExpectFail(nftCollectionId, 2, Alice, Bob, 1, 'NFT');
+ await transferExpectFailure(nftCollectionId, 2, Alice, Bob, 1);
// fungible
const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
- await transferExpectFail(fungibleCollectionId, 2, Alice, Bob, 1, 'Fungible');
+ await transferExpectFailure(fungibleCollectionId, 2, Alice, Bob, 1);
// reFungible
const reFungibleCollectionId = await
createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
- await transferExpectFail(
+ await transferExpectFailure(
reFungibleCollectionId,
2,
Alice,
Bob,
1,
- 'ReFungible',
);
});
it('Transfer with deleted item_id', async () => {
@@ -161,46 +159,44 @@
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
await burnItemExpectSuccess(Alice, nftCollectionId, newNftTokenId, 1);
- await transferExpectFail(nftCollectionId, newNftTokenId, Alice, Bob, 1, 'NFT');
+ await transferExpectFailure(nftCollectionId, newNftTokenId, Alice, Bob, 1);
// fungible
const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
await burnItemExpectSuccess(Alice, fungibleCollectionId, newFungibleTokenId, 10);
- await transferExpectFail(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1, 'Fungible');
+ await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Alice, Bob, 1);
// reFungible
const reFungibleCollectionId = await
createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
await burnItemExpectSuccess(Alice, reFungibleCollectionId, newReFungibleTokenId, 1);
- await transferExpectFail(
+ await transferExpectFailure(
reFungibleCollectionId,
newReFungibleTokenId,
Alice,
Bob,
1,
- 'ReFungible',
);
});
it('Transfer with recipient that is not owner', async () => {
// nft
const nftCollectionId = await createCollectionExpectSuccess();
const newNftTokenId = await createItemExpectSuccess(Alice, nftCollectionId, 'NFT');
- await transferExpectFail(nftCollectionId, newNftTokenId, Charlie, Bob, 1, 'NFT');
+ await transferExpectFailure(nftCollectionId, newNftTokenId, Charlie, Bob, 1);
// fungible
const fungibleCollectionId = await createCollectionExpectSuccess({mode: {type: 'Fungible', decimalPoints: 0}});
const newFungibleTokenId = await createItemExpectSuccess(Alice, fungibleCollectionId, 'Fungible');
- await transferExpectFail(fungibleCollectionId, newFungibleTokenId, Charlie, Bob, 1, 'Fungible');
+ await transferExpectFailure(fungibleCollectionId, newFungibleTokenId, Charlie, Bob, 1);
// reFungible
const reFungibleCollectionId = await
createCollectionExpectSuccess({mode: {type: 'ReFungible'}});
const newReFungibleTokenId = await createItemExpectSuccess(Alice, reFungibleCollectionId, 'ReFungible');
- await transferExpectFail(
+ await transferExpectFailure(
reFungibleCollectionId,
newReFungibleTokenId,
Charlie,
Bob,
1,
- 'ReFungible',
);
});
});
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -84,7 +84,7 @@
}
interface ITokenDataType {
- Owner: number[];
+ Owner: IKeyringPair;
ConstData: number[];
VariableData: number[];
}
@@ -523,6 +523,30 @@
});
}
+export async function setTransferFlagExpectSuccess(sender: IKeyringPair, collectionId: number, enabled: boolean) {
+
+ await usingApi(async (api) => {
+
+ const tx = api.tx.nft.setTransfersEnabledFlag (collectionId, enabled);
+ const events = await submitTransactionAsync(sender, tx);
+ const result = getGenericResult(events);
+
+ expect(result.success).to.be.true;
+ });
+}
+
+export async function setTransferFlagExpectFailure(sender: IKeyringPair, collectionId: number, enabled: boolean) {
+
+ await usingApi(async (api) => {
+
+ const tx = api.tx.nft.setTransfersEnabledFlag (collectionId, enabled);
+ const events = await expect(submitTransactionExpectFailAsync(sender, tx)).to.be.rejected;
+ const result = getGenericResult(events);
+
+ expect(result.success).to.be.false;
+ });
+}
+
export async function setContractSponsoringRateLimitExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, rateLimit: number) {
await usingApi(async (api) => {
const tx = api.tx.nft.setContractSponsoringRateLimit(contractAddress, rateLimit);
@@ -543,9 +567,9 @@
});
}
-export async function toggleContractWhitelistExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string) {
+export async function toggleContractWhitelistExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, value = true) {
await usingApi(async (api) => {
- const tx = api.tx.nft.toggleContractWhiteList(contractAddress, true);
+ const tx = api.tx.nft.toggleContractWhiteList(contractAddress, value);
const events = await submitTransactionAsync(sender, tx);
const result = getGenericResult(events);
@@ -748,29 +772,31 @@
sender: IKeyringPair,
recipient: IKeyringPair,
value: number | bigint = 1,
+ blockTimeMs: number,
+ blockSchedule: number,
) {
await usingApi(async (api: ApiPromise) => {
const blockNumber: number | undefined = await getBlockNumber(api);
- const expectedBlockNumber = blockNumber + 2;
+ const expectedBlockNumber = blockNumber + blockSchedule;
expect(blockNumber).to.be.greaterThan(0);
- const transferTx = await api.tx.nft.transfer(recipient.address, collectionId, tokenId, value);
+ const transferTx = await api.tx.nft.transfer(normalizeAccountId(recipient.address), collectionId, tokenId, value);
const scheduleTx = await api.tx.scheduler.schedule(expectedBlockNumber, null, 0, transferTx);
await submitTransactionAsync(sender, scheduleTx);
const recipientBalanceBefore = new BigNumber((await api.query.system.account(recipient.address)).data.free.toString());
- const nftItemDataBefore = (await api.query.nft.nftItemList(collectionId, tokenId)).toJSON() as unknown as ITokenDataType;
- expect(nftItemDataBefore.Owner.toString()).to.be.equal(sender.address);
+ const nftItemDataBefore = (await api.query.nft.nftItemList(collectionId, tokenId)).toJSON() as any as ITokenDataType;
+ expect(toSubstrateAddress(nftItemDataBefore.Owner)).to.be.equal(sender.address);
- // sleep for 2 blocks
- await new Promise(resolve => setTimeout(resolve, 6000 * 2));
+ // sleep for 4 blocks
+ await new Promise(resolve => setTimeout(resolve, blockTimeMs * (blockSchedule + 1)));
const recipientBalanceAfter = new BigNumber((await api.query.system.account(recipient.address)).data.free.toString());
const nftItemData = (await api.query.nft.nftItemList(collectionId, tokenId)).toJSON() as unknown as ITokenDataType;
- expect(nftItemData.Owner.toString()).to.be.equal(recipient.address);
+ expect(toSubstrateAddress(nftItemData.Owner)).to.be.equal(recipient.address);
expect(recipientBalanceAfter.toNumber()).to.be.equal(recipientBalanceBefore.toNumber());
});
}
@@ -820,7 +846,7 @@
}
export async function
-transferExpectFail(
+transferExpectFailure(
collectionId: number,
tokenId: number,
sender: IKeyringPair,
@@ -895,7 +921,8 @@
const createData = { refungible: { const_data: [], variable_data: [], pieces: 100 } };
tx = api.tx.nft.createItem(collectionId, to, createData);
} else {
- tx = api.tx.nft.createItem(collectionId, to, createMode);
+ const createData = { nft: { const_data: [], variable_data: [] } };
+ tx = api.tx.nft.createItem(collectionId, to, createData);
}
const events = await submitTransactionAsync(sender, tx);
tests/yarn.lockdiffbeforeafterboth--- a/tests/yarn.lock
+++ b/tests/yarn.lock
@@ -42,7 +42,7 @@
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
-"@babel/core@^7.1.0", "@babel/core@^7.14.5", "@babel/core@^7.14.6", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
+"@babel/core@^7.1.0", "@babel/core@^7.14.6", "@babel/core@^7.7.2", "@babel/core@^7.7.5":
version "7.14.6"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab"
integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==
@@ -971,7 +971,7 @@
pirates "^4.0.0"
source-map-support "^0.5.16"
-"@babel/runtime@^7.13.9", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.14.6", "@babel/runtime@^7.8.4":
version "7.14.6"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
@@ -1019,21 +1019,6 @@
version "0.4.2"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"
integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==
- dependencies:
- ajv "^6.12.4"
- debug "^4.1.1"
- espree "^7.3.0"
- globals "^13.9.0"
- ignore "^4.0.6"
- import-fresh "^3.2.1"
- js-yaml "^3.13.1"
- minimatch "^3.0.4"
- strip-json-comments "^3.1.1"
-
-"@eslint/eslintrc@^0.4.3":
- version "0.4.3"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
- integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
dependencies:
ajv "^6.12.4"
debug "^4.1.1"
@@ -1559,47 +1544,46 @@
dependencies:
"@octokit/openapi-types" "^7.3.2"
-"@polkadot/api-contract@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-4.15.1.tgz#bfa5aa67b2cdc3c203ed09cfd14c396469eeafa2"
- integrity sha512-TyKc6fyBMJnrHhnicM2hTCQMZMfd5Baarz4L75QMxkWFLTpxQ68BnYFcdupfH6fNXHZeHdRpSW/KPBj47UYgeA==
+"@polkadot/api-contract@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-5.0.1.tgz#520a7b3cd990a76374b79e12eca5bf629cc565a1"
+ integrity sha512-qZ2wnXHDyU2c1/V9GKpbcZKBfVua4YFsU/LHKevZLkJfnGFBgNRdwAuKgVe5h2FCt2W2/pt618WgxG0UDWwjcw==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/api" "4.15.1"
- "@polkadot/types" "4.15.1"
- "@polkadot/util" "^6.9.1"
- "@polkadot/x-rxjs" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/api" "5.0.1"
+ "@polkadot/types" "5.0.1"
+ "@polkadot/util" "^7.0.1"
+ rxjs "^7.2.0"
-"@polkadot/api-derive@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-4.15.1.tgz#841ae233142f4b509d4db1fbcf76db15a77bed0f"
- integrity sha512-gAkKg4w09PThemRz0VI4YDzTy3RfCJrjpR0ZnYT93lZWsspSDiQIzMOTPbOn7MvC7FujeRIT0zqpzDeqKc4wFQ==
+"@polkadot/api-derive@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-5.0.1.tgz#08064c10ed159826ffd07013dcdde1d8b63186a0"
+ integrity sha512-JZpH1JVLu3PvX4+A71iDLtNr6LL103dAFou61DxyJF4obyTmS2lzigG3xXqUFShiPDb19ywxQpsE4gAOP6emuQ==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/api" "4.15.1"
- "@polkadot/rpc-core" "4.15.1"
- "@polkadot/types" "4.15.1"
- "@polkadot/util" "^6.9.1"
- "@polkadot/util-crypto" "^6.9.1"
- "@polkadot/x-rxjs" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/api" "5.0.1"
+ "@polkadot/rpc-core" "5.0.1"
+ "@polkadot/types" "5.0.1"
+ "@polkadot/util" "^7.0.1"
+ "@polkadot/util-crypto" "^7.0.1"
+ rxjs "^7.2.0"
-"@polkadot/api@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-4.15.1.tgz#c9a041b855639a98d6df0706c7546e076a8d5727"
- integrity sha512-MsGKpTAmnkxIN+Zu21NPKWot4xLsDGn/cdranf+P2OjqB80E6m8zkQOE7ug3912WIi5byZp55TSOE9UUzAAW3Q==
+"@polkadot/api@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-5.0.1.tgz#9607b53009322f9264f7dcc8705c466bd33aa516"
+ integrity sha512-5JDpM2Fjc80gHBju1B/rMBGDfAvY8UiU4XVlivJRk+mTVD3OTwbtTro4nmwJOub05xQCJvD/bnCuxG8eFSoq+Q==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/api-derive" "4.15.1"
- "@polkadot/keyring" "^6.9.1"
- "@polkadot/metadata" "4.15.1"
- "@polkadot/rpc-core" "4.15.1"
- "@polkadot/rpc-provider" "4.15.1"
- "@polkadot/types" "4.15.1"
- "@polkadot/types-known" "4.15.1"
- "@polkadot/util" "^6.9.1"
- "@polkadot/util-crypto" "^6.9.1"
- "@polkadot/x-rxjs" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/api-derive" "5.0.1"
+ "@polkadot/keyring" "^7.0.1"
+ "@polkadot/rpc-core" "5.0.1"
+ "@polkadot/rpc-provider" "5.0.1"
+ "@polkadot/types" "5.0.1"
+ "@polkadot/types-known" "5.0.1"
+ "@polkadot/util" "^7.0.1"
+ "@polkadot/util-crypto" "^7.0.1"
eventemitter3 "^4.0.7"
+ rxjs "^7.2.0"
"@polkadot/dev@0.62.43":
version "0.62.43"
@@ -1665,57 +1649,45 @@
typescript "^4.3.4"
yargs "^17.0.1"
-"@polkadot/keyring@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-6.9.1.tgz#a92dd2d4ef8ccb999bc7d443ef4a13e6ef9b2ce2"
- integrity sha512-UF+9psVwVlar7LRJYWJB/xETYBPu1OcyVrxDe88w17Y+ZIsIeNfcR9quVS4M7AdAhplmscsz/wgEMjmggXH9/Q==
- dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/util" "6.9.1"
- "@polkadot/util-crypto" "6.9.1"
-
-"@polkadot/metadata@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-4.15.1.tgz#3cd2392b956577edf96090793fd8b9b392a67502"
- integrity sha512-pnOgJSFCVgQpZtp7ghS0AS7xWCp6POKrb5LhY1CK7XTy6iQ6VHcGnr1N4wfia1c3o5ZOPj8Xic29Da61tkjp2Q==
+"@polkadot/keyring@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-7.0.1.tgz#666e903661b98279dc16d512be69f5ace4b58d8d"
+ integrity sha512-eSvG8Q4gUTRDFWj2lqTY/9NekGP8dtp+W6WmouKh0DDwHRawaVeDaq6UJYQv6XoBG1i+ZGPvErRQeGMPOn/mUQ==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/types" "4.15.1"
- "@polkadot/types-known" "4.15.1"
- "@polkadot/util" "^6.9.1"
- "@polkadot/util-crypto" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/util" "7.0.1"
+ "@polkadot/util-crypto" "7.0.1"
-"@polkadot/networks@6.9.1", "@polkadot/networks@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-6.9.1.tgz#8d66338569c9891a00cc6737e18c1dbffd7153f5"
- integrity sha512-imBPIrLN0W+7zuosD4WBtOkMzXc/271NhWn6dQmyA0xEoJx+6coJHQH/04fqO/gfZd4M1R70f3Gt5hlsfzCwlA==
+"@polkadot/networks@7.0.1", "@polkadot/networks@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/networks/-/networks-7.0.1.tgz#e07c4b88e25711433e76d24fce4c7273c25dd38b"
+ integrity sha512-bJSvI7UgEpxmBKS8TMh+I1mfmCMwhClGdSs29kwU+K61IjBTKTt3yQJ/SflYIQV7QftGbz3oMfSkGbQbRHZqvQ==
dependencies:
- "@babel/runtime" "^7.14.5"
+ "@babel/runtime" "^7.14.6"
-"@polkadot/rpc-core@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-4.15.1.tgz#2e14edcdf8cd4e6f9658ecbd90540a9d39c3e929"
- integrity sha512-g9NxsHgOBzqLBWGV+hbXd8tmDWBdIZSxr3b107xY090wbQQ0R9I6D6wi+d7mJtcH1tazuhQgWQqyvvsbr2xPZg==
+"@polkadot/rpc-core@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-5.0.1.tgz#8460287532fe61c31505564df53e92ef6feba875"
+ integrity sha512-JMNOVQijjyJZNu9B8CJwIrQzGYzAp03uCBSbqYfzWBFnYVLKh7JmvOlkLnODM8uUYq0gVN4BaDUSPc39GpELAQ==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/metadata" "4.15.1"
- "@polkadot/rpc-provider" "4.15.1"
- "@polkadot/types" "4.15.1"
- "@polkadot/util" "^6.9.1"
- "@polkadot/x-rxjs" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/rpc-provider" "5.0.1"
+ "@polkadot/types" "5.0.1"
+ "@polkadot/util" "^7.0.1"
+ rxjs "^7.2.0"
-"@polkadot/rpc-provider@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-4.15.1.tgz#18a61b5353388da73f722f30905f23927b2c5e31"
- integrity sha512-NfgdBsLP56XAIrSu29iKmqLb4ZAbK50VINGv3Qi99s5V2FiFOAvZq22arkoCmFo1q4zFpQeQqul3ZyZv8QX/Kg==
+"@polkadot/rpc-provider@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-5.0.1.tgz#ef022a123eb9073634b59c6e0f6e1705e96066a5"
+ integrity sha512-t+VKhMtQfQVgkZDqYnP/44KlBDmcCVo1/MvJ+DoNd7RUWUIBJt3v71G5gDSNeGMTyvxn0KK0qL4j+Nqr6c4FUQ==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/types" "4.15.1"
- "@polkadot/util" "^6.9.1"
- "@polkadot/util-crypto" "^6.9.1"
- "@polkadot/x-fetch" "^6.9.1"
- "@polkadot/x-global" "^6.9.1"
- "@polkadot/x-ws" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/types" "5.0.1"
+ "@polkadot/util" "^7.0.1"
+ "@polkadot/util-crypto" "^7.0.1"
+ "@polkadot/x-fetch" "^7.0.1"
+ "@polkadot/x-global" "^7.0.1"
+ "@polkadot/x-ws" "^7.0.1"
eventemitter3 "^4.0.7"
"@polkadot/ts@0.3.89":
@@ -1725,57 +1697,55 @@
dependencies:
"@types/chrome" "^0.0.144"
-"@polkadot/typegen@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/typegen/-/typegen-4.15.1.tgz#e04d5ef70712bfc91707723a1ae0198e5309ed75"
- integrity sha512-gIk3GdgNuRp0GnbrljUVUgrsT7GLbGcNmI/Jbnt64Zyw20beMrvPQyDkoRBWrN4aN14B1SW1xIXQz4axVy7Tug==
+"@polkadot/typegen@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/typegen/-/typegen-5.0.1.tgz#718b517f4f1578441911096603577bd0a2a968e0"
+ integrity sha512-iFLJoWgIkn+J6MDw3AUWveP9qxVn1C+VeLJbpZ21St5WyeE148Tml0BmYnKLSXlaPMhZEwB+/IV3jpQ35dH4bw==
dependencies:
- "@babel/core" "^7.14.5"
+ "@babel/core" "^7.14.6"
"@babel/register" "^7.14.5"
- "@babel/runtime" "^7.14.5"
- "@polkadot/api" "4.15.1"
- "@polkadot/metadata" "4.15.1"
- "@polkadot/rpc-provider" "4.15.1"
- "@polkadot/types" "4.15.1"
- "@polkadot/util" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/api" "5.0.1"
+ "@polkadot/rpc-provider" "5.0.1"
+ "@polkadot/types" "5.0.1"
+ "@polkadot/util" "^7.0.1"
handlebars "^4.7.7"
websocket "^1.0.34"
yargs "^17.0.1"
-"@polkadot/types-known@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-4.15.1.tgz#d60cfb1e4ed315f2c82646795243a34df6b21fd3"
- integrity sha512-yj2fVwEyYrc6eBoW6W3JQ5h1FZjcyyhDzfrtxronSLdT7H6zUtlLqn1A5uzkxPD0eSXkesh960GHeYzAi+p4cw==
+"@polkadot/types-known@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/types-known/-/types-known-5.0.1.tgz#21feb327fc4323733bf027c8d874a2aa3014b21f"
+ integrity sha512-AIhPlN4r14ZW4wdwHZD2nIe1DE61ZO9PsyrCyAU3ysl6Cw6TI+txDCN3aS/8XYuC7wDLEgLB9vJv2sVWdCzqJg==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/networks" "^6.9.1"
- "@polkadot/types" "4.15.1"
- "@polkadot/util" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/networks" "^7.0.1"
+ "@polkadot/types" "5.0.1"
+ "@polkadot/util" "^7.0.1"
-"@polkadot/types@4.15.1":
- version "4.15.1"
- resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-4.15.1.tgz#03f32fd4ce81d69c43368d3e476c0421cedb8607"
- integrity sha512-daCblGDkiNHyDNkVDOQ0x/hblK7zkGAFQy+ykMt6euGGllUiKaAbCKlQN803aKmsB/5m8zQU63MHQC65tkpWXg==
+"@polkadot/types@5.0.1":
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-5.0.1.tgz#2a4e23e452f999eeae175b595470df0e426a930d"
+ integrity sha512-aN6JKeF7ZYi5irYAaUoDqth6qlOlB15C5vhlDOojEorYLfRs/R+GCrO+lPSs+bKmSxh7BSRh500ikI/xD4nx5A==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/metadata" "4.15.1"
- "@polkadot/util" "^6.9.1"
- "@polkadot/util-crypto" "^6.9.1"
- "@polkadot/x-rxjs" "^6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/util" "^7.0.1"
+ "@polkadot/util-crypto" "^7.0.1"
+ rxjs "^7.2.0"
-"@polkadot/util-crypto@6.9.1", "@polkadot/util-crypto@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-6.9.1.tgz#175a2bbc040785599730baee35f0235226b8343e"
- integrity sha512-lniY8bhRoayA8PD3NHyvpAL2N9YETDll6HbxaOIkGS9nnVmlOjIvslcd343b30rj7/qSV72w+8qkReHj650aQw==
+"@polkadot/util-crypto@7.0.1", "@polkadot/util-crypto@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-7.0.1.tgz#03109dc11323dad174fb2214d395855495def16a"
+ integrity sha512-dbvdsICoyOVw/K45RmHOP7wXE/7vj+NzEKGcKbiDt39nglHm6g2BTJ947PwwyNusTTAx82Q2iJ9vIZ1Kl0xG+g==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/networks" "6.9.1"
- "@polkadot/util" "6.9.1"
- "@polkadot/wasm-crypto" "^4.0.2"
- "@polkadot/x-randomvalues" "6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/networks" "7.0.1"
+ "@polkadot/util" "7.0.1"
+ "@polkadot/wasm-crypto" "^4.1.2"
+ "@polkadot/x-randomvalues" "7.0.1"
base-x "^3.0.8"
base64-js "^1.5.1"
- blakejs "^1.1.0"
+ blakejs "^1.1.1"
bn.js "^4.11.9"
create-hash "^1.2.0"
elliptic "^6.5.4"
@@ -1785,101 +1755,91 @@
tweetnacl "^1.0.3"
xxhashjs "^0.2.2"
-"@polkadot/util@6.9.1", "@polkadot/util@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-6.9.1.tgz#009a9e0771523398517dbf3a978285b071f6081c"
- integrity sha512-RTIn8+Xdgywj8Bl7D12557zi8iIoUvDpAJztp/CwIq4O3jEw6Y/7lqNX/K6OXhZm/gZf7tFgFnvGlsIuNbtYcQ==
+"@polkadot/util@7.0.1", "@polkadot/util@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-7.0.1.tgz#79afd40473016876f51d65ebb9900a20108fe0a4"
+ integrity sha512-EtQlZL6ok0Ep+zRz2QHMUoJo/b3kFHVN2qqyD2+9sdqg0FGLmkzNFM+K6dasCMLXieJ1l0HoFsQppSo/leUeaA==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/x-textdecoder" "6.9.1"
- "@polkadot/x-textencoder" "6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/x-textdecoder" "7.0.1"
+ "@polkadot/x-textencoder" "7.0.1"
"@types/bn.js" "^4.11.6"
bn.js "^4.11.9"
camelcase "^5.3.1"
ip-regex "^4.3.0"
-"@polkadot/wasm-crypto-asmjs@^4.0.2":
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-4.0.2.tgz#f42c353a64e1243841daf90e4bd54eff01a4e3cf"
- integrity sha512-hlebqtGvfjg2ZNm4scwBGVHwOwfUhy2yw5RBHmPwkccUif3sIy4SAzstpcVBIVMdAEvo746bPWEInA8zJRcgJA==
+"@polkadot/wasm-crypto-asmjs@^4.1.2":
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-4.1.2.tgz#094b3eeeb5fd39a93db177583b48454511874cfc"
+ integrity sha512-3Q+vVUxDAC2tXgKMM3lKzx2JW+tarDpTjkvdxIKATyi8Ek69KkUqvMyJD0VL/iFZOFZED0YDX9UU4XOJ/astlg==
dependencies:
- "@babel/runtime" "^7.13.9"
+ "@babel/runtime" "^7.14.6"
-"@polkadot/wasm-crypto-wasm@^4.0.2":
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-4.0.2.tgz#89f9e0a1e4d076784d4a42bea37fc8b06bdd8bb6"
- integrity sha512-de/AfNPZ0uDKFWzOZ1rJCtaUbakGN29ks6IRYu6HZTRg7+RtqvE1rIkxabBvYgQVHIesmNwvEA9DlIkS6hYRFQ==
+"@polkadot/wasm-crypto-wasm@^4.1.2":
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-4.1.2.tgz#773c78c1d65886671d3ba1d66c31afd86c93d02f"
+ integrity sha512-/l4IBEdQ41szHdHkuF//z1qr+XmWuLHlpBA7s9Eb221m1Fir6AKoCHoh1hp1r3v0ecZYLKvak1B225w6JAU3Fg==
dependencies:
- "@babel/runtime" "^7.13.9"
+ "@babel/runtime" "^7.14.6"
-"@polkadot/wasm-crypto@^4.0.2":
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-4.0.2.tgz#9649057adee8383cc86433d107ba526b718c5a3b"
- integrity sha512-2h9FuQFkBc+B3TwSapt6LtyPvgtd0Hq9QsHW8g8FrmKBFRiiFKYRpfJKHCk0aCZzuRf9h95bQl/X6IXAIWF2ng==
+"@polkadot/wasm-crypto@^4.1.2":
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/@polkadot/wasm-crypto/-/wasm-crypto-4.1.2.tgz#dead71ae5d2f7722d23aed5be2112e1732d315e9"
+ integrity sha512-2EKdOjIrD2xHP2rC+0G/3Qo6926nL/18vCFkd34lBd9zP9YNF2GDEtDY+zAeDIRFKe1sQHTpsKgNdYSWoV2eBg==
dependencies:
- "@babel/runtime" "^7.13.9"
- "@polkadot/wasm-crypto-asmjs" "^4.0.2"
- "@polkadot/wasm-crypto-wasm" "^4.0.2"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/wasm-crypto-asmjs" "^4.1.2"
+ "@polkadot/wasm-crypto-wasm" "^4.1.2"
-"@polkadot/x-fetch@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-6.9.1.tgz#89ff2741b35f2bb9fdc30a22cdb0debf72248597"
- integrity sha512-CckiiRiGM+7WGOw1WijDeN9NJcTBEjZ96LRMaUng+BNvNhUQplsmX6CUt86Qn6T1O8TQaAg93wtqb+deykkn2g==
+"@polkadot/x-fetch@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/x-fetch/-/x-fetch-7.0.1.tgz#2db6fa19f4f4d9b2f4cf50ba78bf3aa947d7b982"
+ integrity sha512-9R38FjtlJcvdpEA7tVGmTmH4aiBCTABuLJdVSn3cYkgWfxDHeFMqjdFzTJ6Asa5cY0Ds3ZKsh9uccTQBQzV/HQ==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/x-global" "6.9.1"
- "@types/node-fetch" "^2.5.10"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/x-global" "7.0.1"
+ "@types/node-fetch" "^2.5.11"
node-fetch "^2.6.1"
-"@polkadot/x-global@6.9.1", "@polkadot/x-global@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-6.9.1.tgz#c3d7482e2ac62c306379592550d476fc60ce7dfe"
- integrity sha512-/pVzvQUObccuk/f2BGcs0WMjveLQPr1Qf+uiSF/7ae9BZHIG4ydLz0/Lnzbt4YQkIEaRNvVFD1Vph5hyjo4VCA==
+"@polkadot/x-global@7.0.1", "@polkadot/x-global@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-7.0.1.tgz#44fb248d3aaea557753318327149772969e96bff"
+ integrity sha512-gVVACSdRhHYRJejLEAL0mM9BZfY8N50VT2+15A7ALD1tVqwS4tz3P9vRW3Go7ZjfyAc83aEmh0PiQ8Nm1R+2Cg==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@types/node-fetch" "^2.5.10"
- node-fetch "^2.6.1"
+ "@babel/runtime" "^7.14.6"
-"@polkadot/x-randomvalues@6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-6.9.1.tgz#e289e79849e332777fb96e8544b1193a4e793e59"
- integrity sha512-L1c5ddjzyPAvzRkbnrbVgQTUskM4vRtfxblOV/tmM1BP6mB1U3rWo0FeHNWN/uiUoibVFIDNUKqUnZ5vhYs1qg==
+"@polkadot/x-randomvalues@7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/x-randomvalues/-/x-randomvalues-7.0.1.tgz#32036ae5d48645a062f6a1c3ebbf227236c806b8"
+ integrity sha512-UNoIFaz1xJPozruT+lo8BTeT8A3NM3PgWuru7Vs8OsIz0Phkg7lUWlpHu9PZHyQCyKlUryvkOA692IlVlNYy2Q==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/x-global" "6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/x-global" "7.0.1"
-"@polkadot/x-rxjs@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/x-rxjs/-/x-rxjs-6.9.1.tgz#713a399568922aff10fe47c3875dba44a139d6c6"
- integrity sha512-sfQNA7so5KoeFEIIx7OGZL5D+0Hn0SRZJMbZSuGRFMKjyovpyzWi+Mjs3l6T6OXbKm972XAseNGDUWSVG4EpLQ==
+"@polkadot/x-textdecoder@7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-7.0.1.tgz#bb9bba94b2eb1612dd35c299f43ab74515db74d9"
+ integrity sha512-CFRnpI0cp1h2N1+ec551BLVLwV6OHG6Gj62EYcIOXR+o/SX/6MXm3Qcehm2YvfTKqktyIUSWmTwbWjGjuqPrpA==
dependencies:
- "@babel/runtime" "^7.14.5"
- rxjs "^6.6.7"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/x-global" "7.0.1"
-"@polkadot/x-textdecoder@6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/x-textdecoder/-/x-textdecoder-6.9.1.tgz#dab6e95b35c9386550c4907fd1efb195ab605ec9"
- integrity sha512-U7Cu7PbY5CG5kjbKqAQ/e07FfvPYZwHZZbC+343vDHUnJlyONKxp+jhod+A1pepu15fsYH/iZC0Os6RwfKoEAA==
+"@polkadot/x-textencoder@7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-7.0.1.tgz#181d403c5dc1d94fd1e2147fd1c5c528d30d8805"
+ integrity sha512-m+QL1HNiu5GMz6cfr/udSA6fUTv3RyIybJb7v43EQCxqlj/L0J3cUHapFd6tqH9PElD6jPkH1pXcgYN8e7dWTQ==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/x-global" "6.9.1"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/x-global" "7.0.1"
-"@polkadot/x-textencoder@6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/x-textencoder/-/x-textencoder-6.9.1.tgz#cf98a3f248ad9a4cdb2559f950ff6559d009b619"
- integrity sha512-M9VNm7IpbBwQnCZhEBAXSQ+/g2psEv4zjJYdX4/HTcWNpnYEUHeayIVTw91Wkgo3dN8wBL245vVp/8apfKfMkQ==
- dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/x-global" "6.9.1"
-
-"@polkadot/x-ws@^6.9.1":
- version "6.9.1"
- resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-6.9.1.tgz#ac4d0cf22c333359a426f4104581c9e394d7f6e5"
- integrity sha512-BeoVqFFLatrt3k8Leyi6LsOMz5rkdXbQ5oE2Db0V+ezfh5aEV/JjoLsaPkX+i6xsCYibB43rY64FBhpJ2O0iYg==
+"@polkadot/x-ws@^7.0.1":
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@polkadot/x-ws/-/x-ws-7.0.1.tgz#8c22a61c0dd9b82865c7631e22ac147c2b73b118"
+ integrity sha512-VUn/6sCJUpvW9WhUK+DKo1uDrw4yO84twRcy5JSzvSiBTaSplhU9Q4qGFl2Atr3WIzAYYx1jQSm/j6AhPRji1w==
dependencies:
- "@babel/runtime" "^7.14.5"
- "@polkadot/x-global" "6.9.1"
- "@types/websocket" "^1.0.2"
+ "@babel/runtime" "^7.14.6"
+ "@polkadot/x-global" "7.0.1"
+ "@types/websocket" "^1.0.3"
websocket "^1.0.34"
"@rushstack/eslint-patch@^1.0.6":
@@ -2046,10 +2006,10 @@
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.2.tgz#91daa226eb8c2ff261e6a8cbf8c7304641e095e0"
integrity sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==
-"@types/node-fetch@^2.5.10":
- version "2.5.10"
- resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
- integrity sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==
+"@types/node-fetch@^2.5.11":
+ version "2.5.11"
+ resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.11.tgz#ce22a2e65fc8999f4dbdb7ddbbcf187d755169e4"
+ integrity sha512-2upCKaqVZETDRb8A2VTaRymqFBEgH8u6yr96b/u3+1uQEPDRo3mJLEiPk7vdXBHRtjwkjqzFYMJXrt0Z9QsYjQ==
dependencies:
"@types/node" "*"
form-data "^3.0.0"
@@ -2093,10 +2053,10 @@
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
-"@types/websocket@^1.0.2":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.2.tgz#d2855c6a312b7da73ed16ba6781815bf30c6187a"
- integrity sha512-B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ==
+"@types/websocket@^1.0.3":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.3.tgz#49e09f939afd0ccdee4f7108d4712ec9feb0f153"
+ integrity sha512-ZdoTSwmDsKR7l1I8fpfQtmTI/hUwlOvE3q0iyJsp4tXU0MkdrYowimDzwxjhQvxU4qjhHLd3a6ig0OXRbLgIdw==
dependencies:
"@types/node" "*"
@@ -2826,6 +2786,11 @@
resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5"
integrity sha1-ad+S75U6qIylGjLfarHFShVfx6U=
+blakejs@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.1.tgz#bf313053978b2cd4c444a48795710be05c785702"
+ integrity sha512-bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg==
+
bluebird@^3.1.1, bluebird@^3.5.0:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -4307,12 +4272,12 @@
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
eslint@^7.28.0:
- version "7.31.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca"
- integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==
+ version "7.30.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8"
+ integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==
dependencies:
"@babel/code-frame" "7.12.11"
- "@eslint/eslintrc" "^0.4.3"
+ "@eslint/eslintrc" "^0.4.2"
"@humanwhocodes/config-array" "^0.5.0"
ajv "^6.10.0"
chalk "^4.0.0"
@@ -8557,13 +8522,20 @@
dependencies:
queue-microtask "^1.2.2"
-rxjs@^6.6.6, rxjs@^6.6.7:
+rxjs@^6.6.6:
version "6.6.7"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
dependencies:
tslib "^1.9.0"
+rxjs@^7.2.0:
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.2.0.tgz#5cd12409639e9514a71c9f5f9192b2c4ae94de31"
+ integrity sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw==
+ dependencies:
+ tslib "~2.1.0"
+
safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9422,6 +9394,11 @@
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+tslib@~2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
+ integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
+
tslint@^6.1.3:
version "6.1.3"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"