From a4127fe2eb7df27efa1574948d68931145d597b4 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Tue, 27 Jul 2021 17:13:37 +0000 Subject: [PATCH] Merge commit '4359d76172511a9ab73cac61957cc6ddf47a2653' into feature/evm-call-sponsoring --- --- 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![], --- 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::() @@ -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)), + >::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); } --- 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 = ::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::::AccountTokenLimitExceeded ); + // preliminary transfer check + ensure!(collection.transfers_enabled, Error::::TransferNotAllowed); + Ok(()) } --- 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; type Randomness = pallet_randomness_collective_flip::Pallet; - -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 = Default::default(); -} - -impl pallet_contracts::Config for Test { - type Time = Timestamp; - type Randomness = Randomness; - type Currency = pallet_balances::Pallet; - 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; - type Schedule = Schedule; - type CallStack = [pallet_contracts::Frame; 31]; -} parameter_types! { pub const CollectionCreationPrice: u32 = 0; --- 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::::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]); + }); +} --- 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!(!::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!(!::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!(!::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!(!::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::::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!(!::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::::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!(!::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 = - ::DbWeight::get().reads_writes(1, 2); - let base_multiplier = 0; - let named_multiplier = ::DbWeight::get().writes(1); - let periodic_multiplier = - ::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::::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::::TargetBlockNumberInPast, - ); - - assert_err!( - Scheduler::schedule(Origin::root(), 2, None, 127, call2.clone()), - Error::::TargetBlockNumberInPast, - ); - - assert_err!( - Scheduler::schedule(Origin::root(), 3, None, 127, call2), - Error::::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::::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::::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::::iter().collect::>(), - 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::::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::::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::::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::::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::::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::::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>> = 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 for OriginCaller { - fn from(value: u32) -> Self { - match value { - 3 => system::RawOrigin::Root.into(), - 2 => system::RawOrigin::None.into(), - _ => unimplemented!(), - } - } - } - - Scheduler::migrate_origin::(); - - assert_eq_uvec!( - Agenda::::iter().collect::>(), - 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::::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::::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::::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::::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::::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::::default(), - }), - ] - ) - ] - ); - }); - } } --- a/primitives/nft/src/lib.rs +++ b/primitives/nft/src/lib.rs @@ -144,6 +144,7 @@ pub limits: CollectionLimits, // Collection private restrictions pub variable_on_chain_schema: Vec, // pub const_on_chain_schema: Vec, // + pub transfers_enabled: bool, } #[derive(Encode, Decode, Debug, Clone, PartialEq)] --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -154,7 +154,7 @@ transaction_version: 1, }; -pub const MILLISECS_PER_BLOCK: u64 = 12000; +pub const MILLISECS_PER_BLOCK: u64 = 1200; pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK; @@ -449,7 +449,7 @@ } impl pallet_transaction_payment::Config for Runtime { - type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; + type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; type TransactionByteFee = TransactionByteFee; type WeightToFee = LinearFee; type FeeMultiplierUpdate = (); --- a/runtime_types.json +++ b/runtime_types.json @@ -62,7 +62,8 @@ "Sponsorship": "SponsorshipState", "Limits": "CollectionLimits", "VariableOnChainSchema": "Vec", - "ConstOnChainSchema": "Vec" + "ConstOnChainSchema": "Vec", + "TransfersEnabled": "bool" }, "RawData": "Vec", "Address": "MultiAddress", --- 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", --- 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); --- 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 => { --- 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.) --- 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' }); --- 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'); --- 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 () => { --- /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); + }); + }); +}); --- 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); --- 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', () => { --- 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); --- 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'); --- 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; --- 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); }); }); }); --- 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; }); --- 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 () => { --- 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; }); --- 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; } --- 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 => { --- 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', ); }); }); --- 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); --- 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" -- gitstuff