From d83ab4fde4e870139a34545b193320bd4c13739e Mon Sep 17 00:00:00 2001 From: PraetorP Date: Wed, 07 Sep 2022 09:09:22 +0000 Subject: [PATCH] fix appPromotion RPC diasbling, refactor benchmarks, fix `WithdrawReasons`, rename `get_sponsor` to `sponsor` in hadlers traits + change their behavior in impl's blocks --- --- a/node/rpc/src/lib.rs +++ b/node/rpc/src/lib.rs @@ -234,7 +234,7 @@ io.merge(Unique::new(client.clone()).into_rpc())?; - #[cfg(any(feature = "opal-runtime"))] + #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))] io.merge(AppPromotion::new(client.clone()).into_rpc())?; #[cfg(not(feature = "unique-runtime"))] --- a/pallets/app-promotion/src/benchmarking.rs +++ b/pallets/app-promotion/src/benchmarking.rs @@ -30,7 +30,7 @@ const SEED: u32 = 0; -fn set_admin() -> DispatchResult +fn set_admin() -> Result where T: Config + pallet_unique::Config + pallet_evm_migration::Config, T::BlockNumber: From + Into, @@ -46,7 +46,9 @@ PromototionPallet::::set_admin_address( RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()), - ) + )?; + + Ok(pallet_admin) } benchmarks! { @@ -73,12 +75,12 @@ set_admin_address { let pallet_admin = account::("admin", 0, SEED); let _ = ::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::::max_value()); - } : {PromototionPallet::::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin))?} + } : _(RawOrigin::Root, T::CrossAccountId::from_sub(pallet_admin)) payout_stakers{ let b in 1..101; - let pallet_admin = account::("admin", 0, SEED); + let pallet_admin = account::("admin", 1, SEED); let share = Perbill::from_rational(1u32, 20); PromototionPallet::::set_admin_address(RawOrigin::Root.into(), T::CrossAccountId::from_sub(pallet_admin.clone()))?; ::Currency::make_free_balance_be(&pallet_admin, Perbill::from_rational(1u32, 2) * BalanceOf::::max_value()); @@ -92,22 +94,18 @@ (0..10).try_for_each(|_| { stakers.iter() .map(|staker| { - PromototionPallet::::stake(RawOrigin::Signed(staker.clone()).into(), Into::>::into(100u128) * T::Nominal::get()) }).collect::, _>>()?; >::finalize(); Result::<(), sp_runtime::DispatchError>::Ok(()) })?; - - // let _ = ::Currency::make_free_balance_be(&staker, Perbill::from_rational(1u32, 2) * BalanceOf::::max_value()); - // let _ = PromototionPallet::::stake(RawOrigin::Signed(staker.clone()).into(), share * ::Currency::total_balance(&staker))?; - } : {PromototionPallet::::payout_stakers(RawOrigin::Signed(pallet_admin.clone()).into(), Some(b as u8))?} + } : _(RawOrigin::Signed(pallet_admin.clone()), Some(b as u8)) stake { let caller = account::("caller", 0, SEED); let share = Perbill::from_rational(1u32, 10); let _ = ::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::::max_value()); - } : {PromototionPallet::::stake(RawOrigin::Signed(caller.clone()).into(), share * ::Currency::total_balance(&caller))?} + } : _(RawOrigin::Signed(caller.clone()), share * ::Currency::total_balance(&caller)) unstake { let caller = account::("caller", 0, SEED); @@ -117,17 +115,8 @@ >::finalize(); PromototionPallet::::stake(RawOrigin::Signed(caller.clone()).into(), share * ::Currency::total_balance(&caller)) }).collect::, _>>()?; - - } : {PromototionPallet::::unstake(RawOrigin::Signed(caller.clone()).into())?} - // recalculate_and_insert_stake{ - // let caller = account::("caller", 0, SEED); - // let share = Perbill::from_rational(1u32, 10); - // let _ = ::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::::max_value()); - // let _ = PromototionPallet::::stake(RawOrigin::Signed(caller.clone()).into(), share * ::Currency::total_balance(&caller))?; - // let block = ::current_block_number(); - // let mut acc = >::default(); - // } : {PromototionPallet::::recalculate_and_insert_stake(&caller, block, share * ::Currency::total_balance(&caller), &mut acc)} + } : _(RawOrigin::Signed(caller.clone())) sponsor_collection { let pallet_admin = account::("admin", 0, SEED); @@ -136,7 +125,7 @@ let caller: T::AccountId = account("caller", 0, SEED); let _ = ::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::::max_value()); let collection = create_nft_collection::(caller.clone())?; - } : {PromototionPallet::::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?} + } : _(RawOrigin::Signed(pallet_admin.clone()), collection) stop_sponsoring_collection { let pallet_admin = account::("admin", 0, SEED); @@ -146,7 +135,7 @@ let _ = ::Currency::make_free_balance_be(&caller, Perbill::from_rational(1u32, 2) * BalanceOf::::max_value()); let collection = create_nft_collection::(caller.clone())?; PromototionPallet::::sponsor_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?; - } : {PromototionPallet::::stop_sponsoring_collection(RawOrigin::Signed(pallet_admin.clone()).into(), collection)?} + } : _(RawOrigin::Signed(pallet_admin.clone()), collection) sponsor_contract { let pallet_admin = account::("admin", 0, SEED); @@ -157,7 +146,7 @@ let data: Vec = (0..20 as u8).collect(); >::begin(RawOrigin::Root.into(), address)?; >::finish(RawOrigin::Root.into(), address, data)?; - } : {PromototionPallet::::sponsor_conract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?} + } : _(RawOrigin::Signed(pallet_admin.clone()), address) stop_sponsoring_contract { let pallet_admin = account::("admin", 0, SEED); @@ -168,6 +157,6 @@ let data: Vec = (0..20 as u8).collect(); >::begin(RawOrigin::Root.into(), address)?; >::finish(RawOrigin::Root.into(), address, data)?; - PromototionPallet::::sponsor_conract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?; - } : {PromototionPallet::::stop_sponsoring_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?} + PromototionPallet::::sponsor_contract(RawOrigin::Signed(pallet_admin.clone()).into(), address)?; + } : _(RawOrigin::Signed(pallet_admin.clone()), address) } --- a/pallets/app-promotion/src/lib.rs +++ b/pallets/app-promotion/src/lib.rs @@ -226,12 +226,6 @@ where ::BlockNumber: From, { - // let mut consumed_weight = 0; - // let mut add_weight = |reads, writes, weight| { - // consumed_weight += T::DbWeight::get().reads_writes(reads, writes); - // consumed_weight += weight; - // }; - let block_pending = PendingUnstake::::take(current_block_number); let counter = block_pending.len() as u32; // add_weight(0, 1, 0); @@ -243,7 +237,6 @@ } T::WeightInfo::on_initialize(counter) - // consumed_weight } } @@ -286,7 +279,7 @@ <::Currency as Currency>::ensure_can_withdraw( &staker_id, amount, - WithdrawReasons::RESERVE, + WithdrawReasons::all(), balance - amount, )?; @@ -398,8 +391,7 @@ ); ensure!( - T::CollectionHandler::get_sponsor(collection_id)? - .ok_or(>::InvalidArgument)? + T::CollectionHandler::sponsor(collection_id)?.ok_or(>::InvalidArgument)? == Self::account_id(), >::NoPermission ); @@ -407,7 +399,7 @@ } #[pallet::weight(T::WeightInfo::sponsor_contract())] - pub fn sponsor_conract(admin: OriginFor, contract_id: H160) -> DispatchResult { + pub fn sponsor_contract(admin: OriginFor, contract_id: H160) -> DispatchResult { let admin_id = ensure_signed(admin)?; ensure!( @@ -431,7 +423,7 @@ ); ensure!( - T::ContractHandler::get_sponsor(contract_id)?.ok_or(>::InvalidArgument)? + T::ContractHandler::sponsor(contract_id)?.ok_or(>::InvalidArgument)? == T::CrossAccountId::from_sub(Self::account_id()), >::NoPermission ); @@ -673,7 +665,7 @@ LOCK_IDENTIFIER, staker, amount, - WithdrawReasons::RESERVE, + WithdrawReasons::all(), ) } } --- a/pallets/app-promotion/src/types.rs +++ b/pallets/app-promotion/src/types.rs @@ -37,9 +37,8 @@ fn remove_collection_sponsor(collection_id: Self::CollectionId) -> DispatchResult; - fn get_sponsor( - collection_id: Self::CollectionId, - ) -> Result, DispatchError>; + fn sponsor(collection_id: Self::CollectionId) + -> Result, DispatchError>; } impl CollectionHandler for pallet_unique::Pallet { @@ -58,12 +57,12 @@ Self::force_remove_collection_sponsor(collection_id) } - fn get_sponsor( + fn sponsor( collection_id: Self::CollectionId, ) -> Result, DispatchError> { Ok(>::try_get(collection_id)? .sponsorship - .pending_sponsor() + .sponsor() .map(|acc| acc.to_owned())) } } @@ -79,7 +78,7 @@ fn remove_contract_sponsor(contract_address: Self::ContractId) -> DispatchResult; - fn get_sponsor( + fn sponsor( contract_address: Self::ContractId, ) -> Result, DispatchError>; } @@ -100,7 +99,7 @@ Self::force_remove_sponsor(contract_address) } - fn get_sponsor( + fn sponsor( contract_address: Self::ContractId, ) -> Result, DispatchError> { Ok(Self::get_sponsor(contract_address)) --- a/pallets/app-promotion/src/weights.rs +++ b/pallets/app-promotion/src/weights.rs @@ -3,7 +3,7 @@ //! Autogenerated weights for pallet_app_promotion //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-09-06, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-09-07, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024 // Executed Command: @@ -51,16 +51,16 @@ // Storage: AppPromotion PendingUnstake (r:1 w:0) // Storage: System Account (r:1 w:1) fn on_initialize(b: u32, ) -> Weight { - (2_461_000 as Weight) - // Standard Error: 87_000 - .saturating_add((6_006_000 as Weight).saturating_mul(b as Weight)) + (2_651_000 as Weight) + // Standard Error: 103_000 + .saturating_add((6_024_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight))) } // Storage: AppPromotion Admin (r:0 w:1) fn set_admin_address() -> Weight { - (5_467_000 as Weight) + (7_117_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) @@ -68,21 +68,21 @@ // Storage: AppPromotion NextCalculatedRecord (r:1 w:1) // Storage: AppPromotion Staked (r:2 w:0) fn payout_stakers(b: u32, ) -> Weight { - (4_946_000 as Weight) - // Standard Error: 5_000 - .saturating_add((4_599_000 as Weight).saturating_mul(b as Weight)) + (9_958_000 as Weight) + // Standard Error: 8_000 + .saturating_add((4_406_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: AppPromotion StakesPerAccount (r:1 w:1) // Storage: System Account (r:1 w:1) - // Storage: AppPromotion StakesPerAccount (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: ParachainSystem ValidationData (r:1 w:0) // Storage: AppPromotion Staked (r:1 w:1) // Storage: AppPromotion TotalStaked (r:1 w:1) fn stake() -> Weight { - (17_766_000 as Weight) + (20_574_000 as Weight) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } @@ -93,35 +93,35 @@ // Storage: AppPromotion TotalStaked (r:1 w:1) // Storage: AppPromotion StakesPerAccount (r:0 w:1) fn unstake() -> Weight { - (27_250_000 as Weight) + (31_703_000 as Weight) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: Common CollectionById (r:1 w:1) fn sponsor_collection() -> Weight { - (11_014_000 as Weight) + (12_932_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: Common CollectionById (r:1 w:1) fn stop_sponsoring_collection() -> Weight { - (10_494_000 as Weight) + (12_453_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: EvmContractHelpers Sponsoring (r:0 w:1) fn sponsor_contract() -> Weight { - (9_754_000 as Weight) + (11_952_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: EvmContractHelpers Sponsoring (r:1 w:1) fn stop_sponsoring_contract() -> Weight { - (10_063_000 as Weight) + (12_538_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -132,16 +132,16 @@ // Storage: AppPromotion PendingUnstake (r:1 w:0) // Storage: System Account (r:1 w:1) fn on_initialize(b: u32, ) -> Weight { - (2_461_000 as Weight) - // Standard Error: 87_000 - .saturating_add((6_006_000 as Weight).saturating_mul(b as Weight)) + (2_651_000 as Weight) + // Standard Error: 103_000 + .saturating_add((6_024_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight))) } // Storage: AppPromotion Admin (r:0 w:1) fn set_admin_address() -> Weight { - (5_467_000 as Weight) + (7_117_000 as Weight) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) @@ -149,21 +149,21 @@ // Storage: AppPromotion NextCalculatedRecord (r:1 w:1) // Storage: AppPromotion Staked (r:2 w:0) fn payout_stakers(b: u32, ) -> Weight { - (4_946_000 as Weight) - // Standard Error: 5_000 - .saturating_add((4_599_000 as Weight).saturating_mul(b as Weight)) + (9_958_000 as Weight) + // Standard Error: 8_000 + .saturating_add((4_406_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } + // Storage: AppPromotion StakesPerAccount (r:1 w:1) // Storage: System Account (r:1 w:1) - // Storage: AppPromotion StakesPerAccount (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: ParachainSystem ValidationData (r:1 w:0) // Storage: AppPromotion Staked (r:1 w:1) // Storage: AppPromotion TotalStaked (r:1 w:1) fn stake() -> Weight { - (17_766_000 as Weight) + (20_574_000 as Weight) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } @@ -174,35 +174,35 @@ // Storage: AppPromotion TotalStaked (r:1 w:1) // Storage: AppPromotion StakesPerAccount (r:0 w:1) fn unstake() -> Weight { - (27_250_000 as Weight) + (31_703_000 as Weight) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: Common CollectionById (r:1 w:1) fn sponsor_collection() -> Weight { - (11_014_000 as Weight) + (12_932_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: Common CollectionById (r:1 w:1) fn stop_sponsoring_collection() -> Weight { - (10_494_000 as Weight) + (12_453_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: EvmContractHelpers Sponsoring (r:0 w:1) fn sponsor_contract() -> Weight { - (9_754_000 as Weight) + (11_952_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: AppPromotion Admin (r:1 w:0) // Storage: EvmContractHelpers Sponsoring (r:1 w:1) fn stop_sponsoring_contract() -> Weight { - (10_063_000 as Weight) + (12_538_000 as Weight) .saturating_add(RocksDbWeight::get().reads(2 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } --- a/tests/src/app-promotion.test.ts +++ b/tests/src/app-promotion.test.ts @@ -460,7 +460,7 @@ const flipper = await deployFlipper(web3, contractOwner); const contractMethods = contractHelpers(web3, contractOwner); - await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address)); + await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address)); expect(await contractMethods.methods.hasSponsor(flipper.options.address).call()).to.be.true; expect((await api.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner); @@ -488,7 +488,7 @@ }); // set promotion sponsoring - await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address)); + await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address)); // new sponsor is pallet address expect(await contractMethods.methods.hasSponsor(flipper.options.address).call()).to.be.true; @@ -508,7 +508,7 @@ const contractMethods = contractHelpers(web3, contractOwner); // contract sponsored by pallet - await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address)); + await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address)); // owner sets self sponsoring await expect(contractMethods.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected; @@ -532,8 +532,8 @@ await expect(contractMethods.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected; - // nonAdmin calls sponsorConract - await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address))).to.be.rejected; + // nonAdmin calls sponsorContract + await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address))).to.be.rejected; // contract still self-sponsored expect((await api.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({ @@ -560,7 +560,7 @@ await contractHelper.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: contractOwner}); await transferBalanceToEth(api, alice, flipper.options.address, 1000n); - await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address)); + await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address)); await flipper.methods.flip().send({from: caller}); expect(await flipper.methods.getValue().call()).to.be.true; @@ -582,7 +582,7 @@ await transferBalanceToEth(api, alice, flipper.options.address); const contractHelper = contractHelpers(web3, contractOwner); await contractHelper.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: contractOwner}); - await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address)); + await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address)); await helper.signTransaction(palletAdmin, api.tx.appPromotion.stopSponsoringContract(flipper.options.address)); expect(await contractHelper.methods.hasSponsor(flipper.options.address).call()).to.be.false; @@ -609,7 +609,7 @@ const contractOwner = (await createEthAccountWithBalance(api, web3, privateKeyWrapper)).toLowerCase(); const flipper = await deployFlipper(web3, contractOwner); - await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorConract(flipper.options.address)); + await helper.signTransaction(palletAdmin, api.tx.appPromotion.sponsorContract(flipper.options.address)); await expect(helper.signTransaction(nonAdmin, api.tx.appPromotion.stopSponsoringContract(flipper.options.address))).to.be.rejected; }); }); --- a/tests/src/interfaces/augment-api-tx.ts +++ b/tests/src/interfaces/augment-api-tx.ts @@ -21,7 +21,7 @@ payoutStakers: AugmentedSubmittable<(stakersNumber: Option | null | Uint8Array | u8 | AnyNumber) => SubmittableExtrinsic, [Option]>; setAdminAddress: AugmentedSubmittable<(admin: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic, [PalletEvmAccountBasicCrossAccountIdRepr]>; sponsorCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32]>; - sponsorConract: AugmentedSubmittable<(contractId: H160 | string | Uint8Array) => SubmittableExtrinsic, [H160]>; + sponsorContract: AugmentedSubmittable<(contractId: H160 | string | Uint8Array) => SubmittableExtrinsic, [H160]>; stake: AugmentedSubmittable<(amount: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u128]>; stopSponsoringCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32]>; stopSponsoringContract: AugmentedSubmittable<(contractId: H160 | string | Uint8Array) => SubmittableExtrinsic, [H160]>; --- a/tests/src/interfaces/default/types.ts +++ b/tests/src/interfaces/default/types.ts @@ -825,8 +825,8 @@ readonly asStopSponsoringCollection: { readonly collectionId: u32; } & Struct; - readonly isSponsorConract: boolean; - readonly asSponsorConract: { + readonly isSponsorContract: boolean; + readonly asSponsorContract: { readonly contractId: H160; } & Struct; readonly isStopSponsoringContract: boolean; @@ -837,7 +837,7 @@ readonly asPayoutStakers: { readonly stakersNumber: Option; } & Struct; - readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorConract' | 'StopSponsoringContract' | 'PayoutStakers'; + readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorContract' | 'StopSponsoringContract' | 'PayoutStakers'; } /** @name PalletAppPromotionError */ --- a/tests/src/interfaces/lookup.ts +++ b/tests/src/interfaces/lookup.ts @@ -2483,7 +2483,7 @@ stop_sponsoring_collection: { collectionId: 'u32', }, - sponsor_conract: { + sponsor_contract: { contractId: 'H160', }, stop_sponsoring_contract: { --- a/tests/src/interfaces/types-lookup.ts +++ b/tests/src/interfaces/types-lookup.ts @@ -2695,8 +2695,8 @@ readonly asStopSponsoringCollection: { readonly collectionId: u32; } & Struct; - readonly isSponsorConract: boolean; - readonly asSponsorConract: { + readonly isSponsorContract: boolean; + readonly asSponsorContract: { readonly contractId: H160; } & Struct; readonly isStopSponsoringContract: boolean; @@ -2707,7 +2707,7 @@ readonly asPayoutStakers: { readonly stakersNumber: Option; } & Struct; - readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorConract' | 'StopSponsoringContract' | 'PayoutStakers'; + readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorContract' | 'StopSponsoringContract' | 'PayoutStakers'; } /** @name PalletEvmCall (307) */ --- a/tests/src/pallet-presence.test.ts +++ b/tests/src/pallet-presence.test.ts @@ -68,7 +68,7 @@ const refungible = 'refungible'; const scheduler = 'scheduler'; const rmrkPallets = ['rmrkcore', 'rmrkequip']; - const appPromotion = 'promotion'; + const appPromotion = 'apppromotion'; if (chain.eq('OPAL by UNIQUE')) { requiredPallets.push(refungible, scheduler, appPromotion, ...rmrkPallets); -- gitstuff