difftreelog
fix after rebase
in: master
8 files changed
runtime/common/config/pallets/mod.rsdiffbeforeafterboth25 },25 },26 Runtime, RuntimeEvent, RuntimeCall, Balances,26 Runtime, RuntimeEvent, RuntimeCall, Balances,27};27};28use frame_support::traits::ConstU64;28use frame_support::traits::{ConstU32, ConstU64};29use up_common::{29use up_common::{30 types::{AccountId, Balance, BlockNumber},30 types::{AccountId, Balance, BlockNumber},31 constants::*,31 constants::*,tests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth82 appPromotionDailyRate: Perbill & AugmentedConst<ApiType>;82 appPromotionDailyRate: Perbill & AugmentedConst<ApiType>;83 dayRelayBlocks: u32 & AugmentedConst<ApiType>;83 dayRelayBlocks: u32 & AugmentedConst<ApiType>;84 defaultMinGasPrice: u64 & AugmentedConst<ApiType>;84 defaultMinGasPrice: u64 & AugmentedConst<ApiType>;85<<<<<<< HEAD86 defaultWeightToFeeCoefficient: u32 & AugmentedConst<ApiType>;87 maxXcmAllowedLocations: u32 & AugmentedConst<ApiType>;88=======89 defaultWeightToFeeCoefficient: u64 & AugmentedConst<ApiType>;85 defaultWeightToFeeCoefficient: u64 & AugmentedConst<ApiType>;90>>>>>>> chore: regenerate types86 maxXcmAllowedLocations: u32 & AugmentedConst<ApiType>;91 /**87 /**92 * Generic const88 * Generic const93 **/89 **/tests/src/interfaces/augment-api-query.tsdiffbeforeafterboth162 configuration: {162 configuration: {163 appPromomotionConfigurationOverride: AugmentedQuery<ApiType, () => Observable<PalletConfigurationAppPromotionConfiguration>, []> & QueryableStorageEntry<ApiType, []>;163 appPromomotionConfigurationOverride: AugmentedQuery<ApiType, () => Observable<PalletConfigurationAppPromotionConfiguration>, []> & QueryableStorageEntry<ApiType, []>;164 minGasPriceOverride: AugmentedQuery<ApiType, () => Observable<u64>, []> & QueryableStorageEntry<ApiType, []>;164 minGasPriceOverride: AugmentedQuery<ApiType, () => Observable<u64>, []> & QueryableStorageEntry<ApiType, []>;165<<<<<<< HEAD166 weightToFeeCoefficientOverride: AugmentedQuery<ApiType, () => Observable<u32>, []> & QueryableStorageEntry<ApiType, []>;167 xcmAllowedLocationsOverride: AugmentedQuery<ApiType, () => Observable<Option<Vec<XcmV1MultiLocation>>>, []> & QueryableStorageEntry<ApiType, []>;168=======169 weightToFeeCoefficientOverride: AugmentedQuery<ApiType, () => Observable<u64>, []> & QueryableStorageEntry<ApiType, []>;165 weightToFeeCoefficientOverride: AugmentedQuery<ApiType, () => Observable<u64>, []> & QueryableStorageEntry<ApiType, []>;170>>>>>>> chore: regenerate types166 xcmAllowedLocationsOverride: AugmentedQuery<ApiType, () => Observable<Option<Vec<XcmV1MultiLocation>>>, []> & QueryableStorageEntry<ApiType, []>;171 /**167 /**172 * Generic query168 * Generic query173 **/169 **/tests/src/interfaces/augment-api-runtime.tsdiffbeforeafterboth6import '@polkadot/api-base/types/calls';6import '@polkadot/api-base/types/calls';778import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types';8import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types';9import type { Bytes, Null, Option, Result, U256, Vec, bool, u256, u64 } from '@polkadot/types-codec';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';10import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';11import type { CheckInherentsResult, InherentData } from '@polkadot/types/interfaces/blockbuilder';11import type { CheckInherentsResult, InherentData } from '@polkadot/types/interfaces/blockbuilder';12import type { BlockHash } from '@polkadot/types/interfaces/chain';12import type { BlockHash } from '@polkadot/types/interfaces/chain';16import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from '@polkadot/types/interfaces/evm';16import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from '@polkadot/types/interfaces/evm';17import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';17import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';18import type { OpaqueMetadata } from '@polkadot/types/interfaces/metadata';18import type { OpaqueMetadata } from '@polkadot/types/interfaces/metadata';19import type { FeeDetails, RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment';19import type { AccountId, Block, H160, H256, Header, Index, KeyTypeId, Permill, SlotDuration } from '@polkadot/types/interfaces/runtime';20import 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 { RuntimeVersion } from '@polkadot/types/interfaces/state';21import type { ApplyExtrinsicResult, DispatchError } from '@polkadot/types/interfaces/system';22import type { ApplyExtrinsicResult, DispatchError } from '@polkadot/types/interfaces/system';228 **/229 **/229 [key: string]: DecoratedCallBase<ApiType>;230 [key: string]: DecoratedCallBase<ApiType>;230 };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 };231 } // AugmentedCalls247 } // AugmentedCalls232} // declare module248} // declare module233249tests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth217 configuration: {217 configuration: {218 setAppPromotionConfigurationOverride: AugmentedSubmittable<(configuration: PalletConfigurationAppPromotionConfiguration | { recalculationInterval?: any; pendingInterval?: any; intervalIncome?: any; maxStakersPerCalculation?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletConfigurationAppPromotionConfiguration]>;218 setAppPromotionConfigurationOverride: AugmentedSubmittable<(configuration: PalletConfigurationAppPromotionConfiguration | { recalculationInterval?: any; pendingInterval?: any; intervalIncome?: any; maxStakersPerCalculation?: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [PalletConfigurationAppPromotionConfiguration]>;219 setMinGasPriceOverride: AugmentedSubmittable<(coeff: Option<u64> | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u64>]>;219 setMinGasPriceOverride: AugmentedSubmittable<(coeff: Option<u64> | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u64>]>;220<<<<<<< HEAD221 setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option<u32> | null | Uint8Array | u32 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u32>]>;220 setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option<u64> | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u64>]>;222 setXcmAllowedLocations: AugmentedSubmittable<(locations: Option<Vec<XcmV1MultiLocation>> | null | Uint8Array | Vec<XcmV1MultiLocation> | (XcmV1MultiLocation | { parents?: any; interior?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>, [Option<Vec<XcmV1MultiLocation>>]>;221 setXcmAllowedLocations: AugmentedSubmittable<(locations: Option<Vec<XcmV1MultiLocation>> | null | Uint8Array | Vec<XcmV1MultiLocation> | (XcmV1MultiLocation | { parents?: any; interior?: any } | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>, [Option<Vec<XcmV1MultiLocation>>]>;223=======224 setWeightToFeeCoefficientOverride: AugmentedSubmittable<(coeff: Option<u64> | null | Uint8Array | u64 | AnyNumber) => SubmittableExtrinsic<ApiType>, [Option<u64>]>;225>>>>>>> chore: regenerate types226 /**222 /**227 * Generic tx223 * Generic tx228 **/224 **/1436 **/1432 **/1437 destroyCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32]>;1433 destroyCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32]>;1438 /**1434 /**1435 * Repairs a collection if the data was somehow corrupted.1436 * 1437 * # Arguments1438 * 1439 * * `collection_id`: ID of the collection to repair.1440 **/1441 forceRepairCollection: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32]>;1442 /**1443 * Repairs a token if the data was somehow corrupted.1444 * 1445 * # Arguments1446 * 1447 * * `collection_id`: ID of the collection the item belongs to.1448 * * `item_id`: ID of the item.1449 **/1450 forceRepairItem: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, u32]>;1451 /**1439 * Remove admin of a collection.1452 * Remove admin of a collection.1440 * 1453 * 1441 * An admin address can remove itself. List of admins may become empty,1454 * An admin address can remove itself. List of admins may become empty,1478 * * `address`: ID of the address to be removed from the allowlist.1491 * * `address`: ID of the address to be removed from the allowlist.1479 **/1492 **/1480 removeFromAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;1493 removeFromAllowList: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, address: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, PalletEvmAccountBasicCrossAccountIdRepr]>;1481 /**1482 * Repairs a broken item1483 * 1484 * # Arguments1485 * 1486 * * `collection_id`: ID of the collection the item belongs to.1487 * * `item_id`: ID of the item.1488 **/1489 repairItem: AugmentedSubmittable<(collectionId: u32 | AnyNumber | Uint8Array, itemId: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic<ApiType>, [u32, u32]>;1490 /**1494 /**1491 * Re-partition a refungible token, while owning all of its parts/pieces.1495 * Re-partition a refungible token, while owning all of its parts/pieces.1492 * 1496 * tests/src/interfaces/default/types.tsdiffbeforeafterboth2319 readonly operator: PalletEvmAccountBasicCrossAccountIdRepr;2319 readonly operator: PalletEvmAccountBasicCrossAccountIdRepr;2320 readonly approve: bool;2320 readonly approve: bool;2321 } & Struct;2321 } & Struct;2322 readonly isRepairItem: boolean;2322 readonly isForceRepairCollection: boolean;2323 readonly asForceRepairCollection: {2324 readonly collectionId: u32;2325 } & Struct;2326 readonly isForceRepairItem: boolean;2323 readonly asRepairItem: {2327 readonly asForceRepairItem: {2324 readonly collectionId: u32;2328 readonly collectionId: u32;2325 readonly itemId: u32;2329 readonly itemId: u32;2326 } & Struct;2330 } & Struct;2327 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';2331 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';2328}2332}232923332330/** @name PalletUniqueError */2334/** @name PalletUniqueError */tests/src/interfaces/lookup.tsdiffbeforeafterboth2282 operator: 'PalletEvmAccountBasicCrossAccountIdRepr',2282 operator: 'PalletEvmAccountBasicCrossAccountIdRepr',2283 approve: 'bool',2283 approve: 'bool',2284 },2284 },2285 repair_item: {2285 force_repair_collection: {2286 collectionId: 'u32',2286 collectionId: 'u32',2287 },2288 force_repair_item: {2289 collectionId: 'u32',2287 itemId: 'u32'2290 itemId: 'u32'2288 }2291 }2289 }2292 }2452 PalletConfigurationCall: {2455 PalletConfigurationCall: {2453 _enum: {2456 _enum: {2454 set_weight_to_fee_coefficient_override: {2457 set_weight_to_fee_coefficient_override: {2455 coeff: 'Option<u32>',2458 coeff: 'Option<u64>',2456 },2459 },2457 set_min_gas_price_override: {2460 set_min_gas_price_override: {2458 coeff: 'Option<u64>',2461 coeff: 'Option<u64>',2468 /**2471 /**2469 * Lookup286: pallet_configuration::AppPromotionConfiguration<BlockNumber>2472 * Lookup286: pallet_configuration::AppPromotionConfiguration<BlockNumber>2470 **/2473 **/2471<<<<<<< HEAD2472 PalletConfigurationAppPromotionConfiguration: {2474 PalletConfigurationAppPromotionConfiguration: {2473 recalculationInterval: 'Option<u32>',2475 recalculationInterval: 'Option<u32>',2474 pendingInterval: 'Option<u32>',2476 pendingInterval: 'Option<u32>',2475 intervalIncome: 'Option<Perbill>',2477 intervalIncome: 'Option<Perbill>',2476 maxStakersPerCalculation: 'Option<u8>'2478 maxStakersPerCalculation: 'Option<u8>'2477=======2478 PalletConfigurationCall: {2479 _enum: {2480 set_weight_to_fee_coefficient_override: {2481 coeff: 'Option<u64>',2482 },2483 set_min_gas_price_override: {2484 coeff: 'Option<u64>'2485 }2486 }2487>>>>>>> chore: regenerate types2488 },2479 },2489 /**2480 /**2490 * Lookup289: pallet_template_transaction_payment::Call<T>2481 * Lookup289: pallet_template_transaction_payment::Call<T>tests/src/interfaces/types-lookup.tsdiffbeforeafterboth2517 readonly operator: PalletEvmAccountBasicCrossAccountIdRepr;2517 readonly operator: PalletEvmAccountBasicCrossAccountIdRepr;2518 readonly approve: bool;2518 readonly approve: bool;2519 } & Struct;2519 } & Struct;2520 readonly isRepairItem: boolean;2520 readonly isForceRepairCollection: boolean;2521 readonly asForceRepairCollection: {2522 readonly collectionId: u32;2523 } & Struct;2524 readonly isForceRepairItem: boolean;2521 readonly asRepairItem: {2525 readonly asForceRepairItem: {2522 readonly collectionId: u32;2526 readonly collectionId: u32;2523 readonly itemId: u32;2527 readonly itemId: u32;2524 } & Struct;2528 } & Struct;2525 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';2529 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';2526 }2530 }252725312528 /** @name UpDataStructsCollectionMode (237) */2532 /** @name UpDataStructsCollectionMode (237) */