difftreelog
fix after rebase
in: master
8 files changed
runtime/common/config/pallets/mod.rsdiffbeforeafterboth--- 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::*,
tests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-consts.ts
+++ b/tests/src/interfaces/augment-api-consts.ts
@@ -82,12 +82,8 @@
appPromotionDailyRate: Perbill & AugmentedConst<ApiType>;
dayRelayBlocks: u32 & AugmentedConst<ApiType>;
defaultMinGasPrice: u64 & AugmentedConst<ApiType>;
-<<<<<<< HEAD
- defaultWeightToFeeCoefficient: u32 & AugmentedConst<ApiType>;
+ defaultWeightToFeeCoefficient: u64 & AugmentedConst<ApiType>;
maxXcmAllowedLocations: u32 & AugmentedConst<ApiType>;
-=======
- defaultWeightToFeeCoefficient: u64 & AugmentedConst<ApiType>;
->>>>>>> chore: regenerate types
/**
* Generic const
**/
tests/src/interfaces/augment-api-query.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-query.ts
+++ b/tests/src/interfaces/augment-api-query.ts
@@ -162,12 +162,8 @@
configuration: {
appPromomotionConfigurationOverride: AugmentedQuery<ApiType, () => Observable<PalletConfigurationAppPromotionConfiguration>, []> & QueryableStorageEntry<ApiType, []>;
minGasPriceOverride: AugmentedQuery<ApiType, () => Observable<u64>, []> & QueryableStorageEntry<ApiType, []>;
-<<<<<<< HEAD
- weightToFeeCoefficientOverride: AugmentedQuery<ApiType, () => Observable<u32>, []> & QueryableStorageEntry<ApiType, []>;
+ weightToFeeCoefficientOverride: AugmentedQuery<ApiType, () => Observable<u64>, []> & QueryableStorageEntry<ApiType, []>;
xcmAllowedLocationsOverride: AugmentedQuery<ApiType, () => Observable<Option<Vec<XcmV1MultiLocation>>>, []> & QueryableStorageEntry<ApiType, []>;
-=======
- weightToFeeCoefficientOverride: AugmentedQuery<ApiType, () => Observable<u64>, []> & QueryableStorageEntry<ApiType, []>;
->>>>>>> chore: regenerate types
/**
* Generic query
**/
tests/src/interfaces/augment-api-runtime.tsdiffbeforeafterboth1// Auto-generated via `yarn polkadot-types-from-chain`, do not edit2/* eslint-disable */34// import type lookup before we augment - in some environments5// this is required to allow for ambient/previous definitions6import '@polkadot/api-base/types/calls';78import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types';9import type { Bytes, Null, Option, Result, U256, Vec, bool, u256, u64 } from '@polkadot/types-codec';10import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';11import type { CheckInherentsResult, InherentData } from '@polkadot/types/interfaces/blockbuilder';12import type { BlockHash } from '@polkadot/types/interfaces/chain';13import type { AuthorityId } from '@polkadot/types/interfaces/consensus';14import type { CollationInfo } from '@polkadot/types/interfaces/cumulus';15import type { BlockV2, EthReceiptV3, EthTransactionStatus, TransactionV2 } from '@polkadot/types/interfaces/eth';16import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from '@polkadot/types/interfaces/evm';17import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';18import type { OpaqueMetadata } from '@polkadot/types/interfaces/metadata';19import type { AccountId, Block, H160, H256, Header, Index, KeyTypeId, Permill, SlotDuration } from '@polkadot/types/interfaces/runtime';20import type { RuntimeVersion } from '@polkadot/types/interfaces/state';21import type { ApplyExtrinsicResult, DispatchError } from '@polkadot/types/interfaces/system';22import type { TransactionSource, TransactionValidity } from '@polkadot/types/interfaces/txqueue';23import type { IExtrinsic, Observable } from '@polkadot/types/types';2425export type __AugmentedCall<ApiType extends ApiTypes> = AugmentedCall<ApiType>;26export type __DecoratedCallBase<ApiType extends ApiTypes> = DecoratedCallBase<ApiType>;2728declare module '@polkadot/api-base/types/calls' {29 interface AugmentedCalls<ApiType extends ApiTypes> {30 /** 0xbc9d89904f5b923f/1 */31 accountNonceApi: {32 /**33 * The API to query account nonce (aka transaction index)34 **/35 accountNonce: AugmentedCall<ApiType, (accountId: AccountId | string | Uint8Array) => Observable<Index>>;36 /**37 * Generic call38 **/39 [key: string]: DecoratedCallBase<ApiType>;40 };41 /** 0xdd718d5cc53262d4/1 */42 auraApi: {43 /**44 * Return the current set of authorities.45 **/46 authorities: AugmentedCall<ApiType, () => Observable<Vec<AuthorityId>>>;47 /**48 * Returns the slot duration for Aura.49 **/50 slotDuration: AugmentedCall<ApiType, () => Observable<SlotDuration>>;51 /**52 * Generic call53 **/54 [key: string]: DecoratedCallBase<ApiType>;55 };56 /** 0x40fe3ad401f8959a/6 */57 blockBuilder: {58 /**59 * Apply the given extrinsic.60 **/61 applyExtrinsic: AugmentedCall<ApiType, (extrinsic: Extrinsic | IExtrinsic | string | Uint8Array) => Observable<ApplyExtrinsicResult>>;62 /**63 * Check that the inherents are valid.64 **/65 checkInherents: AugmentedCall<ApiType, (block: Block | { header?: any; extrinsics?: any } | string | Uint8Array, data: InherentData | { data?: any } | string | Uint8Array) => Observable<CheckInherentsResult>>;66 /**67 * Finish the current block.68 **/69 finalizeBlock: AugmentedCall<ApiType, () => Observable<Header>>;70 /**71 * Generate inherent extrinsics.72 **/73 inherentExtrinsics: AugmentedCall<ApiType, (inherent: InherentData | { data?: any } | string | Uint8Array) => Observable<Vec<Extrinsic>>>;74 /**75 * Generic call76 **/77 [key: string]: DecoratedCallBase<ApiType>;78 };79 /** 0xea93e3f16f3d6962/2 */80 collectCollationInfo: {81 /**82 * Collect information about a collation.83 **/84 collectCollationInfo: AugmentedCall<ApiType, (header: Header | { parentHash?: any; number?: any; stateRoot?: any; extrinsicsRoot?: any; digest?: any } | string | Uint8Array) => Observable<CollationInfo>>;85 /**86 * Generic call87 **/88 [key: string]: DecoratedCallBase<ApiType>;89 };90 /** 0xe65b00e46cedd0aa/2 */91 convertTransactionRuntimeApi: {92 /**93 * Converts an Ethereum-style transaction to Extrinsic94 **/95 convertTransaction: AugmentedCall<ApiType, (transaction: TransactionV2 | { Legacy: any } | { EIP2930: any } | { EIP1559: any } | string | Uint8Array) => Observable<Extrinsic>>;96 /**97 * Generic call98 **/99 [key: string]: DecoratedCallBase<ApiType>;100 };101 /** 0xdf6acb689907609b/4 */102 core: {103 /**104 * Execute the given block.105 **/106 executeBlock: AugmentedCall<ApiType, (block: Block | { header?: any; extrinsics?: any } | string | Uint8Array) => Observable<Null>>;107 /**108 * Initialize a block with the given header.109 **/110 initializeBlock: AugmentedCall<ApiType, (header: Header | { parentHash?: any; number?: any; stateRoot?: any; extrinsicsRoot?: any; digest?: any } | string | Uint8Array) => Observable<Null>>;111 /**112 * Returns the version of the runtime.113 **/114 version: AugmentedCall<ApiType, () => Observable<RuntimeVersion>>;115 /**116 * Generic call117 **/118 [key: string]: DecoratedCallBase<ApiType>;119 };120 /** 0x582211f65bb14b89/4 */121 ethereumRuntimeRPCApi: {122 /**123 * Returns pallet_evm::Accounts by address.124 **/125 accountBasic: AugmentedCall<ApiType, (address: H160 | string | Uint8Array) => Observable<EvmAccount>>;126 /**127 * For a given account address, returns pallet_evm::AccountCodes.128 **/129 accountCodeAt: AugmentedCall<ApiType, (address: H160 | string | Uint8Array) => Observable<Bytes>>;130 /**131 * Returns the converted FindAuthor::find_author authority id.132 **/133 author: AugmentedCall<ApiType, () => Observable<H160>>;134 /**135 * Returns a frame_ethereum::call response. If `estimate` is true,136 **/137 call: AugmentedCall<ApiType, (from: H160 | string | Uint8Array, to: H160 | string | Uint8Array, data: Bytes | string | Uint8Array, value: U256 | AnyNumber | Uint8Array, gasLimit: U256 | AnyNumber | Uint8Array, maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber, estimate: bool | boolean | Uint8Array, accessList: Option<Vec<ITuple<[H160, Vec<H256>]>>> | null | Uint8Array | Vec<ITuple<[H160, Vec<H256>]>> | ([H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]])[]) => Observable<Result<EvmCallInfo, DispatchError>>>;138 /**139 * Returns runtime defined pallet_evm::ChainId.140 **/141 chainId: AugmentedCall<ApiType, () => Observable<u64>>;142 /**143 * Returns a frame_ethereum::call response. If `estimate` is true,144 **/145 create: AugmentedCall<ApiType, (from: H160 | string | Uint8Array, data: Bytes | string | Uint8Array, value: U256 | AnyNumber | Uint8Array, gasLimit: U256 | AnyNumber | Uint8Array, maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber, estimate: bool | boolean | Uint8Array, accessList: Option<Vec<ITuple<[H160, Vec<H256>]>>> | null | Uint8Array | Vec<ITuple<[H160, Vec<H256>]>> | ([H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]])[]) => Observable<Result<EvmCreateInfo, DispatchError>>>;146 /**147 * Return all the current data for a block in a single runtime call.148 **/149 currentAll: AugmentedCall<ApiType, () => Observable<ITuple<[Option<BlockV2>, Option<Vec<EthReceiptV3>>, Option<Vec<EthTransactionStatus>>]>>>;150 /**151 * Return the current block.152 **/153 currentBlock: AugmentedCall<ApiType, () => Observable<BlockV2>>;154 /**155 * Return the current receipt.156 **/157 currentReceipts: AugmentedCall<ApiType, () => Observable<Option<Vec<EthReceiptV3>>>>;158 /**159 * Return the current transaction status.160 **/161 currentTransactionStatuses: AugmentedCall<ApiType, () => Observable<Option<Vec<EthTransactionStatus>>>>;162 /**163 * Return the elasticity multiplier.164 **/165 elasticity: AugmentedCall<ApiType, () => Observable<Option<Permill>>>;166 /**167 * Receives a `Vec<OpaqueExtrinsic>` and filters all the ethereum transactions.168 **/169 extrinsicFilter: AugmentedCall<ApiType, (xts: Vec<Extrinsic> | (Extrinsic | IExtrinsic | string | Uint8Array)[]) => Observable<Vec<TransactionV2>>>;170 /**171 * Returns FixedGasPrice::min_gas_price172 **/173 gasPrice: AugmentedCall<ApiType, () => Observable<u256>>;174 /**175 * For a given account address and index, returns pallet_evm::AccountStorages.176 **/177 storageAt: AugmentedCall<ApiType, (address: H160 | string | Uint8Array, index: u256 | AnyNumber | Uint8Array) => Observable<H256>>;178 /**179 * Generic call180 **/181 [key: string]: DecoratedCallBase<ApiType>;182 };183 /** 0x37e397fc7c91f5e4/1 */184 metadata: {185 /**186 * Returns the metadata of a runtime187 **/188 metadata: AugmentedCall<ApiType, () => Observable<OpaqueMetadata>>;189 /**190 * Generic call191 **/192 [key: string]: DecoratedCallBase<ApiType>;193 };194 /** 0xf78b278be53f454c/2 */195 offchainWorkerApi: {196 /**197 * Starts the off-chain task for given block header.198 **/199 offchainWorker: AugmentedCall<ApiType, (header: Header | { parentHash?: any; number?: any; stateRoot?: any; extrinsicsRoot?: any; digest?: any } | string | Uint8Array) => Observable<Null>>;200 /**201 * Generic call202 **/203 [key: string]: DecoratedCallBase<ApiType>;204 };205 /** 0xab3c0572291feb8b/1 */206 sessionKeys: {207 /**208 * Decode the given public session keys.209 **/210 decodeSessionKeys: AugmentedCall<ApiType, (encoded: Bytes | string | Uint8Array) => Observable<Option<Vec<ITuple<[Bytes, KeyTypeId]>>>>>;211 /**212 * Generate a set of session keys with optionally using the given seed.213 **/214 generateSessionKeys: AugmentedCall<ApiType, (seed: Option<Bytes> | null | Uint8Array | Bytes | string) => Observable<Bytes>>;215 /**216 * Generic call217 **/218 [key: string]: DecoratedCallBase<ApiType>;219 };220 /** 0xd2bc9897eed08f15/3 */221 taggedTransactionQueue: {222 /**223 * Validate the transaction.224 **/225 validateTransaction: AugmentedCall<ApiType, (source: TransactionSource | 'InBlock' | 'Local' | 'External' | number | Uint8Array, tx: Extrinsic | IExtrinsic | string | Uint8Array, blockHash: BlockHash | string | Uint8Array) => Observable<TransactionValidity>>;226 /**227 * Generic call228 **/229 [key: string]: DecoratedCallBase<ApiType>;230 };231 } // AugmentedCalls232} // declare module1// Auto-generated via `yarn polkadot-types-from-chain`, do not edit2/* eslint-disable */34// import type lookup before we augment - in some environments5// this is required to allow for ambient/previous definitions6import '@polkadot/api-base/types/calls';78import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types';9import type { Bytes, Null, Option, Result, U256, Vec, bool, u256, u32, u64 } from '@polkadot/types-codec';10import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';11import type { CheckInherentsResult, InherentData } from '@polkadot/types/interfaces/blockbuilder';12import type { BlockHash } from '@polkadot/types/interfaces/chain';13import type { AuthorityId } from '@polkadot/types/interfaces/consensus';14import type { CollationInfo } from '@polkadot/types/interfaces/cumulus';15import type { BlockV2, EthReceiptV3, EthTransactionStatus, TransactionV2 } from '@polkadot/types/interfaces/eth';16import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from '@polkadot/types/interfaces/evm';17import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';18import type { OpaqueMetadata } from '@polkadot/types/interfaces/metadata';19import type { FeeDetails, RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment';20import type { AccountId, Block, H160, H256, Header, Index, KeyTypeId, Permill, SlotDuration } from '@polkadot/types/interfaces/runtime';21import type { RuntimeVersion } from '@polkadot/types/interfaces/state';22import type { ApplyExtrinsicResult, DispatchError } from '@polkadot/types/interfaces/system';23import type { TransactionSource, TransactionValidity } from '@polkadot/types/interfaces/txqueue';24import type { IExtrinsic, Observable } from '@polkadot/types/types';2526export type __AugmentedCall<ApiType extends ApiTypes> = AugmentedCall<ApiType>;27export type __DecoratedCallBase<ApiType extends ApiTypes> = DecoratedCallBase<ApiType>;2829declare module '@polkadot/api-base/types/calls' {30 interface AugmentedCalls<ApiType extends ApiTypes> {31 /** 0xbc9d89904f5b923f/1 */32 accountNonceApi: {33 /**34 * The API to query account nonce (aka transaction index)35 **/36 accountNonce: AugmentedCall<ApiType, (accountId: AccountId | string | Uint8Array) => Observable<Index>>;37 /**38 * Generic call39 **/40 [key: string]: DecoratedCallBase<ApiType>;41 };42 /** 0xdd718d5cc53262d4/1 */43 auraApi: {44 /**45 * Return the current set of authorities.46 **/47 authorities: AugmentedCall<ApiType, () => Observable<Vec<AuthorityId>>>;48 /**49 * Returns the slot duration for Aura.50 **/51 slotDuration: AugmentedCall<ApiType, () => Observable<SlotDuration>>;52 /**53 * Generic call54 **/55 [key: string]: DecoratedCallBase<ApiType>;56 };57 /** 0x40fe3ad401f8959a/6 */58 blockBuilder: {59 /**60 * Apply the given extrinsic.61 **/62 applyExtrinsic: AugmentedCall<ApiType, (extrinsic: Extrinsic | IExtrinsic | string | Uint8Array) => Observable<ApplyExtrinsicResult>>;63 /**64 * Check that the inherents are valid.65 **/66 checkInherents: AugmentedCall<ApiType, (block: Block | { header?: any; extrinsics?: any } | string | Uint8Array, data: InherentData | { data?: any } | string | Uint8Array) => Observable<CheckInherentsResult>>;67 /**68 * Finish the current block.69 **/70 finalizeBlock: AugmentedCall<ApiType, () => Observable<Header>>;71 /**72 * Generate inherent extrinsics.73 **/74 inherentExtrinsics: AugmentedCall<ApiType, (inherent: InherentData | { data?: any } | string | Uint8Array) => Observable<Vec<Extrinsic>>>;75 /**76 * Generic call77 **/78 [key: string]: DecoratedCallBase<ApiType>;79 };80 /** 0xea93e3f16f3d6962/2 */81 collectCollationInfo: {82 /**83 * Collect information about a collation.84 **/85 collectCollationInfo: AugmentedCall<ApiType, (header: Header | { parentHash?: any; number?: any; stateRoot?: any; extrinsicsRoot?: any; digest?: any } | string | Uint8Array) => Observable<CollationInfo>>;86 /**87 * Generic call88 **/89 [key: string]: DecoratedCallBase<ApiType>;90 };91 /** 0xe65b00e46cedd0aa/2 */92 convertTransactionRuntimeApi: {93 /**94 * Converts an Ethereum-style transaction to Extrinsic95 **/96 convertTransaction: AugmentedCall<ApiType, (transaction: TransactionV2 | { Legacy: any } | { EIP2930: any } | { EIP1559: any } | string | Uint8Array) => Observable<Extrinsic>>;97 /**98 * Generic call99 **/100 [key: string]: DecoratedCallBase<ApiType>;101 };102 /** 0xdf6acb689907609b/4 */103 core: {104 /**105 * Execute the given block.106 **/107 executeBlock: AugmentedCall<ApiType, (block: Block | { header?: any; extrinsics?: any } | string | Uint8Array) => Observable<Null>>;108 /**109 * Initialize a block with the given header.110 **/111 initializeBlock: AugmentedCall<ApiType, (header: Header | { parentHash?: any; number?: any; stateRoot?: any; extrinsicsRoot?: any; digest?: any } | string | Uint8Array) => Observable<Null>>;112 /**113 * Returns the version of the runtime.114 **/115 version: AugmentedCall<ApiType, () => Observable<RuntimeVersion>>;116 /**117 * Generic call118 **/119 [key: string]: DecoratedCallBase<ApiType>;120 };121 /** 0x582211f65bb14b89/4 */122 ethereumRuntimeRPCApi: {123 /**124 * Returns pallet_evm::Accounts by address.125 **/126 accountBasic: AugmentedCall<ApiType, (address: H160 | string | Uint8Array) => Observable<EvmAccount>>;127 /**128 * For a given account address, returns pallet_evm::AccountCodes.129 **/130 accountCodeAt: AugmentedCall<ApiType, (address: H160 | string | Uint8Array) => Observable<Bytes>>;131 /**132 * Returns the converted FindAuthor::find_author authority id.133 **/134 author: AugmentedCall<ApiType, () => Observable<H160>>;135 /**136 * Returns a frame_ethereum::call response. If `estimate` is true,137 **/138 call: AugmentedCall<ApiType, (from: H160 | string | Uint8Array, to: H160 | string | Uint8Array, data: Bytes | string | Uint8Array, value: U256 | AnyNumber | Uint8Array, gasLimit: U256 | AnyNumber | Uint8Array, maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber, estimate: bool | boolean | Uint8Array, accessList: Option<Vec<ITuple<[H160, Vec<H256>]>>> | null | Uint8Array | Vec<ITuple<[H160, Vec<H256>]>> | ([H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]])[]) => Observable<Result<EvmCallInfo, DispatchError>>>;139 /**140 * Returns runtime defined pallet_evm::ChainId.141 **/142 chainId: AugmentedCall<ApiType, () => Observable<u64>>;143 /**144 * Returns a frame_ethereum::call response. If `estimate` is true,145 **/146 create: AugmentedCall<ApiType, (from: H160 | string | Uint8Array, data: Bytes | string | Uint8Array, value: U256 | AnyNumber | Uint8Array, gasLimit: U256 | AnyNumber | Uint8Array, maxFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, maxPriorityFeePerGas: Option<U256> | null | Uint8Array | U256 | AnyNumber, nonce: Option<U256> | null | Uint8Array | U256 | AnyNumber, estimate: bool | boolean | Uint8Array, accessList: Option<Vec<ITuple<[H160, Vec<H256>]>>> | null | Uint8Array | Vec<ITuple<[H160, Vec<H256>]>> | ([H160 | string | Uint8Array, Vec<H256> | (H256 | string | Uint8Array)[]])[]) => Observable<Result<EvmCreateInfo, DispatchError>>>;147 /**148 * Return all the current data for a block in a single runtime call.149 **/150 currentAll: AugmentedCall<ApiType, () => Observable<ITuple<[Option<BlockV2>, Option<Vec<EthReceiptV3>>, Option<Vec<EthTransactionStatus>>]>>>;151 /**152 * Return the current block.153 **/154 currentBlock: AugmentedCall<ApiType, () => Observable<BlockV2>>;155 /**156 * Return the current receipt.157 **/158 currentReceipts: AugmentedCall<ApiType, () => Observable<Option<Vec<EthReceiptV3>>>>;159 /**160 * Return the current transaction status.161 **/162 currentTransactionStatuses: AugmentedCall<ApiType, () => Observable<Option<Vec<EthTransactionStatus>>>>;163 /**164 * Return the elasticity multiplier.165 **/166 elasticity: AugmentedCall<ApiType, () => Observable<Option<Permill>>>;167 /**168 * Receives a `Vec<OpaqueExtrinsic>` and filters all the ethereum transactions.169 **/170 extrinsicFilter: AugmentedCall<ApiType, (xts: Vec<Extrinsic> | (Extrinsic | IExtrinsic | string | Uint8Array)[]) => Observable<Vec<TransactionV2>>>;171 /**172 * Returns FixedGasPrice::min_gas_price173 **/174 gasPrice: AugmentedCall<ApiType, () => Observable<u256>>;175 /**176 * For a given account address and index, returns pallet_evm::AccountStorages.177 **/178 storageAt: AugmentedCall<ApiType, (address: H160 | string | Uint8Array, index: u256 | AnyNumber | Uint8Array) => Observable<H256>>;179 /**180 * Generic call181 **/182 [key: string]: DecoratedCallBase<ApiType>;183 };184 /** 0x37e397fc7c91f5e4/1 */185 metadata: {186 /**187 * Returns the metadata of a runtime188 **/189 metadata: AugmentedCall<ApiType, () => Observable<OpaqueMetadata>>;190 /**191 * Generic call192 **/193 [key: string]: DecoratedCallBase<ApiType>;194 };195 /** 0xf78b278be53f454c/2 */196 offchainWorkerApi: {197 /**198 * Starts the off-chain task for given block header.199 **/200 offchainWorker: AugmentedCall<ApiType, (header: Header | { parentHash?: any; number?: any; stateRoot?: any; extrinsicsRoot?: any; digest?: any } | string | Uint8Array) => Observable<Null>>;201 /**202 * Generic call203 **/204 [key: string]: DecoratedCallBase<ApiType>;205 };206 /** 0xab3c0572291feb8b/1 */207 sessionKeys: {208 /**209 * Decode the given public session keys.210 **/211 decodeSessionKeys: AugmentedCall<ApiType, (encoded: Bytes | string | Uint8Array) => Observable<Option<Vec<ITuple<[Bytes, KeyTypeId]>>>>>;212 /**213 * Generate a set of session keys with optionally using the given seed.214 **/215 generateSessionKeys: AugmentedCall<ApiType, (seed: Option<Bytes> | null | Uint8Array | Bytes | string) => Observable<Bytes>>;216 /**217 * Generic call218 **/219 [key: string]: DecoratedCallBase<ApiType>;220 };221 /** 0xd2bc9897eed08f15/3 */222 taggedTransactionQueue: {223 /**224 * Validate the transaction.225 **/226 validateTransaction: AugmentedCall<ApiType, (source: TransactionSource | 'InBlock' | 'Local' | 'External' | number | Uint8Array, tx: Extrinsic | IExtrinsic | string | Uint8Array, blockHash: BlockHash | string | Uint8Array) => Observable<TransactionValidity>>;227 /**228 * Generic call229 **/230 [key: string]: DecoratedCallBase<ApiType>;231 };232 /** 0x37c8bb1350a9a2a8/2 */233 transactionPaymentApi: {234 /**235 * The transaction fee details236 **/237 queryFeeDetails: AugmentedCall<ApiType, (uxt: Extrinsic | IExtrinsic | string | Uint8Array, len: u32 | AnyNumber | Uint8Array) => Observable<FeeDetails>>;238 /**239 * The transaction info240 **/241 queryInfo: AugmentedCall<ApiType, (uxt: Extrinsic | IExtrinsic | string | Uint8Array, len: u32 | AnyNumber | Uint8Array) => Observable<RuntimeDispatchInfo>>;242 /**243 * Generic call244 **/245 [key: string]: DecoratedCallBase<ApiType>;246 };247 } // AugmentedCalls248} // declare moduletests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth--- 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<ApiType>, [PalletConfigurationAppPromotionConfiguration]>;
setMinGasPriceOverride: AugmentedSubmittable<(coeff: Option<u64> | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u64>]>;
-<<<<<<< HEAD
- setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option<u32> | null | Uint8Array | u32 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u32>]>;
+ setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option<u64> | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u64>]>;
setXcmAllowedLocations: AugmentedSubmittable<(locations: Option<Vec<XcmV1MultiLocation>> | null | Uint8Array | Vec<XcmV1MultiLocation> | (XcmV1MultiLocation | { parents?: any; interior?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>, [Option<Vec<XcmV1MultiLocation>>]>;
-=======
- setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option<u64> | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u64>]>;
->>>>>>> chore: regenerate types
/**
* Generic tx
**/
@@ -1436,6 +1432,23 @@
**/
destroyCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [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<ApiType>, [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<ApiType>, [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<ApiType>, [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<ApiType>, [u32, u32]>;
/**
* Re-partition a refungible token, while owning all of its parts/pieces.
*
tests/src/interfaces/default/types.tsdiffbeforeafterboth--- 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 */
tests/src/interfaces/lookup.tsdiffbeforeafterboth--- 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<u32>',
+ coeff: 'Option<u64>',
},
set_min_gas_price_override: {
coeff: 'Option<u64>',
@@ -2468,23 +2471,11 @@
/**
* Lookup286: pallet_configuration::AppPromotionConfiguration<BlockNumber>
**/
-<<<<<<< HEAD
PalletConfigurationAppPromotionConfiguration: {
recalculationInterval: 'Option<u32>',
pendingInterval: 'Option<u32>',
intervalIncome: 'Option<Perbill>',
maxStakersPerCalculation: 'Option<u8>'
-=======
- PalletConfigurationCall: {
- _enum: {
- set_weight_to_fee_coefficient_override: {
- coeff: 'Option<u64>',
- },
- set_min_gas_price_override: {
- coeff: 'Option<u64>'
- }
- }
->>>>>>> chore: regenerate types
},
/**
* Lookup289: pallet_template_transaction_payment::Call<T>
tests/src/interfaces/types-lookup.tsdiffbeforeafterboth--- 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) */