From fdc1b224b1bd2a5288f53d0c07ffeced5a825e06 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Fri, 27 May 2022 14:22:28 +0000 Subject: [PATCH] CORE-302 Fix rebase --- --- a/Cargo.lock +++ b/Cargo.lock @@ -6082,7 +6082,6 @@ name = "pallet-evm-contract-helpers" version = "0.1.0" dependencies = [ - "ethereum", "evm-coder", "fp-evm-mapping", "frame-support", @@ -6091,7 +6090,6 @@ "pallet-common", "pallet-evm", "pallet-evm-coder-substrate", - "pallet-nonfungible", "parity-scale-codec 3.1.2", "scale-info", "sp-core", --- a/pallets/evm-contract-helpers/Cargo.toml +++ b/pallets/evm-contract-helpers/Cargo.toml @@ -8,7 +8,6 @@ scale-info = { version = "2.0.1", default-features = false, features = [ "derive", ] } -ethereum = { version = "0.12.0", default-features = false } log = { default-features = false, version = "0.4.14" } # Substrate @@ -27,7 +26,6 @@ evm-coder = { default-features = false, path = '../../crates/evm-coder' } pallet-common = { default-features = false, path = '../../pallets/common' } pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' } -pallet-nonfungible = { default-features = false, path = '../../pallets/nonfungible' } up-data-structs = { default-features = false, path = '../../primitives/data-structs', features = ['serde1'] } [dependencies.codec] --- a/pallets/evm-contract-helpers/src/eth.rs +++ b/pallets/evm-contract-helpers/src/eth.rs @@ -15,8 +15,7 @@ // along with Unique Network. If not, see . use core::marker::PhantomData; -use evm_coder::{abi::AbiWriter, execution::*, generate_stubgen, solidity_interface, types::*, ToLog}; -use ethereum as _; +use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*}; use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder}; use pallet_evm::{ ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, @@ -39,16 +38,6 @@ fn into_recorder(self) -> SubstrateRecorder { self.0 } -} - -#[derive(ToLog)] -pub enum ContractHelperEvent { - CollectionCreated { - #[indexed] - owner: address, - #[indexed] - collection_id: address, - }, } #[solidity_interface(name = "ContractHelpers")] --- a/pallets/evm-contract-helpers/src/lib.rs +++ b/pallets/evm-contract-helpers/src/lib.rs @@ -31,10 +31,7 @@ #[pallet::config] pub trait Config: - frame_system::Config - + pallet_evm_coder_substrate::Config - + pallet_evm::account::Config - + pallet_nonfungible::Config + frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config { type ContractAddress: Get; type DefaultSponsoringRateLimit: Get; --- a/pallets/evm-contract-helpers/src/stubs/Collection.sol +++ /dev/null @@ -1,192 +0,0 @@ -// SPDX-License-Identifier: OTHER -// This code is automatically generated - -pragma solidity >=0.8.0 <0.9.0; - -// Common stubs holder -contract Dummy { - uint8 dummy; - string stub_error = "this contract is implemented in native"; -} - -contract ERC165 is Dummy { - function supportsInterface(bytes4 interfaceID) - external - view - returns (bool) - { - require(false, stub_error); - interfaceID; - return true; - } -} - -// Selector: 61f17ed8 -contract ContractHelpers is Dummy, ERC165 { - // Selector: contractOwner(address) 5152b14c - function contractOwner(address contractAddress) - public - view - returns (address) - { - require(false, stub_error); - contractAddress; - dummy; - return 0x0000000000000000000000000000000000000000; - } - - // Selector: sponsoringEnabled(address) 6027dc61 - function sponsoringEnabled(address contractAddress) - public - view - returns (bool) - { - require(false, stub_error); - contractAddress; - dummy; - return false; - } - - // Deprecated - // - // Selector: toggleSponsoring(address,bool) fcac6d86 - function toggleSponsoring(address contractAddress, bool enabled) public { - require(false, stub_error); - contractAddress; - enabled; - dummy = 0; - } - - // Selector: setSponsoringMode(address,uint8) fde8a560 - function setSponsoringMode(address contractAddress, uint8 mode) public { - require(false, stub_error); - contractAddress; - mode; - dummy = 0; - } - - // Selector: sponsoringMode(address) b70c7267 - function sponsoringMode(address contractAddress) - public - view - returns (uint8) - { - require(false, stub_error); - contractAddress; - dummy; - return 0; - } - - // Selector: setSponsoringRateLimit(address,uint32) 77b6c908 - function setSponsoringRateLimit(address contractAddress, uint32 rateLimit) - public - { - require(false, stub_error); - contractAddress; - rateLimit; - dummy = 0; - } - - // Selector: getSponsoringRateLimit(address) 610cfabd - function getSponsoringRateLimit(address contractAddress) - public - view - returns (uint32) - { - require(false, stub_error); - contractAddress; - dummy; - return 0; - } - - // Selector: allowed(address,address) 5c658165 - function allowed(address contractAddress, address user) - public - view - returns (bool) - { - require(false, stub_error); - contractAddress; - user; - dummy; - return false; - } - - // Selector: allowlistEnabled(address) c772ef6c - function allowlistEnabled(address contractAddress) - public - view - returns (bool) - { - require(false, stub_error); - contractAddress; - dummy; - return false; - } - - // Selector: toggleAllowlist(address,bool) 36de20f5 - function toggleAllowlist(address contractAddress, bool enabled) public { - require(false, stub_error); - contractAddress; - enabled; - dummy = 0; - } - - // Selector: toggleAllowed(address,address,bool) 4706cc1c - function toggleAllowed( - address contractAddress, - address user, - bool allowed - ) public { - require(false, stub_error); - contractAddress; - user; - allowed; - dummy = 0; - } - - // Selector: create721Collection(string,string,string) 951c0151 - function create721Collection( - string memory name, - string memory description, - string memory tokenPrefix - ) public view returns (address) { - require(false, stub_error); - name; - description; - tokenPrefix; - dummy; - return 0x0000000000000000000000000000000000000000; - } - - // Selector: setSponsor(address,address) f01fba93 - function setSponsor(address collectionId, address sponsor) public pure { - require(false, stub_error); - collectionId; - sponsor; - } - - // Selector: setOffchainShema(string) c3aa408b - function setOffchainShema(string memory shema) public pure { - require(false, stub_error); - shema; - } - - // Selector: setConstOnChainSchema(string) b284d8df - function setConstOnChainSchema(string memory shema) public pure { - require(false, stub_error); - shema; - } - - // Selector: setVariableOnChainSchema(string) 7c5f0fea - function setVariableOnChainSchema(string memory shema) public pure { - require(false, stub_error); - shema; - } - - // Selector: setLimits(string) 72cb345d - function setLimits(string memory limits) public pure { - require(false, stub_error); - limits; - } -} --- a/pallets/fungible/src/stubs/UniqueFungible.sol +++ b/pallets/fungible/src/stubs/UniqueFungible.sol @@ -127,8 +127,8 @@ } } -// Selector: 9b5e29c5 -contract CollectionProperties is Dummy, ERC165 { +// Selector: f5652829 +contract Collection is Dummy, ERC165 { // Selector: setCollectionProperty(string,bytes) 2f073f66 function setCollectionProperty(string memory key, bytes memory value) public @@ -159,6 +159,34 @@ dummy; return hex""; } + + // Selector: ethSetSponsor(address) 8f9af356 + function ethSetSponsor(address sponsor) public { + require(false, stub_error); + sponsor; + dummy = 0; + } + + // Selector: ethConfirmSponsorship() a8580d1a + function ethConfirmSponsorship() public { + require(false, stub_error); + dummy = 0; + } + + // Selector: setLimit(string,string) bf4d2014 + function setLimit(string memory limit, string memory value) public { + require(false, stub_error); + limit; + value; + dummy = 0; + } + + // Selector: contractAddress() f6b4dfb4 + function contractAddress() public view returns (address) { + require(false, stub_error); + dummy; + return 0x0000000000000000000000000000000000000000; + } } contract UniqueFungible is @@ -166,5 +194,5 @@ ERC165, ERC20, ERC20UniqueExtensions, - CollectionProperties + Collection {} --- a/pallets/nonfungible/src/common.rs +++ b/pallets/nonfungible/src/common.rs @@ -22,8 +22,7 @@ PropertyKeyPermission, PropertyValue, }; use pallet_common::{ - CommonCollectionOperations, CommonWeightInfo, with_weight, weights::WeightInfo as _, - PropertyKeyPermission, + CommonCollectionOperations, CommonWeightInfo, with_weight, weights::WeightInfo as _ }; use sp_runtime::DispatchError; use sp_std::vec::Vec; --- a/pallets/unique/Cargo.toml +++ b/pallets/unique/Cargo.toml @@ -76,11 +76,6 @@ git = "https://github.com/paritytech/substrate" branch = "polkadot-v0.9.21" -# [dependencies.pallet-transaction-payment] -# default-features = false -# git = "https://github.com/paritytech/substrate" -# branch = "polkadot-v0.9.21" - [dependencies.sp-runtime] default-features = false git = "https://github.com/paritytech/substrate" --- a/tests/src/eth/api/UniqueFungible.sol +++ b/tests/src/eth/api/UniqueFungible.sol @@ -65,8 +65,8 @@ returns (uint256); } -// Selector: 9b5e29c5 -interface CollectionProperties is Dummy, ERC165 { +// Selector: f5652829 +interface Collection is Dummy, ERC165 { // Selector: setCollectionProperty(string,bytes) 2f073f66 function setCollectionProperty(string memory key, bytes memory value) external; @@ -81,6 +81,18 @@ external view returns (bytes memory); + + // Selector: ethSetSponsor(address) 8f9af356 + function ethSetSponsor(address sponsor) external; + + // Selector: ethConfirmSponsorship() a8580d1a + function ethConfirmSponsorship() external; + + // Selector: setLimit(string,string) bf4d2014 + function setLimit(string memory limit, string memory value) external; + + // Selector: contractAddress() f6b4dfb4 + function contractAddress() external view returns (address); } interface UniqueFungible is @@ -88,5 +100,5 @@ ERC165, ERC20, ERC20UniqueExtensions, - CollectionProperties + Collection {} --- a/tests/src/eth/contractSponsoring.test.ts +++ b/tests/src/eth/contractSponsoring.test.ts @@ -36,17 +36,12 @@ import { addCollectionAdminExpectSuccess, createCollectionExpectSuccess, - getCreateCollectionResult, getDetailedCollectionInfo, transferBalanceTo, } from '../util/helpers'; import nonFungibleAbi from './nonFungibleAbi.json'; -import { - submitTransactionAsync, -} from '../substrate/substrate-api'; import getBalance from '../substrate/get-balance'; -import {alicesPublicKey} from '../accounts'; -import { evmToAddress } from '@polkadot/util-crypto'; +import {evmToAddress} from '@polkadot/util-crypto'; describe('Sponsoring EVM contracts', () => { itWeb3('Sponsoring can be set by the address that has deployed the contract', async ({api, web3}) => { --- a/tests/src/eth/fungible.test.ts +++ b/tests/src/eth/fungible.test.ts @@ -362,18 +362,3 @@ ]); }); }); - -describe('Fungible metadata', () => { - itWeb3('Returns fungible decimals', async ({api, web3}) => { - const collection = await createCollectionExpectSuccess({ - mode: {type: 'Fungible', decimalPoints: 6}, - }); - const caller = await createEthAccountWithBalance(api, web3); - - const address = collectionIdToAddress(collection); - const contract = new web3.eth.Contract(fungibleAbi as any, address, {from: caller, ...GAS_ARGS}); - const decimals = await contract.methods.decimals().call(); - - expect(+decimals).to.equal(6); - }); -}); \ No newline at end of file --- a/tests/src/eth/fungibleAbi.json +++ b/tests/src/eth/fungibleAbi.json @@ -97,6 +97,13 @@ }, { "inputs": [], + "name": "contractAddress", + "outputs": [{ "internalType": "address", "name": "", "type": "address" }], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], "name": "decimals", "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }], "stateMutability": "view", @@ -111,6 +118,22 @@ }, { "inputs": [], + "name": "ethConfirmSponsorship", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { "internalType": "address", "name": "sponsor", "type": "address" } + ], + "name": "ethSetSponsor", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], "name": "name", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "stateMutability": "view", @@ -128,6 +151,16 @@ }, { "inputs": [ + { "internalType": "string", "name": "limit", "type": "string" }, + { "internalType": "string", "name": "value", "type": "string" } + ], + "name": "setLimit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" } ], "name": "supportsInterface", --- a/tests/src/interfaces/augment-api-rpc.ts +++ b/tests/src/interfaces/augment-api-rpc.ts @@ -22,7 +22,7 @@ import type { StorageKind } from '@polkadot/types/interfaces/offchain'; import type { FeeDetails, RuntimeDispatchInfo } from '@polkadot/types/interfaces/payment'; import type { RpcMethods } from '@polkadot/types/interfaces/rpc'; -import type { AccountId, BlockNumber, H160, H256, H64, Hash, Header, Index, Justification, KeyValue, SignedBlock, StorageData } from '@polkadot/types/interfaces/runtime'; +import type { AccountId, AccountId32, BlockNumber, H160, H256, H64, Hash, Header, Index, Justification, KeyValue, SignedBlock, StorageData } from '@polkadot/types/interfaces/runtime'; import type { MigrationStatusResult, ReadProof, RuntimeVersion, TraceBlockResponse } from '@polkadot/types/interfaces/state'; import type { ApplyExtrinsicResult, ChainProperties, ChainType, Health, NetworkState, NodeRole, PeerInfo, SyncState } from '@polkadot/types/interfaces/system'; import type { IExtrinsic, Observable } from '@polkadot/types/types'; --- a/tests/src/interfaces/augment-types.ts +++ b/tests/src/interfaces/augment-types.ts @@ -1,7 +1,6 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ -import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportStorageBoundedBTreeSet, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructsRpcCollection, PhantomTypeUpDataStructsTokenData, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionField, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRpcCollection, UpDataStructsSchemaVersion, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './unique'; import type { Data, StorageKey } from '@polkadot/types'; import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec'; import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets'; @@ -291,27 +290,6 @@ CoreOccupied: CoreOccupied; CrateVersion: CrateVersion; CreatedBlock: CreatedBlock; - CumulusPalletDmpQueueCall: CumulusPalletDmpQueueCall; - CumulusPalletDmpQueueConfigData: CumulusPalletDmpQueueConfigData; - CumulusPalletDmpQueueError: CumulusPalletDmpQueueError; - CumulusPalletDmpQueueEvent: CumulusPalletDmpQueueEvent; - CumulusPalletDmpQueuePageIndexData: CumulusPalletDmpQueuePageIndexData; - CumulusPalletParachainSystemCall: CumulusPalletParachainSystemCall; - CumulusPalletParachainSystemError: CumulusPalletParachainSystemError; - CumulusPalletParachainSystemEvent: CumulusPalletParachainSystemEvent; - CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot; - CumulusPalletXcmCall: CumulusPalletXcmCall; - CumulusPalletXcmError: CumulusPalletXcmError; - CumulusPalletXcmEvent: CumulusPalletXcmEvent; - CumulusPalletXcmpQueueCall: CumulusPalletXcmpQueueCall; - CumulusPalletXcmpQueueError: CumulusPalletXcmpQueueError; - CumulusPalletXcmpQueueEvent: CumulusPalletXcmpQueueEvent; - CumulusPalletXcmpQueueInboundChannelDetails: CumulusPalletXcmpQueueInboundChannelDetails; - CumulusPalletXcmpQueueInboundState: CumulusPalletXcmpQueueInboundState; - CumulusPalletXcmpQueueOutboundChannelDetails: CumulusPalletXcmpQueueOutboundChannelDetails; - CumulusPalletXcmpQueueOutboundState: CumulusPalletXcmpQueueOutboundState; - CumulusPalletXcmpQueueQueueConfigData: CumulusPalletXcmpQueueQueueConfigData; - CumulusPrimitivesParachainInherentParachainInherentData: CumulusPrimitivesParachainInherentParachainInherentData; Data: Data; DeferredOffenceOf: DeferredOffenceOf; DefunctVoter: DefunctVoter; @@ -378,25 +356,11 @@ EthAddress: EthAddress; EthBlock: EthBlock; EthBloom: EthBloom; - EthbloomBloom: EthbloomBloom; EthCallRequest: EthCallRequest; EthereumAccountId: EthereumAccountId; EthereumAddress: EthereumAddress; - EthereumBlock: EthereumBlock; - EthereumHeader: EthereumHeader; - EthereumLog: EthereumLog; EthereumLookupSource: EthereumLookupSource; - EthereumReceiptEip658ReceiptData: EthereumReceiptEip658ReceiptData; - EthereumReceiptReceiptV3: EthereumReceiptReceiptV3; EthereumSignature: EthereumSignature; - EthereumTransactionAccessListItem: EthereumTransactionAccessListItem; - EthereumTransactionEip1559Transaction: EthereumTransactionEip1559Transaction; - EthereumTransactionEip2930Transaction: EthereumTransactionEip2930Transaction; - EthereumTransactionLegacyTransaction: EthereumTransactionLegacyTransaction; - EthereumTransactionTransactionAction: EthereumTransactionTransactionAction; - EthereumTransactionTransactionSignature: EthereumTransactionTransactionSignature; - EthereumTransactionTransactionV2: EthereumTransactionTransactionV2; - EthereumTypesHashH64: EthereumTypesHashH64; EthFilter: EthFilter; EthFilterAddress: EthFilterAddress; EthFilterChanges: EthFilterChanges; @@ -433,11 +397,6 @@ EventMetadataV9: EventMetadataV9; EventRecord: EventRecord; EvmAccount: EvmAccount; - EvmCoreErrorExitError: EvmCoreErrorExitError; - EvmCoreErrorExitFatal: EvmCoreErrorExitFatal; - EvmCoreErrorExitReason: EvmCoreErrorExitReason; - EvmCoreErrorExitRevert: EvmCoreErrorExitRevert; - EvmCoreErrorExitSucceed: EvmCoreErrorExitSucceed; EvmLog: EvmLog; EvmVicinity: EvmVicinity; ExecReturnValue: ExecReturnValue; @@ -476,31 +435,6 @@ Forcing: Forcing; ForkTreePendingChange: ForkTreePendingChange; ForkTreePendingChangeNode: ForkTreePendingChangeNode; - FpRpcTransactionStatus: FpRpcTransactionStatus; - FrameSupportPalletId: FrameSupportPalletId; - FrameSupportTokensMiscBalanceStatus: FrameSupportTokensMiscBalanceStatus; - FrameSupportWeightsDispatchClass: FrameSupportWeightsDispatchClass; - FrameSupportWeightsDispatchInfo: FrameSupportWeightsDispatchInfo; - FrameSupportWeightsPays: FrameSupportWeightsPays; - FrameSupportWeightsPerDispatchClassU32: FrameSupportWeightsPerDispatchClassU32; - FrameSupportWeightsPerDispatchClassU64: FrameSupportWeightsPerDispatchClassU64; - FrameSupportWeightsPerDispatchClassWeightsPerClass: FrameSupportWeightsPerDispatchClassWeightsPerClass; - FrameSupportWeightsRuntimeDbWeight: FrameSupportWeightsRuntimeDbWeight; - FrameSupportWeightsWeightToFeeCoefficient: FrameSupportWeightsWeightToFeeCoefficient; - FrameSystemAccountInfo: FrameSystemAccountInfo; - FrameSystemCall: FrameSystemCall; - FrameSystemError: FrameSystemError; - FrameSystemEvent: FrameSystemEvent; - FrameSystemEventRecord: FrameSystemEventRecord; - FrameSystemExtensionsCheckGenesis: FrameSystemExtensionsCheckGenesis; - FrameSystemExtensionsCheckNonce: FrameSystemExtensionsCheckNonce; - FrameSystemExtensionsCheckSpecVersion: FrameSystemExtensionsCheckSpecVersion; - FrameSystemExtensionsCheckWeight: FrameSystemExtensionsCheckWeight; - FrameSystemLastRuntimeUpgradeInfo: FrameSystemLastRuntimeUpgradeInfo; - FrameSystemLimitsBlockLength: FrameSystemLimitsBlockLength; - FrameSystemLimitsBlockWeights: FrameSystemLimitsBlockWeights; - FrameSystemLimitsWeightsPerClass: FrameSystemLimitsWeightsPerClass; - FrameSystemPhase: FrameSystemPhase; FullIdentification: FullIdentification; FunctionArgumentMetadataLatest: FunctionArgumentMetadataLatest; FunctionArgumentMetadataV10: FunctionArgumentMetadataV10; @@ -716,7 +650,6 @@ OffchainAccuracyCompact: OffchainAccuracyCompact; OffenceDetails: OffenceDetails; Offender: Offender; - OpalRuntimeRuntime: OpalRuntimeRuntime; OpaqueCall: OpaqueCall; OpaqueMultiaddr: OpaqueMultiaddr; OpaqueNetworkState: OpaqueNetworkState; @@ -732,10 +665,6 @@ OriginKindV0: OriginKindV0; OriginKindV1: OriginKindV1; OriginKindV2: OriginKindV2; - OrmlVestingModuleCall: OrmlVestingModuleCall; - OrmlVestingModuleError: OrmlVestingModuleError; - OrmlVestingModuleEvent: OrmlVestingModuleEvent; - OrmlVestingVestingSchedule: OrmlVestingVestingSchedule; OutboundHrmpMessage: OutboundHrmpMessage; OutboundLaneData: OutboundLaneData; OutboundMessageFee: OutboundMessageFee; @@ -746,76 +675,21 @@ Owner: Owner; PageCounter: PageCounter; PageIndexData: PageIndexData; - PalletBalancesAccountData: PalletBalancesAccountData; - PalletBalancesBalanceLock: PalletBalancesBalanceLock; - PalletBalancesCall: PalletBalancesCall; - PalletBalancesError: PalletBalancesError; - PalletBalancesEvent: PalletBalancesEvent; - PalletBalancesReasons: PalletBalancesReasons; - PalletBalancesReleases: PalletBalancesReleases; - PalletBalancesReserveData: PalletBalancesReserveData; PalletCallMetadataLatest: PalletCallMetadataLatest; PalletCallMetadataV14: PalletCallMetadataV14; - PalletCommonError: PalletCommonError; - PalletCommonEvent: PalletCommonEvent; PalletConstantMetadataLatest: PalletConstantMetadataLatest; PalletConstantMetadataV14: PalletConstantMetadataV14; PalletErrorMetadataLatest: PalletErrorMetadataLatest; PalletErrorMetadataV14: PalletErrorMetadataV14; - PalletEthereumCall: PalletEthereumCall; - PalletEthereumError: PalletEthereumError; - PalletEthereumEvent: PalletEthereumEvent; - PalletEthereumFakeTransactionFinalizer: PalletEthereumFakeTransactionFinalizer; PalletEventMetadataLatest: PalletEventMetadataLatest; PalletEventMetadataV14: PalletEventMetadataV14; - PalletEvmAccountBasicCrossAccountIdRepr: PalletEvmAccountBasicCrossAccountIdRepr; - PalletEvmCall: PalletEvmCall; - PalletEvmCoderSubstrateError: PalletEvmCoderSubstrateError; - PalletEvmContractHelpersError: PalletEvmContractHelpersError; - PalletEvmContractHelpersSponsoringModeT: PalletEvmContractHelpersSponsoringModeT; - PalletEvmError: PalletEvmError; - PalletEvmEvent: PalletEvmEvent; - PalletEvmMigrationCall: PalletEvmMigrationCall; - PalletEvmMigrationError: PalletEvmMigrationError; - PalletFungibleError: PalletFungibleError; PalletId: PalletId; - PalletInflationCall: PalletInflationCall; PalletMetadataLatest: PalletMetadataLatest; PalletMetadataV14: PalletMetadataV14; - PalletNonfungibleError: PalletNonfungibleError; - PalletNonfungibleItemData: PalletNonfungibleItemData; - PalletRefungibleError: PalletRefungibleError; - PalletRefungibleItemData: PalletRefungibleItemData; - PalletRmrkCoreCall: PalletRmrkCoreCall; - PalletRmrkCoreError: PalletRmrkCoreError; - PalletRmrkCoreEvent: PalletRmrkCoreEvent; - PalletRmrkEquipCall: PalletRmrkEquipCall; - PalletRmrkEquipError: PalletRmrkEquipError; - PalletRmrkEquipEvent: PalletRmrkEquipEvent; PalletsOrigin: PalletsOrigin; PalletStorageMetadataLatest: PalletStorageMetadataLatest; PalletStorageMetadataV14: PalletStorageMetadataV14; - PalletStructureCall: PalletStructureCall; - PalletStructureError: PalletStructureError; - PalletStructureEvent: PalletStructureEvent; - PalletSudoCall: PalletSudoCall; - PalletSudoError: PalletSudoError; - PalletSudoEvent: PalletSudoEvent; - PalletTemplateTransactionPaymentCall: PalletTemplateTransactionPaymentCall; - PalletTemplateTransactionPaymentChargeTransactionPayment: PalletTemplateTransactionPaymentChargeTransactionPayment; - PalletTimestampCall: PalletTimestampCall; - PalletTransactionPaymentReleases: PalletTransactionPaymentReleases; - PalletTreasuryCall: PalletTreasuryCall; - PalletTreasuryError: PalletTreasuryError; - PalletTreasuryEvent: PalletTreasuryEvent; - PalletTreasuryProposal: PalletTreasuryProposal; - PalletUniqueCall: PalletUniqueCall; - PalletUniqueError: PalletUniqueError; - PalletUniqueRawEvent: PalletUniqueRawEvent; PalletVersion: PalletVersion; - PalletXcmCall: PalletXcmCall; - PalletXcmError: PalletXcmError; - PalletXcmEvent: PalletXcmEvent; ParachainDispatchOrigin: ParachainDispatchOrigin; ParachainInherentData: ParachainInherentData; ParachainProposal: ParachainProposal; @@ -855,27 +729,9 @@ PerU16: PerU16; Phantom: Phantom; PhantomData: PhantomData; - PhantomTypeUpDataStructsBaseInfo: PhantomTypeUpDataStructsBaseInfo; - PhantomTypeUpDataStructsCollectionInfo: PhantomTypeUpDataStructsCollectionInfo; - PhantomTypeUpDataStructsNftChild: PhantomTypeUpDataStructsNftChild; - PhantomTypeUpDataStructsNftInfo: PhantomTypeUpDataStructsNftInfo; - PhantomTypeUpDataStructsPartType: PhantomTypeUpDataStructsPartType; - PhantomTypeUpDataStructsPropertyInfo: PhantomTypeUpDataStructsPropertyInfo; - PhantomTypeUpDataStructsResourceInfo: PhantomTypeUpDataStructsResourceInfo; - PhantomTypeUpDataStructsRpcCollection: PhantomTypeUpDataStructsRpcCollection; - PhantomTypeUpDataStructsTheme: PhantomTypeUpDataStructsTheme; - PhantomTypeUpDataStructsTokenData: PhantomTypeUpDataStructsTokenData; Phase: Phase; PhragmenScore: PhragmenScore; Points: Points; - PolkadotCorePrimitivesInboundDownwardMessage: PolkadotCorePrimitivesInboundDownwardMessage; - PolkadotCorePrimitivesInboundHrmpMessage: PolkadotCorePrimitivesInboundHrmpMessage; - PolkadotCorePrimitivesOutboundHrmpMessage: PolkadotCorePrimitivesOutboundHrmpMessage; - PolkadotParachainPrimitivesXcmpMessageFormat: PolkadotParachainPrimitivesXcmpMessageFormat; - PolkadotPrimitivesV2AbridgedHostConfiguration: PolkadotPrimitivesV2AbridgedHostConfiguration; - PolkadotPrimitivesV2AbridgedHrmpChannel: PolkadotPrimitivesV2AbridgedHrmpChannel; - PolkadotPrimitivesV2PersistedValidationData: PolkadotPrimitivesV2PersistedValidationData; - PolkadotPrimitivesV2UpgradeRestriction: PolkadotPrimitivesV2UpgradeRestriction; PortableType: PortableType; PortableTypeV14: PortableTypeV14; Precommits: Precommits; @@ -1071,20 +927,7 @@ SolutionSupports: SolutionSupports; SpanIndex: SpanIndex; SpanRecord: SpanRecord; - SpCoreEcdsaSignature: SpCoreEcdsaSignature; - SpCoreEd25519Signature: SpCoreEd25519Signature; - SpCoreSr25519Signature: SpCoreSr25519Signature; SpecVersion: SpecVersion; - SpRuntimeArithmeticError: SpRuntimeArithmeticError; - SpRuntimeDigest: SpRuntimeDigest; - SpRuntimeDigestDigestItem: SpRuntimeDigestDigestItem; - SpRuntimeDispatchError: SpRuntimeDispatchError; - SpRuntimeModuleError: SpRuntimeModuleError; - SpRuntimeMultiSignature: SpRuntimeMultiSignature; - SpRuntimeTokenError: SpRuntimeTokenError; - SpRuntimeTransactionalError: SpRuntimeTransactionalError; - SpTrieStorageProof: SpTrieStorageProof; - SpVersionRuntimeVersion: SpVersionRuntimeVersion; Sr25519Signature: Sr25519Signature; StakingLedger: StakingLedger; StakingLedgerTo223: StakingLedgerTo223; @@ -1181,50 +1024,6 @@ UnlockChunk: UnlockChunk; UnrewardedRelayer: UnrewardedRelayer; UnrewardedRelayersState: UnrewardedRelayersState; - UpDataStructsAccessMode: UpDataStructsAccessMode; - UpDataStructsCollection: UpDataStructsCollection; - UpDataStructsCollectionField: UpDataStructsCollectionField; - UpDataStructsCollectionLimits: UpDataStructsCollectionLimits; - UpDataStructsCollectionMode: UpDataStructsCollectionMode; - UpDataStructsCollectionStats: UpDataStructsCollectionStats; - UpDataStructsCreateCollectionData: UpDataStructsCreateCollectionData; - UpDataStructsCreateFungibleData: UpDataStructsCreateFungibleData; - UpDataStructsCreateItemData: UpDataStructsCreateItemData; - UpDataStructsCreateItemExData: UpDataStructsCreateItemExData; - UpDataStructsCreateNftData: UpDataStructsCreateNftData; - UpDataStructsCreateNftExData: UpDataStructsCreateNftExData; - UpDataStructsCreateReFungibleData: UpDataStructsCreateReFungibleData; - UpDataStructsCreateRefungibleExData: UpDataStructsCreateRefungibleExData; - UpDataStructsNestingRule: UpDataStructsNestingRule; - UpDataStructsProperties: UpDataStructsProperties; - UpDataStructsPropertiesMapBoundedVec: UpDataStructsPropertiesMapBoundedVec; - UpDataStructsPropertiesMapPropertyPermission: UpDataStructsPropertiesMapPropertyPermission; - UpDataStructsProperty: UpDataStructsProperty; - UpDataStructsPropertyKeyPermission: UpDataStructsPropertyKeyPermission; - UpDataStructsPropertyPermission: UpDataStructsPropertyPermission; - UpDataStructsRmrkAccountIdOrCollectionNftTuple: UpDataStructsRmrkAccountIdOrCollectionNftTuple; - UpDataStructsRmrkBaseInfo: UpDataStructsRmrkBaseInfo; - UpDataStructsRmrkBasicResource: UpDataStructsRmrkBasicResource; - UpDataStructsRmrkCollectionInfo: UpDataStructsRmrkCollectionInfo; - UpDataStructsRmrkComposableResource: UpDataStructsRmrkComposableResource; - UpDataStructsRmrkEquippableList: UpDataStructsRmrkEquippableList; - UpDataStructsRmrkFixedPart: UpDataStructsRmrkFixedPart; - UpDataStructsRmrkNftChild: UpDataStructsRmrkNftChild; - UpDataStructsRmrkNftInfo: UpDataStructsRmrkNftInfo; - UpDataStructsRmrkPartType: UpDataStructsRmrkPartType; - UpDataStructsRmrkPropertyInfo: UpDataStructsRmrkPropertyInfo; - UpDataStructsRmrkResourceInfo: UpDataStructsRmrkResourceInfo; - UpDataStructsRmrkResourceTypes: UpDataStructsRmrkResourceTypes; - UpDataStructsRmrkRoyaltyInfo: UpDataStructsRmrkRoyaltyInfo; - UpDataStructsRmrkSlotPart: UpDataStructsRmrkSlotPart; - UpDataStructsRmrkSlotResource: UpDataStructsRmrkSlotResource; - UpDataStructsRmrkTheme: UpDataStructsRmrkTheme; - UpDataStructsRmrkThemeProperty: UpDataStructsRmrkThemeProperty; - UpDataStructsRpcCollection: UpDataStructsRpcCollection; - UpDataStructsSchemaVersion: UpDataStructsSchemaVersion; - UpDataStructsSponsoringRateLimit: UpDataStructsSponsoringRateLimit; - UpDataStructsSponsorshipState: UpDataStructsSponsorshipState; - UpDataStructsTokenData: UpDataStructsTokenData; UpgradeGoAhead: UpgradeGoAhead; UpgradeRestriction: UpgradeRestriction; UpwardMessage: UpwardMessage; @@ -1296,7 +1095,6 @@ WithdrawReasons: WithdrawReasons; Xcm: Xcm; XcmAssetId: XcmAssetId; - XcmDoubleEncoded: XcmDoubleEncoded; XcmError: XcmError; XcmErrorV0: XcmErrorV0; XcmErrorV1: XcmErrorV1; @@ -1309,41 +1107,8 @@ XcmOriginKind: XcmOriginKind; XcmpMessageFormat: XcmpMessageFormat; XcmV0: XcmV0; - XcmV0Junction: XcmV0Junction; - XcmV0JunctionBodyId: XcmV0JunctionBodyId; - XcmV0JunctionBodyPart: XcmV0JunctionBodyPart; - XcmV0JunctionNetworkId: XcmV0JunctionNetworkId; - XcmV0MultiAsset: XcmV0MultiAsset; - XcmV0MultiLocation: XcmV0MultiLocation; - XcmV0Order: XcmV0Order; - XcmV0OriginKind: XcmV0OriginKind; - XcmV0Response: XcmV0Response; - XcmV0Xcm: XcmV0Xcm; XcmV1: XcmV1; - XcmV1Junction: XcmV1Junction; - XcmV1MultiAsset: XcmV1MultiAsset; - XcmV1MultiassetAssetId: XcmV1MultiassetAssetId; - XcmV1MultiassetAssetInstance: XcmV1MultiassetAssetInstance; - XcmV1MultiassetFungibility: XcmV1MultiassetFungibility; - XcmV1MultiassetMultiAssetFilter: XcmV1MultiassetMultiAssetFilter; - XcmV1MultiassetMultiAssets: XcmV1MultiassetMultiAssets; - XcmV1MultiassetWildFungibility: XcmV1MultiassetWildFungibility; - XcmV1MultiassetWildMultiAsset: XcmV1MultiassetWildMultiAsset; - XcmV1MultiLocation: XcmV1MultiLocation; - XcmV1MultilocationJunctions: XcmV1MultilocationJunctions; - XcmV1Order: XcmV1Order; - XcmV1Response: XcmV1Response; - XcmV1Xcm: XcmV1Xcm; XcmV2: XcmV2; - XcmV2Instruction: XcmV2Instruction; - XcmV2Response: XcmV2Response; - XcmV2TraitsError: XcmV2TraitsError; - XcmV2TraitsOutcome: XcmV2TraitsOutcome; - XcmV2WeightLimit: XcmV2WeightLimit; - XcmV2Xcm: XcmV2Xcm; XcmVersion: XcmVersion; - XcmVersionedMultiAssets: XcmVersionedMultiAssets; - XcmVersionedMultiLocation: XcmVersionedMultiLocation; - XcmVersionedXcm: XcmVersionedXcm; } // InterfaceTypes } // declare module --- a/tests/src/interfaces/lookup.ts +++ b/tests/src/interfaces/lookup.ts @@ -2505,8 +2505,16 @@ /** * Lookup352: PhantomType::up_data_structs, frame_support::storage::bounded_vec::BoundedVec, sp_core::crypto::AccountId32>> **/ - PalletCommonError: { - _enum: ['CollectionNotFound', 'MustBeTokenOwner', 'NoPermission', 'PublicMintingNotAllowed', 'AddressNotInAllowlist', 'CollectionNameLimitExceeded', 'CollectionDescriptionLimitExceeded', 'CollectionTokenPrefixLimitExceeded', 'TotalCollectionsLimitExceeded', 'CollectionAdminCountExceeded', 'CollectionLimitBoundsExceeded', 'OwnerPermissionsCantBeReverted', 'TransferNotAllowed', 'AccountTokenLimitExceeded', 'CollectionTokenLimitExceeded', 'MetadataFlagFrozen', 'TokenNotFound', 'TokenValueTooLow', 'ApprovedValueTooLow', 'CantApproveMoreThanOwned', 'AddressIsZero', 'UnsupportedOperation', 'NotSufficientFounds', 'NestingIsDisabled', 'OnlyOwnerAllowedToNest', 'SourceCollectionIsNotAllowedToNest', 'CollectionFieldSizeExceeded', 'NoSpaceForProperty', 'PropertyLimitReached', 'PropertyKeyIsTooLong', 'InvalidCharacterInPropertyKey', 'EmptyPropertyKey'] + PhantomTypeUpDataStructsCollectionInfo: '[Lookup353;0]', + /** + * Lookup353: up_data_structs::rmrk::CollectionInfo, frame_support::storage::bounded_vec::BoundedVec, sp_core::crypto::AccountId32> + **/ + UpDataStructsRmrkCollectionInfo: { + issuer: 'AccountId32', + metadata: 'Bytes', + max: 'Option', + symbol: 'Bytes', + nftsCount: 'u32' }, /** * Lookup355: PhantomType::up_data_structs>> @@ -2793,7 +2801,7 @@ _enum: ['AccountNotEmpty', 'AccountIsNotMigrating'] }, /** - * Lookup369: sp_runtime::MultiSignature + * Lookup423: sp_runtime::MultiSignature **/ SpRuntimeMultiSignature: { _enum: { @@ -2803,39 +2811,39 @@ } }, /** - * Lookup370: sp_core::ed25519::Signature + * Lookup424: sp_core::ed25519::Signature **/ SpCoreEd25519Signature: '[u8;64]', /** - * Lookup372: sp_core::sr25519::Signature + * Lookup426: sp_core::sr25519::Signature **/ SpCoreSr25519Signature: '[u8;64]', /** - * Lookup373: sp_core::ecdsa::Signature + * Lookup427: sp_core::ecdsa::Signature **/ SpCoreEcdsaSignature: '[u8;65]', /** - * Lookup376: frame_system::extensions::check_spec_version::CheckSpecVersion + * Lookup430: frame_system::extensions::check_spec_version::CheckSpecVersion **/ FrameSystemExtensionsCheckSpecVersion: 'Null', /** - * Lookup377: frame_system::extensions::check_genesis::CheckGenesis + * Lookup431: frame_system::extensions::check_genesis::CheckGenesis **/ FrameSystemExtensionsCheckGenesis: 'Null', /** - * Lookup380: frame_system::extensions::check_nonce::CheckNonce + * Lookup434: frame_system::extensions::check_nonce::CheckNonce **/ FrameSystemExtensionsCheckNonce: 'Compact', /** - * Lookup381: frame_system::extensions::check_weight::CheckWeight + * Lookup435: frame_system::extensions::check_weight::CheckWeight **/ FrameSystemExtensionsCheckWeight: 'Null', /** - * Lookup382: pallet_template_transaction_payment::ChargeTransactionPayment + * Lookup436: pallet_template_transaction_payment::ChargeTransactionPayment **/ PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact', /** - * Lookup383: opal_runtime::Runtime + * Lookup437: opal_runtime::Runtime **/ OpalRuntimeRuntime: 'Null', /** --- a/tests/src/interfaces/registry.ts +++ b/tests/src/interfaces/registry.ts @@ -1,7 +1,7 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ -import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructsRpcCollection, PhantomTypeUpDataStructsTokenData, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionField, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRpcCollection, UpDataStructsSchemaVersion, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; +import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchClass, FrameSupportWeightsDispatchInfo, FrameSupportWeightsPays, FrameSupportWeightsPerDispatchClassU32, FrameSupportWeightsPerDispatchClassU64, FrameSupportWeightsPerDispatchClassWeightsPerClass, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletFungibleError, PalletInflationCall, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTimestampCall, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletUniqueRawEvent, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructsBaseInfo, PhantomTypeUpDataStructsCollectionInfo, PhantomTypeUpDataStructsNftChild, PhantomTypeUpDataStructsNftInfo, PhantomTypeUpDataStructsPartType, PhantomTypeUpDataStructsPropertyInfo, PhantomTypeUpDataStructsResourceInfo, PhantomTypeUpDataStructsRpcCollection, PhantomTypeUpDataStructsTheme, PhantomTypeUpDataStructsTokenData, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionField, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExData, UpDataStructsNestingRule, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsRmrkAccountIdOrCollectionNftTuple, UpDataStructsRmrkBaseInfo, UpDataStructsRmrkBasicResource, UpDataStructsRmrkCollectionInfo, UpDataStructsRmrkComposableResource, UpDataStructsRmrkEquippableList, UpDataStructsRmrkFixedPart, UpDataStructsRmrkNftChild, UpDataStructsRmrkNftInfo, UpDataStructsRmrkPartType, UpDataStructsRmrkPropertyInfo, UpDataStructsRmrkResourceInfo, UpDataStructsRmrkResourceTypes, UpDataStructsRmrkRoyaltyInfo, UpDataStructsRmrkSlotPart, UpDataStructsRmrkSlotResource, UpDataStructsRmrkTheme, UpDataStructsRmrkThemeProperty, UpDataStructsRpcCollection, UpDataStructsSchemaVersion, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipState, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; declare module '@polkadot/types/types/registry' { export interface InterfaceTypes { --- a/tests/src/interfaces/types-lookup.ts +++ b/tests/src/interfaces/types-lookup.ts @@ -3039,7 +3039,7 @@ readonly type: 'AccountNotEmpty' | 'AccountIsNotMigrating'; } - /** @name SpRuntimeMultiSignature (369) */ + /** @name SpRuntimeMultiSignature (423) */ export interface SpRuntimeMultiSignature extends Enum { readonly isEd25519: boolean; readonly asEd25519: SpCoreEd25519Signature; @@ -3050,31 +3050,31 @@ readonly type: 'Ed25519' | 'Sr25519' | 'Ecdsa'; } - /** @name SpCoreEd25519Signature (370) */ + /** @name SpCoreEd25519Signature (424) */ export interface SpCoreEd25519Signature extends U8aFixed {} - /** @name SpCoreSr25519Signature (372) */ + /** @name SpCoreSr25519Signature (426) */ export interface SpCoreSr25519Signature extends U8aFixed {} - /** @name SpCoreEcdsaSignature (373) */ + /** @name SpCoreEcdsaSignature (427) */ export interface SpCoreEcdsaSignature extends U8aFixed {} - /** @name FrameSystemExtensionsCheckSpecVersion (376) */ + /** @name FrameSystemExtensionsCheckSpecVersion (430) */ export type FrameSystemExtensionsCheckSpecVersion = Null; - /** @name FrameSystemExtensionsCheckGenesis (377) */ + /** @name FrameSystemExtensionsCheckGenesis (431) */ export type FrameSystemExtensionsCheckGenesis = Null; - /** @name FrameSystemExtensionsCheckNonce (380) */ + /** @name FrameSystemExtensionsCheckNonce (434) */ export interface FrameSystemExtensionsCheckNonce extends Compact {} - /** @name FrameSystemExtensionsCheckWeight (381) */ + /** @name FrameSystemExtensionsCheckWeight (435) */ export type FrameSystemExtensionsCheckWeight = Null; - /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (382) */ + /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (436) */ export interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact {} - /** @name OpalRuntimeRuntime (383) */ + /** @name OpalRuntimeRuntime (437) */ export type OpalRuntimeRuntime = Null; /** @name PalletEthereumFakeTransactionFinalizer (438) */ --- a/tests/src/interfaces/types.ts +++ b/tests/src/interfaces/types.ts @@ -1,5 +1,3 @@ // Auto-generated via `yarn polkadot-types-from-defs`, do not edit /* eslint-disable */ -export * from './unique/types'; -export * from './rmrk/types'; -- gitstuff