--- a/tests/src/interfaces/augment-api-tx.ts +++ b/tests/src/interfaces/augment-api-tx.ts @@ -8,16 +8,7 @@ import type { ApiTypes, AugmentedSubmittable, SubmittableExtrinsic, SubmittableExtrinsicFunction } from '@polkadot/api-base/types'; import type { Bytes, Compact, Option, U256, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec'; import type { AnyNumber, IMethod, ITuple } from '@polkadot/types-codec/types'; -<<<<<<< HEAD -<<<<<<< HEAD import type { AccountId32, Call, H160, H256, MultiAddress, Permill } from '@polkadot/types/interfaces/runtime'; -======= -<<<<<<< HEAD -import type { AccountId32, Call, H160, H256, MultiAddress, Perbill, Permill } from '@polkadot/types/interfaces/runtime'; ->>>>>>> chore: regenerate types -======= -import type { AccountId32, Call, H160, H256, MultiAddress, Permill } from '@polkadot/types/interfaces/runtime'; ->>>>>>> chore: regenerate types import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumLog, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletConfigurationAppPromotionConfiguration, PalletEvmAccountBasicCrossAccountIdRepr, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, SpWeightsWeightV2Weight, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; export type __AugmentedSubmittable = AugmentedSubmittable<() => unknown>; --- a/tests/src/interfaces/augment-types.ts +++ b/tests/src/interfaces/augment-types.ts @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, 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, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default'; ======= ======= @@ -83,6 +84,9 @@ 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, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, UpPovEstimateRpcPovInfo, UpPovEstimateRpcTrieKeyValue, 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, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default'; >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= +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, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, UpPovEstimateRpcPovInfo, UpPovEstimateRpcTrieKeyValue, 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, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default'; +>>>>>>> chore: regenerate types import type { Data, StorageKey } from '@polkadot/types'; import type { BitVec, Bool, Bytes, F32, F64, I128, I16, I256, I32, I64, I8, Json, Null, OptionBool, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, f32, f64, 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'; --- a/tests/src/interfaces/lookup.ts +++ b/tests/src/interfaces/lookup.ts @@ -1360,32 +1360,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup129: frame_system::limits::BlockWeights -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup130: frame_system::limits::BlockWeights -======= -<<<<<<< HEAD - * Lookup133: frame_system::limits::BlockWeights -======= - * Lookup134: frame_system::limits::BlockWeights ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup133: frame_system::limits::BlockWeights ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup129: frame_system::limits::BlockWeights ->>>>>>> chore: regenerate types **/ FrameSystemLimitsBlockWeights: { baseBlock: 'SpWeightsWeightV2Weight', @@ -1393,32 +1368,7 @@ perClass: 'FrameSupportDispatchPerDispatchClassWeightsPerClass' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup130: frame_support::dispatch::PerDispatchClass -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup131: frame_support::dispatch::PerDispatchClass -======= -<<<<<<< HEAD - * Lookup134: frame_support::dispatch::PerDispatchClass -======= - * Lookup135: frame_support::dispatch::PerDispatchClass ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup134: frame_support::dispatch::PerDispatchClass ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup130: frame_support::dispatch::PerDispatchClass ->>>>>>> chore: regenerate types **/ FrameSupportDispatchPerDispatchClassWeightsPerClass: { normal: 'FrameSystemLimitsWeightsPerClass', @@ -1426,32 +1376,7 @@ mandatory: 'FrameSystemLimitsWeightsPerClass' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup131: frame_system::limits::WeightsPerClass -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup132: frame_system::limits::WeightsPerClass -======= -<<<<<<< HEAD - * Lookup135: frame_system::limits::WeightsPerClass -======= - * Lookup136: frame_system::limits::WeightsPerClass ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup135: frame_system::limits::WeightsPerClass ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup131: frame_system::limits::WeightsPerClass ->>>>>>> chore: regenerate types **/ FrameSystemLimitsWeightsPerClass: { baseExtrinsic: 'SpWeightsWeightV2Weight', @@ -1460,63 +1385,13 @@ reserved: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup133: frame_system::limits::BlockLength -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup134: frame_system::limits::BlockLength -======= -<<<<<<< HEAD - * Lookup137: frame_system::limits::BlockLength -======= - * Lookup138: frame_system::limits::BlockLength ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup137: frame_system::limits::BlockLength ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup133: frame_system::limits::BlockLength ->>>>>>> chore: regenerate types **/ FrameSystemLimitsBlockLength: { max: 'FrameSupportDispatchPerDispatchClassU32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup134: frame_support::dispatch::PerDispatchClass -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup135: frame_support::dispatch::PerDispatchClass -======= -<<<<<<< HEAD - * Lookup138: frame_support::dispatch::PerDispatchClass -======= - * Lookup139: frame_support::dispatch::PerDispatchClass ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup138: frame_support::dispatch::PerDispatchClass ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup134: frame_support::dispatch::PerDispatchClass ->>>>>>> chore: regenerate types **/ FrameSupportDispatchPerDispatchClassU32: { normal: 'u32', @@ -1524,64 +1399,14 @@ mandatory: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup135: sp_weights::RuntimeDbWeight -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup136: sp_weights::RuntimeDbWeight -======= -<<<<<<< HEAD - * Lookup139: sp_weights::RuntimeDbWeight -======= - * Lookup140: sp_weights::RuntimeDbWeight ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup139: sp_weights::RuntimeDbWeight ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup135: sp_weights::RuntimeDbWeight ->>>>>>> chore: regenerate types **/ SpWeightsRuntimeDbWeight: { read: 'u64', write: 'u64' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup136: sp_version::RuntimeVersion -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup137: sp_version::RuntimeVersion -======= -<<<<<<< HEAD - * Lookup140: sp_version::RuntimeVersion -======= - * Lookup141: sp_version::RuntimeVersion ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup140: sp_version::RuntimeVersion ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup136: sp_version::RuntimeVersion ->>>>>>> chore: regenerate types **/ SpVersionRuntimeVersion: { specName: 'Text', @@ -1594,63 +1419,13 @@ stateVersion: 'u8' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup141: frame_system::pallet::Error -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup142: frame_system::pallet::Error -======= -<<<<<<< HEAD - * Lookup145: frame_system::pallet::Error -======= - * Lookup146: frame_system::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup145: frame_system::pallet::Error ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup141: frame_system::pallet::Error ->>>>>>> chore: regenerate types **/ FrameSystemError: { _enum: ['InvalidSpecName', 'SpecVersionNeedsToIncrease', 'FailedToExtractRuntimeVersion', 'NonDefaultComposite', 'NonZeroRefCount', 'CallFiltered'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup142: polkadot_primitives::v2::PersistedValidationData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup143: polkadot_primitives::v2::PersistedValidationData -======= -<<<<<<< HEAD - * Lookup146: polkadot_primitives::v2::PersistedValidationData -======= - * Lookup147: polkadot_primitives::v2::PersistedValidationData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup146: polkadot_primitives::v2::PersistedValidationData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup142: polkadot_primitives::v2::PersistedValidationData ->>>>>>> chore: regenerate types **/ PolkadotPrimitivesV2PersistedValidationData: { parentHead: 'Bytes', @@ -1659,94 +1434,19 @@ maxPovSize: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup145: polkadot_primitives::v2::UpgradeRestriction -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup146: polkadot_primitives::v2::UpgradeRestriction -======= -<<<<<<< HEAD - * Lookup149: polkadot_primitives::v2::UpgradeRestriction -======= - * Lookup150: polkadot_primitives::v2::UpgradeRestriction ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup149: polkadot_primitives::v2::UpgradeRestriction ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup145: polkadot_primitives::v2::UpgradeRestriction ->>>>>>> chore: regenerate types **/ PolkadotPrimitivesV2UpgradeRestriction: { _enum: ['Present'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup146: sp_trie::storage_proof::StorageProof -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup147: sp_trie::storage_proof::StorageProof -======= -<<<<<<< HEAD - * Lookup150: sp_trie::storage_proof::StorageProof -======= - * Lookup151: sp_trie::storage_proof::StorageProof ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup150: sp_trie::storage_proof::StorageProof ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup146: sp_trie::storage_proof::StorageProof ->>>>>>> chore: regenerate types **/ SpTrieStorageProof: { trieNodes: 'BTreeSet' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup148: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup149: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot -======= -<<<<<<< HEAD - * Lookup152: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot -======= - * Lookup153: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup152: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup148: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot ->>>>>>> chore: regenerate types **/ CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: { dmqMqcHead: 'H256', @@ -1755,32 +1455,7 @@ egressChannels: 'Vec<(u32,PolkadotPrimitivesV2AbridgedHrmpChannel)>' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup151: polkadot_primitives::v2::AbridgedHrmpChannel -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup152: polkadot_primitives::v2::AbridgedHrmpChannel -======= -<<<<<<< HEAD - * Lookup155: polkadot_primitives::v2::AbridgedHrmpChannel -======= - * Lookup156: polkadot_primitives::v2::AbridgedHrmpChannel ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup155: polkadot_primitives::v2::AbridgedHrmpChannel ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup151: polkadot_primitives::v2::AbridgedHrmpChannel ->>>>>>> chore: regenerate types **/ PolkadotPrimitivesV2AbridgedHrmpChannel: { maxCapacity: 'u32', @@ -1791,32 +1466,7 @@ mqcHead: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup152: polkadot_primitives::v2::AbridgedHostConfiguration -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup153: polkadot_primitives::v2::AbridgedHostConfiguration -======= -<<<<<<< HEAD - * Lookup156: polkadot_primitives::v2::AbridgedHostConfiguration -======= - * Lookup157: polkadot_primitives::v2::AbridgedHostConfiguration ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup156: polkadot_primitives::v2::AbridgedHostConfiguration ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup152: polkadot_primitives::v2::AbridgedHostConfiguration ->>>>>>> chore: regenerate types **/ PolkadotPrimitivesV2AbridgedHostConfiguration: { maxCodeSize: 'u32', @@ -1830,64 +1480,14 @@ validationUpgradeDelay: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup158: polkadot_core_primitives::OutboundHrmpMessage -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup159: polkadot_core_primitives::OutboundHrmpMessage -======= -<<<<<<< HEAD - * Lookup162: polkadot_core_primitives::OutboundHrmpMessage -======= - * Lookup163: polkadot_core_primitives::OutboundHrmpMessage ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup162: polkadot_core_primitives::OutboundHrmpMessage ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup158: polkadot_core_primitives::OutboundHrmpMessage ->>>>>>> chore: regenerate types **/ PolkadotCorePrimitivesOutboundHrmpMessage: { recipient: 'u32', data: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup159: cumulus_pallet_parachain_system::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup160: cumulus_pallet_parachain_system::pallet::Call -======= -<<<<<<< HEAD - * Lookup163: cumulus_pallet_parachain_system::pallet::Call -======= - * Lookup164: cumulus_pallet_parachain_system::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup163: cumulus_pallet_parachain_system::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup159: cumulus_pallet_parachain_system::pallet::Call ->>>>>>> chore: regenerate types **/ CumulusPalletParachainSystemCall: { _enum: { @@ -1906,32 +1506,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup160: cumulus_primitives_parachain_inherent::ParachainInherentData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup161: cumulus_primitives_parachain_inherent::ParachainInherentData -======= -<<<<<<< HEAD - * Lookup164: cumulus_primitives_parachain_inherent::ParachainInherentData -======= - * Lookup165: cumulus_primitives_parachain_inherent::ParachainInherentData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup164: cumulus_primitives_parachain_inherent::ParachainInherentData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup160: cumulus_primitives_parachain_inherent::ParachainInherentData ->>>>>>> chore: regenerate types **/ CumulusPrimitivesParachainInherentParachainInherentData: { validationData: 'PolkadotPrimitivesV2PersistedValidationData', @@ -1940,127 +1515,27 @@ horizontalMessages: 'BTreeMap>' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup162: polkadot_core_primitives::InboundDownwardMessage -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup163: polkadot_core_primitives::InboundDownwardMessage -======= -<<<<<<< HEAD - * Lookup166: polkadot_core_primitives::InboundDownwardMessage -======= - * Lookup167: polkadot_core_primitives::InboundDownwardMessage ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup166: polkadot_core_primitives::InboundDownwardMessage ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup162: polkadot_core_primitives::InboundDownwardMessage ->>>>>>> chore: regenerate types **/ PolkadotCorePrimitivesInboundDownwardMessage: { sentAt: 'u32', msg: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup165: polkadot_core_primitives::InboundHrmpMessage -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup166: polkadot_core_primitives::InboundHrmpMessage -======= -<<<<<<< HEAD - * Lookup169: polkadot_core_primitives::InboundHrmpMessage -======= - * Lookup170: polkadot_core_primitives::InboundHrmpMessage ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup169: polkadot_core_primitives::InboundHrmpMessage ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup165: polkadot_core_primitives::InboundHrmpMessage ->>>>>>> chore: regenerate types **/ PolkadotCorePrimitivesInboundHrmpMessage: { sentAt: 'u32', data: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup168: cumulus_pallet_parachain_system::pallet::Error -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup169: cumulus_pallet_parachain_system::pallet::Error -======= -<<<<<<< HEAD - * Lookup172: cumulus_pallet_parachain_system::pallet::Error -======= - * Lookup173: cumulus_pallet_parachain_system::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup172: cumulus_pallet_parachain_system::pallet::Error ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup168: cumulus_pallet_parachain_system::pallet::Error ->>>>>>> chore: regenerate types **/ CumulusPalletParachainSystemError: { _enum: ['OverlappingUpgrades', 'ProhibitedByPolkadot', 'TooBig', 'ValidationDataNotAvailable', 'HostConfigurationNotAvailable', 'NotScheduled', 'NothingAuthorized', 'Unauthorized'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup170: pallet_balances::BalanceLock -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup171: pallet_balances::BalanceLock -======= -<<<<<<< HEAD - * Lookup174: pallet_balances::BalanceLock -======= - * Lookup175: pallet_balances::BalanceLock ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup174: pallet_balances::BalanceLock ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup170: pallet_balances::BalanceLock ->>>>>>> chore: regenerate types **/ PalletBalancesBalanceLock: { id: '[u8;8]', @@ -2068,113 +1543,20 @@ reasons: 'PalletBalancesReasons' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup171: pallet_balances::Reasons -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup172: pallet_balances::Reasons -======= -<<<<<<< HEAD - * Lookup175: pallet_balances::Reasons -======= - * Lookup176: pallet_balances::Reasons ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup175: pallet_balances::Reasons ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup171: pallet_balances::Reasons ->>>>>>> chore: regenerate types **/ PalletBalancesReasons: { _enum: ['Fee', 'Misc', 'All'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup174: pallet_balances::ReserveData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup175: pallet_balances::ReserveData -======= -<<<<<<< HEAD - * Lookup178: pallet_balances::ReserveData -======= - * Lookup179: pallet_balances::ReserveData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup178: pallet_balances::ReserveData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup174: pallet_balances::ReserveData ->>>>>>> chore: regenerate types **/ PalletBalancesReserveData: { id: '[u8;16]', amount: 'u128' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup176: pallet_balances::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup177: pallet_balances::Releases -======= -<<<<<<< HEAD - * Lookup180: pallet_balances::Releases -======= - * Lookup181: pallet_balances::Releases ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup180: pallet_balances::Releases ->>>>>>> fix: regenerate types after rebase - **/ - PalletBalancesReleases: { - _enum: ['V1_0_0', 'V2_0_0'] - }, - /** -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup178: pallet_balances::pallet::Call -======= -<<<<<<< HEAD - * Lookup181: pallet_balances::pallet::Call -======= - * Lookup182: pallet_balances::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup181: pallet_balances::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup176: pallet_balances::pallet::Call ->>>>>>> chore: regenerate types **/ PalletBalancesCall: { _enum: { @@ -2207,63 +1589,13 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup179: pallet_balances::pallet::Error -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup181: pallet_balances::pallet::Error -======= -<<<<<<< HEAD - * Lookup184: pallet_balances::pallet::Error -======= - * Lookup185: pallet_balances::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup184: pallet_balances::pallet::Error ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup179: pallet_balances::pallet::Error ->>>>>>> chore: regenerate types **/ PalletBalancesError: { _enum: ['VestingBalance', 'LiquidityRestrictions', 'InsufficientBalance', 'ExistentialDeposit', 'KeepAlive', 'ExistingVestingSchedule', 'DeadAccount', 'TooManyReserves'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup181: pallet_timestamp::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup183: pallet_timestamp::pallet::Call -======= -<<<<<<< HEAD - * Lookup186: pallet_timestamp::pallet::Call -======= - * Lookup187: pallet_timestamp::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup186: pallet_timestamp::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup181: pallet_timestamp::pallet::Call ->>>>>>> chore: regenerate types **/ PalletTimestampCall: { _enum: { @@ -2273,63 +1605,13 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup183: pallet_transaction_payment::Releases -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup185: pallet_transaction_payment::Releases -======= -<<<<<<< HEAD - * Lookup188: pallet_transaction_payment::Releases -======= - * Lookup189: pallet_transaction_payment::Releases ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup188: pallet_transaction_payment::Releases ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup183: pallet_transaction_payment::Releases ->>>>>>> chore: regenerate types **/ PalletTransactionPaymentReleases: { _enum: ['V1Ancient', 'V2'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup184: pallet_treasury::Proposal -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup186: pallet_treasury::Proposal -======= -<<<<<<< HEAD - * Lookup189: pallet_treasury::Proposal -======= - * Lookup190: pallet_treasury::Proposal ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup189: pallet_treasury::Proposal ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup184: pallet_treasury::Proposal ->>>>>>> chore: regenerate types **/ PalletTreasuryProposal: { proposer: 'AccountId32', @@ -2338,32 +1620,7 @@ bond: 'u128' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup187: pallet_treasury::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup189: pallet_treasury::pallet::Call -======= -<<<<<<< HEAD - * Lookup192: pallet_treasury::pallet::Call -======= - * Lookup193: pallet_treasury::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup192: pallet_treasury::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup187: pallet_treasury::pallet::Call ->>>>>>> chore: regenerate types **/ PalletTreasuryCall: { _enum: { @@ -2386,86 +1643,18 @@ } } }, - /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup190: frame_support::PalletId - **/ - FrameSupportPalletId: '[u8;8]', - /** - * Lookup191: pallet_treasury::pallet::Error -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup192: frame_support::PalletId - **/ - FrameSupportPalletId: '[u8;8]', - /** - * Lookup193: pallet_treasury::pallet::Error -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup195: frame_support::PalletId - **/ - FrameSupportPalletId: '[u8;8]', - /** - * Lookup196: pallet_treasury::pallet::Error -<<<<<<< HEAD -======= - * Lookup196: frame_support::PalletId - **/ - FrameSupportPalletId: '[u8;8]', /** - * Lookup197: pallet_treasury::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup190: frame_support::PalletId **/ FrameSupportPalletId: '[u8;8]', /** * Lookup191: pallet_treasury::pallet::Error ->>>>>>> chore: regenerate types **/ PalletTreasuryError: { _enum: ['InsufficientProposersBalance', 'InvalidIndex', 'TooManyApprovals', 'InsufficientPermission', 'ProposalNotApproved'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup192: pallet_sudo::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup194: pallet_sudo::pallet::Call -======= -<<<<<<< HEAD - * Lookup197: pallet_sudo::pallet::Call -======= - * Lookup198: pallet_sudo::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup197: pallet_sudo::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup192: pallet_sudo::pallet::Call ->>>>>>> chore: regenerate types **/ PalletSudoCall: { _enum: { @@ -2489,32 +1678,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup194: orml_vesting::module::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup196: orml_vesting::module::Call -======= -<<<<<<< HEAD - * Lookup199: orml_vesting::module::Call -======= - * Lookup200: orml_vesting::module::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup199: orml_vesting::module::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup194: orml_vesting::module::Call ->>>>>>> chore: regenerate types **/ OrmlVestingModuleCall: { _enum: { @@ -2533,32 +1697,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup196: orml_xtokens::module::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup198: orml_xtokens::module::Call -======= -<<<<<<< HEAD - * Lookup201: orml_xtokens::module::Call -======= - * Lookup202: orml_xtokens::module::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup201: orml_xtokens::module::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup196: orml_xtokens::module::Call ->>>>>>> chore: regenerate types **/ OrmlXtokensModuleCall: { _enum: { @@ -2601,32 +1740,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup197: xcm::VersionedMultiAsset -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup199: xcm::VersionedMultiAsset -======= -<<<<<<< HEAD - * Lookup202: xcm::VersionedMultiAsset -======= - * Lookup203: xcm::VersionedMultiAsset ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup202: xcm::VersionedMultiAsset ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup197: xcm::VersionedMultiAsset ->>>>>>> chore: regenerate types **/ XcmVersionedMultiAsset: { _enum: { @@ -2635,32 +1749,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup200: orml_tokens::module::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup202: orml_tokens::module::Call -======= -<<<<<<< HEAD - * Lookup205: orml_tokens::module::Call -======= - * Lookup206: orml_tokens::module::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup205: orml_tokens::module::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup200: orml_tokens::module::Call ->>>>>>> chore: regenerate types **/ OrmlTokensModuleCall: { _enum: { @@ -2694,32 +1783,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup201: cumulus_pallet_xcmp_queue::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup203: cumulus_pallet_xcmp_queue::pallet::Call -======= -<<<<<<< HEAD - * Lookup206: cumulus_pallet_xcmp_queue::pallet::Call -======= - * Lookup207: cumulus_pallet_xcmp_queue::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup206: cumulus_pallet_xcmp_queue::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup201: cumulus_pallet_xcmp_queue::pallet::Call ->>>>>>> chore: regenerate types **/ CumulusPalletXcmpQueueCall: { _enum: { @@ -2768,32 +1832,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup202: pallet_xcm::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup204: pallet_xcm::pallet::Call -======= -<<<<<<< HEAD - * Lookup207: pallet_xcm::pallet::Call -======= - * Lookup208: pallet_xcm::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup207: pallet_xcm::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup202: pallet_xcm::pallet::Call ->>>>>>> chore: regenerate types **/ PalletXcmCall: { _enum: { @@ -2847,32 +1886,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup203: xcm::VersionedXcm -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup205: xcm::VersionedXcm -======= -<<<<<<< HEAD - * Lookup208: xcm::VersionedXcm -======= - * Lookup209: xcm::VersionedXcm ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup208: xcm::VersionedXcm ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup203: xcm::VersionedXcm ->>>>>>> chore: regenerate types **/ XcmVersionedXcm: { _enum: { @@ -2882,32 +1896,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup204: xcm::v0::Xcm -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup206: xcm::v0::Xcm -======= -<<<<<<< HEAD - * Lookup209: xcm::v0::Xcm -======= - * Lookup210: xcm::v0::Xcm ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup209: xcm::v0::Xcm ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup204: xcm::v0::Xcm ->>>>>>> chore: regenerate types **/ XcmV0Xcm: { _enum: { @@ -2961,32 +1950,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup206: xcm::v0::order::Order -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup208: xcm::v0::order::Order -======= -<<<<<<< HEAD - * Lookup211: xcm::v0::order::Order -======= - * Lookup212: xcm::v0::order::Order ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup211: xcm::v0::order::Order ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup206: xcm::v0::order::Order ->>>>>>> chore: regenerate types **/ XcmV0Order: { _enum: { @@ -3029,32 +1993,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup208: xcm::v0::Response -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup210: xcm::v0::Response -======= -<<<<<<< HEAD - * Lookup213: xcm::v0::Response -======= - * Lookup214: xcm::v0::Response ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup213: xcm::v0::Response ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup208: xcm::v0::Response ->>>>>>> chore: regenerate types **/ XcmV0Response: { _enum: { @@ -3062,32 +2001,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup209: xcm::v1::Xcm -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup211: xcm::v1::Xcm -======= -<<<<<<< HEAD - * Lookup214: xcm::v1::Xcm -======= - * Lookup215: xcm::v1::Xcm ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup214: xcm::v1::Xcm ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup209: xcm::v1::Xcm ->>>>>>> chore: regenerate types **/ XcmV1Xcm: { _enum: { @@ -3146,32 +2060,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup211: xcm::v1::order::Order -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup213: xcm::v1::order::Order -======= -<<<<<<< HEAD - * Lookup216: xcm::v1::order::Order -======= - * Lookup217: xcm::v1::order::Order ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup216: xcm::v1::order::Order ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup211: xcm::v1::order::Order ->>>>>>> chore: regenerate types **/ XcmV1Order: { _enum: { @@ -3216,32 +2105,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup213: xcm::v1::Response -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup215: xcm::v1::Response -======= -<<<<<<< HEAD - * Lookup218: xcm::v1::Response -======= - * Lookup219: xcm::v1::Response ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup218: xcm::v1::Response ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup213: xcm::v1::Response ->>>>>>> chore: regenerate types **/ XcmV1Response: { _enum: { @@ -3250,55 +2114,12 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup227: cumulus_pallet_xcm::pallet::Call **/ CumulusPalletXcmCall: 'Null', /** * Lookup228: cumulus_pallet_dmp_queue::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup229: cumulus_pallet_xcm::pallet::Call **/ - CumulusPalletXcmCall: 'Null', - /** - * Lookup230: cumulus_pallet_dmp_queue::pallet::Call -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup232: cumulus_pallet_xcm::pallet::Call - **/ - CumulusPalletXcmCall: 'Null', - /** - * Lookup233: cumulus_pallet_dmp_queue::pallet::Call -<<<<<<< HEAD -======= - * Lookup233: cumulus_pallet_xcm::pallet::Call - **/ - CumulusPalletXcmCall: 'Null', - /** - * Lookup234: cumulus_pallet_dmp_queue::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup227: cumulus_pallet_xcm::pallet::Call - **/ - CumulusPalletXcmCall: 'Null', - /** - * Lookup228: cumulus_pallet_dmp_queue::pallet::Call ->>>>>>> chore: regenerate types - **/ CumulusPalletDmpQueueCall: { _enum: { service_overweight: { @@ -3308,32 +2129,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup229: pallet_inflation::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup231: pallet_inflation::pallet::Call -======= -<<<<<<< HEAD - * Lookup234: pallet_inflation::pallet::Call -======= - * Lookup235: pallet_inflation::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup234: pallet_inflation::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup229: pallet_inflation::pallet::Call ->>>>>>> chore: regenerate types **/ PalletInflationCall: { _enum: { @@ -3343,32 +2139,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup230: pallet_unique::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup232: pallet_unique::Call -======= -<<<<<<< HEAD - * Lookup235: pallet_unique::Call -======= - * Lookup236: pallet_unique::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup235: pallet_unique::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup230: pallet_unique::Call ->>>>>>> chore: regenerate types **/ PalletUniqueCall: { _enum: { @@ -3512,32 +2283,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup235: up_data_structs::CollectionMode -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup237: up_data_structs::CollectionMode -======= -<<<<<<< HEAD - * Lookup240: up_data_structs::CollectionMode -======= - * Lookup241: up_data_structs::CollectionMode ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup240: up_data_structs::CollectionMode ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup235: up_data_structs::CollectionMode ->>>>>>> chore: regenerate types **/ UpDataStructsCollectionMode: { _enum: { @@ -3547,32 +2293,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup236: up_data_structs::CreateCollectionData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup238: up_data_structs::CreateCollectionData -======= -<<<<<<< HEAD - * Lookup241: up_data_structs::CreateCollectionData -======= - * Lookup242: up_data_structs::CreateCollectionData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup241: up_data_structs::CreateCollectionData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup236: up_data_structs::CreateCollectionData ->>>>>>> chore: regenerate types **/ UpDataStructsCreateCollectionData: { mode: 'UpDataStructsCollectionMode', @@ -3587,63 +2308,13 @@ properties: 'Vec' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup238: up_data_structs::AccessMode -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup240: up_data_structs::AccessMode -======= -<<<<<<< HEAD - * Lookup243: up_data_structs::AccessMode -======= - * Lookup244: up_data_structs::AccessMode ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup243: up_data_structs::AccessMode ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup238: up_data_structs::AccessMode ->>>>>>> chore: regenerate types **/ UpDataStructsAccessMode: { _enum: ['Normal', 'AllowList'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup240: up_data_structs::CollectionLimits -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup242: up_data_structs::CollectionLimits -======= -<<<<<<< HEAD - * Lookup245: up_data_structs::CollectionLimits -======= - * Lookup246: up_data_structs::CollectionLimits ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup245: up_data_structs::CollectionLimits ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup240: up_data_structs::CollectionLimits ->>>>>>> chore: regenerate types **/ UpDataStructsCollectionLimits: { accountTokenOwnershipLimit: 'Option', @@ -3657,32 +2328,7 @@ transfersEnabled: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup242: up_data_structs::SponsoringRateLimit -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup244: up_data_structs::SponsoringRateLimit -======= -<<<<<<< HEAD - * Lookup247: up_data_structs::SponsoringRateLimit -======= - * Lookup248: up_data_structs::SponsoringRateLimit ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup247: up_data_structs::SponsoringRateLimit ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup242: up_data_structs::SponsoringRateLimit ->>>>>>> chore: regenerate types **/ UpDataStructsSponsoringRateLimit: { _enum: { @@ -3691,32 +2337,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup245: up_data_structs::CollectionPermissions -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup247: up_data_structs::CollectionPermissions -======= -<<<<<<< HEAD - * Lookup250: up_data_structs::CollectionPermissions -======= - * Lookup251: up_data_structs::CollectionPermissions ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup250: up_data_structs::CollectionPermissions ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup245: up_data_structs::CollectionPermissions ->>>>>>> chore: regenerate types **/ UpDataStructsCollectionPermissions: { access: 'Option', @@ -3724,119 +2345,26 @@ nesting: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup247: up_data_structs::NestingPermissions -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup249: up_data_structs::NestingPermissions -======= -<<<<<<< HEAD - * Lookup252: up_data_structs::NestingPermissions -======= - * Lookup253: up_data_structs::NestingPermissions ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup252: up_data_structs::NestingPermissions ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup247: up_data_structs::NestingPermissions ->>>>>>> chore: regenerate types **/ UpDataStructsNestingPermissions: { tokenOwner: 'bool', collectionAdmin: 'bool', restricted: 'Option' }, - /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup249: up_data_structs::OwnerRestrictedSet - **/ - UpDataStructsOwnerRestrictedSet: 'BTreeSet', /** - * Lookup254: up_data_structs::PropertyKeyPermission -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup251: up_data_structs::OwnerRestrictedSet - **/ - UpDataStructsOwnerRestrictedSet: 'BTreeSet', - /** - * Lookup256: up_data_structs::PropertyKeyPermission -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup254: up_data_structs::OwnerRestrictedSet - **/ - UpDataStructsOwnerRestrictedSet: 'BTreeSet', - /** - * Lookup259: up_data_structs::PropertyKeyPermission -<<<<<<< HEAD -======= - * Lookup255: up_data_structs::OwnerRestrictedSet - **/ - UpDataStructsOwnerRestrictedSet: 'BTreeSet', - /** - * Lookup260: up_data_structs::PropertyKeyPermission ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup249: up_data_structs::OwnerRestrictedSet **/ UpDataStructsOwnerRestrictedSet: 'BTreeSet', /** * Lookup254: up_data_structs::PropertyKeyPermission ->>>>>>> chore: regenerate types **/ UpDataStructsPropertyKeyPermission: { key: 'Bytes', permission: 'UpDataStructsPropertyPermission' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup255: up_data_structs::PropertyPermission -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup257: up_data_structs::PropertyPermission -======= -<<<<<<< HEAD - * Lookup260: up_data_structs::PropertyPermission -======= - * Lookup261: up_data_structs::PropertyPermission ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup260: up_data_structs::PropertyPermission ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup255: up_data_structs::PropertyPermission ->>>>>>> chore: regenerate types **/ UpDataStructsPropertyPermission: { mutable: 'bool', @@ -3844,64 +2372,14 @@ tokenOwner: 'bool' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup258: up_data_structs::Property -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup260: up_data_structs::Property -======= -<<<<<<< HEAD - * Lookup263: up_data_structs::Property -======= - * Lookup264: up_data_structs::Property ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup263: up_data_structs::Property ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup258: up_data_structs::Property ->>>>>>> chore: regenerate types **/ UpDataStructsProperty: { key: 'Bytes', value: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup261: up_data_structs::CreateItemData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup263: up_data_structs::CreateItemData -======= -<<<<<<< HEAD - * Lookup266: up_data_structs::CreateItemData -======= - * Lookup267: up_data_structs::CreateItemData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup266: up_data_structs::CreateItemData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup261: up_data_structs::CreateItemData ->>>>>>> chore: regenerate types **/ UpDataStructsCreateItemData: { _enum: { @@ -3911,126 +2389,26 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup262: up_data_structs::CreateNftData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup264: up_data_structs::CreateNftData -======= -<<<<<<< HEAD - * Lookup267: up_data_structs::CreateNftData -======= - * Lookup268: up_data_structs::CreateNftData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup267: up_data_structs::CreateNftData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup262: up_data_structs::CreateNftData ->>>>>>> chore: regenerate types **/ UpDataStructsCreateNftData: { properties: 'Vec' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup263: up_data_structs::CreateFungibleData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup265: up_data_structs::CreateFungibleData -======= -<<<<<<< HEAD - * Lookup268: up_data_structs::CreateFungibleData -======= - * Lookup269: up_data_structs::CreateFungibleData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup268: up_data_structs::CreateFungibleData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup263: up_data_structs::CreateFungibleData ->>>>>>> chore: regenerate types **/ UpDataStructsCreateFungibleData: { value: 'u128' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup264: up_data_structs::CreateReFungibleData -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup266: up_data_structs::CreateReFungibleData -======= -<<<<<<< HEAD - * Lookup269: up_data_structs::CreateReFungibleData -======= - * Lookup270: up_data_structs::CreateReFungibleData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup269: up_data_structs::CreateReFungibleData ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup264: up_data_structs::CreateReFungibleData ->>>>>>> chore: regenerate types **/ UpDataStructsCreateReFungibleData: { pieces: 'u128', properties: 'Vec' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup267: up_data_structs::CreateItemExData> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup269: up_data_structs::CreateItemExData> -======= -<<<<<<< HEAD - * Lookup272: up_data_structs::CreateItemExData> -======= - * Lookup273: up_data_structs::CreateItemExData> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup272: up_data_structs::CreateItemExData> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup267: up_data_structs::CreateItemExData> ->>>>>>> chore: regenerate types **/ UpDataStructsCreateItemExData: { _enum: { @@ -4041,64 +2419,14 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup269: up_data_structs::CreateNftExData> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup271: up_data_structs::CreateNftExData> -======= -<<<<<<< HEAD - * Lookup274: up_data_structs::CreateNftExData> -======= - * Lookup275: up_data_structs::CreateNftExData> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup274: up_data_structs::CreateNftExData> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup269: up_data_structs::CreateNftExData> ->>>>>>> chore: regenerate types **/ UpDataStructsCreateNftExData: { properties: 'Vec', owner: 'PalletEvmAccountBasicCrossAccountIdRepr' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup276: up_data_structs::CreateRefungibleExSingleOwner> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup278: up_data_structs::CreateRefungibleExSingleOwner> -======= -<<<<<<< HEAD - * Lookup281: up_data_structs::CreateRefungibleExSingleOwner> -======= - * Lookup282: up_data_structs::CreateRefungibleExSingleOwner> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup281: up_data_structs::CreateRefungibleExSingleOwner> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup276: up_data_structs::CreateRefungibleExSingleOwner> ->>>>>>> chore: regenerate types **/ UpDataStructsCreateRefungibleExSingleOwner: { user: 'PalletEvmAccountBasicCrossAccountIdRepr', @@ -4106,64 +2434,14 @@ properties: 'Vec' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup278: up_data_structs::CreateRefungibleExMultipleOwners> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup280: up_data_structs::CreateRefungibleExMultipleOwners> -======= -<<<<<<< HEAD - * Lookup283: up_data_structs::CreateRefungibleExMultipleOwners> -======= - * Lookup284: up_data_structs::CreateRefungibleExMultipleOwners> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup283: up_data_structs::CreateRefungibleExMultipleOwners> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup278: up_data_structs::CreateRefungibleExMultipleOwners> ->>>>>>> chore: regenerate types **/ UpDataStructsCreateRefungibleExMultipleOwners: { users: 'BTreeMap', properties: 'Vec' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup279: pallet_configuration::pallet::Call -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup281: pallet_configuration::pallet::Call -======= -<<<<<<< HEAD - * Lookup284: pallet_unique_scheduler_v2::pallet::Call -======= - * Lookup285: pallet_unique_scheduler_v2::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup284: pallet_unique_scheduler_v2::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup279: pallet_configuration::pallet::Call ->>>>>>> chore: regenerate types **/ PalletConfigurationCall: { _enum: { @@ -4182,32 +2460,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup284: pallet_configuration::AppPromotionConfiguration -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup286: pallet_configuration::AppPromotionConfiguration -======= -<<<<<<< HEAD - * Lookup287: pallet_configuration::pallet::Call -======= - * Lookup288: pallet_configuration::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup287: pallet_configuration::pallet::Call ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup284: pallet_configuration::AppPromotionConfiguration ->>>>>>> chore: regenerate types **/ PalletConfigurationAppPromotionConfiguration: { recalculationInterval: 'Option', @@ -4216,19 +2469,7 @@ maxStakersPerCalculation: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup288: pallet_template_transaction_payment::Call -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup289: pallet_template_transaction_payment::Call ->>>>>>> chore: regenerate types -======= * Lookup288: pallet_template_transaction_payment::Call ->>>>>>> chore: regenerate types **/ PalletTemplateTransactionPaymentCall: 'Null', /** @@ -4236,30 +2477,8 @@ **/ PalletStructureCall: 'Null', /** -<<<<<<< HEAD -<<<<<<< HEAD * Lookup290: pallet_rmrk_core::pallet::Call -======= - * Lookup291: pallet_rmrk_core::pallet::Call -<<<<<<< HEAD -======= - * Lookup290: pallet_template_transaction_payment::Call **/ - PalletTemplateTransactionPaymentCall: 'Null', - /** - * Lookup291: pallet_structure::pallet::Call - **/ - PalletStructureCall: 'Null', - /** - * Lookup292: pallet_rmrk_core::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -======= - * Lookup290: pallet_rmrk_core::pallet::Call ->>>>>>> chore: regenerate types - **/ PalletRmrkCoreCall: { _enum: { create_collection: { @@ -4349,23 +2568,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup296: rmrk_traits::resource::ResourceTypes, sp_core::bounded::bounded_vec::BoundedVec> -======= -<<<<<<< HEAD - * Lookup297: rmrk_traits::resource::ResourceTypes, sp_core::bounded::bounded_vec::BoundedVec> -======= - * Lookup298: rmrk_traits::resource::ResourceTypes, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup297: rmrk_traits::resource::ResourceTypes, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> fix: regenerate types after rebase -======= * Lookup296: rmrk_traits::resource::ResourceTypes, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types **/ RmrkTraitsResourceResourceTypes: { _enum: { @@ -4375,23 +2578,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup298: rmrk_traits::resource::BasicResource> -======= -<<<<<<< HEAD - * Lookup299: rmrk_traits::resource::BasicResource> -======= - * Lookup300: rmrk_traits::resource::BasicResource> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup299: rmrk_traits::resource::BasicResource> ->>>>>>> fix: regenerate types after rebase -======= * Lookup298: rmrk_traits::resource::BasicResource> ->>>>>>> chore: regenerate types **/ RmrkTraitsResourceBasicResource: { src: 'Option', @@ -4400,23 +2587,7 @@ thumb: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup300: rmrk_traits::resource::ComposableResource, sp_core::bounded::bounded_vec::BoundedVec> -======= -<<<<<<< HEAD - * Lookup301: rmrk_traits::resource::ComposableResource, sp_core::bounded::bounded_vec::BoundedVec> -======= - * Lookup302: rmrk_traits::resource::ComposableResource, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup301: rmrk_traits::resource::ComposableResource, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> fix: regenerate types after rebase -======= - * Lookup300: rmrk_traits::resource::ComposableResource, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types **/ RmrkTraitsResourceComposableResource: { parts: 'Vec', @@ -4427,23 +2598,7 @@ thumb: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup301: rmrk_traits::resource::SlotResource> -======= -<<<<<<< HEAD - * Lookup302: rmrk_traits::resource::SlotResource> -======= - * Lookup303: rmrk_traits::resource::SlotResource> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup302: rmrk_traits::resource::SlotResource> ->>>>>>> fix: regenerate types after rebase -======= * Lookup301: rmrk_traits::resource::SlotResource> ->>>>>>> chore: regenerate types **/ RmrkTraitsResourceSlotResource: { base: 'u32', @@ -4454,23 +2609,7 @@ thumb: 'Option' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup304: pallet_rmrk_equip::pallet::Call -======= -<<<<<<< HEAD - * Lookup305: pallet_rmrk_equip::pallet::Call -======= - * Lookup306: pallet_rmrk_equip::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup305: pallet_rmrk_equip::pallet::Call ->>>>>>> fix: regenerate types after rebase -======= * Lookup304: pallet_rmrk_equip::pallet::Call ->>>>>>> chore: regenerate types **/ PalletRmrkEquipCall: { _enum: { @@ -4491,23 +2630,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup307: rmrk_traits::part::PartType, sp_core::bounded::bounded_vec::BoundedVec> -======= -<<<<<<< HEAD - * Lookup308: rmrk_traits::part::PartType, sp_core::bounded::bounded_vec::BoundedVec> -======= - * Lookup309: rmrk_traits::part::PartType, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup308: rmrk_traits::part::PartType, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> fix: regenerate types after rebase -======= * Lookup307: rmrk_traits::part::PartType, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types **/ RmrkTraitsPartPartType: { _enum: { @@ -4516,23 +2639,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup309: rmrk_traits::part::FixedPart> -======= -<<<<<<< HEAD - * Lookup310: rmrk_traits::part::FixedPart> -======= - * Lookup311: rmrk_traits::part::FixedPart> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup310: rmrk_traits::part::FixedPart> ->>>>>>> fix: regenerate types after rebase -======= * Lookup309: rmrk_traits::part::FixedPart> ->>>>>>> chore: regenerate types **/ RmrkTraitsPartFixedPart: { id: 'u32', @@ -4540,23 +2647,7 @@ src: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup310: rmrk_traits::part::SlotPart, sp_core::bounded::bounded_vec::BoundedVec> -======= -<<<<<<< HEAD - * Lookup311: rmrk_traits::part::SlotPart, sp_core::bounded::bounded_vec::BoundedVec> -======= - * Lookup312: rmrk_traits::part::SlotPart, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup311: rmrk_traits::part::SlotPart, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> fix: regenerate types after rebase -======= * Lookup310: rmrk_traits::part::SlotPart, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types **/ RmrkTraitsPartSlotPart: { id: 'u32', @@ -4565,23 +2656,7 @@ z: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup311: rmrk_traits::part::EquippableList> -======= -<<<<<<< HEAD - * Lookup312: rmrk_traits::part::EquippableList> -======= - * Lookup313: rmrk_traits::part::EquippableList> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup312: rmrk_traits::part::EquippableList> ->>>>>>> fix: regenerate types after rebase -======= * Lookup311: rmrk_traits::part::EquippableList> ->>>>>>> chore: regenerate types **/ RmrkTraitsPartEquippableList: { _enum: { @@ -4591,23 +2666,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup313: rmrk_traits::theme::Theme, sp_core::bounded::bounded_vec::BoundedVec>, S>> -======= -<<<<<<< HEAD - * Lookup314: rmrk_traits::theme::Theme, sp_core::bounded::bounded_vec::BoundedVec>, S>> -======= - * Lookup315: rmrk_traits::theme::Theme, sp_core::bounded::bounded_vec::BoundedVec>, S>> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup314: rmrk_traits::theme::Theme, sp_core::bounded::bounded_vec::BoundedVec>, S>> ->>>>>>> fix: regenerate types after rebase -======= - * Lookup313: rmrk_traits::theme::Theme, sp_core::bounded::bounded_vec::BoundedVec>, S>> ->>>>>>> chore: regenerate types **/ RmrkTraitsTheme: { name: 'Bytes', @@ -4615,46 +2674,14 @@ inherit: 'bool' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup315: rmrk_traits::theme::ThemeProperty> -======= -<<<<<<< HEAD - * Lookup316: rmrk_traits::theme::ThemeProperty> -======= - * Lookup317: rmrk_traits::theme::ThemeProperty> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup316: rmrk_traits::theme::ThemeProperty> ->>>>>>> fix: regenerate types after rebase -======= * Lookup315: rmrk_traits::theme::ThemeProperty> ->>>>>>> chore: regenerate types **/ RmrkTraitsThemeThemeProperty: { key: 'Bytes', value: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup317: pallet_app_promotion::pallet::Call -======= -<<<<<<< HEAD - * Lookup318: pallet_app_promotion::pallet::Call -======= - * Lookup319: pallet_app_promotion::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup318: pallet_app_promotion::pallet::Call ->>>>>>> fix: regenerate types after rebase -======= - * Lookup317: pallet_app_promotion::pallet::Call ->>>>>>> chore: regenerate types **/ PalletAppPromotionCall: { _enum: { @@ -4683,23 +2710,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup318: pallet_foreign_assets::module::Call -======= -<<<<<<< HEAD - * Lookup319: pallet_foreign_assets::module::Call -======= - * Lookup320: pallet_foreign_assets::module::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup319: pallet_foreign_assets::module::Call ->>>>>>> fix: regenerate types after rebase -======= - * Lookup318: pallet_foreign_assets::module::Call ->>>>>>> chore: regenerate types **/ PalletForeignAssetsModuleCall: { _enum: { @@ -4716,23 +2727,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup319: pallet_evm::pallet::Call -======= -<<<<<<< HEAD - * Lookup320: pallet_evm::pallet::Call -======= - * Lookup321: pallet_evm::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup320: pallet_evm::pallet::Call ->>>>>>> fix: regenerate types after rebase -======= * Lookup319: pallet_evm::pallet::Call ->>>>>>> chore: regenerate types **/ PalletEvmCall: { _enum: { @@ -4775,23 +2770,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup325: pallet_ethereum::pallet::Call -======= -<<<<<<< HEAD - * Lookup326: pallet_ethereum::pallet::Call -======= * Lookup325: pallet_ethereum::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup326: pallet_ethereum::pallet::Call ->>>>>>> fix: regenerate types after rebase -======= - * Lookup325: pallet_ethereum::pallet::Call ->>>>>>> chore: regenerate types **/ PalletEthereumCall: { _enum: { @@ -4801,23 +2780,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup326: ethereum::transaction::TransactionV2 -======= -<<<<<<< HEAD - * Lookup327: ethereum::transaction::TransactionV2 -======= * Lookup326: ethereum::transaction::TransactionV2 ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup327: ethereum::transaction::TransactionV2 ->>>>>>> fix: regenerate types after rebase -======= - * Lookup326: ethereum::transaction::TransactionV2 ->>>>>>> chore: regenerate types **/ EthereumTransactionTransactionV2: { _enum: { @@ -4827,23 +2790,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup327: ethereum::transaction::LegacyTransaction -======= -<<<<<<< HEAD - * Lookup328: ethereum::transaction::LegacyTransaction -======= - * Lookup327: ethereum::transaction::LegacyTransaction ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup328: ethereum::transaction::LegacyTransaction ->>>>>>> fix: regenerate types after rebase -======= * Lookup327: ethereum::transaction::LegacyTransaction ->>>>>>> chore: regenerate types **/ EthereumTransactionLegacyTransaction: { nonce: 'U256', @@ -4855,23 +2802,7 @@ signature: 'EthereumTransactionTransactionSignature' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup328: ethereum::transaction::TransactionAction -======= -<<<<<<< HEAD - * Lookup329: ethereum::transaction::TransactionAction -======= - * Lookup328: ethereum::transaction::TransactionAction ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup329: ethereum::transaction::TransactionAction ->>>>>>> fix: regenerate types after rebase -======= * Lookup328: ethereum::transaction::TransactionAction ->>>>>>> chore: regenerate types **/ EthereumTransactionTransactionAction: { _enum: { @@ -4880,23 +2811,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup329: ethereum::transaction::TransactionSignature -======= -<<<<<<< HEAD - * Lookup330: ethereum::transaction::TransactionSignature -======= * Lookup329: ethereum::transaction::TransactionSignature ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup330: ethereum::transaction::TransactionSignature ->>>>>>> fix: regenerate types after rebase -======= - * Lookup329: ethereum::transaction::TransactionSignature ->>>>>>> chore: regenerate types **/ EthereumTransactionTransactionSignature: { v: 'u64', @@ -4904,23 +2819,7 @@ s: 'H256' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup331: ethereum::transaction::EIP2930Transaction -======= -<<<<<<< HEAD - * Lookup332: ethereum::transaction::EIP2930Transaction -======= - * Lookup331: ethereum::transaction::EIP2930Transaction ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup332: ethereum::transaction::EIP2930Transaction ->>>>>>> fix: regenerate types after rebase -======= * Lookup331: ethereum::transaction::EIP2930Transaction ->>>>>>> chore: regenerate types **/ EthereumTransactionEip2930Transaction: { chainId: 'u64', @@ -4936,46 +2835,14 @@ s: 'H256' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup333: ethereum::transaction::AccessListItem -======= -<<<<<<< HEAD - * Lookup334: ethereum::transaction::AccessListItem -======= - * Lookup333: ethereum::transaction::AccessListItem ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup334: ethereum::transaction::AccessListItem ->>>>>>> fix: regenerate types after rebase -======= - * Lookup333: ethereum::transaction::AccessListItem ->>>>>>> chore: regenerate types **/ EthereumTransactionAccessListItem: { address: 'H160', storageKeys: 'Vec' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup334: ethereum::transaction::EIP1559Transaction -======= -<<<<<<< HEAD - * Lookup335: ethereum::transaction::EIP1559Transaction -======= - * Lookup334: ethereum::transaction::EIP1559Transaction ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup335: ethereum::transaction::EIP1559Transaction ->>>>>>> fix: regenerate types after rebase -======= * Lookup334: ethereum::transaction::EIP1559Transaction ->>>>>>> chore: regenerate types **/ EthereumTransactionEip1559Transaction: { chainId: 'u64', @@ -4992,23 +2859,7 @@ s: 'H256' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup335: pallet_evm_migration::pallet::Call -======= -<<<<<<< HEAD - * Lookup336: pallet_evm_migration::pallet::Call -======= - * Lookup335: pallet_evm_migration::pallet::Call ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup336: pallet_evm_migration::pallet::Call ->>>>>>> fix: regenerate types after rebase -======= - * Lookup335: pallet_evm_migration::pallet::Call ->>>>>>> chore: regenerate types **/ PalletEvmMigrationCall: { _enum: { @@ -5032,37 +2883,13 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup339: pallet_maintenance::pallet::Call -======= - * Lookup338: pallet_maintenance::pallet::Call ->>>>>>> chore: regenerate types -======= - * Lookup340: pallet_maintenance::pallet::Call ->>>>>>> fix: regenerate types after rebase -======= * Lookup339: pallet_maintenance::pallet::Call ->>>>>>> chore: regenerate types **/ PalletMaintenanceCall: { _enum: ['enable', 'disable'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup340: pallet_test_utils::pallet::Call -======= - * Lookup339: pallet_test_utils::pallet::Call ->>>>>>> chore: regenerate types -======= - * Lookup341: pallet_test_utils::pallet::Call ->>>>>>> fix: regenerate types after rebase -======= * Lookup340: pallet_test_utils::pallet::Call ->>>>>>> chore: regenerate types **/ PalletTestUtilsCall: { _enum: { @@ -5081,112 +2908,32 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup342: pallet_sudo::pallet::Error -======= -<<<<<<< HEAD - * Lookup343: pallet_sudo::pallet::Error -======= - * Lookup341: pallet_sudo::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup343: pallet_sudo::pallet::Error ->>>>>>> fix: regenerate types after rebase -======= * Lookup342: pallet_sudo::pallet::Error ->>>>>>> chore: regenerate types **/ PalletSudoError: { _enum: ['RequireSudo'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup344: orml_vesting::module::Error -======= -<<<<<<< HEAD - * Lookup345: orml_vesting::module::Error -======= - * Lookup343: orml_vesting::module::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup345: orml_vesting::module::Error ->>>>>>> fix: regenerate types after rebase -======= - * Lookup344: orml_vesting::module::Error ->>>>>>> chore: regenerate types **/ OrmlVestingModuleError: { _enum: ['ZeroVestingPeriod', 'ZeroVestingPeriodCount', 'InsufficientBalanceToLock', 'TooManyVestingSchedules', 'AmountLow', 'MaxVestingSchedulesExceeded'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup345: orml_xtokens::module::Error -======= -<<<<<<< HEAD - * Lookup346: orml_xtokens::module::Error -======= - * Lookup344: orml_xtokens::module::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup346: orml_xtokens::module::Error ->>>>>>> fix: regenerate types after rebase -======= - * Lookup345: orml_xtokens::module::Error ->>>>>>> chore: regenerate types **/ OrmlXtokensModuleError: { _enum: ['AssetHasNoReserve', 'NotCrossChainTransfer', 'InvalidDest', 'NotCrossChainTransferableCurrency', 'UnweighableMessage', 'XcmExecutionFailed', 'CannotReanchor', 'InvalidAncestry', 'InvalidAsset', 'DestinationNotInvertible', 'BadVersion', 'DistinctReserveForAssetAndFee', 'ZeroFee', 'ZeroAmount', 'TooManyAssetsBeingSent', 'AssetIndexNonExistent', 'FeeNotEnough', 'NotSupportedMultiLocation', 'MinXcmFeeNotDefined'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup348: orml_tokens::BalanceLock -======= -<<<<<<< HEAD - * Lookup349: orml_tokens::BalanceLock -======= - * Lookup347: orml_tokens::BalanceLock ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup349: orml_tokens::BalanceLock ->>>>>>> fix: regenerate types after rebase -======= * Lookup348: orml_tokens::BalanceLock ->>>>>>> chore: regenerate types **/ OrmlTokensBalanceLock: { id: '[u8;8]', amount: 'u128' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup350: orml_tokens::AccountData -======= -<<<<<<< HEAD - * Lookup351: orml_tokens::AccountData -======= - * Lookup349: orml_tokens::AccountData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup351: orml_tokens::AccountData ->>>>>>> fix: regenerate types after rebase -======= * Lookup350: orml_tokens::AccountData ->>>>>>> chore: regenerate types **/ OrmlTokensAccountData: { free: 'u128', @@ -5194,68 +2941,20 @@ frozen: 'u128' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup352: orml_tokens::ReserveData -======= -<<<<<<< HEAD - * Lookup353: orml_tokens::ReserveData -======= - * Lookup351: orml_tokens::ReserveData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup353: orml_tokens::ReserveData ->>>>>>> fix: regenerate types after rebase -======= * Lookup352: orml_tokens::ReserveData ->>>>>>> chore: regenerate types **/ OrmlTokensReserveData: { id: 'Null', amount: 'u128' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup354: orml_tokens::module::Error -======= -<<<<<<< HEAD - * Lookup355: orml_tokens::module::Error -======= - * Lookup353: orml_tokens::module::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup355: orml_tokens::module::Error ->>>>>>> fix: regenerate types after rebase -======= * Lookup354: orml_tokens::module::Error ->>>>>>> chore: regenerate types **/ OrmlTokensModuleError: { _enum: ['BalanceTooLow', 'AmountIntoBalanceFailed', 'LiquidityRestrictions', 'MaxLocksExceeded', 'KeepAlive', 'ExistentialDeposit', 'DeadAccount', 'TooManyReserves'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup356: cumulus_pallet_xcmp_queue::InboundChannelDetails -======= -<<<<<<< HEAD - * Lookup357: cumulus_pallet_xcmp_queue::InboundChannelDetails -======= - * Lookup355: cumulus_pallet_xcmp_queue::InboundChannelDetails ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup357: cumulus_pallet_xcmp_queue::InboundChannelDetails ->>>>>>> fix: regenerate types after rebase -======= * Lookup356: cumulus_pallet_xcmp_queue::InboundChannelDetails ->>>>>>> chore: regenerate types **/ CumulusPalletXcmpQueueInboundChannelDetails: { sender: 'u32', @@ -5263,67 +2962,19 @@ messageMetadata: 'Vec<(u32,PolkadotParachainPrimitivesXcmpMessageFormat)>' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup357: cumulus_pallet_xcmp_queue::InboundState -======= -<<<<<<< HEAD - * Lookup358: cumulus_pallet_xcmp_queue::InboundState -======= - * Lookup356: cumulus_pallet_xcmp_queue::InboundState ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup358: cumulus_pallet_xcmp_queue::InboundState ->>>>>>> fix: regenerate types after rebase -======= - * Lookup357: cumulus_pallet_xcmp_queue::InboundState ->>>>>>> chore: regenerate types **/ CumulusPalletXcmpQueueInboundState: { _enum: ['Ok', 'Suspended'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup360: polkadot_parachain::primitives::XcmpMessageFormat -======= -<<<<<<< HEAD - * Lookup361: polkadot_parachain::primitives::XcmpMessageFormat -======= - * Lookup359: polkadot_parachain::primitives::XcmpMessageFormat ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup361: polkadot_parachain::primitives::XcmpMessageFormat ->>>>>>> fix: regenerate types after rebase -======= - * Lookup360: polkadot_parachain::primitives::XcmpMessageFormat ->>>>>>> chore: regenerate types **/ PolkadotParachainPrimitivesXcmpMessageFormat: { _enum: ['ConcatenatedVersionedXcm', 'ConcatenatedEncodedBlob', 'Signals'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup363: cumulus_pallet_xcmp_queue::OutboundChannelDetails -======= -<<<<<<< HEAD - * Lookup364: cumulus_pallet_xcmp_queue::OutboundChannelDetails -======= - * Lookup362: cumulus_pallet_xcmp_queue::OutboundChannelDetails ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup364: cumulus_pallet_xcmp_queue::OutboundChannelDetails ->>>>>>> fix: regenerate types after rebase -======= * Lookup363: cumulus_pallet_xcmp_queue::OutboundChannelDetails ->>>>>>> chore: regenerate types **/ CumulusPalletXcmpQueueOutboundChannelDetails: { recipient: 'u32', @@ -5333,45 +2984,13 @@ lastIndex: 'u16' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup364: cumulus_pallet_xcmp_queue::OutboundState -======= -<<<<<<< HEAD - * Lookup365: cumulus_pallet_xcmp_queue::OutboundState -======= - * Lookup363: cumulus_pallet_xcmp_queue::OutboundState ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup365: cumulus_pallet_xcmp_queue::OutboundState ->>>>>>> fix: regenerate types after rebase -======= - * Lookup364: cumulus_pallet_xcmp_queue::OutboundState ->>>>>>> chore: regenerate types **/ CumulusPalletXcmpQueueOutboundState: { _enum: ['Ok', 'Suspended'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup366: cumulus_pallet_xcmp_queue::QueueConfigData -======= -<<<<<<< HEAD - * Lookup367: cumulus_pallet_xcmp_queue::QueueConfigData -======= - * Lookup365: cumulus_pallet_xcmp_queue::QueueConfigData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup367: cumulus_pallet_xcmp_queue::QueueConfigData ->>>>>>> fix: regenerate types after rebase -======= * Lookup366: cumulus_pallet_xcmp_queue::QueueConfigData ->>>>>>> chore: regenerate types **/ CumulusPalletXcmpQueueQueueConfigData: { suspendThreshold: 'u32', @@ -5382,107 +3001,29 @@ xcmpMaxIndividualWeight: 'SpWeightsWeightV2Weight' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup368: cumulus_pallet_xcmp_queue::pallet::Error -======= -<<<<<<< HEAD - * Lookup369: cumulus_pallet_xcmp_queue::pallet::Error -======= - * Lookup367: cumulus_pallet_xcmp_queue::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup369: cumulus_pallet_xcmp_queue::pallet::Error ->>>>>>> fix: regenerate types after rebase -======= * Lookup368: cumulus_pallet_xcmp_queue::pallet::Error ->>>>>>> chore: regenerate types **/ CumulusPalletXcmpQueueError: { _enum: ['FailedToSend', 'BadXcmOrigin', 'BadXcm', 'BadOverweightIndex', 'WeightOverLimit'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup369: pallet_xcm::pallet::Error -======= -<<<<<<< HEAD - * Lookup370: pallet_xcm::pallet::Error -======= - * Lookup368: pallet_xcm::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup370: pallet_xcm::pallet::Error ->>>>>>> fix: regenerate types after rebase -======= - * Lookup369: pallet_xcm::pallet::Error ->>>>>>> chore: regenerate types **/ PalletXcmError: { _enum: ['Unreachable', 'SendFailure', 'Filtered', 'UnweighableMessage', 'DestinationNotInvertible', 'Empty', 'CannotReanchor', 'TooManyAssets', 'InvalidOrigin', 'BadVersion', 'BadLocation', 'NoSubscription', 'AlreadySubscribed'] }, - /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup370: cumulus_pallet_xcm::pallet::Error - **/ - CumulusPalletXcmError: 'Null', - /** - * Lookup371: cumulus_pallet_dmp_queue::ConfigData -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup371: cumulus_pallet_xcm::pallet::Error - **/ - CumulusPalletXcmError: 'Null', - /** - * Lookup372: cumulus_pallet_dmp_queue::ConfigData -<<<<<<< HEAD -======= - * Lookup369: cumulus_pallet_xcm::pallet::Error - **/ - CumulusPalletXcmError: 'Null', /** - * Lookup370: cumulus_pallet_dmp_queue::ConfigData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -======= * Lookup370: cumulus_pallet_xcm::pallet::Error **/ CumulusPalletXcmError: 'Null', /** * Lookup371: cumulus_pallet_dmp_queue::ConfigData ->>>>>>> chore: regenerate types **/ CumulusPalletDmpQueueConfigData: { maxIndividual: 'SpWeightsWeightV2Weight' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup372: cumulus_pallet_dmp_queue::PageIndexData -======= -<<<<<<< HEAD - * Lookup373: cumulus_pallet_dmp_queue::PageIndexData -======= - * Lookup371: cumulus_pallet_dmp_queue::PageIndexData ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup373: cumulus_pallet_dmp_queue::PageIndexData ->>>>>>> fix: regenerate types after rebase -======= * Lookup372: cumulus_pallet_dmp_queue::PageIndexData ->>>>>>> chore: regenerate types **/ CumulusPalletDmpQueuePageIndexData: { beginUsed: 'u32', @@ -5490,277 +3031,26 @@ overweightCount: 'u64' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup375: cumulus_pallet_dmp_queue::pallet::Error -======= -<<<<<<< HEAD - * Lookup376: cumulus_pallet_dmp_queue::pallet::Error -======= - * Lookup374: cumulus_pallet_dmp_queue::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup376: cumulus_pallet_dmp_queue::pallet::Error ->>>>>>> fix: regenerate types after rebase -======= * Lookup375: cumulus_pallet_dmp_queue::pallet::Error ->>>>>>> chore: regenerate types **/ CumulusPalletDmpQueueError: { _enum: ['Unknown', 'OverLimit'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup379: pallet_unique::Error -======= -<<<<<<< HEAD - * Lookup380: pallet_unique::Error -======= - * Lookup378: pallet_unique::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup380: pallet_unique::Error ->>>>>>> fix: regenerate types after rebase -======= * Lookup379: pallet_unique::Error ->>>>>>> chore: regenerate types **/ PalletUniqueError: { _enum: ['CollectionDecimalPointLimitExceeded', 'EmptyArgument', 'RepartitionCalledOnNonRefungibleCollection'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup380: pallet_configuration::pallet::Error -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup381: pallet_configuration::pallet::Error -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup381: pallet_unique_scheduler_v2::BlockAgenda ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= * Lookup380: pallet_configuration::pallet::Error ->>>>>>> chore: regenerate types **/ PalletConfigurationError: { _enum: ['InconsistentConfiguration'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD * Lookup381: up_data_structs::Collection -======= -<<<<<<< HEAD - * Lookup382: up_data_structs::Collection -======= - * Lookup384: pallet_unique_scheduler_v2::Scheduled, BlockNumber, opal_runtime::OriginCaller, sp_core::crypto::AccountId32> **/ - PalletUniqueSchedulerV2Scheduled: { - maybeId: 'Option<[u8;32]>', - priority: 'u8', - call: 'PalletUniqueSchedulerV2ScheduledCall', - maybePeriodic: 'Option<(u32,u32)>', - origin: 'OpalRuntimeOriginCaller' - }, - /** - * Lookup385: pallet_unique_scheduler_v2::ScheduledCall - **/ - PalletUniqueSchedulerV2ScheduledCall: { - _enum: { - Inline: 'Bytes', - PreimageLookup: { - _alias: { - hash_: 'hash', - }, - hash_: 'H256', - unboundedLen: 'u32' - } - } - }, - /** - * Lookup387: opal_runtime::OriginCaller - **/ - OpalRuntimeOriginCaller: { - _enum: { - system: 'FrameSupportDispatchRawOrigin', - __Unused1: 'Null', - __Unused2: 'Null', - __Unused3: 'Null', - Void: 'SpCoreVoid', - __Unused5: 'Null', - __Unused6: 'Null', - __Unused7: 'Null', - __Unused8: 'Null', - __Unused9: 'Null', - __Unused10: 'Null', - __Unused11: 'Null', - __Unused12: 'Null', - __Unused13: 'Null', - __Unused14: 'Null', - __Unused15: 'Null', - __Unused16: 'Null', - __Unused17: 'Null', - __Unused18: 'Null', - __Unused19: 'Null', - __Unused20: 'Null', - __Unused21: 'Null', - __Unused22: 'Null', - __Unused23: 'Null', - __Unused24: 'Null', - __Unused25: 'Null', - __Unused26: 'Null', - __Unused27: 'Null', - __Unused28: 'Null', - __Unused29: 'Null', - __Unused30: 'Null', - __Unused31: 'Null', - __Unused32: 'Null', - __Unused33: 'Null', - __Unused34: 'Null', - __Unused35: 'Null', - __Unused36: 'Null', - __Unused37: 'Null', - __Unused38: 'Null', - __Unused39: 'Null', - __Unused40: 'Null', - __Unused41: 'Null', - __Unused42: 'Null', - __Unused43: 'Null', - __Unused44: 'Null', - __Unused45: 'Null', - __Unused46: 'Null', - __Unused47: 'Null', - __Unused48: 'Null', - __Unused49: 'Null', - __Unused50: 'Null', - PolkadotXcm: 'PalletXcmOrigin', - CumulusXcm: 'CumulusPalletXcmOrigin', - __Unused53: 'Null', - __Unused54: 'Null', - __Unused55: 'Null', - __Unused56: 'Null', - __Unused57: 'Null', - __Unused58: 'Null', - __Unused59: 'Null', - __Unused60: 'Null', - __Unused61: 'Null', - __Unused62: 'Null', - __Unused63: 'Null', - __Unused64: 'Null', - __Unused65: 'Null', - __Unused66: 'Null', - __Unused67: 'Null', - __Unused68: 'Null', - __Unused69: 'Null', - __Unused70: 'Null', - __Unused71: 'Null', - __Unused72: 'Null', - __Unused73: 'Null', - __Unused74: 'Null', - __Unused75: 'Null', - __Unused76: 'Null', - __Unused77: 'Null', - __Unused78: 'Null', - __Unused79: 'Null', - __Unused80: 'Null', - __Unused81: 'Null', - __Unused82: 'Null', - __Unused83: 'Null', - __Unused84: 'Null', - __Unused85: 'Null', - __Unused86: 'Null', - __Unused87: 'Null', - __Unused88: 'Null', - __Unused89: 'Null', - __Unused90: 'Null', - __Unused91: 'Null', - __Unused92: 'Null', - __Unused93: 'Null', - __Unused94: 'Null', - __Unused95: 'Null', - __Unused96: 'Null', - __Unused97: 'Null', - __Unused98: 'Null', - __Unused99: 'Null', - __Unused100: 'Null', - Ethereum: 'PalletEthereumRawOrigin' - } - }, - /** - * Lookup388: frame_support::dispatch::RawOrigin - **/ - FrameSupportDispatchRawOrigin: { - _enum: { - Root: 'Null', - Signed: 'AccountId32', - None: 'Null' - } - }, - /** - * Lookup389: pallet_xcm::pallet::Origin - **/ - PalletXcmOrigin: { - _enum: { - Xcm: 'XcmV1MultiLocation', - Response: 'XcmV1MultiLocation' - } - }, - /** - * Lookup390: cumulus_pallet_xcm::pallet::Origin - **/ - CumulusPalletXcmOrigin: { - _enum: { - Relay: 'Null', - SiblingParachain: 'u32' - } - }, - /** - * Lookup391: pallet_ethereum::RawOrigin - **/ - PalletEthereumRawOrigin: { - _enum: { - EthereumTransaction: 'H160' - } - }, - /** - * Lookup392: sp_core::Void - **/ - SpCoreVoid: 'Null', - /** - * Lookup394: pallet_unique_scheduler_v2::pallet::Error - **/ - PalletUniqueSchedulerV2Error: { - _enum: ['FailedToSchedule', 'AgendaIsExhausted', 'ScheduledCallCorrupted', 'PreimageNotFound', 'TooBigScheduledCall', 'NotFound', 'TargetBlockNumberInPast', 'Named'] - }, - /** - * Lookup395: up_data_structs::Collection -<<<<<<< HEAD -======= - * Lookup393: up_data_structs::Collection ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup381: up_data_structs::Collection ->>>>>>> chore: regenerate types - **/ UpDataStructsCollection: { owner: 'AccountId32', mode: 'UpDataStructsCollectionMode', @@ -5773,32 +3063,7 @@ flags: '[u8;1]' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup382: up_data_structs::SponsorshipState -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup383: up_data_structs::SponsorshipState -======= -<<<<<<< HEAD - * Lookup396: up_data_structs::SponsorshipState -======= - * Lookup394: up_data_structs::SponsorshipState ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup396: up_data_structs::SponsorshipState ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup382: up_data_structs::SponsorshipState ->>>>>>> chore: regenerate types **/ UpDataStructsSponsorshipStateAccountId32: { _enum: { @@ -5808,32 +3073,7 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup384: up_data_structs::Properties -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup385: up_data_structs::Properties -======= -<<<<<<< HEAD - * Lookup398: up_data_structs::Properties -======= - * Lookup396: up_data_structs::Properties ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup398: up_data_structs::Properties ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup384: up_data_structs::Properties ->>>>>>> chore: regenerate types **/ UpDataStructsProperties: { map: 'UpDataStructsPropertiesMapBoundedVec', @@ -5841,62 +3081,15 @@ spaceLimit: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup385: up_data_structs::PropertiesMap> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup386: up_data_structs::PropertiesMap> -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup399: up_data_structs::PropertiesMap> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - * Lookup385: up_data_structs::PropertiesMap> ->>>>>>> chore: regenerate types **/ UpDataStructsPropertiesMapBoundedVec: 'BTreeMap', /** * Lookup390: up_data_structs::PropertiesMap - **/ - UpDataStructsPropertiesMapPropertyPermission: 'BTreeMap', - /** -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup397: up_data_structs::CollectionStats -======= -<<<<<<< HEAD - * Lookup398: up_data_structs::CollectionStats -======= - * Lookup411: up_data_structs::CollectionStats -<<<<<<< HEAD -======= - * Lookup397: up_data_structs::PropertiesMap> - **/ - UpDataStructsPropertiesMapBoundedVec: 'BTreeMap', - /** - * Lookup402: up_data_structs::PropertiesMap **/ UpDataStructsPropertiesMapPropertyPermission: 'BTreeMap', /** - * Lookup409: up_data_structs::CollectionStats ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup397: up_data_structs::CollectionStats ->>>>>>> chore: regenerate types **/ UpDataStructsCollectionStats: { created: 'u32', @@ -5904,86 +3097,18 @@ alive: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup398: up_data_structs::TokenChild -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup399: up_data_structs::TokenChild -======= -<<<<<<< HEAD - * Lookup412: up_data_structs::TokenChild -======= - * Lookup410: up_data_structs::TokenChild ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup412: up_data_structs::TokenChild ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup398: up_data_structs::TokenChild ->>>>>>> chore: regenerate types **/ UpDataStructsTokenChild: { token: 'u32', collection: 'u32' }, - /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup399: PhantomType::up_data_structs - **/ - PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]', - /** - * Lookup401: up_data_structs::TokenData> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup400: PhantomType::up_data_structs - **/ - PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]', /** - * Lookup402: up_data_structs::TokenData> -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - * Lookup413: PhantomType::up_data_structs - **/ - PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]', - /** - * Lookup415: up_data_structs::TokenData> -<<<<<<< HEAD -======= - * Lookup411: PhantomType::up_data_structs - **/ - PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]', - /** - * Lookup413: up_data_structs::TokenData> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup399: PhantomType::up_data_structs **/ PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]', /** * Lookup401: up_data_structs::TokenData> ->>>>>>> chore: regenerate types **/ UpDataStructsTokenData: { properties: 'Vec', @@ -5991,32 +3116,7 @@ pieces: 'u128' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup403: up_data_structs::RpcCollection -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup404: up_data_structs::RpcCollection -======= -<<<<<<< HEAD - * Lookup417: up_data_structs::RpcCollection -======= - * Lookup415: up_data_structs::RpcCollection ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup417: up_data_structs::RpcCollection ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup403: up_data_structs::RpcCollection ->>>>>>> chore: regenerate types **/ UpDataStructsRpcCollection: { owner: 'AccountId32', @@ -6033,64 +3133,14 @@ flags: 'UpDataStructsRpcCollectionFlags' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup404: up_data_structs::RpcCollectionFlags -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup405: up_data_structs::RpcCollectionFlags -======= -<<<<<<< HEAD - * Lookup418: up_data_structs::RpcCollectionFlags -======= - * Lookup416: up_data_structs::RpcCollectionFlags ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup418: up_data_structs::RpcCollectionFlags ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup404: up_data_structs::RpcCollectionFlags ->>>>>>> chore: regenerate types **/ UpDataStructsRpcCollectionFlags: { foreign: 'bool', erc721metadata: 'bool' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup405: rmrk_traits::collection::CollectionInfo, sp_core::bounded::bounded_vec::BoundedVec, sp_core::crypto::AccountId32> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup406: rmrk_traits::collection::CollectionInfo, sp_core::bounded::bounded_vec::BoundedVec, sp_core::crypto::AccountId32> -======= -<<<<<<< HEAD - * Lookup419: rmrk_traits::collection::CollectionInfo, sp_core::bounded::bounded_vec::BoundedVec, sp_core::crypto::AccountId32> -======= - * Lookup417: rmrk_traits::collection::CollectionInfo, sp_core::bounded::bounded_vec::BoundedVec, sp_core::crypto::AccountId32> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup419: rmrk_traits::collection::CollectionInfo, sp_core::bounded::bounded_vec::BoundedVec, sp_core::crypto::AccountId32> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup405: rmrk_traits::collection::CollectionInfo, sp_core::bounded::bounded_vec::BoundedVec, sp_core::crypto::AccountId32> ->>>>>>> chore: regenerate types **/ RmrkTraitsCollectionCollectionInfo: { issuer: 'AccountId32', @@ -6100,32 +3150,7 @@ nftsCount: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup406: rmrk_traits::nft::NftInfo> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup407: rmrk_traits::nft::NftInfo> -======= -<<<<<<< HEAD - * Lookup420: rmrk_traits::nft::NftInfo> -======= - * Lookup418: rmrk_traits::nft::NftInfo> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup420: rmrk_traits::nft::NftInfo> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup406: rmrk_traits::nft::NftInfo> ->>>>>>> chore: regenerate types **/ RmrkTraitsNftNftInfo: { owner: 'RmrkTraitsNftAccountIdOrCollectionNftTuple', @@ -6135,64 +3160,14 @@ pending: 'bool' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup408: rmrk_traits::nft::RoyaltyInfo -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup409: rmrk_traits::nft::RoyaltyInfo -======= -<<<<<<< HEAD - * Lookup422: rmrk_traits::nft::RoyaltyInfo -======= - * Lookup420: rmrk_traits::nft::RoyaltyInfo ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup422: rmrk_traits::nft::RoyaltyInfo ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup408: rmrk_traits::nft::RoyaltyInfo ->>>>>>> chore: regenerate types **/ RmrkTraitsNftRoyaltyInfo: { recipient: 'AccountId32', amount: 'Permill' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup409: rmrk_traits::resource::ResourceInfo, sp_core::bounded::bounded_vec::BoundedVec> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup410: rmrk_traits::resource::ResourceInfo, sp_core::bounded::bounded_vec::BoundedVec> -======= -<<<<<<< HEAD - * Lookup423: rmrk_traits::resource::ResourceInfo, sp_core::bounded::bounded_vec::BoundedVec> -======= - * Lookup421: rmrk_traits::resource::ResourceInfo, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup423: rmrk_traits::resource::ResourceInfo, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup409: rmrk_traits::resource::ResourceInfo, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types **/ RmrkTraitsResourceResourceInfo: { id: 'u32', @@ -6201,64 +3176,14 @@ pendingRemoval: 'bool' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD * Lookup410: rmrk_traits::property::PropertyInfo, sp_core::bounded::bounded_vec::BoundedVec> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup411: rmrk_traits::property::PropertyInfo, sp_core::bounded::bounded_vec::BoundedVec> -======= -<<<<<<< HEAD - * Lookup424: rmrk_traits::property::PropertyInfo, sp_core::bounded::bounded_vec::BoundedVec> -======= - * Lookup422: rmrk_traits::property::PropertyInfo, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup424: rmrk_traits::property::PropertyInfo, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - * Lookup410: rmrk_traits::property::PropertyInfo, sp_core::bounded::bounded_vec::BoundedVec> ->>>>>>> chore: regenerate types **/ RmrkTraitsPropertyPropertyInfo: { key: 'Bytes', value: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup411: rmrk_traits::base::BaseInfo> -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup412: rmrk_traits::base::BaseInfo> -======= -<<<<<<< HEAD - * Lookup425: rmrk_traits::base::BaseInfo> -======= - * Lookup423: rmrk_traits::base::BaseInfo> ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup425: rmrk_traits::base::BaseInfo> ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup411: rmrk_traits::base::BaseInfo> ->>>>>>> chore: regenerate types **/ RmrkTraitsBaseBaseInfo: { issuer: 'AccountId32', @@ -6266,66 +3191,14 @@ symbol: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup412: rmrk_traits::nft::NftChild -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup413: rmrk_traits::nft::NftChild -======= -<<<<<<< HEAD - * Lookup426: rmrk_traits::nft::NftChild -======= - * Lookup424: rmrk_traits::nft::NftChild ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup426: rmrk_traits::nft::NftChild ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup412: rmrk_traits::nft::NftChild ->>>>>>> chore: regenerate types **/ RmrkTraitsNftNftChild: { collectionId: 'u32', nftId: 'u32' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup414: pallet_common::pallet::Error -======= -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup415: pallet_common::pallet::Error -======= -======= ->>>>>>> chore: regenerate types -<<<<<<< HEAD - * Lookup428: pallet_common::pallet::Error -======= - * Lookup422: up_pov_estimate_rpc::PovInfo -======= - * Lookup425: up_pov_estimate_rpc::PovInfo ->>>>>>> chore: regenerate types -======= - * Lookup427: up_pov_estimate_rpc::PovInfo ->>>>>>> fix: regenerate types after rebase -======= * Lookup413: up_pov_estimate_rpc::PovInfo ->>>>>>> chore: regenerate types **/ UpPovEstimateRpcPovInfo: { proofSize: 'u64', @@ -6335,29 +3208,7 @@ keyValues: 'Vec' }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup424: pallet_common::pallet::Error ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -======= -======= -======= - * Lookup424: sp_runtime::transaction_validity::TransactionValidityError -======= - * Lookup428: sp_runtime::transaction_validity::TransactionValidityError ->>>>>>> chore: regenerate types -======= - * Lookup430: sp_runtime::transaction_validity::TransactionValidityError ->>>>>>> fix: regenerate types after rebase -======= * Lookup416: sp_runtime::transaction_validity::TransactionValidityError ->>>>>>> chore: regenerate types **/ SpRuntimeTransactionValidityTransactionValidityError: { _enum: { @@ -6394,105 +3245,20 @@ } }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup428: pallet_common::pallet::Error ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= -======= - * Lookup432: up_pov_estimate_rpc::TrieKeyValue -======= - * Lookup434: up_pov_estimate_rpc::TrieKeyValue ->>>>>>> fix: regenerate types after rebase -======= * Lookup420: up_pov_estimate_rpc::TrieKeyValue ->>>>>>> chore: regenerate types **/ UpPovEstimateRpcTrieKeyValue: { key: 'Bytes', value: 'Bytes' }, /** -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup434: pallet_common::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup436: pallet_common::pallet::Error ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup422: pallet_common::pallet::Error ->>>>>>> chore: regenerate types **/ PalletCommonError: { _enum: ['CollectionNotFound', 'MustBeTokenOwner', 'NoPermission', 'CantDestroyNotEmptyCollection', 'PublicMintingNotAllowed', 'AddressNotInAllowlist', 'CollectionNameLimitExceeded', 'CollectionDescriptionLimitExceeded', 'CollectionTokenPrefixLimitExceeded', 'TotalCollectionsLimitExceeded', 'CollectionAdminCountExceeded', 'CollectionLimitBoundsExceeded', 'OwnerPermissionsCantBeReverted', 'TransferNotAllowed', 'AccountTokenLimitExceeded', 'CollectionTokenLimitExceeded', 'MetadataFlagFrozen', 'TokenNotFound', 'TokenValueTooLow', 'ApprovedValueTooLow', 'CantApproveMoreThanOwned', 'AddressIsZero', 'UnsupportedOperation', 'NotSufficientFounds', 'UserIsNotAllowedToNest', 'SourceCollectionIsNotAllowedToNest', 'CollectionFieldSizeExceeded', 'NoSpaceForProperty', 'PropertyLimitReached', 'PropertyKeyIsTooLong', 'InvalidCharacterInPropertyKey', 'EmptyPropertyKey', 'CollectionIsExternal', 'CollectionIsInternal', 'ConfirmSponsorshipFail', 'UserIsNotCollectionAdmin'] }, /** -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - * Lookup416: pallet_fungible::pallet::Error -======= -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - * Lookup417: pallet_fungible::pallet::Error -======= -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> chore: regenerate types -<<<<<<< HEAD - * Lookup430: pallet_fungible::pallet::Error -======= - * Lookup426: pallet_fungible::pallet::Error ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -======= -======= -======= - * Lookup430: pallet_fungible::pallet::Error ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= -======= - * Lookup436: pallet_fungible::pallet::Error ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - * Lookup438: pallet_fungible::pallet::Error ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= * Lookup424: pallet_fungible::pallet::Error ->>>>>>> chore: regenerate types **/ PalletFungibleError: { _enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed', 'SettingAllowanceForAllNotAllowed', 'FungibleTokensAreAlwaysValid'] @@ -6503,6 +3269,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup420: pallet_refungible::pallet::Error ======= ======= @@ -6561,8 +3328,9 @@ >>>>>>> fix: regenerate types after rebase >>>>>>> fix: regenerate types after rebase ======= +======= +>>>>>>> chore: regenerate types * Lookup425: pallet_refungible::ItemData ->>>>>>> chore: regenerate types **/ PalletRefungibleItemData: { constData: 'Bytes' @@ -6573,6 +3341,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup422: pallet_refungible::pallet::Error ======= ======= @@ -6635,6 +3404,9 @@ * Lookup430: pallet_refungible::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup430: pallet_refungible::pallet::Error +>>>>>>> chore: regenerate types **/ PalletRefungibleError: { _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RepartitionWhileNotOwningAllPieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed'] @@ -6645,6 +3417,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup421: pallet_nonfungible::ItemData> ======= ======= @@ -6718,6 +3491,9 @@ * Lookup431: pallet_nonfungible::ItemData> >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup431: pallet_nonfungible::ItemData> +>>>>>>> chore: regenerate types **/ PalletNonfungibleItemData: { owner: 'PalletEvmAccountBasicCrossAccountIdRepr' @@ -6728,6 +3504,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup423: up_data_structs::PropertyScope ======= ======= @@ -6801,6 +3578,9 @@ * Lookup433: up_data_structs::PropertyScope >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup433: up_data_structs::PropertyScope +>>>>>>> chore: regenerate types **/ UpDataStructsPropertyScope: { _enum: ['None', 'Rmrk'] @@ -6811,6 +3591,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup426: pallet_nonfungible::pallet::Error ======= ======= @@ -6884,6 +3665,9 @@ * Lookup435: pallet_nonfungible::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup435: pallet_nonfungible::pallet::Error +>>>>>>> chore: regenerate types **/ PalletNonfungibleError: { _enum: ['NotNonfungibleDataUsedToMintFungibleCollectionToken', 'NonfungibleItemsHaveNoAmount', 'CantBurnNftWithChildren'] @@ -6894,6 +3678,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup427: pallet_structure::pallet::Error ======= ======= @@ -6967,6 +3752,9 @@ * Lookup436: pallet_structure::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup436: pallet_structure::pallet::Error +>>>>>>> chore: regenerate types **/ PalletStructureError: { _enum: ['OuroborosDetected', 'DepthLimit', 'BreadthLimit', 'TokenNotFound'] @@ -6977,6 +3765,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup428: pallet_rmrk_core::pallet::Error ======= ======= @@ -7050,6 +3839,9 @@ * Lookup437: pallet_rmrk_core::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup437: pallet_rmrk_core::pallet::Error +>>>>>>> chore: regenerate types **/ PalletRmrkCoreError: { _enum: ['CorruptedCollectionType', 'RmrkPropertyKeyIsTooLong', 'RmrkPropertyValueIsTooLong', 'RmrkPropertyIsNotFound', 'UnableToDecodeRmrkData', 'CollectionNotEmpty', 'NoAvailableCollectionId', 'NoAvailableNftId', 'CollectionUnknown', 'NoPermission', 'NonTransferable', 'CollectionFullOrLocked', 'ResourceDoesntExist', 'CannotSendToDescendentOrSelf', 'CannotAcceptNonOwnedNft', 'CannotRejectNonOwnedNft', 'CannotRejectNonPendingNft', 'ResourceNotPending', 'NoAvailableResourceId'] @@ -7060,6 +3852,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup430: pallet_rmrk_equip::pallet::Error ======= ======= @@ -7133,6 +3926,9 @@ * Lookup439: pallet_rmrk_equip::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup439: pallet_rmrk_equip::pallet::Error +>>>>>>> chore: regenerate types **/ PalletRmrkEquipError: { _enum: ['PermissionError', 'NoAvailableBaseId', 'NoAvailablePartId', 'BaseDoesntExist', 'NeedsDefaultThemeFirst', 'PartDoesntExist', 'NoEquippableOnFixedPart'] @@ -7143,6 +3939,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup436: pallet_app_promotion::pallet::Error ======= ======= @@ -7216,6 +4013,9 @@ * Lookup445: pallet_app_promotion::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup445: pallet_app_promotion::pallet::Error +>>>>>>> chore: regenerate types **/ PalletAppPromotionError: { _enum: ['AdminNotSet', 'NoPermission', 'NotSufficientFunds', 'PendingForBlockOverflow', 'SponsorNotSet', 'IncorrectLockedBalanceOperation'] @@ -7226,6 +4026,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup437: pallet_foreign_assets::module::Error ======= ======= @@ -7299,6 +4100,9 @@ * Lookup446: pallet_foreign_assets::module::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup446: pallet_foreign_assets::module::Error +>>>>>>> chore: regenerate types **/ PalletForeignAssetsModuleError: { _enum: ['BadLocation', 'MultiLocationExisted', 'AssetIdNotExists', 'AssetIdExisted'] @@ -7309,6 +4113,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup439: pallet_evm::pallet::Error ======= ======= @@ -7382,6 +4187,9 @@ * Lookup448: pallet_evm::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup448: pallet_evm::pallet::Error +>>>>>>> chore: regenerate types **/ PalletEvmError: { _enum: ['BalanceLow', 'FeeOverflow', 'PaymentOverflow', 'WithdrawFailed', 'GasPriceTooLow', 'InvalidNonce', 'GasLimitTooLow', 'GasLimitTooHigh', 'Undefined', 'Reentrancy', 'TransactionMustComeFromEOA'] @@ -7392,6 +4200,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup442: fp_rpc::TransactionStatus ======= ======= @@ -7465,6 +4274,9 @@ * Lookup451: fp_rpc::TransactionStatus >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup451: fp_rpc::TransactionStatus +>>>>>>> chore: regenerate types **/ FpRpcTransactionStatus: { transactionHash: 'H256', @@ -7481,6 +4293,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup444: ethbloom::Bloom **/ EthbloomBloom: '[u8;256]', @@ -7583,13 +4396,18 @@ >>>>>>> fix: regenerate types after rebase ======= ======= +======= +>>>>>>> chore: regenerate types * Lookup453: ethbloom::Bloom **/ EthbloomBloom: '[u8;256]', /** * Lookup455: ethereum::receipt::ReceiptV3 +<<<<<<< HEAD >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= +>>>>>>> chore: regenerate types **/ EthereumReceiptReceiptV3: { _enum: { @@ -7604,6 +4422,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup447: ethereum::receipt::EIP658ReceiptData ======= ======= @@ -7677,6 +4496,9 @@ * Lookup456: ethereum::receipt::EIP658ReceiptData >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup456: ethereum::receipt::EIP658ReceiptData +>>>>>>> chore: regenerate types **/ EthereumReceiptEip658ReceiptData: { statusCode: 'u8', @@ -7690,6 +4512,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup448: ethereum::block::Block ======= ======= @@ -7763,6 +4586,9 @@ * Lookup457: ethereum::block::Block >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup457: ethereum::block::Block +>>>>>>> chore: regenerate types **/ EthereumBlock: { header: 'EthereumHeader', @@ -7775,6 +4601,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup449: ethereum::header::Header ======= ======= @@ -7848,6 +4675,9 @@ * Lookup458: ethereum::header::Header >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup458: ethereum::header::Header +>>>>>>> chore: regenerate types **/ EthereumHeader: { parentHash: 'H256', @@ -7872,6 +4702,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup450: ethereum_types::hash::H64 **/ EthereumTypesHashH64: '[u8;8]', @@ -7974,12 +4805,17 @@ >>>>>>> fix: regenerate types after rebase ======= ======= +======= +>>>>>>> chore: regenerate types * Lookup459: ethereum_types::hash::H64 **/ EthereumTypesHashH64: '[u8;8]', /** * Lookup464: pallet_ethereum::pallet::Error +<<<<<<< HEAD +>>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= >>>>>>> chore: regenerate types **/ PalletEthereumError: { @@ -7991,6 +4827,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup456: pallet_evm_coder_substrate::pallet::Error ======= ======= @@ -8064,6 +4901,9 @@ * Lookup465: pallet_evm_coder_substrate::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup465: pallet_evm_coder_substrate::pallet::Error +>>>>>>> chore: regenerate types **/ PalletEvmCoderSubstrateError: { _enum: ['OutOfGas', 'OutOfFund'] @@ -8074,6 +4914,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup457: up_data_structs::SponsorshipState> ======= ======= @@ -8147,6 +4988,9 @@ * Lookup466: up_data_structs::SponsorshipState> >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup466: up_data_structs::SponsorshipState> +>>>>>>> chore: regenerate types **/ UpDataStructsSponsorshipStateBasicCrossAccountIdRepr: { _enum: { @@ -8161,6 +5005,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup458: pallet_evm_contract_helpers::SponsoringModeT ======= ======= @@ -8234,6 +5079,9 @@ * Lookup467: pallet_evm_contract_helpers::SponsoringModeT >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup467: pallet_evm_contract_helpers::SponsoringModeT +>>>>>>> chore: regenerate types **/ PalletEvmContractHelpersSponsoringModeT: { _enum: ['Disabled', 'Allowlisted', 'Generous'] @@ -8244,6 +5092,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup464: pallet_evm_contract_helpers::pallet::Error ======= ======= @@ -8317,6 +5166,9 @@ * Lookup473: pallet_evm_contract_helpers::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup473: pallet_evm_contract_helpers::pallet::Error +>>>>>>> chore: regenerate types **/ PalletEvmContractHelpersError: { _enum: ['NoPermission', 'NoPendingSponsor', 'TooManyMethodsHaveSponsoredLimit'] @@ -8327,6 +5179,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup465: pallet_evm_migration::pallet::Error ======= ======= @@ -8400,6 +5253,9 @@ * Lookup474: pallet_evm_migration::pallet::Error >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup474: pallet_evm_migration::pallet::Error +>>>>>>> chore: regenerate types **/ PalletEvmMigrationError: { _enum: ['AccountNotEmpty', 'AccountIsNotMigrating', 'BadEvent'] @@ -8410,6 +5266,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup466: pallet_maintenance::pallet::Error **/ PalletMaintenanceError: 'Null', @@ -8512,12 +5369,17 @@ >>>>>>> fix: regenerate types after rebase ======= ======= +======= +>>>>>>> chore: regenerate types * Lookup475: pallet_maintenance::pallet::Error **/ PalletMaintenanceError: 'Null', /** * Lookup476: pallet_test_utils::pallet::Error +<<<<<<< HEAD +>>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= >>>>>>> chore: regenerate types **/ PalletTestUtilsError: { @@ -8529,6 +5391,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup469: sp_runtime::MultiSignature ======= ======= @@ -8602,6 +5465,9 @@ * Lookup478: sp_runtime::MultiSignature >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup478: sp_runtime::MultiSignature +>>>>>>> chore: regenerate types **/ SpRuntimeMultiSignature: { _enum: { @@ -8616,6 +5482,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup470: sp_core::ed25519::Signature ======= ======= @@ -8712,8 +5579,9 @@ * Lookup493: sp_core::ed25519::Signature >>>>>>> fix: regenerate types after rebase ======= - * Lookup479: sp_core::ed25519::Signature +======= >>>>>>> chore: regenerate types + * Lookup479: sp_core::ed25519::Signature **/ SpCoreEd25519Signature: '[u8;64]', /** @@ -8761,6 +5629,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * Lookup498: pallet_ethereum::FakeTransactionFinalizer >>>>>>> fix: update polkadot types and definitions <<<<<<< HEAD @@ -8805,6 +5674,9 @@ * Lookup495: pallet_ethereum::FakeTransactionFinalizer >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + * Lookup495: pallet_ethereum::FakeTransactionFinalizer +>>>>>>> chore: regenerate types **/ PalletEthereumFakeTransactionFinalizer: 'Null' }; --- a/tests/src/interfaces/registry.ts +++ b/tests/src/interfaces/registry.ts @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD 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, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, 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, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; ======= ======= @@ -83,6 +84,9 @@ 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, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, UpPovEstimateRpcPovInfo, UpPovEstimateRpcTrieKeyValue, 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, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= +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, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, UpPovEstimateRpcPovInfo, UpPovEstimateRpcTrieKeyValue, 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, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup'; +>>>>>>> chore: regenerate types declare module '@polkadot/types/types/registry' { interface InterfaceTypes { --- a/tests/src/interfaces/types-lookup.ts +++ b/tests/src/interfaces/types-lookup.ts @@ -1524,96 +1524,21 @@ readonly type: 'Remark' | 'SetHeapPages' | 'SetCode' | 'SetCodeWithoutChecks' | 'SetStorage' | 'KillStorage' | 'KillPrefix' | 'RemarkWithEvent'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name FrameSystemLimitsBlockWeights (129) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name FrameSystemLimitsBlockWeights (130) */ -======= -<<<<<<< HEAD - /** @name FrameSystemLimitsBlockWeights (133) */ -======= - /** @name FrameSystemLimitsBlockWeights (134) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name FrameSystemLimitsBlockWeights (133) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name FrameSystemLimitsBlockWeights (129) */ ->>>>>>> chore: regenerate types interface FrameSystemLimitsBlockWeights extends Struct { readonly baseBlock: SpWeightsWeightV2Weight; readonly maxBlock: SpWeightsWeightV2Weight; readonly perClass: FrameSupportDispatchPerDispatchClassWeightsPerClass; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (131) */ -======= -<<<<<<< HEAD - /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (134) */ -======= - /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (135) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (134) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */ ->>>>>>> chore: regenerate types interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct { readonly normal: FrameSystemLimitsWeightsPerClass; readonly operational: FrameSystemLimitsWeightsPerClass; readonly mandatory: FrameSystemLimitsWeightsPerClass; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name FrameSystemLimitsWeightsPerClass (131) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name FrameSystemLimitsWeightsPerClass (132) */ -======= -<<<<<<< HEAD - /** @name FrameSystemLimitsWeightsPerClass (135) */ -======= - /** @name FrameSystemLimitsWeightsPerClass (136) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name FrameSystemLimitsWeightsPerClass (135) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name FrameSystemLimitsWeightsPerClass (131) */ ->>>>>>> chore: regenerate types interface FrameSystemLimitsWeightsPerClass extends Struct { readonly baseExtrinsic: SpWeightsWeightV2Weight; readonly maxExtrinsic: Option; @@ -1621,125 +1546,25 @@ readonly reserved: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name FrameSystemLimitsBlockLength (133) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name FrameSystemLimitsBlockLength (134) */ -======= -<<<<<<< HEAD - /** @name FrameSystemLimitsBlockLength (137) */ -======= - /** @name FrameSystemLimitsBlockLength (138) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name FrameSystemLimitsBlockLength (137) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name FrameSystemLimitsBlockLength (133) */ ->>>>>>> chore: regenerate types interface FrameSystemLimitsBlockLength extends Struct { readonly max: FrameSupportDispatchPerDispatchClassU32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name FrameSupportDispatchPerDispatchClassU32 (134) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name FrameSupportDispatchPerDispatchClassU32 (135) */ -======= -<<<<<<< HEAD - /** @name FrameSupportDispatchPerDispatchClassU32 (138) */ -======= - /** @name FrameSupportDispatchPerDispatchClassU32 (139) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name FrameSupportDispatchPerDispatchClassU32 (138) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name FrameSupportDispatchPerDispatchClassU32 (134) */ ->>>>>>> chore: regenerate types interface FrameSupportDispatchPerDispatchClassU32 extends Struct { readonly normal: u32; readonly operational: u32; readonly mandatory: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name SpWeightsRuntimeDbWeight (135) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name SpWeightsRuntimeDbWeight (136) */ -======= -<<<<<<< HEAD - /** @name SpWeightsRuntimeDbWeight (139) */ -======= - /** @name SpWeightsRuntimeDbWeight (140) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name SpWeightsRuntimeDbWeight (139) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name SpWeightsRuntimeDbWeight (135) */ ->>>>>>> chore: regenerate types interface SpWeightsRuntimeDbWeight extends Struct { readonly read: u64; readonly write: u64; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name SpVersionRuntimeVersion (136) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name SpVersionRuntimeVersion (137) */ -======= -<<<<<<< HEAD - /** @name SpVersionRuntimeVersion (140) */ -======= - /** @name SpVersionRuntimeVersion (141) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name SpVersionRuntimeVersion (140) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name SpVersionRuntimeVersion (136) */ ->>>>>>> chore: regenerate types interface SpVersionRuntimeVersion extends Struct { readonly specName: Text; readonly implName: Text; @@ -1751,32 +1576,7 @@ readonly stateVersion: u8; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name FrameSystemError (141) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name FrameSystemError (142) */ -======= -<<<<<<< HEAD - /** @name FrameSystemError (145) */ -======= - /** @name FrameSystemError (146) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name FrameSystemError (145) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name FrameSystemError (141) */ ->>>>>>> chore: regenerate types interface FrameSystemError extends Enum { readonly isInvalidSpecName: boolean; readonly isSpecVersionNeedsToIncrease: boolean; @@ -1787,32 +1587,7 @@ readonly type: 'InvalidSpecName' | 'SpecVersionNeedsToIncrease' | 'FailedToExtractRuntimeVersion' | 'NonDefaultComposite' | 'NonZeroRefCount' | 'CallFiltered'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2PersistedValidationData (142) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2PersistedValidationData (143) */ -======= -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2PersistedValidationData (146) */ -======= - /** @name PolkadotPrimitivesV2PersistedValidationData (147) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PolkadotPrimitivesV2PersistedValidationData (146) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PolkadotPrimitivesV2PersistedValidationData (142) */ ->>>>>>> chore: regenerate types interface PolkadotPrimitivesV2PersistedValidationData extends Struct { readonly parentHead: Bytes; readonly relayParentNumber: u32; @@ -1820,93 +1595,18 @@ readonly maxPovSize: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2UpgradeRestriction (146) */ -======= -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2UpgradeRestriction (149) */ -======= - /** @name PolkadotPrimitivesV2UpgradeRestriction (150) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PolkadotPrimitivesV2UpgradeRestriction (149) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */ ->>>>>>> chore: regenerate types interface PolkadotPrimitivesV2UpgradeRestriction extends Enum { readonly isPresent: boolean; readonly type: 'Present'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name SpTrieStorageProof (146) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name SpTrieStorageProof (147) */ -======= -<<<<<<< HEAD - /** @name SpTrieStorageProof (150) */ -======= - /** @name SpTrieStorageProof (151) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name SpTrieStorageProof (150) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name SpTrieStorageProof (146) */ ->>>>>>> chore: regenerate types interface SpTrieStorageProof extends Struct { readonly trieNodes: BTreeSet; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (149) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (152) */ -======= - /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (153) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (152) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */ ->>>>>>> chore: regenerate types interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct { readonly dmqMqcHead: H256; readonly relayDispatchQueueSize: ITuple<[u32, u32]>; @@ -1914,32 +1614,7 @@ readonly egressChannels: Vec>; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (152) */ -======= -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (155) */ -======= - /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (156) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (155) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */ ->>>>>>> chore: regenerate types interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct { readonly maxCapacity: u32; readonly maxTotalSize: u32; @@ -1949,32 +1624,7 @@ readonly mqcHead: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (153) */ -======= -<<<<<<< HEAD - /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (156) */ -======= - /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (157) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (156) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */ ->>>>>>> chore: regenerate types interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct { readonly maxCodeSize: u32; readonly maxHeadDataSize: u32; @@ -1987,63 +1637,13 @@ readonly validationUpgradeDelay: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesOutboundHrmpMessage (159) */ -======= -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesOutboundHrmpMessage (162) */ -======= - /** @name PolkadotCorePrimitivesOutboundHrmpMessage (163) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PolkadotCorePrimitivesOutboundHrmpMessage (162) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */ ->>>>>>> chore: regenerate types interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct { readonly recipient: u32; readonly data: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletParachainSystemCall (159) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name CumulusPalletParachainSystemCall (160) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletParachainSystemCall (163) */ -======= - /** @name CumulusPalletParachainSystemCall (164) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name CumulusPalletParachainSystemCall (163) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletParachainSystemCall (159) */ ->>>>>>> chore: regenerate types interface CumulusPalletParachainSystemCall extends Enum { readonly isSetValidationData: boolean; readonly asSetValidationData: { @@ -2064,32 +1664,7 @@ readonly type: 'SetValidationData' | 'SudoSendUpwardMessage' | 'AuthorizeUpgrade' | 'EnactAuthorizedUpgrade'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name CumulusPrimitivesParachainInherentParachainInherentData (161) */ -======= -<<<<<<< HEAD - /** @name CumulusPrimitivesParachainInherentParachainInherentData (164) */ -======= - /** @name CumulusPrimitivesParachainInherentParachainInherentData (165) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name CumulusPrimitivesParachainInherentParachainInherentData (164) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */ ->>>>>>> chore: regenerate types interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct { readonly validationData: PolkadotPrimitivesV2PersistedValidationData; readonly relayChainState: SpTrieStorageProof; @@ -2097,94 +1672,19 @@ readonly horizontalMessages: BTreeMap>; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesInboundDownwardMessage (163) */ -======= -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesInboundDownwardMessage (166) */ -======= - /** @name PolkadotCorePrimitivesInboundDownwardMessage (167) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PolkadotCorePrimitivesInboundDownwardMessage (166) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */ ->>>>>>> chore: regenerate types interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct { readonly sentAt: u32; readonly msg: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesInboundHrmpMessage (166) */ -======= -<<<<<<< HEAD - /** @name PolkadotCorePrimitivesInboundHrmpMessage (169) */ -======= - /** @name PolkadotCorePrimitivesInboundHrmpMessage (170) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PolkadotCorePrimitivesInboundHrmpMessage (169) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */ ->>>>>>> chore: regenerate types interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct { readonly sentAt: u32; readonly data: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletParachainSystemError (168) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name CumulusPalletParachainSystemError (169) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletParachainSystemError (172) */ -======= - /** @name CumulusPalletParachainSystemError (173) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name CumulusPalletParachainSystemError (172) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletParachainSystemError (168) */ ->>>>>>> chore: regenerate types interface CumulusPalletParachainSystemError extends Enum { readonly isOverlappingUpgrades: boolean; readonly isProhibitedByPolkadot: boolean; @@ -2197,64 +1697,14 @@ readonly type: 'OverlappingUpgrades' | 'ProhibitedByPolkadot' | 'TooBig' | 'ValidationDataNotAvailable' | 'HostConfigurationNotAvailable' | 'NotScheduled' | 'NothingAuthorized' | 'Unauthorized'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletBalancesBalanceLock (170) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletBalancesBalanceLock (171) */ -======= -<<<<<<< HEAD - /** @name PalletBalancesBalanceLock (174) */ -======= - /** @name PalletBalancesBalanceLock (175) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletBalancesBalanceLock (174) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletBalancesBalanceLock (170) */ ->>>>>>> chore: regenerate types interface PalletBalancesBalanceLock extends Struct { readonly id: U8aFixed; readonly amount: u128; readonly reasons: PalletBalancesReasons; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletBalancesReasons (171) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletBalancesReasons (172) */ -======= -<<<<<<< HEAD - /** @name PalletBalancesReasons (175) */ -======= - /** @name PalletBalancesReasons (176) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletBalancesReasons (175) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletBalancesReasons (171) */ ->>>>>>> chore: regenerate types interface PalletBalancesReasons extends Enum { readonly isFee: boolean; readonly isMisc: boolean; @@ -2262,82 +1712,13 @@ readonly type: 'Fee' | 'Misc' | 'All'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletBalancesReserveData (174) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletBalancesReserveData (175) */ -======= -<<<<<<< HEAD - /** @name PalletBalancesReserveData (178) */ -======= - /** @name PalletBalancesReserveData (179) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletBalancesReserveData (178) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletBalancesReserveData (174) */ ->>>>>>> chore: regenerate types interface PalletBalancesReserveData extends Struct { readonly id: U8aFixed; readonly amount: u128; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletBalancesCall (176) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletBalancesReleases (177) */ -======= -<<<<<<< HEAD - /** @name PalletBalancesReleases (180) */ -======= - /** @name PalletBalancesReleases (181) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletBalancesReleases (180) */ ->>>>>>> fix: regenerate types after rebase - interface PalletBalancesReleases extends Enum { - readonly isV100: boolean; - readonly isV200: boolean; - readonly type: 'V100' | 'V200'; - } - -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletBalancesCall (178) */ -======= -<<<<<<< HEAD - /** @name PalletBalancesCall (181) */ -======= - /** @name PalletBalancesCall (182) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletBalancesCall (181) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletBalancesCall (176) */ ->>>>>>> chore: regenerate types interface PalletBalancesCall extends Enum { readonly isTransfer: boolean; readonly asTransfer: { @@ -2374,32 +1755,7 @@ readonly type: 'Transfer' | 'SetBalance' | 'ForceTransfer' | 'TransferKeepAlive' | 'TransferAll' | 'ForceUnreserve'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletBalancesError (179) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletBalancesError (181) */ -======= -<<<<<<< HEAD - /** @name PalletBalancesError (184) */ -======= - /** @name PalletBalancesError (185) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletBalancesError (184) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletBalancesError (179) */ ->>>>>>> chore: regenerate types interface PalletBalancesError extends Enum { readonly isVestingBalance: boolean; readonly isLiquidityRestrictions: boolean; @@ -2412,32 +1768,7 @@ readonly type: 'VestingBalance' | 'LiquidityRestrictions' | 'InsufficientBalance' | 'ExistentialDeposit' | 'KeepAlive' | 'ExistingVestingSchedule' | 'DeadAccount' | 'TooManyReserves'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletTimestampCall (181) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletTimestampCall (183) */ -======= -<<<<<<< HEAD - /** @name PalletTimestampCall (186) */ -======= - /** @name PalletTimestampCall (187) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletTimestampCall (186) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletTimestampCall (181) */ ->>>>>>> chore: regenerate types interface PalletTimestampCall extends Enum { readonly isSet: boolean; readonly asSet: { @@ -2446,64 +1777,14 @@ readonly type: 'Set'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletTransactionPaymentReleases (183) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletTransactionPaymentReleases (185) */ -======= -<<<<<<< HEAD - /** @name PalletTransactionPaymentReleases (188) */ -======= - /** @name PalletTransactionPaymentReleases (189) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletTransactionPaymentReleases (188) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletTransactionPaymentReleases (183) */ ->>>>>>> chore: regenerate types interface PalletTransactionPaymentReleases extends Enum { readonly isV1Ancient: boolean; readonly isV2: boolean; readonly type: 'V1Ancient' | 'V2'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletTreasuryProposal (184) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletTreasuryProposal (186) */ -======= -<<<<<<< HEAD - /** @name PalletTreasuryProposal (189) */ -======= - /** @name PalletTreasuryProposal (190) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletTreasuryProposal (189) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletTreasuryProposal (184) */ ->>>>>>> chore: regenerate types interface PalletTreasuryProposal extends Struct { readonly proposer: AccountId32; readonly value: u128; @@ -2511,32 +1792,7 @@ readonly bond: u128; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletTreasuryCall (187) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletTreasuryCall (189) */ -======= -<<<<<<< HEAD - /** @name PalletTreasuryCall (192) */ -======= - /** @name PalletTreasuryCall (193) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletTreasuryCall (192) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletTreasuryCall (187) */ ->>>>>>> chore: regenerate types interface PalletTreasuryCall extends Enum { readonly isProposeSpend: boolean; readonly asProposeSpend: { @@ -2563,49 +1819,10 @@ readonly type: 'ProposeSpend' | 'RejectProposal' | 'ApproveProposal' | 'Spend' | 'RemoveApproval'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name FrameSupportPalletId (190) */ interface FrameSupportPalletId extends U8aFixed {} /** @name PalletTreasuryError (191) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name FrameSupportPalletId (192) */ - interface FrameSupportPalletId extends U8aFixed {} - - /** @name PalletTreasuryError (193) */ -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - /** @name FrameSupportPalletId (195) */ - interface FrameSupportPalletId extends U8aFixed {} - - /** @name PalletTreasuryError (196) */ -<<<<<<< HEAD -======= - /** @name FrameSupportPalletId (196) */ - interface FrameSupportPalletId extends U8aFixed {} - - /** @name PalletTreasuryError (197) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name FrameSupportPalletId (190) */ - interface FrameSupportPalletId extends U8aFixed {} - - /** @name PalletTreasuryError (191) */ ->>>>>>> chore: regenerate types interface PalletTreasuryError extends Enum { readonly isInsufficientProposersBalance: boolean; readonly isInvalidIndex: boolean; @@ -2615,32 +1832,7 @@ readonly type: 'InsufficientProposersBalance' | 'InvalidIndex' | 'TooManyApprovals' | 'InsufficientPermission' | 'ProposalNotApproved'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletSudoCall (192) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletSudoCall (194) */ -======= -<<<<<<< HEAD - /** @name PalletSudoCall (197) */ -======= - /** @name PalletSudoCall (198) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletSudoCall (197) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletSudoCall (192) */ ->>>>>>> chore: regenerate types interface PalletSudoCall extends Enum { readonly isSudo: boolean; readonly asSudo: { @@ -2663,32 +1855,7 @@ readonly type: 'Sudo' | 'SudoUncheckedWeight' | 'SetKey' | 'SudoAs'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlVestingModuleCall (194) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name OrmlVestingModuleCall (196) */ -======= -<<<<<<< HEAD - /** @name OrmlVestingModuleCall (199) */ -======= - /** @name OrmlVestingModuleCall (200) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name OrmlVestingModuleCall (199) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlVestingModuleCall (194) */ ->>>>>>> chore: regenerate types interface OrmlVestingModuleCall extends Enum { readonly isClaim: boolean; readonly isVestedTransfer: boolean; @@ -2708,32 +1875,7 @@ readonly type: 'Claim' | 'VestedTransfer' | 'UpdateVestingSchedules' | 'ClaimFor'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlXtokensModuleCall (196) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name OrmlXtokensModuleCall (198) */ -======= -<<<<<<< HEAD - /** @name OrmlXtokensModuleCall (201) */ -======= - /** @name OrmlXtokensModuleCall (202) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name OrmlXtokensModuleCall (201) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlXtokensModuleCall (196) */ ->>>>>>> chore: regenerate types interface OrmlXtokensModuleCall extends Enum { readonly isTransfer: boolean; readonly asTransfer: { @@ -2780,32 +1922,7 @@ readonly type: 'Transfer' | 'TransferMultiasset' | 'TransferWithFee' | 'TransferMultiassetWithFee' | 'TransferMulticurrencies' | 'TransferMultiassets'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name XcmVersionedMultiAsset (197) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmVersionedMultiAsset (199) */ -======= -<<<<<<< HEAD - /** @name XcmVersionedMultiAsset (202) */ -======= - /** @name XcmVersionedMultiAsset (203) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmVersionedMultiAsset (202) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name XcmVersionedMultiAsset (197) */ ->>>>>>> chore: regenerate types interface XcmVersionedMultiAsset extends Enum { readonly isV0: boolean; readonly asV0: XcmV0MultiAsset; @@ -2814,32 +1931,7 @@ readonly type: 'V0' | 'V1'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlTokensModuleCall (200) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name OrmlTokensModuleCall (202) */ -======= -<<<<<<< HEAD - /** @name OrmlTokensModuleCall (205) */ -======= - /** @name OrmlTokensModuleCall (206) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name OrmlTokensModuleCall (205) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlTokensModuleCall (200) */ ->>>>>>> chore: regenerate types interface OrmlTokensModuleCall extends Enum { readonly isTransfer: boolean; readonly asTransfer: { @@ -2876,32 +1968,7 @@ readonly type: 'Transfer' | 'TransferAll' | 'TransferKeepAlive' | 'ForceTransfer' | 'SetBalance'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueCall (201) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueCall (203) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueCall (206) */ -======= - /** @name CumulusPalletXcmpQueueCall (207) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name CumulusPalletXcmpQueueCall (206) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name CumulusPalletXcmpQueueCall (201) */ ->>>>>>> chore: regenerate types interface CumulusPalletXcmpQueueCall extends Enum { readonly isServiceOverweight: boolean; readonly asServiceOverweight: { @@ -2937,32 +2004,7 @@ readonly type: 'ServiceOverweight' | 'SuspendXcmExecution' | 'ResumeXcmExecution' | 'UpdateSuspendThreshold' | 'UpdateDropThreshold' | 'UpdateResumeThreshold' | 'UpdateThresholdWeight' | 'UpdateWeightRestrictDecay' | 'UpdateXcmpMaxIndividualWeight'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletXcmCall (202) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletXcmCall (204) */ -======= -<<<<<<< HEAD - /** @name PalletXcmCall (207) */ -======= - /** @name PalletXcmCall (208) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletXcmCall (207) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletXcmCall (202) */ ->>>>>>> chore: regenerate types interface PalletXcmCall extends Enum { readonly isSend: boolean; readonly asSend: { @@ -3024,32 +2066,7 @@ readonly type: 'Send' | 'TeleportAssets' | 'ReserveTransferAssets' | 'Execute' | 'ForceXcmVersion' | 'ForceDefaultXcmVersion' | 'ForceSubscribeVersionNotify' | 'ForceUnsubscribeVersionNotify' | 'LimitedReserveTransferAssets' | 'LimitedTeleportAssets'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name XcmVersionedXcm (203) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmVersionedXcm (205) */ -======= -<<<<<<< HEAD - /** @name XcmVersionedXcm (208) */ -======= - /** @name XcmVersionedXcm (209) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmVersionedXcm (208) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name XcmVersionedXcm (203) */ ->>>>>>> chore: regenerate types interface XcmVersionedXcm extends Enum { readonly isV0: boolean; readonly asV0: XcmV0Xcm; @@ -3060,32 +2077,7 @@ readonly type: 'V0' | 'V1' | 'V2'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name XcmV0Xcm (204) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmV0Xcm (206) */ -======= -<<<<<<< HEAD - /** @name XcmV0Xcm (209) */ -======= - /** @name XcmV0Xcm (210) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmV0Xcm (209) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name XcmV0Xcm (204) */ ->>>>>>> chore: regenerate types interface XcmV0Xcm extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: { @@ -3148,32 +2140,7 @@ readonly type: 'WithdrawAsset' | 'ReserveAssetDeposit' | 'TeleportAsset' | 'QueryResponse' | 'TransferAsset' | 'TransferReserveAsset' | 'Transact' | 'HrmpNewChannelOpenRequest' | 'HrmpChannelAccepted' | 'HrmpChannelClosing' | 'RelayedFrom'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name XcmV0Order (206) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmV0Order (208) */ -======= -<<<<<<< HEAD - /** @name XcmV0Order (211) */ -======= - /** @name XcmV0Order (212) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmV0Order (211) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name XcmV0Order (206) */ ->>>>>>> chore: regenerate types interface XcmV0Order extends Enum { readonly isNull: boolean; readonly isDepositAsset: boolean; @@ -3221,64 +2188,14 @@ readonly type: 'Null' | 'DepositAsset' | 'DepositReserveAsset' | 'ExchangeAsset' | 'InitiateReserveWithdraw' | 'InitiateTeleport' | 'QueryHolding' | 'BuyExecution'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name XcmV0Response (208) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmV0Response (210) */ -======= -<<<<<<< HEAD - /** @name XcmV0Response (213) */ -======= - /** @name XcmV0Response (214) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmV0Response (213) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name XcmV0Response (208) */ ->>>>>>> chore: regenerate types interface XcmV0Response extends Enum { readonly isAssets: boolean; readonly asAssets: Vec; readonly type: 'Assets'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name XcmV1Xcm (209) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmV1Xcm (211) */ -======= -<<<<<<< HEAD - /** @name XcmV1Xcm (214) */ -======= - /** @name XcmV1Xcm (215) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmV1Xcm (214) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name XcmV1Xcm (209) */ ->>>>>>> chore: regenerate types interface XcmV1Xcm extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: { @@ -3347,32 +2264,7 @@ readonly type: 'WithdrawAsset' | 'ReserveAssetDeposited' | 'ReceiveTeleportedAsset' | 'QueryResponse' | 'TransferAsset' | 'TransferReserveAsset' | 'Transact' | 'HrmpNewChannelOpenRequest' | 'HrmpChannelAccepted' | 'HrmpChannelClosing' | 'RelayedFrom' | 'SubscribeVersion' | 'UnsubscribeVersion'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name XcmV1Order (211) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmV1Order (213) */ -======= -<<<<<<< HEAD - /** @name XcmV1Order (216) */ -======= - /** @name XcmV1Order (217) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmV1Order (216) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name XcmV1Order (211) */ ->>>>>>> chore: regenerate types interface XcmV1Order extends Enum { readonly isNoop: boolean; readonly isDepositAsset: boolean; @@ -3422,32 +2314,7 @@ readonly type: 'Noop' | 'DepositAsset' | 'DepositReserveAsset' | 'ExchangeAsset' | 'InitiateReserveWithdraw' | 'InitiateTeleport' | 'QueryHolding' | 'BuyExecution'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name XcmV1Response (213) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name XcmV1Response (215) */ -======= -<<<<<<< HEAD - /** @name XcmV1Response (218) */ -======= - /** @name XcmV1Response (219) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name XcmV1Response (218) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name XcmV1Response (213) */ ->>>>>>> chore: regenerate types interface XcmV1Response extends Enum { readonly isAssets: boolean; readonly asAssets: XcmV1MultiassetMultiAssets; @@ -3456,49 +2323,10 @@ readonly type: 'Assets' | 'Version'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletXcmCall (227) */ type CumulusPalletXcmCall = Null; /** @name CumulusPalletDmpQueueCall (228) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name CumulusPalletXcmCall (229) */ - type CumulusPalletXcmCall = Null; - - /** @name CumulusPalletDmpQueueCall (230) */ -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - /** @name CumulusPalletXcmCall (232) */ - type CumulusPalletXcmCall = Null; - - /** @name CumulusPalletDmpQueueCall (233) */ -<<<<<<< HEAD -======= - /** @name CumulusPalletXcmCall (233) */ - type CumulusPalletXcmCall = Null; - - /** @name CumulusPalletDmpQueueCall (234) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletXcmCall (227) */ - type CumulusPalletXcmCall = Null; - - /** @name CumulusPalletDmpQueueCall (228) */ ->>>>>>> chore: regenerate types interface CumulusPalletDmpQueueCall extends Enum { readonly isServiceOverweight: boolean; readonly asServiceOverweight: { @@ -3508,32 +2336,7 @@ readonly type: 'ServiceOverweight'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletInflationCall (229) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletInflationCall (231) */ -======= -<<<<<<< HEAD - /** @name PalletInflationCall (234) */ -======= - /** @name PalletInflationCall (235) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletInflationCall (234) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletInflationCall (229) */ ->>>>>>> chore: regenerate types interface PalletInflationCall extends Enum { readonly isStartInflation: boolean; readonly asStartInflation: { @@ -3542,32 +2345,7 @@ readonly type: 'StartInflation'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletUniqueCall (230) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletUniqueCall (232) */ -======= -<<<<<<< HEAD - /** @name PalletUniqueCall (235) */ -======= - /** @name PalletUniqueCall (236) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletUniqueCall (235) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletUniqueCall (230) */ ->>>>>>> chore: regenerate types interface PalletUniqueCall extends Enum { readonly isCreateCollection: boolean; readonly asCreateCollection: { @@ -3740,32 +2518,7 @@ 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'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsCollectionMode (235) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCollectionMode (237) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCollectionMode (240) */ -======= - /** @name UpDataStructsCollectionMode (241) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCollectionMode (240) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsCollectionMode (235) */ ->>>>>>> chore: regenerate types interface UpDataStructsCollectionMode extends Enum { readonly isNft: boolean; readonly isFungible: boolean; @@ -3774,32 +2527,7 @@ readonly type: 'Nft' | 'Fungible' | 'ReFungible'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCreateCollectionData (236) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateCollectionData (238) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateCollectionData (241) */ -======= - /** @name UpDataStructsCreateCollectionData (242) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateCollectionData (241) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCreateCollectionData (236) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateCollectionData extends Struct { readonly mode: UpDataStructsCollectionMode; readonly access: Option; @@ -3813,64 +2541,14 @@ readonly properties: Vec; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsAccessMode (238) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsAccessMode (240) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsAccessMode (243) */ -======= - /** @name UpDataStructsAccessMode (244) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsAccessMode (243) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsAccessMode (238) */ ->>>>>>> chore: regenerate types interface UpDataStructsAccessMode extends Enum { readonly isNormal: boolean; readonly isAllowList: boolean; readonly type: 'Normal' | 'AllowList'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCollectionLimits (240) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCollectionLimits (242) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCollectionLimits (245) */ -======= - /** @name UpDataStructsCollectionLimits (246) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCollectionLimits (245) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCollectionLimits (240) */ ->>>>>>> chore: regenerate types interface UpDataStructsCollectionLimits extends Struct { readonly accountTokenOwnershipLimit: Option; readonly sponsoredDataSize: Option; @@ -3883,32 +2561,7 @@ readonly transfersEnabled: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsSponsoringRateLimit (242) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsSponsoringRateLimit (244) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsSponsoringRateLimit (247) */ -======= - /** @name UpDataStructsSponsoringRateLimit (248) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsSponsoringRateLimit (247) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsSponsoringRateLimit (242) */ ->>>>>>> chore: regenerate types interface UpDataStructsSponsoringRateLimit extends Enum { readonly isSponsoringDisabled: boolean; readonly isBlocks: boolean; @@ -3916,207 +2569,43 @@ readonly type: 'SponsoringDisabled' | 'Blocks'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCollectionPermissions (245) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCollectionPermissions (247) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCollectionPermissions (250) */ -======= - /** @name UpDataStructsCollectionPermissions (251) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCollectionPermissions (250) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCollectionPermissions (245) */ ->>>>>>> chore: regenerate types interface UpDataStructsCollectionPermissions extends Struct { readonly access: Option; readonly mintMode: Option; readonly nesting: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsNestingPermissions (247) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsNestingPermissions (249) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsNestingPermissions (252) */ -======= - /** @name UpDataStructsNestingPermissions (253) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsNestingPermissions (252) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsNestingPermissions (247) */ ->>>>>>> chore: regenerate types interface UpDataStructsNestingPermissions extends Struct { readonly tokenOwner: bool; readonly collectionAdmin: bool; readonly restricted: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsOwnerRestrictedSet (249) */ interface UpDataStructsOwnerRestrictedSet extends BTreeSet {} /** @name UpDataStructsPropertyKeyPermission (254) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsOwnerRestrictedSet (251) */ - interface UpDataStructsOwnerRestrictedSet extends BTreeSet {} - - /** @name UpDataStructsPropertyKeyPermission (256) */ -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - /** @name UpDataStructsOwnerRestrictedSet (254) */ - interface UpDataStructsOwnerRestrictedSet extends BTreeSet {} - - /** @name UpDataStructsPropertyKeyPermission (259) */ -<<<<<<< HEAD -======= - /** @name UpDataStructsOwnerRestrictedSet (255) */ - interface UpDataStructsOwnerRestrictedSet extends BTreeSet {} - - /** @name UpDataStructsPropertyKeyPermission (260) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsOwnerRestrictedSet (249) */ - interface UpDataStructsOwnerRestrictedSet extends BTreeSet {} - - /** @name UpDataStructsPropertyKeyPermission (254) */ ->>>>>>> chore: regenerate types interface UpDataStructsPropertyKeyPermission extends Struct { readonly key: Bytes; readonly permission: UpDataStructsPropertyPermission; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsPropertyPermission (255) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsPropertyPermission (257) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsPropertyPermission (260) */ -======= - /** @name UpDataStructsPropertyPermission (261) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsPropertyPermission (260) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsPropertyPermission (255) */ ->>>>>>> chore: regenerate types interface UpDataStructsPropertyPermission extends Struct { readonly mutable: bool; readonly collectionAdmin: bool; readonly tokenOwner: bool; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsProperty (258) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsProperty (260) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsProperty (263) */ -======= - /** @name UpDataStructsProperty (264) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsProperty (263) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsProperty (258) */ ->>>>>>> chore: regenerate types interface UpDataStructsProperty extends Struct { readonly key: Bytes; readonly value: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCreateItemData (261) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateItemData (263) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateItemData (266) */ -======= - /** @name UpDataStructsCreateItemData (267) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateItemData (266) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCreateItemData (261) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateItemData extends Enum { readonly isNft: boolean; readonly asNft: UpDataStructsCreateNftData; @@ -4127,123 +2616,23 @@ readonly type: 'Nft' | 'Fungible' | 'ReFungible'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCreateNftData (262) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateNftData (264) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateNftData (267) */ -======= - /** @name UpDataStructsCreateNftData (268) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateNftData (267) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCreateNftData (262) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateNftData extends Struct { readonly properties: Vec; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCreateFungibleData (263) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateFungibleData (265) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateFungibleData (268) */ -======= - /** @name UpDataStructsCreateFungibleData (269) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateFungibleData (268) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCreateFungibleData (263) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateFungibleData extends Struct { readonly value: u128; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCreateReFungibleData (264) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateReFungibleData (266) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateReFungibleData (269) */ -======= - /** @name UpDataStructsCreateReFungibleData (270) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateReFungibleData (269) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCreateReFungibleData (264) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateReFungibleData extends Struct { readonly pieces: u128; readonly properties: Vec; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsCreateItemExData (267) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateItemExData (269) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateItemExData (272) */ -======= - /** @name UpDataStructsCreateItemExData (273) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateItemExData (272) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsCreateItemExData (267) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateItemExData extends Enum { readonly isNft: boolean; readonly asNft: Vec; @@ -4256,177 +2645,26 @@ readonly type: 'Nft' | 'Fungible' | 'RefungibleMultipleItems' | 'RefungibleMultipleOwners'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCreateNftExData (269) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateNftExData (271) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateNftExData (274) */ -======= - /** @name UpDataStructsCreateNftExData (275) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateNftExData (274) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCreateNftExData (269) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateNftExData extends Struct { readonly properties: Vec; readonly owner: PalletEvmAccountBasicCrossAccountIdRepr; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateRefungibleExSingleOwner (278) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateRefungibleExSingleOwner (281) */ -======= - /** @name UpDataStructsCreateRefungibleExSingleOwner (282) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateRefungibleExSingleOwner (281) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateRefungibleExSingleOwner extends Struct { readonly user: PalletEvmAccountBasicCrossAccountIdRepr; readonly pieces: u128; readonly properties: Vec; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsCreateRefungibleExMultipleOwners (280) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCreateRefungibleExMultipleOwners (283) */ -======= - /** @name UpDataStructsCreateRefungibleExMultipleOwners (284) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsCreateRefungibleExMultipleOwners (283) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */ ->>>>>>> chore: regenerate types interface UpDataStructsCreateRefungibleExMultipleOwners extends Struct { readonly users: BTreeMap; readonly properties: Vec; - } - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletConfigurationCall (279) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletConfigurationCall (281) */ -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - /** @name PalletUniqueSchedulerV2Call (284) */ - interface PalletUniqueSchedulerV2Call extends Enum { - readonly isSchedule: boolean; - readonly asSchedule: { - readonly when: u32; - readonly maybePeriodic: Option>; - readonly priority: Option; - readonly call: Call; - } & Struct; - readonly isCancel: boolean; - readonly asCancel: { - readonly when: u32; - readonly index: u32; - } & Struct; - readonly isScheduleNamed: boolean; - readonly asScheduleNamed: { - readonly id: U8aFixed; - readonly when: u32; - readonly maybePeriodic: Option>; - readonly priority: Option; - readonly call: Call; - } & Struct; - readonly isCancelNamed: boolean; - readonly asCancelNamed: { - readonly id: U8aFixed; - } & Struct; - readonly isScheduleAfter: boolean; - readonly asScheduleAfter: { - readonly after: u32; - readonly maybePeriodic: Option>; - readonly priority: Option; - readonly call: Call; - } & Struct; - readonly isScheduleNamedAfter: boolean; - readonly asScheduleNamedAfter: { - readonly id: U8aFixed; - readonly after: u32; - readonly maybePeriodic: Option>; - readonly priority: Option; - readonly call: Call; - } & Struct; - readonly isChangeNamedPriority: boolean; - readonly asChangeNamedPriority: { - readonly id: U8aFixed; - readonly priority: u8; - } & Struct; - readonly type: 'Schedule' | 'Cancel' | 'ScheduleNamed' | 'CancelNamed' | 'ScheduleAfter' | 'ScheduleNamedAfter' | 'ChangeNamedPriority'; } - /** @name PalletConfigurationCall (287) */ -<<<<<<< HEAD -======= - /** @name PalletConfigurationCall (288) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletConfigurationCall (279) */ ->>>>>>> chore: regenerate types interface PalletConfigurationCall extends Enum { readonly isSetWeightToFeeCoefficientOverride: boolean; readonly asSetWeightToFeeCoefficientOverride: { @@ -4455,45 +2693,13 @@ readonly maxStakersPerCalculation: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletTemplateTransactionPaymentCall (288) */ -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - /** @name PalletTemplateTransactionPaymentCall (289) */ ->>>>>>> chore: regenerate types -======= - /** @name PalletTemplateTransactionPaymentCall (288) */ ->>>>>>> chore: regenerate types type PalletTemplateTransactionPaymentCall = Null; /** @name PalletStructureCall (289) */ - type PalletStructureCall = Null; - -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletRmrkCoreCall (290) */ -======= - /** @name PalletRmrkCoreCall (291) */ -<<<<<<< HEAD -======= - /** @name PalletTemplateTransactionPaymentCall (290) */ - type PalletTemplateTransactionPaymentCall = Null; - - /** @name PalletStructureCall (291) */ type PalletStructureCall = Null; - /** @name PalletRmrkCoreCall (292) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletRmrkCoreCall (290) */ ->>>>>>> chore: regenerate types interface PalletRmrkCoreCall extends Enum { readonly isCreateCollection: boolean; readonly asCreateCollection: { @@ -4599,23 +2805,7 @@ readonly type: 'CreateCollection' | 'DestroyCollection' | 'ChangeCollectionIssuer' | 'LockCollection' | 'MintNft' | 'BurnNft' | 'Send' | 'AcceptNft' | 'RejectNft' | 'AcceptResource' | 'AcceptResourceRemoval' | 'SetProperty' | 'SetPriority' | 'AddBasicResource' | 'AddComposableResource' | 'AddSlotResource' | 'RemoveResource'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsResourceResourceTypes (296) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsResourceResourceTypes (297) */ -======= - /** @name RmrkTraitsResourceResourceTypes (298) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsResourceResourceTypes (297) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsResourceResourceTypes (296) */ ->>>>>>> chore: regenerate types interface RmrkTraitsResourceResourceTypes extends Enum { readonly isBasic: boolean; readonly asBasic: RmrkTraitsResourceBasicResource; @@ -4626,23 +2816,7 @@ readonly type: 'Basic' | 'Composable' | 'Slot'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsResourceBasicResource (298) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsResourceBasicResource (299) */ -======= - /** @name RmrkTraitsResourceBasicResource (300) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsResourceBasicResource (299) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsResourceBasicResource (298) */ ->>>>>>> chore: regenerate types interface RmrkTraitsResourceBasicResource extends Struct { readonly src: Option; readonly metadata: Option; @@ -4650,23 +2824,7 @@ readonly thumb: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsResourceComposableResource (300) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsResourceComposableResource (301) */ -======= - /** @name RmrkTraitsResourceComposableResource (302) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsResourceComposableResource (301) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsResourceComposableResource (300) */ ->>>>>>> chore: regenerate types interface RmrkTraitsResourceComposableResource extends Struct { readonly parts: Vec; readonly base: u32; @@ -4676,23 +2834,7 @@ readonly thumb: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsResourceSlotResource (301) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsResourceSlotResource (302) */ -======= - /** @name RmrkTraitsResourceSlotResource (303) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsResourceSlotResource (302) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsResourceSlotResource (301) */ ->>>>>>> chore: regenerate types interface RmrkTraitsResourceSlotResource extends Struct { readonly base: u32; readonly src: Option; @@ -4702,23 +2844,7 @@ readonly thumb: Option; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletRmrkEquipCall (304) */ -======= -<<<<<<< HEAD - /** @name PalletRmrkEquipCall (305) */ -======= - /** @name PalletRmrkEquipCall (306) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletRmrkEquipCall (305) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletRmrkEquipCall (304) */ ->>>>>>> chore: regenerate types interface PalletRmrkEquipCall extends Enum { readonly isCreateBase: boolean; readonly asCreateBase: { @@ -4740,23 +2866,7 @@ readonly type: 'CreateBase' | 'ThemeAdd' | 'Equippable'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsPartPartType (307) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsPartPartType (308) */ -======= - /** @name RmrkTraitsPartPartType (309) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsPartPartType (308) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsPartPartType (307) */ ->>>>>>> chore: regenerate types interface RmrkTraitsPartPartType extends Enum { readonly isFixedPart: boolean; readonly asFixedPart: RmrkTraitsPartFixedPart; @@ -4765,46 +2875,14 @@ readonly type: 'FixedPart' | 'SlotPart'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsPartFixedPart (309) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsPartFixedPart (310) */ -======= - /** @name RmrkTraitsPartFixedPart (311) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsPartFixedPart (310) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsPartFixedPart (309) */ ->>>>>>> chore: regenerate types interface RmrkTraitsPartFixedPart extends Struct { readonly id: u32; readonly z: u32; readonly src: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsPartSlotPart (310) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsPartSlotPart (311) */ -======= - /** @name RmrkTraitsPartSlotPart (312) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsPartSlotPart (311) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsPartSlotPart (310) */ ->>>>>>> chore: regenerate types interface RmrkTraitsPartSlotPart extends Struct { readonly id: u32; readonly equippable: RmrkTraitsPartEquippableList; @@ -4812,23 +2890,7 @@ readonly z: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsPartEquippableList (311) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsPartEquippableList (312) */ -======= - /** @name RmrkTraitsPartEquippableList (313) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsPartEquippableList (312) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsPartEquippableList (311) */ ->>>>>>> chore: regenerate types interface RmrkTraitsPartEquippableList extends Enum { readonly isAll: boolean; readonly isEmpty: boolean; @@ -4837,68 +2899,20 @@ readonly type: 'All' | 'Empty' | 'Custom'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsTheme (313) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsTheme (314) */ -======= - /** @name RmrkTraitsTheme (315) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsTheme (314) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsTheme (313) */ ->>>>>>> chore: regenerate types interface RmrkTraitsTheme extends Struct { readonly name: Bytes; readonly properties: Vec; readonly inherit: bool; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsThemeThemeProperty (315) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsThemeThemeProperty (316) */ -======= - /** @name RmrkTraitsThemeThemeProperty (317) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name RmrkTraitsThemeThemeProperty (316) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsThemeThemeProperty (315) */ ->>>>>>> chore: regenerate types interface RmrkTraitsThemeThemeProperty extends Struct { readonly key: Bytes; readonly value: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletAppPromotionCall (317) */ -======= -<<<<<<< HEAD - /** @name PalletAppPromotionCall (318) */ -======= - /** @name PalletAppPromotionCall (319) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletAppPromotionCall (318) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletAppPromotionCall (317) */ ->>>>>>> chore: regenerate types interface PalletAppPromotionCall extends Enum { readonly isSetAdminAddress: boolean; readonly asSetAdminAddress: { @@ -4932,23 +2946,7 @@ readonly type: 'SetAdminAddress' | 'Stake' | 'Unstake' | 'SponsorCollection' | 'StopSponsoringCollection' | 'SponsorContract' | 'StopSponsoringContract' | 'PayoutStakers'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletForeignAssetsModuleCall (318) */ -======= -<<<<<<< HEAD - /** @name PalletForeignAssetsModuleCall (319) */ -======= - /** @name PalletForeignAssetsModuleCall (320) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletForeignAssetsModuleCall (319) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletForeignAssetsModuleCall (318) */ ->>>>>>> chore: regenerate types interface PalletForeignAssetsModuleCall extends Enum { readonly isRegisterForeignAsset: boolean; readonly asRegisterForeignAsset: { @@ -4965,23 +2963,7 @@ readonly type: 'RegisterForeignAsset' | 'UpdateForeignAsset'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletEvmCall (319) */ -======= -<<<<<<< HEAD - /** @name PalletEvmCall (320) */ -======= - /** @name PalletEvmCall (321) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletEvmCall (320) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletEvmCall (319) */ ->>>>>>> chore: regenerate types interface PalletEvmCall extends Enum { readonly isWithdraw: boolean; readonly asWithdraw: { @@ -5026,23 +3008,7 @@ readonly type: 'Withdraw' | 'Call' | 'Create' | 'Create2'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletEthereumCall (325) */ -======= -<<<<<<< HEAD - /** @name PalletEthereumCall (326) */ -======= - /** @name PalletEthereumCall (325) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletEthereumCall (326) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletEthereumCall (325) */ ->>>>>>> chore: regenerate types interface PalletEthereumCall extends Enum { readonly isTransact: boolean; readonly asTransact: { @@ -5051,23 +3017,7 @@ readonly type: 'Transact'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name EthereumTransactionTransactionV2 (326) */ -======= -<<<<<<< HEAD - /** @name EthereumTransactionTransactionV2 (327) */ -======= - /** @name EthereumTransactionTransactionV2 (326) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name EthereumTransactionTransactionV2 (327) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name EthereumTransactionTransactionV2 (326) */ ->>>>>>> chore: regenerate types interface EthereumTransactionTransactionV2 extends Enum { readonly isLegacy: boolean; readonly asLegacy: EthereumTransactionLegacyTransaction; @@ -5078,23 +3028,7 @@ readonly type: 'Legacy' | 'Eip2930' | 'Eip1559'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name EthereumTransactionLegacyTransaction (327) */ -======= -<<<<<<< HEAD - /** @name EthereumTransactionLegacyTransaction (328) */ -======= - /** @name EthereumTransactionLegacyTransaction (327) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name EthereumTransactionLegacyTransaction (328) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name EthereumTransactionLegacyTransaction (327) */ ->>>>>>> chore: regenerate types interface EthereumTransactionLegacyTransaction extends Struct { readonly nonce: U256; readonly gasPrice: U256; @@ -5105,23 +3039,7 @@ readonly signature: EthereumTransactionTransactionSignature; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name EthereumTransactionTransactionAction (328) */ -======= -<<<<<<< HEAD - /** @name EthereumTransactionTransactionAction (329) */ -======= - /** @name EthereumTransactionTransactionAction (328) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name EthereumTransactionTransactionAction (329) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name EthereumTransactionTransactionAction (328) */ ->>>>>>> chore: regenerate types interface EthereumTransactionTransactionAction extends Enum { readonly isCall: boolean; readonly asCall: H160; @@ -5129,46 +3047,14 @@ readonly type: 'Call' | 'Create'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name EthereumTransactionTransactionSignature (329) */ -======= -<<<<<<< HEAD - /** @name EthereumTransactionTransactionSignature (330) */ -======= /** @name EthereumTransactionTransactionSignature (329) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name EthereumTransactionTransactionSignature (330) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name EthereumTransactionTransactionSignature (329) */ ->>>>>>> chore: regenerate types interface EthereumTransactionTransactionSignature extends Struct { readonly v: u64; readonly r: H256; readonly s: H256; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name EthereumTransactionEip2930Transaction (331) */ -======= -<<<<<<< HEAD - /** @name EthereumTransactionEip2930Transaction (332) */ -======= - /** @name EthereumTransactionEip2930Transaction (331) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name EthereumTransactionEip2930Transaction (332) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name EthereumTransactionEip2930Transaction (331) */ ->>>>>>> chore: regenerate types interface EthereumTransactionEip2930Transaction extends Struct { readonly chainId: u64; readonly nonce: U256; @@ -5183,45 +3069,13 @@ readonly s: H256; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name EthereumTransactionAccessListItem (333) */ -======= -<<<<<<< HEAD - /** @name EthereumTransactionAccessListItem (334) */ -======= - /** @name EthereumTransactionAccessListItem (333) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name EthereumTransactionAccessListItem (334) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name EthereumTransactionAccessListItem (333) */ ->>>>>>> chore: regenerate types interface EthereumTransactionAccessListItem extends Struct { readonly address: H160; readonly storageKeys: Vec; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name EthereumTransactionEip1559Transaction (334) */ -======= -<<<<<<< HEAD - /** @name EthereumTransactionEip1559Transaction (335) */ -======= /** @name EthereumTransactionEip1559Transaction (334) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name EthereumTransactionEip1559Transaction (335) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name EthereumTransactionEip1559Transaction (334) */ ->>>>>>> chore: regenerate types interface EthereumTransactionEip1559Transaction extends Struct { readonly chainId: u64; readonly nonce: U256; @@ -5237,23 +3091,7 @@ readonly s: H256; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletEvmMigrationCall (335) */ -======= -<<<<<<< HEAD - /** @name PalletEvmMigrationCall (336) */ -======= /** @name PalletEvmMigrationCall (335) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletEvmMigrationCall (336) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletEvmMigrationCall (335) */ ->>>>>>> chore: regenerate types interface PalletEvmMigrationCall extends Enum { readonly isBegin: boolean; readonly asBegin: { @@ -5280,38 +3118,14 @@ readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletMaintenanceCall (339) */ -======= - /** @name PalletMaintenanceCall (338) */ ->>>>>>> chore: regenerate types -======= - /** @name PalletMaintenanceCall (340) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletMaintenanceCall (339) */ ->>>>>>> chore: regenerate types interface PalletMaintenanceCall extends Enum { readonly isEnable: boolean; readonly isDisable: boolean; readonly type: 'Enable' | 'Disable'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletTestUtilsCall (340) */ -======= - /** @name PalletTestUtilsCall (339) */ ->>>>>>> chore: regenerate types -======= - /** @name PalletTestUtilsCall (341) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletTestUtilsCall (340) */ ->>>>>>> chore: regenerate types interface PalletTestUtilsCall extends Enum { readonly isEnable: boolean; readonly isSetTestValue: boolean; @@ -5331,45 +3145,13 @@ readonly type: 'Enable' | 'SetTestValue' | 'SetTestValueAndRollback' | 'IncTestValue' | 'JustTakeFee' | 'BatchAll'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PalletSudoError (342) */ -======= -<<<<<<< HEAD - /** @name PalletSudoError (343) */ -======= - /** @name PalletSudoError (341) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletSudoError (343) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PalletSudoError (342) */ ->>>>>>> chore: regenerate types interface PalletSudoError extends Enum { readonly isRequireSudo: boolean; readonly type: 'RequireSudo'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlVestingModuleError (344) */ -======= -<<<<<<< HEAD - /** @name OrmlVestingModuleError (345) */ -======= - /** @name OrmlVestingModuleError (343) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name OrmlVestingModuleError (345) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlVestingModuleError (344) */ ->>>>>>> chore: regenerate types interface OrmlVestingModuleError extends Enum { readonly isZeroVestingPeriod: boolean; readonly isZeroVestingPeriodCount: boolean; @@ -5380,23 +3162,7 @@ readonly type: 'ZeroVestingPeriod' | 'ZeroVestingPeriodCount' | 'InsufficientBalanceToLock' | 'TooManyVestingSchedules' | 'AmountLow' | 'MaxVestingSchedulesExceeded'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlXtokensModuleError (345) */ -======= -<<<<<<< HEAD - /** @name OrmlXtokensModuleError (346) */ -======= - /** @name OrmlXtokensModuleError (344) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name OrmlXtokensModuleError (346) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlXtokensModuleError (345) */ ->>>>>>> chore: regenerate types interface OrmlXtokensModuleError extends Enum { readonly isAssetHasNoReserve: boolean; readonly isNotCrossChainTransfer: boolean; @@ -5420,90 +3186,26 @@ readonly type: 'AssetHasNoReserve' | 'NotCrossChainTransfer' | 'InvalidDest' | 'NotCrossChainTransferableCurrency' | 'UnweighableMessage' | 'XcmExecutionFailed' | 'CannotReanchor' | 'InvalidAncestry' | 'InvalidAsset' | 'DestinationNotInvertible' | 'BadVersion' | 'DistinctReserveForAssetAndFee' | 'ZeroFee' | 'ZeroAmount' | 'TooManyAssetsBeingSent' | 'AssetIndexNonExistent' | 'FeeNotEnough' | 'NotSupportedMultiLocation' | 'MinXcmFeeNotDefined'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlTokensBalanceLock (348) */ -======= -<<<<<<< HEAD - /** @name OrmlTokensBalanceLock (349) */ -======= - /** @name OrmlTokensBalanceLock (347) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name OrmlTokensBalanceLock (349) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlTokensBalanceLock (348) */ ->>>>>>> chore: regenerate types interface OrmlTokensBalanceLock extends Struct { readonly id: U8aFixed; readonly amount: u128; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlTokensAccountData (350) */ -======= -<<<<<<< HEAD - /** @name OrmlTokensAccountData (351) */ -======= - /** @name OrmlTokensAccountData (349) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name OrmlTokensAccountData (351) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlTokensAccountData (350) */ ->>>>>>> chore: regenerate types interface OrmlTokensAccountData extends Struct { readonly free: u128; readonly reserved: u128; readonly frozen: u128; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name OrmlTokensReserveData (352) */ -======= -<<<<<<< HEAD - /** @name OrmlTokensReserveData (353) */ -======= - /** @name OrmlTokensReserveData (351) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name OrmlTokensReserveData (353) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name OrmlTokensReserveData (352) */ ->>>>>>> chore: regenerate types interface OrmlTokensReserveData extends Struct { readonly id: Null; readonly amount: u128; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name OrmlTokensModuleError (354) */ -======= -<<<<<<< HEAD - /** @name OrmlTokensModuleError (355) */ -======= - /** @name OrmlTokensModuleError (353) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name OrmlTokensModuleError (355) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name OrmlTokensModuleError (354) */ ->>>>>>> chore: regenerate types interface OrmlTokensModuleError extends Enum { readonly isBalanceTooLow: boolean; readonly isAmountIntoBalanceFailed: boolean; @@ -5516,69 +3218,21 @@ readonly type: 'BalanceTooLow' | 'AmountIntoBalanceFailed' | 'LiquidityRestrictions' | 'MaxLocksExceeded' | 'KeepAlive' | 'ExistentialDeposit' | 'DeadAccount' | 'TooManyReserves'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueInboundChannelDetails (357) */ -======= - /** @name CumulusPalletXcmpQueueInboundChannelDetails (355) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletXcmpQueueInboundChannelDetails (357) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */ ->>>>>>> chore: regenerate types interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct { readonly sender: u32; readonly state: CumulusPalletXcmpQueueInboundState; readonly messageMetadata: Vec>; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletXcmpQueueInboundState (357) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueInboundState (358) */ -======= - /** @name CumulusPalletXcmpQueueInboundState (356) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletXcmpQueueInboundState (358) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletXcmpQueueInboundState (357) */ ->>>>>>> chore: regenerate types interface CumulusPalletXcmpQueueInboundState extends Enum { readonly isOk: boolean; readonly isSuspended: boolean; readonly type: 'Ok' | 'Suspended'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */ -======= -<<<<<<< HEAD - /** @name PolkadotParachainPrimitivesXcmpMessageFormat (361) */ -======= - /** @name PolkadotParachainPrimitivesXcmpMessageFormat (359) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PolkadotParachainPrimitivesXcmpMessageFormat (361) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */ ->>>>>>> chore: regenerate types interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum { readonly isConcatenatedVersionedXcm: boolean; readonly isConcatenatedEncodedBlob: boolean; @@ -5586,23 +3240,7 @@ readonly type: 'ConcatenatedVersionedXcm' | 'ConcatenatedEncodedBlob' | 'Signals'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueOutboundChannelDetails (364) */ -======= - /** @name CumulusPalletXcmpQueueOutboundChannelDetails (362) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletXcmpQueueOutboundChannelDetails (364) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */ ->>>>>>> chore: regenerate types interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct { readonly recipient: u32; readonly state: CumulusPalletXcmpQueueOutboundState; @@ -5611,46 +3249,14 @@ readonly lastIndex: u16; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletXcmpQueueOutboundState (364) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueOutboundState (365) */ -======= - /** @name CumulusPalletXcmpQueueOutboundState (363) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletXcmpQueueOutboundState (365) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletXcmpQueueOutboundState (364) */ ->>>>>>> chore: regenerate types interface CumulusPalletXcmpQueueOutboundState extends Enum { readonly isOk: boolean; readonly isSuspended: boolean; readonly type: 'Ok' | 'Suspended'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueQueueConfigData (366) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueQueueConfigData (367) */ -======= - /** @name CumulusPalletXcmpQueueQueueConfigData (365) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletXcmpQueueQueueConfigData (367) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name CumulusPalletXcmpQueueQueueConfigData (366) */ ->>>>>>> chore: regenerate types interface CumulusPalletXcmpQueueQueueConfigData extends Struct { readonly suspendThreshold: u32; readonly dropThreshold: u32; @@ -5660,23 +3266,7 @@ readonly xcmpMaxIndividualWeight: SpWeightsWeightV2Weight; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletXcmpQueueError (368) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletXcmpQueueError (369) */ -======= - /** @name CumulusPalletXcmpQueueError (367) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletXcmpQueueError (369) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletXcmpQueueError (368) */ ->>>>>>> chore: regenerate types interface CumulusPalletXcmpQueueError extends Enum { readonly isFailedToSend: boolean; readonly isBadXcmOrigin: boolean; @@ -5686,23 +3276,7 @@ readonly type: 'FailedToSend' | 'BadXcmOrigin' | 'BadXcm' | 'BadOverweightIndex' | 'WeightOverLimit'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletXcmError (369) */ -======= -<<<<<<< HEAD - /** @name PalletXcmError (370) */ -======= - /** @name PalletXcmError (368) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletXcmError (370) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletXcmError (369) */ ->>>>>>> chore: regenerate types interface PalletXcmError extends Enum { readonly isUnreachable: boolean; readonly isSendFailure: boolean; @@ -5719,105 +3293,30 @@ readonly isAlreadySubscribed: boolean; readonly type: 'Unreachable' | 'SendFailure' | 'Filtered' | 'UnweighableMessage' | 'DestinationNotInvertible' | 'Empty' | 'CannotReanchor' | 'TooManyAssets' | 'InvalidOrigin' | 'BadVersion' | 'BadLocation' | 'NoSubscription' | 'AlreadySubscribed'; } - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name CumulusPalletXcmError (370) */ - type CumulusPalletXcmError = Null; - - /** @name CumulusPalletDmpQueueConfigData (371) */ -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - /** @name CumulusPalletXcmError (371) */ - type CumulusPalletXcmError = Null; - - /** @name CumulusPalletDmpQueueConfigData (372) */ -<<<<<<< HEAD -======= - /** @name CumulusPalletXcmError (369) */ - type CumulusPalletXcmError = Null; - /** @name CumulusPalletDmpQueueConfigData (370) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -======= /** @name CumulusPalletXcmError (370) */ type CumulusPalletXcmError = Null; /** @name CumulusPalletDmpQueueConfigData (371) */ ->>>>>>> chore: regenerate types interface CumulusPalletDmpQueueConfigData extends Struct { readonly maxIndividual: SpWeightsWeightV2Weight; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletDmpQueuePageIndexData (372) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletDmpQueuePageIndexData (373) */ -======= - /** @name CumulusPalletDmpQueuePageIndexData (371) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletDmpQueuePageIndexData (373) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletDmpQueuePageIndexData (372) */ ->>>>>>> chore: regenerate types interface CumulusPalletDmpQueuePageIndexData extends Struct { readonly beginUsed: u32; readonly endUsed: u32; readonly overweightCount: u64; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name CumulusPalletDmpQueueError (375) */ -======= -<<<<<<< HEAD - /** @name CumulusPalletDmpQueueError (376) */ -======= - /** @name CumulusPalletDmpQueueError (374) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name CumulusPalletDmpQueueError (376) */ ->>>>>>> fix: regenerate types after rebase -======= - /** @name CumulusPalletDmpQueueError (375) */ ->>>>>>> chore: regenerate types interface CumulusPalletDmpQueueError extends Enum { readonly isUnknown: boolean; readonly isOverLimit: boolean; readonly type: 'Unknown' | 'OverLimit'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletUniqueError (379) */ -======= -<<<<<<< HEAD - /** @name PalletUniqueError (380) */ -======= - /** @name PalletUniqueError (378) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -======= - /** @name PalletUniqueError (380) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletUniqueError (379) */ ->>>>>>> chore: regenerate types interface PalletUniqueError extends Enum { readonly isCollectionDecimalPointLimitExceeded: boolean; readonly isEmptyArgument: boolean; @@ -5829,122 +3328,9 @@ interface PalletConfigurationError extends Enum { readonly isInconsistentConfiguration: boolean; readonly type: 'InconsistentConfiguration'; - } - -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsCollection (381) */ -======= - /** @name UpDataStructsCollection (382) */ -======= - readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection'; - } - - /** @name PalletUniqueSchedulerV2BlockAgenda (381) */ - interface PalletUniqueSchedulerV2BlockAgenda extends Struct { - readonly agenda: Vec>; - readonly freePlaces: u32; - } - - /** @name PalletUniqueSchedulerV2Scheduled (384) */ - interface PalletUniqueSchedulerV2Scheduled extends Struct { - readonly maybeId: Option; - readonly priority: u8; - readonly call: PalletUniqueSchedulerV2ScheduledCall; - readonly maybePeriodic: Option>; - readonly origin: OpalRuntimeOriginCaller; - } - - /** @name PalletUniqueSchedulerV2ScheduledCall (385) */ - interface PalletUniqueSchedulerV2ScheduledCall extends Enum { - readonly isInline: boolean; - readonly asInline: Bytes; - readonly isPreimageLookup: boolean; - readonly asPreimageLookup: { - readonly hash_: H256; - readonly unboundedLen: u32; - } & Struct; - readonly type: 'Inline' | 'PreimageLookup'; - } - - /** @name OpalRuntimeOriginCaller (387) */ - interface OpalRuntimeOriginCaller extends Enum { - readonly isSystem: boolean; - readonly asSystem: FrameSupportDispatchRawOrigin; - readonly isVoid: boolean; - readonly isPolkadotXcm: boolean; - readonly asPolkadotXcm: PalletXcmOrigin; - readonly isCumulusXcm: boolean; - readonly asCumulusXcm: CumulusPalletXcmOrigin; - readonly isEthereum: boolean; - readonly asEthereum: PalletEthereumRawOrigin; - readonly type: 'System' | 'Void' | 'PolkadotXcm' | 'CumulusXcm' | 'Ethereum'; - } - - /** @name FrameSupportDispatchRawOrigin (388) */ - interface FrameSupportDispatchRawOrigin extends Enum { - readonly isRoot: boolean; - readonly isSigned: boolean; - readonly asSigned: AccountId32; - readonly isNone: boolean; - readonly type: 'Root' | 'Signed' | 'None'; - } - - /** @name PalletXcmOrigin (389) */ - interface PalletXcmOrigin extends Enum { - readonly isXcm: boolean; - readonly asXcm: XcmV1MultiLocation; - readonly isResponse: boolean; - readonly asResponse: XcmV1MultiLocation; - readonly type: 'Xcm' | 'Response'; - } - - /** @name CumulusPalletXcmOrigin (390) */ - interface CumulusPalletXcmOrigin extends Enum { - readonly isRelay: boolean; - readonly isSiblingParachain: boolean; - readonly asSiblingParachain: u32; - readonly type: 'Relay' | 'SiblingParachain'; - } - - /** @name PalletEthereumRawOrigin (391) */ - interface PalletEthereumRawOrigin extends Enum { - readonly isEthereumTransaction: boolean; - readonly asEthereumTransaction: H160; - readonly type: 'EthereumTransaction'; - } - - /** @name SpCoreVoid (392) */ - type SpCoreVoid = Null; - - /** @name PalletUniqueSchedulerV2Error (394) */ - interface PalletUniqueSchedulerV2Error extends Enum { - readonly isFailedToSchedule: boolean; - readonly isAgendaIsExhausted: boolean; - readonly isScheduledCallCorrupted: boolean; - readonly isPreimageNotFound: boolean; - readonly isTooBigScheduledCall: boolean; - readonly isNotFound: boolean; - readonly isTargetBlockNumberInPast: boolean; - readonly isNamed: boolean; - readonly type: 'FailedToSchedule' | 'AgendaIsExhausted' | 'ScheduledCallCorrupted' | 'PreimageNotFound' | 'TooBigScheduledCall' | 'NotFound' | 'TargetBlockNumberInPast' | 'Named'; } - /** @name UpDataStructsCollection (395) */ -<<<<<<< HEAD -======= - /** @name UpDataStructsCollection (393) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsCollection (381) */ ->>>>>>> chore: regenerate types interface UpDataStructsCollection extends Struct { readonly owner: AccountId32; readonly mode: UpDataStructsCollectionMode; @@ -5957,32 +3343,7 @@ readonly flags: U8aFixed; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsSponsorshipStateAccountId32 (382) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsSponsorshipStateAccountId32 (383) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsSponsorshipStateAccountId32 (396) */ -======= - /** @name UpDataStructsSponsorshipStateAccountId32 (394) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsSponsorshipStateAccountId32 (396) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsSponsorshipStateAccountId32 (382) */ ->>>>>>> chore: regenerate types interface UpDataStructsSponsorshipStateAccountId32 extends Enum { readonly isDisabled: boolean; readonly isUnconfirmed: boolean; @@ -5992,217 +3353,43 @@ readonly type: 'Disabled' | 'Unconfirmed' | 'Confirmed'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsProperties (384) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsProperties (385) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsProperties (398) */ -======= - /** @name UpDataStructsProperties (396) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsProperties (398) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsProperties (384) */ ->>>>>>> chore: regenerate types interface UpDataStructsProperties extends Struct { readonly map: UpDataStructsPropertiesMapBoundedVec; readonly consumedSpace: u32; readonly spaceLimit: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsPropertiesMapBoundedVec (385) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsPropertiesMapBoundedVec (386) */ -======= -<<<<<<< HEAD -======= ->>>>>>> fix: regenerate types after rebase - /** @name UpDataStructsPropertiesMapBoundedVec (399) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types interface UpDataStructsPropertiesMapBoundedVec extends BTreeMap {} /** @name UpDataStructsPropertiesMapPropertyPermission (390) */ interface UpDataStructsPropertiesMapPropertyPermission extends BTreeMap {} -<<<<<<< HEAD - /** @name UpDataStructsCollectionStats (397) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsCollectionStats (398) */ -======= - /** @name UpDataStructsCollectionStats (411) */ -<<<<<<< HEAD -======= - /** @name UpDataStructsPropertiesMapBoundedVec (397) */ -======= - /** @name UpDataStructsPropertiesMapBoundedVec (385) */ ->>>>>>> chore: regenerate types - interface UpDataStructsPropertiesMapBoundedVec extends BTreeMap {} - - /** @name UpDataStructsPropertiesMapPropertyPermission (390) */ - interface UpDataStructsPropertiesMapPropertyPermission extends BTreeMap {} - -<<<<<<< HEAD - /** @name UpDataStructsCollectionStats (409) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsCollectionStats (397) */ ->>>>>>> chore: regenerate types interface UpDataStructsCollectionStats extends Struct { readonly created: u32; readonly destroyed: u32; readonly alive: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsTokenChild (398) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsTokenChild (399) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsTokenChild (412) */ -======= - /** @name UpDataStructsTokenChild (410) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsTokenChild (412) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsTokenChild (398) */ ->>>>>>> chore: regenerate types interface UpDataStructsTokenChild extends Struct { readonly token: u32; readonly collection: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name PhantomTypeUpDataStructs (399) */ -======= -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PhantomTypeUpDataStructs (400) */ -======= -======= ->>>>>>> chore: regenerate types -<<<<<<< HEAD - /** @name PhantomTypeUpDataStructs (413) */ ->>>>>>> fix: update polkadot types and definitions ->>>>>>> fix: update polkadot types and definitions - interface PhantomTypeUpDataStructs extends Vec> {} -======= - /** @name PhantomTypeUpDataStructs (408) */ -======= - /** @name PhantomTypeUpDataStructs (411) */ ->>>>>>> chore: regenerate types -======= - /** @name PhantomTypeUpDataStructs (413) */ ->>>>>>> fix: regenerate types after rebase interface PhantomTypeUpDataStructs extends Vec> {} -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsTokenData (401) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsTokenData (402) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsTokenData (415) */ -======= - /** @name UpDataStructsTokenData (413) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsTokenData (415) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name PhantomTypeUpDataStructs (399) */ - interface PhantomTypeUpDataStructs extends Vec> {} - - /** @name UpDataStructsTokenData (401) */ ->>>>>>> chore: regenerate types interface UpDataStructsTokenData extends Struct { readonly properties: Vec; readonly owner: Option; readonly pieces: u128; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name UpDataStructsRpcCollection (403) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsRpcCollection (404) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsRpcCollection (417) */ -======= - /** @name UpDataStructsRpcCollection (415) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsRpcCollection (417) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name UpDataStructsRpcCollection (403) */ ->>>>>>> chore: regenerate types interface UpDataStructsRpcCollection extends Struct { readonly owner: AccountId32; readonly mode: UpDataStructsCollectionMode; @@ -6218,63 +3405,13 @@ readonly flags: UpDataStructsRpcCollectionFlags; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name UpDataStructsRpcCollectionFlags (404) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name UpDataStructsRpcCollectionFlags (405) */ -======= -<<<<<<< HEAD - /** @name UpDataStructsRpcCollectionFlags (418) */ -======= - /** @name UpDataStructsRpcCollectionFlags (416) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name UpDataStructsRpcCollectionFlags (418) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name UpDataStructsRpcCollectionFlags (404) */ ->>>>>>> chore: regenerate types interface UpDataStructsRpcCollectionFlags extends Struct { readonly foreign: bool; readonly erc721metadata: bool; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsCollectionCollectionInfo (405) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name RmrkTraitsCollectionCollectionInfo (406) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsCollectionCollectionInfo (419) */ -======= - /** @name RmrkTraitsCollectionCollectionInfo (417) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name RmrkTraitsCollectionCollectionInfo (419) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsCollectionCollectionInfo (405) */ ->>>>>>> chore: regenerate types interface RmrkTraitsCollectionCollectionInfo extends Struct { readonly issuer: AccountId32; readonly metadata: Bytes; @@ -6283,32 +3420,7 @@ readonly nftsCount: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsNftNftInfo (406) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name RmrkTraitsNftNftInfo (407) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsNftNftInfo (420) */ -======= - /** @name RmrkTraitsNftNftInfo (418) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name RmrkTraitsNftNftInfo (420) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsNftNftInfo (406) */ ->>>>>>> chore: regenerate types interface RmrkTraitsNftNftInfo extends Struct { readonly owner: RmrkTraitsNftAccountIdOrCollectionNftTuple; readonly royalty: Option; @@ -6317,63 +3429,13 @@ readonly pending: bool; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsNftRoyaltyInfo (408) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name RmrkTraitsNftRoyaltyInfo (409) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsNftRoyaltyInfo (422) */ -======= - /** @name RmrkTraitsNftRoyaltyInfo (420) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name RmrkTraitsNftRoyaltyInfo (422) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsNftRoyaltyInfo (408) */ ->>>>>>> chore: regenerate types interface RmrkTraitsNftRoyaltyInfo extends Struct { readonly recipient: AccountId32; readonly amount: Permill; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsResourceResourceInfo (409) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name RmrkTraitsResourceResourceInfo (410) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsResourceResourceInfo (423) */ -======= - /** @name RmrkTraitsResourceResourceInfo (421) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name RmrkTraitsResourceResourceInfo (423) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsResourceResourceInfo (409) */ ->>>>>>> chore: regenerate types interface RmrkTraitsResourceResourceInfo extends Struct { readonly id: u32; readonly resource: RmrkTraitsResourceResourceTypes; @@ -6381,128 +3443,26 @@ readonly pendingRemoval: bool; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsPropertyPropertyInfo (410) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name RmrkTraitsPropertyPropertyInfo (411) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsPropertyPropertyInfo (424) */ -======= - /** @name RmrkTraitsPropertyPropertyInfo (422) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name RmrkTraitsPropertyPropertyInfo (424) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsPropertyPropertyInfo (410) */ ->>>>>>> chore: regenerate types interface RmrkTraitsPropertyPropertyInfo extends Struct { readonly key: Bytes; readonly value: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD /** @name RmrkTraitsBaseBaseInfo (411) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name RmrkTraitsBaseBaseInfo (412) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsBaseBaseInfo (425) */ -======= - /** @name RmrkTraitsBaseBaseInfo (423) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name RmrkTraitsBaseBaseInfo (425) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= - /** @name RmrkTraitsBaseBaseInfo (411) */ ->>>>>>> chore: regenerate types interface RmrkTraitsBaseBaseInfo extends Struct { readonly issuer: AccountId32; readonly baseType: Bytes; readonly symbol: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name RmrkTraitsNftNftChild (412) */ -======= -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name RmrkTraitsNftNftChild (413) */ -======= -<<<<<<< HEAD - /** @name RmrkTraitsNftNftChild (426) */ -======= - /** @name RmrkTraitsNftNftChild (424) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name RmrkTraitsNftNftChild (426) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name RmrkTraitsNftNftChild (412) */ ->>>>>>> chore: regenerate types interface RmrkTraitsNftNftChild extends Struct { readonly collectionId: u32; readonly nftId: u32; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletCommonError (414) */ -======= -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletCommonError (415) */ -======= -======= ->>>>>>> chore: regenerate types -<<<<<<< HEAD - /** @name PalletCommonError (428) */ -======= - /** @name UpPovEstimateRpcPovInfo (422) */ -======= - /** @name UpPovEstimateRpcPovInfo (425) */ ->>>>>>> chore: regenerate types -======= - /** @name UpPovEstimateRpcPovInfo (427) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name UpPovEstimateRpcPovInfo (413) */ ->>>>>>> chore: regenerate types interface UpPovEstimateRpcPovInfo extends Struct { readonly proofSize: u64; readonly compactProofSize: u64; @@ -6511,29 +3471,7 @@ readonly keyValues: Vec; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletCommonError (424) */ ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -======= -======= -======= - /** @name SpRuntimeTransactionValidityTransactionValidityError (424) */ -======= - /** @name SpRuntimeTransactionValidityTransactionValidityError (428) */ ->>>>>>> chore: regenerate types -======= - /** @name SpRuntimeTransactionValidityTransactionValidityError (430) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name SpRuntimeTransactionValidityTransactionValidityError (416) */ ->>>>>>> chore: regenerate types interface SpRuntimeTransactionValidityTransactionValidityError extends Enum { readonly isInvalid: boolean; readonly asInvalid: SpRuntimeTransactionValidityInvalidTransaction; @@ -6568,45 +3506,13 @@ readonly type: 'CannotLookup' | 'NoUnsignedValidator' | 'Custom'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletCommonError (428) */ ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= -======= - /** @name UpPovEstimateRpcTrieKeyValue (432) */ -======= - /** @name UpPovEstimateRpcTrieKeyValue (434) */ ->>>>>>> fix: regenerate types after rebase -======= /** @name UpPovEstimateRpcTrieKeyValue (420) */ ->>>>>>> chore: regenerate types interface UpPovEstimateRpcTrieKeyValue extends Struct { readonly key: Bytes; readonly value: Bytes; } -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletCommonError (434) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletCommonError (436) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletCommonError (422) */ ->>>>>>> chore: regenerate types interface PalletCommonError extends Enum { readonly isCollectionNotFound: boolean; readonly isMustBeTokenOwner: boolean; @@ -6647,60 +3553,7 @@ readonly type: 'CollectionNotFound' | 'MustBeTokenOwner' | 'NoPermission' | 'CantDestroyNotEmptyCollection' | 'PublicMintingNotAllowed' | 'AddressNotInAllowlist' | 'CollectionNameLimitExceeded' | 'CollectionDescriptionLimitExceeded' | 'CollectionTokenPrefixLimitExceeded' | 'TotalCollectionsLimitExceeded' | 'CollectionAdminCountExceeded' | 'CollectionLimitBoundsExceeded' | 'OwnerPermissionsCantBeReverted' | 'TransferNotAllowed' | 'AccountTokenLimitExceeded' | 'CollectionTokenLimitExceeded' | 'MetadataFlagFrozen' | 'TokenNotFound' | 'TokenValueTooLow' | 'ApprovedValueTooLow' | 'CantApproveMoreThanOwned' | 'AddressIsZero' | 'UnsupportedOperation' | 'NotSufficientFounds' | 'UserIsNotAllowedToNest' | 'SourceCollectionIsNotAllowedToNest' | 'CollectionFieldSizeExceeded' | 'NoSpaceForProperty' | 'PropertyLimitReached' | 'PropertyKeyIsTooLong' | 'InvalidCharacterInPropertyKey' | 'EmptyPropertyKey' | 'CollectionIsExternal' | 'CollectionIsInternal' | 'ConfirmSponsorshipFail' | 'UserIsNotCollectionAdmin'; } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - /** @name PalletFungibleError (416) */ -======= -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> fix: regenerate types after rebase -<<<<<<< HEAD - /** @name PalletFungibleError (417) */ -======= -======= ->>>>>>> chore: regenerate types -======= ->>>>>>> chore: regenerate types -<<<<<<< HEAD - /** @name PalletFungibleError (430) */ -======= - /** @name PalletFungibleError (426) */ ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -<<<<<<< HEAD ->>>>>>> fix: update polkadot types and definitions -======= -======= -======= - /** @name PalletFungibleError (430) */ ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= -======= - /** @name PalletFungibleError (436) */ ->>>>>>> chore: regenerate types ->>>>>>> chore: regenerate types -<<<<<<< HEAD ->>>>>>> chore: regenerate types -======= -======= - /** @name PalletFungibleError (438) */ ->>>>>>> fix: regenerate types after rebase ->>>>>>> fix: regenerate types after rebase -======= /** @name PalletFungibleError (424) */ ->>>>>>> chore: regenerate types interface PalletFungibleError extends Enum { readonly isNotFungibleDataUsedToMintFungibleCollectionToken: boolean; readonly isFungibleItemsHaveNoId: boolean; @@ -6717,6 +3570,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletRefungibleError (420) */ ======= ======= @@ -6775,8 +3629,9 @@ >>>>>>> fix: regenerate types after rebase >>>>>>> fix: regenerate types after rebase ======= +======= +>>>>>>> chore: regenerate types /** @name PalletRefungibleItemData (425) */ ->>>>>>> chore: regenerate types interface PalletRefungibleItemData extends Struct { readonly constData: Bytes; } @@ -6786,6 +3641,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletRefungibleError (422) */ ======= ======= @@ -6848,6 +3704,9 @@ /** @name PalletRefungibleError (430) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletRefungibleError (430) */ +>>>>>>> chore: regenerate types interface PalletRefungibleError extends Enum { readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean; readonly isWrongRefungiblePieces: boolean; @@ -6862,6 +3721,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletNonfungibleItemData (421) */ ======= ======= @@ -6935,6 +3795,9 @@ /** @name PalletNonfungibleItemData (431) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletNonfungibleItemData (431) */ +>>>>>>> chore: regenerate types interface PalletNonfungibleItemData extends Struct { readonly owner: PalletEvmAccountBasicCrossAccountIdRepr; } @@ -6944,6 +3807,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name UpDataStructsPropertyScope (423) */ ======= ======= @@ -7017,6 +3881,9 @@ /** @name UpDataStructsPropertyScope (433) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name UpDataStructsPropertyScope (433) */ +>>>>>>> chore: regenerate types interface UpDataStructsPropertyScope extends Enum { readonly isNone: boolean; readonly isRmrk: boolean; @@ -7028,6 +3895,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletNonfungibleError (426) */ ======= ======= @@ -7101,6 +3969,9 @@ /** @name PalletNonfungibleError (435) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletNonfungibleError (435) */ +>>>>>>> chore: regenerate types interface PalletNonfungibleError extends Enum { readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean; readonly isNonfungibleItemsHaveNoAmount: boolean; @@ -7113,6 +3984,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletStructureError (427) */ ======= ======= @@ -7186,6 +4058,9 @@ /** @name PalletStructureError (436) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletStructureError (436) */ +>>>>>>> chore: regenerate types interface PalletStructureError extends Enum { readonly isOuroborosDetected: boolean; readonly isDepthLimit: boolean; @@ -7199,6 +4074,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletRmrkCoreError (428) */ ======= ======= @@ -7272,6 +4148,9 @@ /** @name PalletRmrkCoreError (437) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletRmrkCoreError (437) */ +>>>>>>> chore: regenerate types interface PalletRmrkCoreError extends Enum { readonly isCorruptedCollectionType: boolean; readonly isRmrkPropertyKeyIsTooLong: boolean; @@ -7300,6 +4179,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletRmrkEquipError (430) */ ======= ======= @@ -7373,6 +4253,9 @@ /** @name PalletRmrkEquipError (439) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletRmrkEquipError (439) */ +>>>>>>> chore: regenerate types interface PalletRmrkEquipError extends Enum { readonly isPermissionError: boolean; readonly isNoAvailableBaseId: boolean; @@ -7389,6 +4272,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletAppPromotionError (436) */ ======= ======= @@ -7462,6 +4346,9 @@ /** @name PalletAppPromotionError (445) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletAppPromotionError (445) */ +>>>>>>> chore: regenerate types interface PalletAppPromotionError extends Enum { readonly isAdminNotSet: boolean; readonly isNoPermission: boolean; @@ -7477,6 +4364,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletForeignAssetsModuleError (437) */ ======= ======= @@ -7550,6 +4438,9 @@ /** @name PalletForeignAssetsModuleError (446) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletForeignAssetsModuleError (446) */ +>>>>>>> chore: regenerate types interface PalletForeignAssetsModuleError extends Enum { readonly isBadLocation: boolean; readonly isMultiLocationExisted: boolean; @@ -7563,6 +4454,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletEvmError (439) */ ======= ======= @@ -7636,6 +4528,9 @@ /** @name PalletEvmError (448) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletEvmError (448) */ +>>>>>>> chore: regenerate types interface PalletEvmError extends Enum { readonly isBalanceLow: boolean; readonly isFeeOverflow: boolean; @@ -7656,6 +4551,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name FpRpcTransactionStatus (442) */ ======= ======= @@ -7729,6 +4625,9 @@ /** @name FpRpcTransactionStatus (451) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name FpRpcTransactionStatus (451) */ +>>>>>>> chore: regenerate types interface FpRpcTransactionStatus extends Struct { readonly transactionHash: H256; readonly transactionIndex: u32; @@ -7744,6 +4643,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name EthbloomBloom (444) */ interface EthbloomBloom extends U8aFixed {} @@ -7838,11 +4738,16 @@ >>>>>>> fix: regenerate types after rebase ======= ======= +======= +>>>>>>> chore: regenerate types /** @name EthbloomBloom (453) */ interface EthbloomBloom extends U8aFixed {} /** @name EthereumReceiptReceiptV3 (455) */ +<<<<<<< HEAD +>>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= >>>>>>> chore: regenerate types interface EthereumReceiptReceiptV3 extends Enum { readonly isLegacy: boolean; @@ -7859,6 +4764,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name EthereumReceiptEip658ReceiptData (447) */ ======= ======= @@ -7932,6 +4838,9 @@ /** @name EthereumReceiptEip658ReceiptData (456) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name EthereumReceiptEip658ReceiptData (456) */ +>>>>>>> chore: regenerate types interface EthereumReceiptEip658ReceiptData extends Struct { readonly statusCode: u8; readonly usedGas: U256; @@ -7944,6 +4853,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name EthereumBlock (448) */ ======= ======= @@ -8017,6 +4927,9 @@ /** @name EthereumBlock (457) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name EthereumBlock (457) */ +>>>>>>> chore: regenerate types interface EthereumBlock extends Struct { readonly header: EthereumHeader; readonly transactions: Vec; @@ -8028,6 +4941,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name EthereumHeader (449) */ ======= ======= @@ -8101,6 +5015,9 @@ /** @name EthereumHeader (458) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name EthereumHeader (458) */ +>>>>>>> chore: regenerate types interface EthereumHeader extends Struct { readonly parentHash: H256; readonly ommersHash: H256; @@ -8124,6 +5041,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name EthereumTypesHashH64 (450) */ interface EthereumTypesHashH64 extends U8aFixed {} @@ -8218,12 +5136,17 @@ >>>>>>> fix: regenerate types after rebase ======= ======= +======= +>>>>>>> chore: regenerate types /** @name EthereumTypesHashH64 (459) */ interface EthereumTypesHashH64 extends U8aFixed {} /** @name PalletEthereumError (464) */ +<<<<<<< HEAD >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= +>>>>>>> chore: regenerate types interface PalletEthereumError extends Enum { readonly isInvalidSignature: boolean; readonly isPreLogExists: boolean; @@ -8235,6 +5158,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletEvmCoderSubstrateError (456) */ ======= ======= @@ -8308,6 +5232,9 @@ /** @name PalletEvmCoderSubstrateError (465) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletEvmCoderSubstrateError (465) */ +>>>>>>> chore: regenerate types interface PalletEvmCoderSubstrateError extends Enum { readonly isOutOfGas: boolean; readonly isOutOfFund: boolean; @@ -8319,6 +5246,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (457) */ ======= ======= @@ -8392,6 +5320,9 @@ /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (466) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (466) */ +>>>>>>> chore: regenerate types interface UpDataStructsSponsorshipStateBasicCrossAccountIdRepr extends Enum { readonly isDisabled: boolean; readonly isUnconfirmed: boolean; @@ -8406,6 +5337,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletEvmContractHelpersSponsoringModeT (458) */ ======= ======= @@ -8479,6 +5411,9 @@ /** @name PalletEvmContractHelpersSponsoringModeT (467) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletEvmContractHelpersSponsoringModeT (467) */ +>>>>>>> chore: regenerate types interface PalletEvmContractHelpersSponsoringModeT extends Enum { readonly isDisabled: boolean; readonly isAllowlisted: boolean; @@ -8491,6 +5426,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletEvmContractHelpersError (464) */ ======= ======= @@ -8564,6 +5500,9 @@ /** @name PalletEvmContractHelpersError (473) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletEvmContractHelpersError (473) */ +>>>>>>> chore: regenerate types interface PalletEvmContractHelpersError extends Enum { readonly isNoPermission: boolean; readonly isNoPendingSponsor: boolean; @@ -8576,6 +5515,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletEvmMigrationError (465) */ ======= ======= @@ -8649,6 +5589,9 @@ /** @name PalletEvmMigrationError (474) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletEvmMigrationError (474) */ +>>>>>>> chore: regenerate types interface PalletEvmMigrationError extends Enum { readonly isAccountNotEmpty: boolean; readonly isAccountIsNotMigrating: boolean; @@ -8661,6 +5604,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletMaintenanceError (466) */ type PalletMaintenanceError = Null; @@ -8755,11 +5699,16 @@ >>>>>>> fix: regenerate types after rebase ======= ======= +======= +>>>>>>> chore: regenerate types /** @name PalletMaintenanceError (475) */ type PalletMaintenanceError = Null; /** @name PalletTestUtilsError (476) */ +<<<<<<< HEAD +>>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= >>>>>>> chore: regenerate types interface PalletTestUtilsError extends Enum { readonly isTestPalletDisabled: boolean; @@ -8772,6 +5721,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name SpRuntimeMultiSignature (469) */ ======= ======= @@ -8845,6 +5795,9 @@ /** @name SpRuntimeMultiSignature (478) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name SpRuntimeMultiSignature (478) */ +>>>>>>> chore: regenerate types interface SpRuntimeMultiSignature extends Enum { readonly isEd25519: boolean; readonly asEd25519: SpCoreEd25519Signature; @@ -8860,6 +5813,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name SpCoreEd25519Signature (470) */ ======= ======= @@ -8945,8 +5899,9 @@ /** @name SpCoreEd25519Signature (493) */ >>>>>>> fix: regenerate types after rebase ======= +======= +>>>>>>> chore: regenerate types /** @name SpCoreEd25519Signature (479) */ ->>>>>>> chore: regenerate types interface SpCoreEd25519Signature extends U8aFixed {} /** @name SpCoreSr25519Signature (481) */ @@ -8983,6 +5938,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /** @name PalletEthereumFakeTransactionFinalizer (498) */ >>>>>>> fix: update polkadot types and definitions <<<<<<< HEAD @@ -9027,6 +5983,9 @@ /** @name PalletEthereumFakeTransactionFinalizer (495) */ >>>>>>> chore: regenerate types >>>>>>> chore: regenerate types +======= + /** @name PalletEthereumFakeTransactionFinalizer (495) */ +>>>>>>> chore: regenerate types type PalletEthereumFakeTransactionFinalizer = Null; } // declare module