From a026438a3d7abc749bc8ed05eda451ad5050e202 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Mon, 19 Dec 2022 10:37:08 +0000 Subject: [PATCH] fix: after rebase --- --- a/runtime/common/config/pallets/mod.rs +++ b/runtime/common/config/pallets/mod.rs @@ -25,7 +25,7 @@ }, Runtime, RuntimeEvent, RuntimeCall, Balances, }; -use frame_support::traits::ConstU64; +use frame_support::traits::{ConstU32, ConstU64}; use up_common::{ types::{AccountId, Balance, BlockNumber}, constants::*, --- a/tests/src/interfaces/augment-api-consts.ts +++ b/tests/src/interfaces/augment-api-consts.ts @@ -82,12 +82,8 @@ appPromotionDailyRate: Perbill & AugmentedConst; dayRelayBlocks: u32 & AugmentedConst; defaultMinGasPrice: u64 & AugmentedConst; -<<<<<<< HEAD - defaultWeightToFeeCoefficient: u32 & AugmentedConst; + defaultWeightToFeeCoefficient: u64 & AugmentedConst; maxXcmAllowedLocations: u32 & AugmentedConst; -======= - defaultWeightToFeeCoefficient: u64 & AugmentedConst; ->>>>>>> chore: regenerate types /** * Generic const **/ --- a/tests/src/interfaces/augment-api-query.ts +++ b/tests/src/interfaces/augment-api-query.ts @@ -162,12 +162,8 @@ configuration: { appPromomotionConfigurationOverride: AugmentedQuery Observable, []> & QueryableStorageEntry; minGasPriceOverride: AugmentedQuery Observable, []> & QueryableStorageEntry; -<<<<<<< HEAD - weightToFeeCoefficientOverride: AugmentedQuery Observable, []> & QueryableStorageEntry; + weightToFeeCoefficientOverride: AugmentedQuery Observable, []> & QueryableStorageEntry; xcmAllowedLocationsOverride: AugmentedQuery Observable>>, []> & QueryableStorageEntry; -======= - weightToFeeCoefficientOverride: AugmentedQuery Observable, []> & QueryableStorageEntry; ->>>>>>> chore: regenerate types /** * Generic query **/ --- a/tests/src/interfaces/augment-api-runtime.ts +++ b/tests/src/interfaces/augment-api-runtime.ts @@ -6,7 +6,7 @@ import '@polkadot/api-base/types/calls'; import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types'; -import type { Bytes, Null, Option, Result, U256, Vec, bool, u256, u64 } from '@polkadot/types-codec'; +import type { Bytes, Null, Option, Result, U256, Vec, bool, u256, u32, u64 } from '@polkadot/types-codec'; import type { AnyNumber, ITuple } from '@polkadot/types-codec/types'; import type { CheckInherentsResult, InherentData } from '@polkadot/types/interfaces/blockbuilder'; import type { BlockHash } from '@polkadot/types/interfaces/chain'; @@ -16,6 +16,7 @@ import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from '@polkadot/types/interfaces/evm'; import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics'; import type { OpaqueMetadata } from '@polkadot/types/interfaces/metadata'; +import type { FeeDetails, RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment'; import type { AccountId, Block, H160, H256, Header, Index, KeyTypeId, Permill, SlotDuration } from '@polkadot/types/interfaces/runtime'; import type { RuntimeVersion } from '@polkadot/types/interfaces/state'; import type { ApplyExtrinsicResult, DispatchError } from '@polkadot/types/interfaces/system'; @@ -228,5 +229,20 @@ **/ [key: string]: DecoratedCallBase; }; + /** 0x37c8bb1350a9a2a8/2 */ + transactionPaymentApi: { + /** + * The transaction fee details + **/ + queryFeeDetails: AugmentedCall Observable>; + /** + * The transaction info + **/ + queryInfo: AugmentedCall Observable>; + /** + * Generic call + **/ + [key: string]: DecoratedCallBase; + }; } // AugmentedCalls } // declare module --- a/tests/src/interfaces/augment-api-tx.ts +++ b/tests/src/interfaces/augment-api-tx.ts @@ -217,12 +217,8 @@ configuration: { setAppPromotionConfigurationOverride: AugmentedSubmittable<(configuration: PalletConfigurationAppPromotionConfiguration | { recalculationInterval?: any; pendingInterval?: any; intervalIncome?: any; maxStakersPerCalculation?: any } | string | Uint8Array) => SubmittableExtrinsic, [PalletConfigurationAppPromotionConfiguration]>; setMinGasPriceOverride: AugmentedSubmittable<(coeff: Option | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic, [Option]>; -<<<<<<< HEAD - setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option | null | Uint8Array | u32 | AnyNumber) => SubmittableExtrinsic, [Option]>; + setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic, [Option]>; setXcmAllowedLocations: AugmentedSubmittable<(locations: Option> | null | Uint8Array | Vec | (XcmV1MultiLocation | { parents?: any; interior?: any } | string | Uint8Array)[]) => SubmittableExtrinsic, [Option>]>; -======= - setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic, [Option]>; ->>>>>>> chore: regenerate types /** * Generic tx **/ @@ -1436,6 +1432,23 @@ **/ destroyCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32]>; /** + * Repairs a collection if the data was somehow corrupted. + * + * # Arguments + * + * * `collection_id`: ID of the collection to repair. + **/ + forceRepairCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32]>; + /** + * Repairs a token if the data was somehow corrupted. + * + * # Arguments + * + * * `collection_id`: ID of the collection the item belongs to. + * * `item_id`: ID of the item. + **/ + forceRepairItem: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32, u32]>; + /** * Remove admin of a collection. * * An admin address can remove itself. List of admins may become empty, @@ -1478,15 +1491,6 @@ * * `address`: ID of the address to be removed from the allowlist. **/ removeFromAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>; - /** - * Repairs a broken item - * - * # Arguments - * - * * `collection_id`: ID of the collection the item belongs to. - * * `item_id`: ID of the item. - **/ - repairItem: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32, u32]>; /** * Re-partition a refungible token, while owning all of its parts/pieces. * --- a/tests/src/interfaces/default/types.ts +++ b/tests/src/interfaces/default/types.ts @@ -2319,12 +2319,16 @@ readonly operator: PalletEvmAccountBasicCrossAccountIdRepr; readonly approve: bool; } & Struct; - readonly isRepairItem: boolean; - readonly asRepairItem: { + readonly isForceRepairCollection: boolean; + readonly asForceRepairCollection: { + readonly collectionId: u32; + } & Struct; + readonly isForceRepairItem: boolean; + readonly asForceRepairItem: { readonly collectionId: u32; readonly itemId: u32; } & Struct; - readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetAllowanceForAll' | 'RepairItem'; + readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetAllowanceForAll' | 'ForceRepairCollection' | 'ForceRepairItem'; } /** @name PalletUniqueError */ --- a/tests/src/interfaces/lookup.ts +++ b/tests/src/interfaces/lookup.ts @@ -2282,7 +2282,10 @@ operator: 'PalletEvmAccountBasicCrossAccountIdRepr', approve: 'bool', }, - repair_item: { + force_repair_collection: { + collectionId: 'u32', + }, + force_repair_item: { collectionId: 'u32', itemId: 'u32' } @@ -2452,7 +2455,7 @@ PalletConfigurationCall: { _enum: { set_weight_to_fee_coefficient_override: { - coeff: 'Option', + coeff: 'Option', }, set_min_gas_price_override: { coeff: 'Option', @@ -2468,23 +2471,11 @@ /** * Lookup286: pallet_configuration::AppPromotionConfiguration **/ -<<<<<<< HEAD PalletConfigurationAppPromotionConfiguration: { recalculationInterval: 'Option', pendingInterval: 'Option', intervalIncome: 'Option', maxStakersPerCalculation: 'Option' -======= - PalletConfigurationCall: { - _enum: { - set_weight_to_fee_coefficient_override: { - coeff: 'Option', - }, - set_min_gas_price_override: { - coeff: 'Option' - } - } ->>>>>>> chore: regenerate types }, /** * Lookup289: pallet_template_transaction_payment::Call --- a/tests/src/interfaces/types-lookup.ts +++ b/tests/src/interfaces/types-lookup.ts @@ -2517,12 +2517,16 @@ readonly operator: PalletEvmAccountBasicCrossAccountIdRepr; readonly approve: bool; } & Struct; - readonly isRepairItem: boolean; - readonly asRepairItem: { + readonly isForceRepairCollection: boolean; + readonly asForceRepairCollection: { + readonly collectionId: u32; + } & Struct; + readonly isForceRepairItem: boolean; + readonly asForceRepairItem: { readonly collectionId: u32; readonly itemId: u32; } & Struct; - readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetAllowanceForAll' | 'RepairItem'; + readonly type: 'CreateCollection' | 'CreateCollectionEx' | 'DestroyCollection' | 'AddToAllowList' | 'RemoveFromAllowList' | 'ChangeCollectionOwner' | 'AddCollectionAdmin' | 'RemoveCollectionAdmin' | 'SetCollectionSponsor' | 'ConfirmSponsorship' | 'RemoveCollectionSponsor' | 'CreateItem' | 'CreateMultipleItems' | 'SetCollectionProperties' | 'DeleteCollectionProperties' | 'SetTokenProperties' | 'DeleteTokenProperties' | 'SetTokenPropertyPermissions' | 'CreateMultipleItemsEx' | 'SetTransfersEnabledFlag' | 'BurnItem' | 'BurnFrom' | 'Transfer' | 'Approve' | 'TransferFrom' | 'SetCollectionLimits' | 'SetCollectionPermissions' | 'Repartition' | 'SetAllowanceForAll' | 'ForceRepairCollection' | 'ForceRepairItem'; } /** @name UpDataStructsCollectionMode (237) */ -- gitstuff