git.delta.rocks / unique-network / refs/commits / 992dc8a7b061

difftreelog

chore regenerate types

Daniel Shiposha2022-12-23parent: #674c25d.patch.diff
in: master

6 files changed

modifiedtests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -9,22 +9,16 @@
 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 { 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';
 =======
-import type { AccountId32, Call, H160, H256, MultiAddress, Perbill, Permill, Weight } from '@polkadot/types/interfaces/runtime';
-import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumLog, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
-<<<<<<< HEAD
-=======
-import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
+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>;
 export type __SubmittableExtrinsic<ApiType extends ApiTypes> = SubmittableExtrinsic<ApiType>;
modifiedtests/src/interfaces/augment-types.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -9,6 +9,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';
 =======
 =======
@@ -17,6 +18,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< 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, 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, 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';
 =======
@@ -73,7 +76,13 @@
 import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, 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, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationCall, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, 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, PalletUniqueRawEvent, PalletUniqueSchedulerV2BlockAgenda, PalletUniqueSchedulerV2Call, PalletUniqueSchedulerV2Error, PalletUniqueSchedulerV2Event, PalletUniqueSchedulerV2Scheduled, PalletUniqueSchedulerV2ScheduledCall, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, 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, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, 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';
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+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 { 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';
modifiedtests/src/interfaces/default/types.tsdiffbeforeafterboth
--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -2760,9 +2760,9 @@
   readonly isCustom: boolean;
   readonly asCustom: u8;
   readonly isBadMandatory: boolean;
-  readonly isMandatoryDispatch: boolean;
+  readonly isMandatoryValidation: boolean;
   readonly isBadSigner: boolean;
-  readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryDispatch' | 'BadSigner';
+  readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryValidation' | 'BadSigner';
 }
 
 /** @name SpRuntimeTransactionValidityTransactionValidityError */
modifiedtests/src/interfaces/lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -1211,19 +1211,7 @@
     data: 'Bytes'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup109: pallet_ethereum::pallet::Event
-=======
-<<<<<<< HEAD
-   * Lookup113: pallet_ethereum::pallet::Event
-=======
-   * Lookup115: pallet_ethereum::pallet::Event
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup113: pallet_ethereum::pallet::Event
->>>>>>> fix: regenerate types after rebase
    **/
   PalletEthereumEvent: {
     _enum: {
@@ -1236,19 +1224,7 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup110: evm_core::error::ExitReason
-=======
-<<<<<<< HEAD
-   * Lookup114: evm_core::error::ExitReason
-=======
-   * Lookup116: evm_core::error::ExitReason
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup114: evm_core::error::ExitReason
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitReason: {
     _enum: {
@@ -1259,37 +1235,13 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup111: evm_core::error::ExitSucceed
-=======
-<<<<<<< HEAD
-   * Lookup115: evm_core::error::ExitSucceed
-=======
-   * Lookup117: evm_core::error::ExitSucceed
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup115: evm_core::error::ExitSucceed
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitSucceed: {
     _enum: ['Stopped', 'Returned', 'Suicided']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup112: evm_core::error::ExitError
-=======
-<<<<<<< HEAD
-   * Lookup116: evm_core::error::ExitError
-=======
-   * Lookup118: evm_core::error::ExitError
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup116: evm_core::error::ExitError
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitError: {
     _enum: {
@@ -1311,37 +1263,13 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup115: evm_core::error::ExitRevert
-=======
-<<<<<<< HEAD
-   * Lookup119: evm_core::error::ExitRevert
-=======
-   * Lookup121: evm_core::error::ExitRevert
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup119: evm_core::error::ExitRevert
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitRevert: {
     _enum: ['Reverted']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup116: evm_core::error::ExitFatal
-=======
-<<<<<<< HEAD
-   * Lookup120: evm_core::error::ExitFatal
-=======
-   * Lookup122: evm_core::error::ExitFatal
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup120: evm_core::error::ExitFatal
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitFatal: {
     _enum: {
@@ -1352,19 +1280,7 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup117: pallet_evm_contract_helpers::pallet::Event<T>
-=======
-<<<<<<< HEAD
-   * Lookup121: pallet_evm_contract_helpers::pallet::Event<T>
-=======
-   * Lookup123: pallet_evm_contract_helpers::pallet::Event<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup121: pallet_evm_contract_helpers::pallet::Event<T>
->>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmContractHelpersEvent: {
     _enum: {
@@ -1374,67 +1290,25 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup118: pallet_evm_migration::pallet::Event<T>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> fix: regenerate types after rebase
-   * Lookup122: pallet_evm_migration::pallet::Event<T>
->>>>>>> chore:  regenerate types
    **/
   PalletEvmMigrationEvent: {
     _enum: ['TestEvent']
   },
   /**
-<<<<<<< HEAD
    * Lookup119: pallet_maintenance::pallet::Event<T>
-=======
-   * Lookup123: pallet_maintenance::pallet::Event<T>
-<<<<<<< HEAD
-=======
-   * Lookup124: pallet_maintenance::pallet::Event<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
    **/
   PalletMaintenanceEvent: {
     _enum: ['MaintenanceEnabled', 'MaintenanceDisabled']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup120: pallet_test_utils::pallet::Event<T>
-=======
-<<<<<<< HEAD
-   * Lookup124: pallet_test_utils::pallet::Event<T>
-=======
-   * Lookup125: pallet_test_utils::pallet::Event<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup124: pallet_test_utils::pallet::Event<T>
->>>>>>> fix: regenerate types after rebase
    **/
   PalletTestUtilsEvent: {
     _enum: ['ValueIsSet', 'ShouldRollback', 'BatchCompleted']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup121: frame_system::Phase
-=======
-<<<<<<< HEAD
-   * Lookup125: frame_system::Phase
-=======
-   * Lookup126: frame_system::Phase
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup125: frame_system::Phase
->>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemPhase: {
     _enum: {
@@ -1444,38 +1318,14 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup124: frame_system::LastRuntimeUpgradeInfo
-=======
-<<<<<<< HEAD
-   * Lookup127: frame_system::LastRuntimeUpgradeInfo
-=======
-   * Lookup128: frame_system::LastRuntimeUpgradeInfo
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup127: frame_system::LastRuntimeUpgradeInfo
->>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemLastRuntimeUpgradeInfo: {
     specVersion: 'Compact<u32>',
     specName: 'Text'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup125: frame_system::pallet::Call<T>
-=======
-<<<<<<< HEAD
-   * Lookup128: frame_system::pallet::Call<T>
-=======
-   * Lookup129: frame_system::pallet::Call<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup128: frame_system::pallet::Call<T>
->>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemCall: {
     _enum: {
@@ -1512,6 +1362,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup129: frame_system::limits::BlockWeights
 =======
 =======
@@ -1532,6 +1383,9 @@
    * 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',
@@ -1541,6 +1395,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup130: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
 =======
 =======
@@ -1561,6 +1416,9 @@
    * Lookup134: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup130: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
+>>>>>>> chore: regenerate types
    **/
   FrameSupportDispatchPerDispatchClassWeightsPerClass: {
     normal: 'FrameSystemLimitsWeightsPerClass',
@@ -1570,6 +1428,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup131: frame_system::limits::WeightsPerClass
 =======
 =======
@@ -1590,6 +1449,9 @@
    * 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',
@@ -1600,6 +1462,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup133: frame_system::limits::BlockLength
 =======
 =======
@@ -1620,6 +1483,9 @@
    * 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'
@@ -1627,6 +1493,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup134: frame_support::dispatch::PerDispatchClass<T>
 =======
 =======
@@ -1647,6 +1514,9 @@
    * Lookup138: frame_support::dispatch::PerDispatchClass<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup134: frame_support::dispatch::PerDispatchClass<T>
+>>>>>>> chore: regenerate types
    **/
   FrameSupportDispatchPerDispatchClassU32: {
     normal: 'u32',
@@ -1656,6 +1526,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup135: sp_weights::RuntimeDbWeight
 =======
 =======
@@ -1676,6 +1547,9 @@
    * Lookup139: sp_weights::RuntimeDbWeight
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup135: sp_weights::RuntimeDbWeight
+>>>>>>> chore: regenerate types
    **/
   SpWeightsRuntimeDbWeight: {
     read: 'u64',
@@ -1684,6 +1558,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup136: sp_version::RuntimeVersion
 =======
 =======
@@ -1704,6 +1579,9 @@
    * Lookup140: sp_version::RuntimeVersion
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup136: sp_version::RuntimeVersion
+>>>>>>> chore: regenerate types
    **/
   SpVersionRuntimeVersion: {
     specName: 'Text',
@@ -1718,6 +1596,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup141: frame_system::pallet::Error<T>
 =======
 =======
@@ -1738,6 +1617,9 @@
    * Lookup145: frame_system::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup141: frame_system::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   FrameSystemError: {
     _enum: ['InvalidSpecName', 'SpecVersionNeedsToIncrease', 'FailedToExtractRuntimeVersion', 'NonDefaultComposite', 'NonZeroRefCount', 'CallFiltered']
@@ -1745,6 +1627,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup142: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
 =======
 =======
@@ -1765,6 +1648,9 @@
    * Lookup146: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup142: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
+>>>>>>> chore: regenerate types
    **/
   PolkadotPrimitivesV2PersistedValidationData: {
     parentHead: 'Bytes',
@@ -1775,6 +1661,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup145: polkadot_primitives::v2::UpgradeRestriction
 =======
 =======
@@ -1795,6 +1682,9 @@
    * 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']
@@ -1802,6 +1692,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup146: sp_trie::storage_proof::StorageProof
 =======
 =======
@@ -1822,6 +1713,9 @@
    * 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<Bytes>'
@@ -1829,6 +1723,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup148: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
 =======
 =======
@@ -1849,6 +1744,9 @@
    * 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',
@@ -1859,6 +1757,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup151: polkadot_primitives::v2::AbridgedHrmpChannel
 =======
 =======
@@ -1879,6 +1778,9 @@
    * 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',
@@ -1891,6 +1793,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup152: polkadot_primitives::v2::AbridgedHostConfiguration
 =======
 =======
@@ -1911,6 +1814,9 @@
    * 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',
@@ -1926,6 +1832,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup158: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
 =======
 =======
@@ -1946,6 +1853,9 @@
    * Lookup162: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup158: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
+>>>>>>> chore: regenerate types
    **/
   PolkadotCorePrimitivesOutboundHrmpMessage: {
     recipient: 'u32',
@@ -1954,6 +1864,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup159: cumulus_pallet_parachain_system::pallet::Call<T>
 =======
 =======
@@ -1974,6 +1885,9 @@
    * Lookup163: cumulus_pallet_parachain_system::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup159: cumulus_pallet_parachain_system::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletParachainSystemCall: {
     _enum: {
@@ -1994,6 +1908,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup160: cumulus_primitives_parachain_inherent::ParachainInherentData
 =======
 =======
@@ -2014,6 +1929,9 @@
    * 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',
@@ -2024,6 +1942,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup162: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
 =======
 =======
@@ -2044,6 +1963,9 @@
    * Lookup166: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup162: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
+>>>>>>> chore: regenerate types
    **/
   PolkadotCorePrimitivesInboundDownwardMessage: {
     sentAt: 'u32',
@@ -2052,6 +1974,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup165: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
 =======
 =======
@@ -2072,6 +1995,9 @@
    * Lookup169: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup165: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
+>>>>>>> chore: regenerate types
    **/
   PolkadotCorePrimitivesInboundHrmpMessage: {
     sentAt: 'u32',
@@ -2080,6 +2006,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup168: cumulus_pallet_parachain_system::pallet::Error<T>
 =======
 =======
@@ -2100,6 +2027,9 @@
    * Lookup172: cumulus_pallet_parachain_system::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup168: cumulus_pallet_parachain_system::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletParachainSystemError: {
     _enum: ['OverlappingUpgrades', 'ProhibitedByPolkadot', 'TooBig', 'ValidationDataNotAvailable', 'HostConfigurationNotAvailable', 'NotScheduled', 'NothingAuthorized', 'Unauthorized']
@@ -2107,6 +2037,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup170: pallet_balances::BalanceLock<Balance>
 =======
 =======
@@ -2127,6 +2058,9 @@
    * Lookup174: pallet_balances::BalanceLock<Balance>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup170: pallet_balances::BalanceLock<Balance>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesBalanceLock: {
     id: '[u8;8]',
@@ -2136,6 +2070,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup171: pallet_balances::Reasons
 =======
 =======
@@ -2156,6 +2091,9 @@
    * 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']
@@ -2163,6 +2101,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup174: pallet_balances::ReserveData<ReserveIdentifier, Balance>
 =======
 =======
@@ -2183,6 +2122,9 @@
    * Lookup178: pallet_balances::ReserveData<ReserveIdentifier, Balance>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup174: pallet_balances::ReserveData<ReserveIdentifier, Balance>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesReserveData: {
     id: '[u8;16]',
@@ -2191,6 +2133,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup176: pallet_balances::pallet::Call<T, I>
 =======
 =======
@@ -2229,6 +2172,9 @@
    * Lookup181: pallet_balances::pallet::Call<T, I>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup176: pallet_balances::pallet::Call<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesCall: {
     _enum: {
@@ -2263,6 +2209,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup179: pallet_balances::pallet::Error<T, I>
 =======
 =======
@@ -2283,6 +2230,9 @@
    * Lookup184: pallet_balances::pallet::Error<T, I>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup179: pallet_balances::pallet::Error<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesError: {
     _enum: ['VestingBalance', 'LiquidityRestrictions', 'InsufficientBalance', 'ExistentialDeposit', 'KeepAlive', 'ExistingVestingSchedule', 'DeadAccount', 'TooManyReserves']
@@ -2290,6 +2240,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup181: pallet_timestamp::pallet::Call<T>
 =======
 =======
@@ -2310,6 +2261,9 @@
    * Lookup186: pallet_timestamp::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup181: pallet_timestamp::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletTimestampCall: {
     _enum: {
@@ -2321,6 +2275,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup183: pallet_transaction_payment::Releases
 =======
 =======
@@ -2341,6 +2296,9 @@
    * 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']
@@ -2348,6 +2306,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup184: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
 =======
 =======
@@ -2368,6 +2327,9 @@
    * Lookup189: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup184: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
+>>>>>>> chore: regenerate types
    **/
   PalletTreasuryProposal: {
     proposer: 'AccountId32',
@@ -2378,6 +2340,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup187: pallet_treasury::pallet::Call<T, I>
 =======
 =======
@@ -2398,6 +2361,9 @@
    * Lookup192: pallet_treasury::pallet::Call<T, I>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup187: pallet_treasury::pallet::Call<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletTreasuryCall: {
     _enum: {
@@ -2423,6 +2389,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup190: frame_support::PalletId
    **/
   FrameSupportPalletId: '[u8;8]',
@@ -2461,6 +2428,13 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup190: frame_support::PalletId
+   **/
+  FrameSupportPalletId: '[u8;8]',
+  /**
+   * Lookup191: pallet_treasury::pallet::Error<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletTreasuryError: {
     _enum: ['InsufficientProposersBalance', 'InvalidIndex', 'TooManyApprovals', 'InsufficientPermission', 'ProposalNotApproved']
@@ -2468,6 +2442,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup192: pallet_sudo::pallet::Call<T>
 =======
 =======
@@ -2488,6 +2463,9 @@
    * Lookup197: pallet_sudo::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup192: pallet_sudo::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletSudoCall: {
     _enum: {
@@ -2513,6 +2491,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup194: orml_vesting::module::Call<T>
 =======
 =======
@@ -2533,6 +2512,9 @@
    * Lookup199: orml_vesting::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup194: orml_vesting::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlVestingModuleCall: {
     _enum: {
@@ -2553,6 +2535,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup196: orml_xtokens::module::Call<T>
 =======
 =======
@@ -2573,6 +2556,9 @@
    * Lookup201: orml_xtokens::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup196: orml_xtokens::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlXtokensModuleCall: {
     _enum: {
@@ -2617,6 +2603,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup197: xcm::VersionedMultiAsset
 =======
 =======
@@ -2637,6 +2624,9 @@
    * Lookup202: xcm::VersionedMultiAsset
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup197: xcm::VersionedMultiAsset
+>>>>>>> chore: regenerate types
    **/
   XcmVersionedMultiAsset: {
     _enum: {
@@ -2647,6 +2637,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup200: orml_tokens::module::Call<T>
 =======
 =======
@@ -2667,6 +2658,9 @@
    * Lookup205: orml_tokens::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup200: orml_tokens::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensModuleCall: {
     _enum: {
@@ -2702,6 +2696,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup201: cumulus_pallet_xcmp_queue::pallet::Call<T>
 =======
 =======
@@ -2722,6 +2717,9 @@
    * Lookup206: cumulus_pallet_xcmp_queue::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup201: cumulus_pallet_xcmp_queue::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueCall: {
     _enum: {
@@ -2772,6 +2770,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup202: pallet_xcm::pallet::Call<T>
 =======
 =======
@@ -2792,6 +2791,9 @@
    * Lookup207: pallet_xcm::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup202: pallet_xcm::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletXcmCall: {
     _enum: {
@@ -2847,6 +2849,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup203: xcm::VersionedXcm<RuntimeCall>
 =======
 =======
@@ -2867,6 +2870,9 @@
    * Lookup208: xcm::VersionedXcm<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup203: xcm::VersionedXcm<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmVersionedXcm: {
     _enum: {
@@ -2878,6 +2884,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup204: xcm::v0::Xcm<RuntimeCall>
 =======
 =======
@@ -2898,6 +2905,9 @@
    * Lookup209: xcm::v0::Xcm<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup204: xcm::v0::Xcm<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV0Xcm: {
     _enum: {
@@ -2953,6 +2963,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup206: xcm::v0::order::Order<RuntimeCall>
 =======
 =======
@@ -2973,6 +2984,9 @@
    * Lookup211: xcm::v0::order::Order<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup206: xcm::v0::order::Order<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV0Order: {
     _enum: {
@@ -3017,6 +3031,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup208: xcm::v0::Response
 =======
 =======
@@ -3037,6 +3052,9 @@
    * Lookup213: xcm::v0::Response
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup208: xcm::v0::Response
+>>>>>>> chore: regenerate types
    **/
   XcmV0Response: {
     _enum: {
@@ -3046,6 +3064,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup209: xcm::v1::Xcm<RuntimeCall>
 =======
 =======
@@ -3066,6 +3085,9 @@
    * Lookup214: xcm::v1::Xcm<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup209: xcm::v1::Xcm<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV1Xcm: {
     _enum: {
@@ -3126,6 +3148,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup211: xcm::v1::order::Order<RuntimeCall>
 =======
 =======
@@ -3146,6 +3169,9 @@
    * Lookup216: xcm::v1::order::Order<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup211: xcm::v1::order::Order<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV1Order: {
     _enum: {
@@ -3192,6 +3218,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup213: xcm::v1::Response
 =======
 =======
@@ -3212,6 +3239,9 @@
    * Lookup218: xcm::v1::Response
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup213: xcm::v1::Response
+>>>>>>> chore: regenerate types
    **/
   XcmV1Response: {
     _enum: {
@@ -3222,6 +3252,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup227: cumulus_pallet_xcm::pallet::Call<T>
    **/
   CumulusPalletXcmCall: 'Null',
@@ -3260,7 +3291,14 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup227: cumulus_pallet_xcm::pallet::Call<T>
    **/
+  CumulusPalletXcmCall: 'Null',
+  /**
+   * Lookup228: cumulus_pallet_dmp_queue::pallet::Call<T>
+>>>>>>> chore: regenerate types
+   **/
   CumulusPalletDmpQueueCall: {
     _enum: {
       service_overweight: {
@@ -3272,6 +3310,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup229: pallet_inflation::pallet::Call<T>
 =======
 =======
@@ -3292,6 +3331,9 @@
    * Lookup234: pallet_inflation::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup229: pallet_inflation::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletInflationCall: {
     _enum: {
@@ -3303,6 +3345,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup230: pallet_unique::Call<T>
 =======
 =======
@@ -3323,6 +3366,9 @@
    * Lookup235: pallet_unique::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup230: pallet_unique::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletUniqueCall: {
     _enum: {
@@ -3468,6 +3514,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup235: up_data_structs::CollectionMode
 =======
 =======
@@ -3488,6 +3535,9 @@
    * 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: {
@@ -3499,6 +3549,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup236: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
 =======
 =======
@@ -3519,6 +3570,9 @@
    * Lookup241: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup236: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateCollectionData: {
     mode: 'UpDataStructsCollectionMode',
@@ -3535,6 +3589,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup238: up_data_structs::AccessMode
 =======
 =======
@@ -3555,6 +3610,9 @@
    * 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']
@@ -3562,6 +3620,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup240: up_data_structs::CollectionLimits
 =======
 =======
@@ -3582,6 +3641,9 @@
    * 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<u32>',
@@ -3597,6 +3659,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup242: up_data_structs::SponsoringRateLimit
 =======
 =======
@@ -3617,6 +3680,9 @@
    * 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: {
@@ -3627,6 +3693,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup245: up_data_structs::CollectionPermissions
 =======
 =======
@@ -3647,6 +3714,9 @@
    * 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<UpDataStructsAccessMode>',
@@ -3656,6 +3726,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup247: up_data_structs::NestingPermissions
 =======
 =======
@@ -3676,6 +3747,9 @@
    * 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',
@@ -3685,6 +3759,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup249: up_data_structs::OwnerRestrictedSet
    **/
   UpDataStructsOwnerRestrictedSet: 'BTreeSet<u32>',
@@ -3723,7 +3798,14 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup249: up_data_structs::OwnerRestrictedSet
    **/
+  UpDataStructsOwnerRestrictedSet: 'BTreeSet<u32>',
+  /**
+   * Lookup254: up_data_structs::PropertyKeyPermission
+>>>>>>> chore: regenerate types
+   **/
   UpDataStructsPropertyKeyPermission: {
     key: 'Bytes',
     permission: 'UpDataStructsPropertyPermission'
@@ -3731,6 +3813,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup255: up_data_structs::PropertyPermission
 =======
 =======
@@ -3751,6 +3834,9 @@
    * 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',
@@ -3760,6 +3846,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup258: up_data_structs::Property
 =======
 =======
@@ -3780,6 +3867,9 @@
    * 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',
@@ -3788,6 +3878,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup261: up_data_structs::CreateItemData
 =======
 =======
@@ -3808,6 +3899,9 @@
    * 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: {
@@ -3819,6 +3913,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup262: up_data_structs::CreateNftData
 =======
 =======
@@ -3839,6 +3934,9 @@
    * 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<UpDataStructsProperty>'
@@ -3846,6 +3944,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup263: up_data_structs::CreateFungibleData
 =======
 =======
@@ -3866,6 +3965,9 @@
    * 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'
@@ -3873,6 +3975,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup264: up_data_structs::CreateReFungibleData
 =======
 =======
@@ -3893,6 +3996,9 @@
    * 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',
@@ -3901,6 +4007,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup267: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -3921,6 +4028,9 @@
    * Lookup272: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup267: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateItemExData: {
     _enum: {
@@ -3933,6 +4043,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup269: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -3953,6 +4064,9 @@
    * Lookup274: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup269: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateNftExData: {
     properties: 'Vec<UpDataStructsProperty>',
@@ -3961,6 +4075,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup276: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -3981,6 +4096,9 @@
    * Lookup281: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup276: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateRefungibleExSingleOwner: {
     user: 'PalletEvmAccountBasicCrossAccountIdRepr',
@@ -3990,6 +4108,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup278: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -4010,6 +4129,9 @@
    * Lookup283: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup278: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateRefungibleExMultipleOwners: {
     users: 'BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>',
@@ -4018,6 +4140,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup279: pallet_configuration::pallet::Call<T>
 =======
 =======
@@ -4038,6 +4161,9 @@
    * Lookup284: pallet_unique_scheduler_v2::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup279: pallet_configuration::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletConfigurationCall: {
     _enum: {
@@ -4058,6 +4184,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup284: pallet_configuration::AppPromotionConfiguration<BlockNumber>
 =======
 =======
@@ -4078,6 +4205,9 @@
    * Lookup287: pallet_configuration::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup284: pallet_configuration::AppPromotionConfiguration<BlockNumber>
+>>>>>>> chore: regenerate types
    **/
   PalletConfigurationAppPromotionConfiguration: {
     recalculationInterval: 'Option<u32>',
@@ -4088,6 +4218,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup288: pallet_template_transaction_payment::Call<T>
 =======
 <<<<<<< HEAD
@@ -4095,6 +4226,9 @@
 >>>>>>> fix: regenerate types after rebase
    * Lookup289: pallet_template_transaction_payment::Call<T>
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup288: pallet_template_transaction_payment::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletTemplateTransactionPaymentCall: 'Null',
   /**
@@ -4103,6 +4237,7 @@
   PalletStructureCall: 'Null',
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup290: pallet_rmrk_core::pallet::Call<T>
 =======
    * Lookup291: pallet_rmrk_core::pallet::Call<T>
@@ -4121,6 +4256,9 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup290: pallet_rmrk_core::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkCoreCall: {
     _enum: {
@@ -4213,6 +4351,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup296: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4224,6 +4363,9 @@
 =======
    * Lookup297: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup296: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceResourceTypes: {
     _enum: {
@@ -4235,6 +4377,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup298: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4246,6 +4389,9 @@
 =======
    * Lookup299: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup298: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceBasicResource: {
     src: 'Option<Bytes>',
@@ -4256,6 +4402,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup300: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4267,6 +4414,9 @@
 =======
    * Lookup301: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup300: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceComposableResource: {
     parts: 'Vec<u32>',
@@ -4279,6 +4429,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup301: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4290,6 +4441,9 @@
 =======
    * Lookup302: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup301: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceSlotResource: {
     base: 'u32',
@@ -4302,6 +4456,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup304: pallet_rmrk_equip::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4313,6 +4468,9 @@
 =======
    * Lookup305: pallet_rmrk_equip::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup304: pallet_rmrk_equip::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkEquipCall: {
     _enum: {
@@ -4335,6 +4493,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup307: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4346,6 +4505,9 @@
 =======
    * Lookup308: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup307: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartPartType: {
     _enum: {
@@ -4356,6 +4518,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup309: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4367,6 +4530,9 @@
 =======
    * Lookup310: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup309: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartFixedPart: {
     id: 'u32',
@@ -4376,6 +4542,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup310: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4387,6 +4554,9 @@
 =======
    * Lookup311: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup310: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartSlotPart: {
     id: 'u32',
@@ -4397,6 +4567,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup311: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4408,6 +4579,9 @@
 =======
    * Lookup312: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup311: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartEquippableList: {
     _enum: {
@@ -4419,6 +4593,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup313: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
 =======
 <<<<<<< HEAD
@@ -4430,6 +4605,9 @@
 =======
    * Lookup314: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup313: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsTheme: {
     name: 'Bytes',
@@ -4439,6 +4617,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup315: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4450,6 +4629,9 @@
 =======
    * Lookup316: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup315: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsThemeThemeProperty: {
     key: 'Bytes',
@@ -4458,6 +4640,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup317: pallet_app_promotion::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4469,6 +4652,9 @@
 =======
    * Lookup318: pallet_app_promotion::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup317: pallet_app_promotion::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletAppPromotionCall: {
     _enum: {
@@ -4499,6 +4685,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup318: pallet_foreign_assets::module::Call<T>
 =======
 <<<<<<< HEAD
@@ -4510,6 +4697,9 @@
 =======
    * Lookup319: pallet_foreign_assets::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup318: pallet_foreign_assets::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletForeignAssetsModuleCall: {
     _enum: {
@@ -4528,6 +4718,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup319: pallet_evm::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4539,6 +4730,9 @@
 =======
    * Lookup320: pallet_evm::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup319: pallet_evm::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletEvmCall: {
     _enum: {
@@ -4583,6 +4777,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup325: pallet_ethereum::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4594,6 +4789,9 @@
 =======
    * Lookup326: pallet_ethereum::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup325: pallet_ethereum::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletEthereumCall: {
     _enum: {
@@ -4605,6 +4803,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup326: ethereum::transaction::TransactionV2
 =======
 <<<<<<< HEAD
@@ -4616,6 +4815,9 @@
 =======
    * Lookup327: ethereum::transaction::TransactionV2
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup326: ethereum::transaction::TransactionV2
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionTransactionV2: {
     _enum: {
@@ -4627,6 +4829,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup327: ethereum::transaction::LegacyTransaction
 =======
 <<<<<<< HEAD
@@ -4638,6 +4841,9 @@
 =======
    * Lookup328: ethereum::transaction::LegacyTransaction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup327: ethereum::transaction::LegacyTransaction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionLegacyTransaction: {
     nonce: 'U256',
@@ -4651,6 +4857,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup328: ethereum::transaction::TransactionAction
 =======
 <<<<<<< HEAD
@@ -4662,6 +4869,9 @@
 =======
    * Lookup329: ethereum::transaction::TransactionAction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup328: ethereum::transaction::TransactionAction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionTransactionAction: {
     _enum: {
@@ -4672,6 +4882,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup329: ethereum::transaction::TransactionSignature
 =======
 <<<<<<< HEAD
@@ -4683,6 +4894,9 @@
 =======
    * Lookup330: ethereum::transaction::TransactionSignature
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup329: ethereum::transaction::TransactionSignature
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionTransactionSignature: {
     v: 'u64',
@@ -4692,6 +4906,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup331: ethereum::transaction::EIP2930Transaction
 =======
 <<<<<<< HEAD
@@ -4703,6 +4918,9 @@
 =======
    * Lookup332: ethereum::transaction::EIP2930Transaction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup331: ethereum::transaction::EIP2930Transaction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionEip2930Transaction: {
     chainId: 'u64',
@@ -4720,6 +4938,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup333: ethereum::transaction::AccessListItem
 =======
 <<<<<<< HEAD
@@ -4731,6 +4950,9 @@
 =======
    * Lookup334: ethereum::transaction::AccessListItem
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup333: ethereum::transaction::AccessListItem
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionAccessListItem: {
     address: 'H160',
@@ -4739,6 +4961,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup334: ethereum::transaction::EIP1559Transaction
 =======
 <<<<<<< HEAD
@@ -4750,6 +4973,9 @@
 =======
    * Lookup335: ethereum::transaction::EIP1559Transaction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup334: ethereum::transaction::EIP1559Transaction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionEip1559Transaction: {
     chainId: 'u64',
@@ -4768,6 +4994,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup335: pallet_evm_migration::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4779,6 +5006,9 @@
 =======
    * Lookup336: pallet_evm_migration::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup335: pallet_evm_migration::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletEvmMigrationCall: {
     _enum: {
@@ -4804,6 +5034,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup339: pallet_maintenance::pallet::Call<T>
 =======
    * Lookup338: pallet_maintenance::pallet::Call<T>
@@ -4811,6 +5042,9 @@
 =======
    * Lookup340: pallet_maintenance::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup339: pallet_maintenance::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletMaintenanceCall: {
     _enum: ['enable', 'disable']
@@ -4818,6 +5052,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup340: pallet_test_utils::pallet::Call<T>
 =======
    * Lookup339: pallet_test_utils::pallet::Call<T>
@@ -4825,6 +5060,9 @@
 =======
    * Lookup341: pallet_test_utils::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup340: pallet_test_utils::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletTestUtilsCall: {
     _enum: {
@@ -4845,6 +5083,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup342: pallet_sudo::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -4856,6 +5095,9 @@
 =======
    * Lookup343: pallet_sudo::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup342: pallet_sudo::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletSudoError: {
     _enum: ['RequireSudo']
@@ -4863,6 +5105,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup344: orml_vesting::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4874,6 +5117,9 @@
 =======
    * Lookup345: orml_vesting::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup344: orml_vesting::module::Error<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlVestingModuleError: {
     _enum: ['ZeroVestingPeriod', 'ZeroVestingPeriodCount', 'InsufficientBalanceToLock', 'TooManyVestingSchedules', 'AmountLow', 'MaxVestingSchedulesExceeded']
@@ -4881,6 +5127,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup345: orml_xtokens::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4892,6 +5139,9 @@
 =======
    * Lookup346: orml_xtokens::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup345: orml_xtokens::module::Error<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlXtokensModuleError: {
     _enum: ['AssetHasNoReserve', 'NotCrossChainTransfer', 'InvalidDest', 'NotCrossChainTransferableCurrency', 'UnweighableMessage', 'XcmExecutionFailed', 'CannotReanchor', 'InvalidAncestry', 'InvalidAsset', 'DestinationNotInvertible', 'BadVersion', 'DistinctReserveForAssetAndFee', 'ZeroFee', 'ZeroAmount', 'TooManyAssetsBeingSent', 'AssetIndexNonExistent', 'FeeNotEnough', 'NotSupportedMultiLocation', 'MinXcmFeeNotDefined']
@@ -4899,6 +5149,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup348: orml_tokens::BalanceLock<Balance>
 =======
 <<<<<<< HEAD
@@ -4910,6 +5161,9 @@
 =======
    * Lookup349: orml_tokens::BalanceLock<Balance>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup348: orml_tokens::BalanceLock<Balance>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensBalanceLock: {
     id: '[u8;8]',
@@ -4918,6 +5172,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup350: orml_tokens::AccountData<Balance>
 =======
 <<<<<<< HEAD
@@ -4929,6 +5184,9 @@
 =======
    * Lookup351: orml_tokens::AccountData<Balance>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup350: orml_tokens::AccountData<Balance>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensAccountData: {
     free: 'u128',
@@ -4938,6 +5196,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup352: orml_tokens::ReserveData<ReserveIdentifier, Balance>
 =======
 <<<<<<< HEAD
@@ -4949,6 +5208,9 @@
 =======
    * Lookup353: orml_tokens::ReserveData<ReserveIdentifier, Balance>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup352: orml_tokens::ReserveData<ReserveIdentifier, Balance>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensReserveData: {
     id: 'Null',
@@ -4957,6 +5219,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup354: orml_tokens::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4968,6 +5231,9 @@
 =======
    * Lookup355: orml_tokens::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup354: orml_tokens::module::Error<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensModuleError: {
     _enum: ['BalanceTooLow', 'AmountIntoBalanceFailed', 'LiquidityRestrictions', 'MaxLocksExceeded', 'KeepAlive', 'ExistentialDeposit', 'DeadAccount', 'TooManyReserves']
@@ -4975,6 +5241,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup356: cumulus_pallet_xcmp_queue::InboundChannelDetails
 =======
 <<<<<<< HEAD
@@ -4986,6 +5253,9 @@
 =======
    * Lookup357: cumulus_pallet_xcmp_queue::InboundChannelDetails
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup356: cumulus_pallet_xcmp_queue::InboundChannelDetails
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueInboundChannelDetails: {
     sender: 'u32',
@@ -4995,6 +5265,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup357: cumulus_pallet_xcmp_queue::InboundState
 =======
 <<<<<<< HEAD
@@ -5006,6 +5277,9 @@
 =======
    * Lookup358: cumulus_pallet_xcmp_queue::InboundState
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup357: cumulus_pallet_xcmp_queue::InboundState
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueInboundState: {
     _enum: ['Ok', 'Suspended']
@@ -5013,6 +5287,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup360: polkadot_parachain::primitives::XcmpMessageFormat
 =======
 <<<<<<< HEAD
@@ -5024,6 +5299,9 @@
 =======
    * Lookup361: polkadot_parachain::primitives::XcmpMessageFormat
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup360: polkadot_parachain::primitives::XcmpMessageFormat
+>>>>>>> chore: regenerate types
    **/
   PolkadotParachainPrimitivesXcmpMessageFormat: {
     _enum: ['ConcatenatedVersionedXcm', 'ConcatenatedEncodedBlob', 'Signals']
@@ -5031,6 +5309,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup363: cumulus_pallet_xcmp_queue::OutboundChannelDetails
 =======
 <<<<<<< HEAD
@@ -5042,6 +5321,9 @@
 =======
    * Lookup364: cumulus_pallet_xcmp_queue::OutboundChannelDetails
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup363: cumulus_pallet_xcmp_queue::OutboundChannelDetails
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueOutboundChannelDetails: {
     recipient: 'u32',
@@ -5053,6 +5335,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup364: cumulus_pallet_xcmp_queue::OutboundState
 =======
 <<<<<<< HEAD
@@ -5064,6 +5347,9 @@
 =======
    * Lookup365: cumulus_pallet_xcmp_queue::OutboundState
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup364: cumulus_pallet_xcmp_queue::OutboundState
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueOutboundState: {
     _enum: ['Ok', 'Suspended']
@@ -5071,6 +5357,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup366: cumulus_pallet_xcmp_queue::QueueConfigData
 =======
 <<<<<<< HEAD
@@ -5082,6 +5369,9 @@
 =======
    * Lookup367: cumulus_pallet_xcmp_queue::QueueConfigData
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup366: cumulus_pallet_xcmp_queue::QueueConfigData
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueQueueConfigData: {
     suspendThreshold: 'u32',
@@ -5094,6 +5384,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup368: cumulus_pallet_xcmp_queue::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -5105,6 +5396,9 @@
 =======
    * Lookup369: cumulus_pallet_xcmp_queue::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup368: cumulus_pallet_xcmp_queue::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueError: {
     _enum: ['FailedToSend', 'BadXcmOrigin', 'BadXcm', 'BadOverweightIndex', 'WeightOverLimit']
@@ -5112,6 +5406,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup369: pallet_xcm::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -5123,6 +5418,9 @@
 =======
    * Lookup370: pallet_xcm::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup369: pallet_xcm::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletXcmError: {
     _enum: ['Unreachable', 'SendFailure', 'Filtered', 'UnweighableMessage', 'DestinationNotInvertible', 'Empty', 'CannotReanchor', 'TooManyAssets', 'InvalidOrigin', 'BadVersion', 'BadLocation', 'NoSubscription', 'AlreadySubscribed']
@@ -5130,6 +5428,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup370: cumulus_pallet_xcm::pallet::Error<T>
    **/
   CumulusPalletXcmError: 'Null',
@@ -5155,13 +5454,21 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup370: cumulus_pallet_xcm::pallet::Error<T>
    **/
+  CumulusPalletXcmError: 'Null',
+  /**
+   * Lookup371: cumulus_pallet_dmp_queue::ConfigData
+>>>>>>> chore: regenerate types
+   **/
   CumulusPalletDmpQueueConfigData: {
     maxIndividual: 'SpWeightsWeightV2Weight'
   },
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup372: cumulus_pallet_dmp_queue::PageIndexData
 =======
 <<<<<<< HEAD
@@ -5173,6 +5480,9 @@
 =======
    * Lookup373: cumulus_pallet_dmp_queue::PageIndexData
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup372: cumulus_pallet_dmp_queue::PageIndexData
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletDmpQueuePageIndexData: {
     beginUsed: 'u32',
@@ -5182,6 +5492,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup375: cumulus_pallet_dmp_queue::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -5193,6 +5504,9 @@
 =======
    * Lookup376: cumulus_pallet_dmp_queue::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup375: cumulus_pallet_dmp_queue::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletDmpQueueError: {
     _enum: ['Unknown', 'OverLimit']
@@ -5200,6 +5514,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup379: pallet_unique::Error<T>
 =======
 <<<<<<< HEAD
@@ -5211,6 +5526,9 @@
 =======
    * Lookup380: pallet_unique::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup379: pallet_unique::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletUniqueError: {
     _enum: ['CollectionDecimalPointLimitExceeded', 'EmptyArgument', 'RepartitionCalledOnNonRefungibleCollection']
@@ -5218,6 +5536,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup380: pallet_configuration::pallet::Error<T>
 =======
 =======
@@ -5231,12 +5550,16 @@
    * Lookup381: pallet_unique_scheduler_v2::BlockAgenda<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup380: pallet_configuration::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletConfigurationError: {
     _enum: ['InconsistentConfiguration']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup381: up_data_structs::Collection<sp_core::crypto::AccountId32>
 =======
 <<<<<<< HEAD
@@ -5434,6 +5757,9 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup381: up_data_structs::Collection<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCollection: {
     owner: 'AccountId32',
@@ -5449,6 +5775,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup382: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
 =======
 =======
@@ -5469,6 +5796,9 @@
    * Lookup396: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup382: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsSponsorshipStateAccountId32: {
     _enum: {
@@ -5480,6 +5810,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup384: up_data_structs::Properties
 =======
 =======
@@ -5500,6 +5831,9 @@
    * 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',
@@ -5509,6 +5843,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup385: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5522,6 +5857,9 @@
    * Lookup399: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup385: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsPropertiesMapBoundedVec: 'BTreeMap<Bytes, Bytes>',
   /**
@@ -5530,6 +5868,7 @@
   UpDataStructsPropertiesMapPropertyPermission: 'BTreeMap<Bytes, UpDataStructsPropertyPermission>',
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup397: up_data_structs::CollectionStats
 =======
 <<<<<<< HEAD
@@ -5555,6 +5894,9 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup397: up_data_structs::CollectionStats
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCollectionStats: {
     created: 'u32',
@@ -5564,6 +5906,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup398: up_data_structs::TokenChild
 =======
 =======
@@ -5584,6 +5927,9 @@
    * 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',
@@ -5592,6 +5938,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup399: PhantomType::up_data_structs<T>
    **/
   PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]',
@@ -5630,6 +5977,13 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup399: PhantomType::up_data_structs<T>
+   **/
+  PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]',
+  /**
+   * Lookup401: up_data_structs::TokenData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsTokenData: {
     properties: 'Vec<UpDataStructsProperty>',
@@ -5639,6 +5993,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup403: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
 =======
 =======
@@ -5659,6 +6014,9 @@
    * Lookup417: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup403: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsRpcCollection: {
     owner: 'AccountId32',
@@ -5677,6 +6035,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup404: up_data_structs::RpcCollectionFlags
 =======
 =======
@@ -5697,6 +6056,9 @@
    * 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',
@@ -5705,6 +6067,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup405: rmrk_traits::collection::CollectionInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
 =======
 =======
@@ -5725,6 +6088,9 @@
    * Lookup419: rmrk_traits::collection::CollectionInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>, 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<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsCollectionCollectionInfo: {
     issuer: 'AccountId32',
@@ -5736,6 +6102,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup406: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5756,6 +6123,9 @@
    * Lookup420: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup406: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsNftNftInfo: {
     owner: 'RmrkTraitsNftAccountIdOrCollectionNftTuple',
@@ -5767,6 +6137,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup408: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
 =======
 =======
@@ -5787,6 +6158,9 @@
    * Lookup422: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup408: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsNftRoyaltyInfo: {
     recipient: 'AccountId32',
@@ -5795,6 +6169,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup409: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5815,6 +6190,9 @@
    * Lookup423: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup409: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceResourceInfo: {
     id: 'u32',
@@ -5825,6 +6203,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup410: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5845,6 +6224,9 @@
    * Lookup424: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup410: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPropertyPropertyInfo: {
     key: 'Bytes',
@@ -5853,6 +6235,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup411: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5873,6 +6256,9 @@
    * Lookup425: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup411: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsBaseBaseInfo: {
     issuer: 'AccountId32',
@@ -5882,6 +6268,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup412: rmrk_traits::nft::NftChild
 =======
 =======
@@ -5902,6 +6289,9 @@
    * 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',
@@ -5911,6 +6301,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup414: pallet_common::pallet::Error<T>
 =======
 =======
@@ -5932,6 +6323,9 @@
 =======
    * Lookup427: up_pov_estimate_rpc::PovInfo
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup413: up_pov_estimate_rpc::PovInfo
+>>>>>>> chore: regenerate types
    **/
   UpPovEstimateRpcPovInfo: {
     proofSize: 'u64',
@@ -5944,6 +6338,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup424: pallet_common::pallet::Error<T>
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -5960,6 +6355,9 @@
 =======
    * Lookup430: sp_runtime::transaction_validity::TransactionValidityError
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup416: sp_runtime::transaction_validity::TransactionValidityError
+>>>>>>> chore: regenerate types
    **/
   SpRuntimeTransactionValidityTransactionValidityError: {
     _enum: {
@@ -5968,7 +6366,7 @@
     }
   },
   /**
-   * Lookup431: sp_runtime::transaction_validity::InvalidTransaction
+   * Lookup417: sp_runtime::transaction_validity::InvalidTransaction
    **/
   SpRuntimeTransactionValidityInvalidTransaction: {
     _enum: {
@@ -5981,12 +6379,12 @@
       ExhaustsResources: 'Null',
       Custom: 'u8',
       BadMandatory: 'Null',
-      MandatoryDispatch: 'Null',
+      MandatoryValidation: 'Null',
       BadSigner: 'Null'
     }
   },
   /**
-   * Lookup432: sp_runtime::transaction_validity::UnknownTransaction
+   * Lookup418: sp_runtime::transaction_validity::UnknownTransaction
    **/
   SpRuntimeTransactionValidityUnknownTransaction: {
     _enum: {
@@ -5998,6 +6396,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup428: pallet_common::pallet::Error<T>
 >>>>>>> chore: regenerate types
 <<<<<<< HEAD
@@ -6011,6 +6410,9 @@
 =======
    * Lookup434: up_pov_estimate_rpc::TrieKeyValue
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup420: up_pov_estimate_rpc::TrieKeyValue
+>>>>>>> chore: regenerate types
    **/
   UpPovEstimateRpcTrieKeyValue: {
     key: 'Bytes',
@@ -6018,6 +6420,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup434: pallet_common::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
@@ -6028,6 +6431,9 @@
    * Lookup436: pallet_common::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup422: pallet_common::pallet::Error<T>
+>>>>>>> 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']
@@ -6037,6 +6443,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup416: pallet_fungible::pallet::Error<T>
 =======
 =======
@@ -6083,6 +6490,9 @@
    * Lookup438: pallet_fungible::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup424: pallet_fungible::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletFungibleError: {
     _enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed', 'SettingAllowanceForAllNotAllowed', 'FungibleTokensAreAlwaysValid']
@@ -6092,6 +6502,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup420: pallet_refungible::pallet::Error<T>
 =======
 =======
@@ -6100,6 +6511,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup417: pallet_refungible::ItemData
 =======
@@ -6147,6 +6560,9 @@
    * Lookup439: pallet_refungible::ItemData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup425: pallet_refungible::ItemData
+>>>>>>> chore: regenerate types
    **/
   PalletRefungibleItemData: {
     constData: 'Bytes'
@@ -6156,6 +6572,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup422: pallet_refungible::pallet::Error<T>
 =======
 =======
@@ -6211,7 +6628,13 @@
    * Lookup444: pallet_refungible::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup430: pallet_refungible::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletRefungibleError: {
     _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RepartitionWhileNotOwningAllPieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed']
@@ -6221,6 +6644,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup421: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -6229,6 +6653,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup423: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -6285,7 +6711,13 @@
    * Lookup445: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup431: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletNonfungibleItemData: {
     owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
@@ -6295,6 +6727,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup423: up_data_structs::PropertyScope
 =======
 =======
@@ -6303,6 +6736,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup425: up_data_structs::PropertyScope
 =======
@@ -6359,7 +6794,13 @@
    * Lookup447: up_data_structs::PropertyScope
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup433: up_data_structs::PropertyScope
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsPropertyScope: {
     _enum: ['None', 'Rmrk']
@@ -6369,6 +6810,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup426: pallet_nonfungible::pallet::Error<T>
 =======
 =======
@@ -6377,6 +6819,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup427: pallet_nonfungible::pallet::Error<T>
 =======
@@ -6433,7 +6877,13 @@
    * Lookup449: pallet_nonfungible::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup435: pallet_nonfungible::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletNonfungibleError: {
     _enum: ['NotNonfungibleDataUsedToMintFungibleCollectionToken', 'NonfungibleItemsHaveNoAmount', 'CantBurnNftWithChildren']
@@ -6443,6 +6893,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup427: pallet_structure::pallet::Error<T>
 =======
 =======
@@ -6451,6 +6902,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup428: pallet_structure::pallet::Error<T>
 =======
@@ -6507,7 +6960,13 @@
    * Lookup450: pallet_structure::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup436: pallet_structure::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletStructureError: {
     _enum: ['OuroborosDetected', 'DepthLimit', 'BreadthLimit', 'TokenNotFound']
@@ -6517,6 +6976,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup428: pallet_rmrk_core::pallet::Error<T>
 =======
 =======
@@ -6525,6 +6985,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup429: pallet_rmrk_core::pallet::Error<T>
 =======
@@ -6581,7 +7043,13 @@
    * Lookup451: pallet_rmrk_core::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup437: pallet_rmrk_core::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkCoreError: {
     _enum: ['CorruptedCollectionType', 'RmrkPropertyKeyIsTooLong', 'RmrkPropertyValueIsTooLong', 'RmrkPropertyIsNotFound', 'UnableToDecodeRmrkData', 'CollectionNotEmpty', 'NoAvailableCollectionId', 'NoAvailableNftId', 'CollectionUnknown', 'NoPermission', 'NonTransferable', 'CollectionFullOrLocked', 'ResourceDoesntExist', 'CannotSendToDescendentOrSelf', 'CannotAcceptNonOwnedNft', 'CannotRejectNonOwnedNft', 'CannotRejectNonPendingNft', 'ResourceNotPending', 'NoAvailableResourceId']
@@ -6591,6 +7059,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup430: pallet_rmrk_equip::pallet::Error<T>
 =======
 =======
@@ -6599,6 +7068,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup431: pallet_rmrk_equip::pallet::Error<T>
 =======
@@ -6655,7 +7126,13 @@
    * Lookup453: pallet_rmrk_equip::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup439: pallet_rmrk_equip::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkEquipError: {
     _enum: ['PermissionError', 'NoAvailableBaseId', 'NoAvailablePartId', 'BaseDoesntExist', 'NeedsDefaultThemeFirst', 'PartDoesntExist', 'NoEquippableOnFixedPart']
@@ -6665,6 +7142,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup436: pallet_app_promotion::pallet::Error<T>
 =======
 =======
@@ -6673,6 +7151,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup437: pallet_app_promotion::pallet::Error<T>
 =======
@@ -6729,7 +7209,13 @@
    * Lookup459: pallet_app_promotion::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup445: pallet_app_promotion::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletAppPromotionError: {
     _enum: ['AdminNotSet', 'NoPermission', 'NotSufficientFunds', 'PendingForBlockOverflow', 'SponsorNotSet', 'IncorrectLockedBalanceOperation']
@@ -6739,6 +7225,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup437: pallet_foreign_assets::module::Error<T>
 =======
 =======
@@ -6747,6 +7234,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup438: pallet_foreign_assets::module::Error<T>
 =======
@@ -6803,7 +7292,13 @@
    * Lookup460: pallet_foreign_assets::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup446: pallet_foreign_assets::module::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletForeignAssetsModuleError: {
     _enum: ['BadLocation', 'MultiLocationExisted', 'AssetIdNotExists', 'AssetIdExisted']
@@ -6813,6 +7308,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup439: pallet_evm::pallet::Error<T>
 =======
 =======
@@ -6821,6 +7317,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup440: pallet_evm::pallet::Error<T>
 =======
@@ -6877,7 +7375,13 @@
    * Lookup462: pallet_evm::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup448: pallet_evm::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmError: {
     _enum: ['BalanceLow', 'FeeOverflow', 'PaymentOverflow', 'WithdrawFailed', 'GasPriceTooLow', 'InvalidNonce', 'GasLimitTooLow', 'GasLimitTooHigh', 'Undefined', 'Reentrancy', 'TransactionMustComeFromEOA']
@@ -6887,6 +7391,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup442: fp_rpc::TransactionStatus
 =======
 =======
@@ -6895,6 +7400,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup443: fp_rpc::TransactionStatus
 =======
@@ -6951,7 +7458,13 @@
    * Lookup465: fp_rpc::TransactionStatus
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup451: fp_rpc::TransactionStatus
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   FpRpcTransactionStatus: {
     transactionHash: 'H256',
@@ -6967,6 +7480,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup444: ethbloom::Bloom
    **/
   EthbloomBloom: '[u8;256]',
@@ -6979,6 +7493,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup445: ethbloom::Bloom
    **/
@@ -7063,8 +7579,18 @@
    * Lookup469: ethereum::receipt::ReceiptV3
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup453: ethbloom::Bloom
    **/
+  EthbloomBloom: '[u8;256]',
+  /**
+   * Lookup455: ethereum::receipt::ReceiptV3
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
+   **/
   EthereumReceiptReceiptV3: {
     _enum: {
       Legacy: 'EthereumReceiptEip658ReceiptData',
@@ -7077,6 +7603,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup447: ethereum::receipt::EIP658ReceiptData
 =======
 =======
@@ -7085,6 +7612,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup448: ethereum::receipt::EIP658ReceiptData
 =======
@@ -7141,7 +7670,13 @@
    * Lookup470: ethereum::receipt::EIP658ReceiptData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup456: ethereum::receipt::EIP658ReceiptData
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   EthereumReceiptEip658ReceiptData: {
     statusCode: 'u8',
@@ -7154,6 +7689,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup448: ethereum::block::Block<ethereum::transaction::TransactionV2>
 =======
 =======
@@ -7162,6 +7698,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup449: ethereum::block::Block<ethereum::transaction::TransactionV2>
 =======
@@ -7218,7 +7756,13 @@
    * Lookup471: ethereum::block::Block<ethereum::transaction::TransactionV2>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup457: ethereum::block::Block<ethereum::transaction::TransactionV2>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   EthereumBlock: {
     header: 'EthereumHeader',
@@ -7230,6 +7774,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup449: ethereum::header::Header
 =======
 =======
@@ -7238,6 +7783,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup450: ethereum::header::Header
 =======
@@ -7294,7 +7841,13 @@
    * Lookup472: ethereum::header::Header
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup458: ethereum::header::Header
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   EthereumHeader: {
     parentHash: 'H256',
@@ -7318,6 +7871,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup450: ethereum_types::hash::H64
    **/
   EthereumTypesHashH64: '[u8;8]',
@@ -7330,6 +7884,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup451: ethereum_types::hash::H64
    **/
@@ -7414,8 +7970,18 @@
    * Lookup478: pallet_ethereum::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup459: ethereum_types::hash::H64
    **/
+  EthereumTypesHashH64: '[u8;8]',
+  /**
+   * Lookup464: pallet_ethereum::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
+   **/
   PalletEthereumError: {
     _enum: ['InvalidSignature', 'PreLogExists']
   },
@@ -7424,6 +7990,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup456: pallet_evm_coder_substrate::pallet::Error<T>
 =======
 =======
@@ -7432,6 +7999,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup457: pallet_evm_coder_substrate::pallet::Error<T>
 =======
@@ -7488,7 +8057,13 @@
    * Lookup479: pallet_evm_coder_substrate::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup465: pallet_evm_coder_substrate::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmCoderSubstrateError: {
     _enum: ['OutOfGas', 'OutOfFund']
@@ -7498,6 +8073,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup457: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -7506,6 +8082,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup458: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -7562,7 +8140,13 @@
    * Lookup480: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup466: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsSponsorshipStateBasicCrossAccountIdRepr: {
     _enum: {
@@ -7576,6 +8160,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup458: pallet_evm_contract_helpers::SponsoringModeT
 =======
 =======
@@ -7584,6 +8169,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup459: pallet_evm_contract_helpers::SponsoringModeT
 =======
@@ -7640,7 +8227,13 @@
    * Lookup481: pallet_evm_contract_helpers::SponsoringModeT
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup467: pallet_evm_contract_helpers::SponsoringModeT
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmContractHelpersSponsoringModeT: {
     _enum: ['Disabled', 'Allowlisted', 'Generous']
@@ -7650,6 +8243,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup464: pallet_evm_contract_helpers::pallet::Error<T>
 =======
 =======
@@ -7658,6 +8252,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup465: pallet_evm_contract_helpers::pallet::Error<T>
 =======
@@ -7714,7 +8310,13 @@
    * Lookup487: pallet_evm_contract_helpers::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup473: pallet_evm_contract_helpers::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmContractHelpersError: {
     _enum: ['NoPermission', 'NoPendingSponsor', 'TooManyMethodsHaveSponsoredLimit']
@@ -7724,6 +8326,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup465: pallet_evm_migration::pallet::Error<T>
 =======
 =======
@@ -7732,6 +8335,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup466: pallet_evm_migration::pallet::Error<T>
 =======
@@ -7788,7 +8393,13 @@
    * Lookup488: pallet_evm_migration::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup474: pallet_evm_migration::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmMigrationError: {
     _enum: ['AccountNotEmpty', 'AccountIsNotMigrating', 'BadEvent']
@@ -7798,6 +8409,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup466: pallet_maintenance::pallet::Error<T>
    **/
   PalletMaintenanceError: 'Null',
@@ -7810,6 +8422,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup467: pallet_maintenance::pallet::Error<T>
    **/
@@ -7894,7 +8508,17 @@
    * Lookup490: pallet_test_utils::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup475: pallet_maintenance::pallet::Error<T>
+   **/
+  PalletMaintenanceError: 'Null',
+  /**
+   * Lookup476: pallet_test_utils::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletTestUtilsError: {
     _enum: ['TestPalletDisabled', 'TriggerRollback']
@@ -7904,6 +8528,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup469: sp_runtime::MultiSignature
 =======
 =======
@@ -7912,6 +8537,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup470: sp_runtime::MultiSignature
 =======
@@ -7968,7 +8595,13 @@
    * Lookup492: sp_runtime::MultiSignature
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup478: sp_runtime::MultiSignature
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   SpRuntimeMultiSignature: {
     _enum: {
@@ -7982,6 +8615,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup470: sp_core::ed25519::Signature
 =======
 =======
@@ -7990,6 +8624,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup471: sp_core::ed25519::Signature
 =======
@@ -8075,52 +8711,56 @@
 =======
    * Lookup493: sp_core::ed25519::Signature
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup479: sp_core::ed25519::Signature
+>>>>>>> chore: regenerate types
    **/
   SpCoreEd25519Signature: '[u8;64]',
   /**
-   * Lookup495: sp_core::sr25519::Signature
+   * Lookup481: sp_core::sr25519::Signature
    **/
   SpCoreSr25519Signature: '[u8;64]',
   /**
-   * Lookup496: sp_core::ecdsa::Signature
+   * Lookup482: sp_core::ecdsa::Signature
    **/
   SpCoreEcdsaSignature: '[u8;65]',
   /**
-   * Lookup499: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
+   * Lookup485: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
    **/
   FrameSystemExtensionsCheckSpecVersion: 'Null',
   /**
-   * Lookup500: frame_system::extensions::check_tx_version::CheckTxVersion<T>
+   * Lookup486: frame_system::extensions::check_tx_version::CheckTxVersion<T>
    **/
   FrameSystemExtensionsCheckTxVersion: 'Null',
   /**
-   * Lookup501: frame_system::extensions::check_genesis::CheckGenesis<T>
+   * Lookup487: frame_system::extensions::check_genesis::CheckGenesis<T>
    **/
   FrameSystemExtensionsCheckGenesis: 'Null',
   /**
-   * Lookup504: frame_system::extensions::check_nonce::CheckNonce<T>
+   * Lookup490: frame_system::extensions::check_nonce::CheckNonce<T>
    **/
   FrameSystemExtensionsCheckNonce: 'Compact<u32>',
   /**
-   * Lookup505: frame_system::extensions::check_weight::CheckWeight<T>
+   * Lookup491: frame_system::extensions::check_weight::CheckWeight<T>
    **/
   FrameSystemExtensionsCheckWeight: 'Null',
   /**
-   * Lookup506: opal_runtime::runtime_common::maintenance::CheckMaintenance
+   * Lookup492: opal_runtime::runtime_common::maintenance::CheckMaintenance
    **/
   OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance: 'Null',
   /**
-   * Lookup507: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
+   * Lookup493: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
    **/
   PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
   /**
-   * Lookup508: opal_runtime::Runtime
+   * Lookup494: opal_runtime::Runtime
    **/
   OpalRuntimeRuntime: 'Null',
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup498: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -8158,7 +8798,13 @@
    * Lookup509: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup495: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEthereumFakeTransactionFinalizer: 'Null'
 };
modifiedtests/src/interfaces/registry.tsdiffbeforeafterboth
--- a/tests/src/interfaces/registry.ts
+++ b/tests/src/interfaces/registry.ts
@@ -9,6 +9,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';
 =======
 =======
@@ -17,6 +18,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< 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, 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, 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';
 =======
@@ -73,7 +76,13 @@
 import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, 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, FrameSupportDispatchRawOrigin, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeOriginCaller, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReleases, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationCall, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEthereumRawOrigin, 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, PalletUniqueRawEvent, PalletUniqueSchedulerV2BlockAgenda, PalletUniqueSchedulerV2Call, PalletUniqueSchedulerV2Error, PalletUniqueSchedulerV2Event, PalletUniqueSchedulerV2Scheduled, PalletUniqueSchedulerV2ScheduledCall, PalletXcmCall, PalletXcmError, PalletXcmEvent, PalletXcmOrigin, 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, SpCoreVoid, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, 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';
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+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
 
 declare module '@polkadot/types/types/registry' {
   interface InterfaceTypes {
modifiedtests/src/interfaces/types-lookup.tsdiffbeforeafterboth
1368    readonly data: Bytes;1368    readonly data: Bytes;
1369  }1369  }
13701370
1371<<<<<<< HEAD
1372<<<<<<< HEAD
1373  /** @name PalletEthereumEvent (109) */1371  /** @name PalletEthereumEvent (109) */
1374=======
1375<<<<<<< HEAD
1376  /** @name PalletEthereumEvent (113) */
1377=======
1378  /** @name PalletEthereumEvent (115) */
1379>>>>>>> chore:  regenerate types
1380>>>>>>> chore:  regenerate types
1381=======
1382  /** @name PalletEthereumEvent (113) */
1383>>>>>>> fix: regenerate types after rebase
1384  interface PalletEthereumEvent extends Enum {1372  interface PalletEthereumEvent extends Enum {
1385    readonly isExecuted: boolean;1373    readonly isExecuted: boolean;
1386    readonly asExecuted: {1374    readonly asExecuted: {
1392    readonly type: 'Executed';1380    readonly type: 'Executed';
1393  }1381  }
13941382
1395<<<<<<< HEAD
1396<<<<<<< HEAD
1397  /** @name EvmCoreErrorExitReason (110) */1383  /** @name EvmCoreErrorExitReason (110) */
1398=======
1399<<<<<<< HEAD
1400  /** @name EvmCoreErrorExitReason (114) */
1401=======
1402  /** @name EvmCoreErrorExitReason (116) */
1403>>>>>>> chore:  regenerate types
1404>>>>>>> chore:  regenerate types
1405=======
1406  /** @name EvmCoreErrorExitReason (114) */
1407>>>>>>> fix: regenerate types after rebase
1408  interface EvmCoreErrorExitReason extends Enum {1384  interface EvmCoreErrorExitReason extends Enum {
1409    readonly isSucceed: boolean;1385    readonly isSucceed: boolean;
1410    readonly asSucceed: EvmCoreErrorExitSucceed;1386    readonly asSucceed: EvmCoreErrorExitSucceed;
1417    readonly type: 'Succeed' | 'Error' | 'Revert' | 'Fatal';1393    readonly type: 'Succeed' | 'Error' | 'Revert' | 'Fatal';
1418  }1394  }
14191395
1420<<<<<<< HEAD
1421<<<<<<< HEAD
1422  /** @name EvmCoreErrorExitSucceed (111) */1396  /** @name EvmCoreErrorExitSucceed (111) */
1423=======
1424<<<<<<< HEAD
1425  /** @name EvmCoreErrorExitSucceed (115) */
1426=======
1427  /** @name EvmCoreErrorExitSucceed (117) */
1428>>>>>>> chore:  regenerate types
1429>>>>>>> chore:  regenerate types
1430=======
1431  /** @name EvmCoreErrorExitSucceed (115) */
1432>>>>>>> fix: regenerate types after rebase
1433  interface EvmCoreErrorExitSucceed extends Enum {1397  interface EvmCoreErrorExitSucceed extends Enum {
1434    readonly isStopped: boolean;1398    readonly isStopped: boolean;
1435    readonly isReturned: boolean;1399    readonly isReturned: boolean;
1436    readonly isSuicided: boolean;1400    readonly isSuicided: boolean;
1437    readonly type: 'Stopped' | 'Returned' | 'Suicided';1401    readonly type: 'Stopped' | 'Returned' | 'Suicided';
1438  }1402  }
14391403
1440<<<<<<< HEAD
1441<<<<<<< HEAD
1442  /** @name EvmCoreErrorExitError (112) */1404  /** @name EvmCoreErrorExitError (112) */
1443=======
1444<<<<<<< HEAD
1445  /** @name EvmCoreErrorExitError (116) */
1446=======
1447  /** @name EvmCoreErrorExitError (118) */
1448>>>>>>> chore:  regenerate types
1449>>>>>>> chore:  regenerate types
1450=======
1451  /** @name EvmCoreErrorExitError (116) */
1452>>>>>>> fix: regenerate types after rebase
1453  interface EvmCoreErrorExitError extends Enum {1405  interface EvmCoreErrorExitError extends Enum {
1454    readonly isStackUnderflow: boolean;1406    readonly isStackUnderflow: boolean;
1455    readonly isStackOverflow: boolean;1407    readonly isStackOverflow: boolean;
1470    readonly type: 'StackUnderflow' | 'StackOverflow' | 'InvalidJump' | 'InvalidRange' | 'DesignatedInvalid' | 'CallTooDeep' | 'CreateCollision' | 'CreateContractLimit' | 'OutOfOffset' | 'OutOfGas' | 'OutOfFund' | 'PcUnderflow' | 'CreateEmpty' | 'Other' | 'InvalidCode';1422    readonly type: 'StackUnderflow' | 'StackOverflow' | 'InvalidJump' | 'InvalidRange' | 'DesignatedInvalid' | 'CallTooDeep' | 'CreateCollision' | 'CreateContractLimit' | 'OutOfOffset' | 'OutOfGas' | 'OutOfFund' | 'PcUnderflow' | 'CreateEmpty' | 'Other' | 'InvalidCode';
1471  }1423  }
14721424
1473<<<<<<< HEAD
1474<<<<<<< HEAD
1475  /** @name EvmCoreErrorExitRevert (115) */1425  /** @name EvmCoreErrorExitRevert (115) */
1476=======
1477<<<<<<< HEAD
1478  /** @name EvmCoreErrorExitRevert (119) */
1479=======
1480  /** @name EvmCoreErrorExitRevert (121) */
1481>>>>>>> chore:  regenerate types
1482>>>>>>> chore:  regenerate types
1483=======
1484  /** @name EvmCoreErrorExitRevert (119) */
1485>>>>>>> fix: regenerate types after rebase
1486  interface EvmCoreErrorExitRevert extends Enum {1426  interface EvmCoreErrorExitRevert extends Enum {
1487    readonly isReverted: boolean;1427    readonly isReverted: boolean;
1488    readonly type: 'Reverted';1428    readonly type: 'Reverted';
1489  }1429  }
14901430
1491<<<<<<< HEAD
1492<<<<<<< HEAD
1493  /** @name EvmCoreErrorExitFatal (116) */1431  /** @name EvmCoreErrorExitFatal (116) */
1494=======
1495<<<<<<< HEAD
1496  /** @name EvmCoreErrorExitFatal (120) */
1497=======
1498  /** @name EvmCoreErrorExitFatal (122) */
1499>>>>>>> chore:  regenerate types
1500>>>>>>> chore:  regenerate types
1501=======
1502  /** @name EvmCoreErrorExitFatal (120) */
1503>>>>>>> fix: regenerate types after rebase
1504  interface EvmCoreErrorExitFatal extends Enum {1432  interface EvmCoreErrorExitFatal extends Enum {
1505    readonly isNotSupported: boolean;1433    readonly isNotSupported: boolean;
1506    readonly isUnhandledInterrupt: boolean;1434    readonly isUnhandledInterrupt: boolean;
1511    readonly type: 'NotSupported' | 'UnhandledInterrupt' | 'CallErrorAsFatal' | 'Other';1439    readonly type: 'NotSupported' | 'UnhandledInterrupt' | 'CallErrorAsFatal' | 'Other';
1512  }1440  }
15131441
1514<<<<<<< HEAD
1515<<<<<<< HEAD
1516  /** @name PalletEvmContractHelpersEvent (117) */1442  /** @name PalletEvmContractHelpersEvent (117) */
1517=======
1518<<<<<<< HEAD
1519  /** @name PalletEvmContractHelpersEvent (121) */
1520=======
1521  /** @name PalletEvmContractHelpersEvent (123) */
1522>>>>>>> chore:  regenerate types
1523>>>>>>> chore:  regenerate types
1524=======
1525  /** @name PalletEvmContractHelpersEvent (121) */
1526>>>>>>> fix: regenerate types after rebase
1527  interface PalletEvmContractHelpersEvent extends Enum {1443  interface PalletEvmContractHelpersEvent extends Enum {
1528    readonly isContractSponsorSet: boolean;1444    readonly isContractSponsorSet: boolean;
1529    readonly asContractSponsorSet: ITuple<[H160, AccountId32]>;1445    readonly asContractSponsorSet: ITuple<[H160, AccountId32]>;
1534    readonly type: 'ContractSponsorSet' | 'ContractSponsorshipConfirmed' | 'ContractSponsorRemoved';1450    readonly type: 'ContractSponsorSet' | 'ContractSponsorshipConfirmed' | 'ContractSponsorRemoved';
1535  }1451  }
15361452
1537<<<<<<< HEAD
1538<<<<<<< HEAD
1539  /** @name PalletEvmMigrationEvent (118) */1453  /** @name PalletEvmMigrationEvent (118) */
1540=======
1541<<<<<<< HEAD
1542=======
1543>>>>>>> fix: regenerate types after rebase
1544  /** @name PalletEvmMigrationEvent (122) */
1545>>>>>>> chore:  regenerate types
1546  interface PalletEvmMigrationEvent extends Enum {1454  interface PalletEvmMigrationEvent extends Enum {
1547    readonly isTestEvent: boolean;1455    readonly isTestEvent: boolean;
1548    readonly type: 'TestEvent';1456    readonly type: 'TestEvent';
1549  }1457  }
15501458
1551<<<<<<< HEAD
1552  /** @name PalletMaintenanceEvent (119) */1459  /** @name PalletMaintenanceEvent (119) */
1553=======
1554  /** @name PalletMaintenanceEvent (123) */
1555<<<<<<< HEAD
1556=======
1557  /** @name PalletMaintenanceEvent (124) */
1558>>>>>>> chore:  regenerate types
1559>>>>>>> chore:  regenerate types
1560=======
1561>>>>>>> fix: regenerate types after rebase
1562  interface PalletMaintenanceEvent extends Enum {1460  interface PalletMaintenanceEvent extends Enum {
1563    readonly isMaintenanceEnabled: boolean;1461    readonly isMaintenanceEnabled: boolean;
1564    readonly isMaintenanceDisabled: boolean;1462    readonly isMaintenanceDisabled: boolean;
1565    readonly type: 'MaintenanceEnabled' | 'MaintenanceDisabled';1463    readonly type: 'MaintenanceEnabled' | 'MaintenanceDisabled';
1566  }1464  }
15671465
1568<<<<<<< HEAD
1569<<<<<<< HEAD
1570  /** @name PalletTestUtilsEvent (120) */1466  /** @name PalletTestUtilsEvent (120) */
1571=======
1572<<<<<<< HEAD
1573  /** @name PalletTestUtilsEvent (124) */
1574=======
1575  /** @name PalletTestUtilsEvent (125) */
1576>>>>>>> chore:  regenerate types
1577>>>>>>> chore:  regenerate types
1578=======
1579  /** @name PalletTestUtilsEvent (124) */
1580>>>>>>> fix: regenerate types after rebase
1581  interface PalletTestUtilsEvent extends Enum {1467  interface PalletTestUtilsEvent extends Enum {
1582    readonly isValueIsSet: boolean;1468    readonly isValueIsSet: boolean;
1583    readonly isShouldRollback: boolean;1469    readonly isShouldRollback: boolean;
1584    readonly isBatchCompleted: boolean;1470    readonly isBatchCompleted: boolean;
1585    readonly type: 'ValueIsSet' | 'ShouldRollback' | 'BatchCompleted';1471    readonly type: 'ValueIsSet' | 'ShouldRollback' | 'BatchCompleted';
1586  }1472  }
15871473
1588<<<<<<< HEAD
1589<<<<<<< HEAD
1590  /** @name FrameSystemPhase (121) */1474  /** @name FrameSystemPhase (121) */
1591=======
1592<<<<<<< HEAD
1593  /** @name FrameSystemPhase (125) */
1594=======
1595  /** @name FrameSystemPhase (126) */
1596>>>>>>> chore:  regenerate types
1597>>>>>>> chore:  regenerate types
1598=======
1599  /** @name FrameSystemPhase (125) */
1600>>>>>>> fix: regenerate types after rebase
1601  interface FrameSystemPhase extends Enum {1475  interface FrameSystemPhase extends Enum {
1602    readonly isApplyExtrinsic: boolean;1476    readonly isApplyExtrinsic: boolean;
1603    readonly asApplyExtrinsic: u32;1477    readonly asApplyExtrinsic: u32;
1606    readonly type: 'ApplyExtrinsic' | 'Finalization' | 'Initialization';1480    readonly type: 'ApplyExtrinsic' | 'Finalization' | 'Initialization';
1607  }1481  }
16081482
1609<<<<<<< HEAD
1610<<<<<<< HEAD
1611  /** @name FrameSystemLastRuntimeUpgradeInfo (124) */1483  /** @name FrameSystemLastRuntimeUpgradeInfo (124) */
1612=======
1613<<<<<<< HEAD
1614  /** @name FrameSystemLastRuntimeUpgradeInfo (127) */
1615=======
1616  /** @name FrameSystemLastRuntimeUpgradeInfo (128) */
1617>>>>>>> chore:  regenerate types
1618>>>>>>> chore:  regenerate types
1619=======
1620  /** @name FrameSystemLastRuntimeUpgradeInfo (127) */
1621>>>>>>> fix: regenerate types after rebase
1622  interface FrameSystemLastRuntimeUpgradeInfo extends Struct {1484  interface FrameSystemLastRuntimeUpgradeInfo extends Struct {
1623    readonly specVersion: Compact<u32>;1485    readonly specVersion: Compact<u32>;
1624    readonly specName: Text;1486    readonly specName: Text;
1625  }1487  }
16261488
1627<<<<<<< HEAD
1628<<<<<<< HEAD
1629  /** @name FrameSystemCall (125) */1489  /** @name FrameSystemCall (125) */
1630=======
1631<<<<<<< HEAD
1632  /** @name FrameSystemCall (128) */
1633=======
1634  /** @name FrameSystemCall (129) */
1635>>>>>>> chore:  regenerate types
1636>>>>>>> chore:  regenerate types
1637=======
1638  /** @name FrameSystemCall (128) */
1639>>>>>>> fix: regenerate types after rebase
1640  interface FrameSystemCall extends Enum {1490  interface FrameSystemCall extends Enum {
1641    readonly isRemark: boolean;1491    readonly isRemark: boolean;
1642    readonly asRemark: {1492    readonly asRemark: {
16761526
1677<<<<<<< HEAD1527<<<<<<< HEAD
1678<<<<<<< HEAD1528<<<<<<< HEAD
1529<<<<<<< HEAD
1679  /** @name FrameSystemLimitsBlockWeights (129) */1530  /** @name FrameSystemLimitsBlockWeights (129) */
1680=======1531=======
1681=======1532=======
1696  /** @name FrameSystemLimitsBlockWeights (133) */1547  /** @name FrameSystemLimitsBlockWeights (133) */
1697>>>>>>> fix: regenerate types after rebase1548>>>>>>> fix: regenerate types after rebase
1698>>>>>>> fix: regenerate types after rebase1549>>>>>>> fix: regenerate types after rebase
1550=======
1551  /** @name FrameSystemLimitsBlockWeights (129) */
1552>>>>>>> chore: regenerate types
1699  interface FrameSystemLimitsBlockWeights extends Struct {1553  interface FrameSystemLimitsBlockWeights extends Struct {
1700    readonly baseBlock: SpWeightsWeightV2Weight;1554    readonly baseBlock: SpWeightsWeightV2Weight;
1701    readonly maxBlock: SpWeightsWeightV2Weight;1555    readonly maxBlock: SpWeightsWeightV2Weight;
17041558
1705<<<<<<< HEAD1559<<<<<<< HEAD
1706<<<<<<< HEAD1560<<<<<<< HEAD
1561<<<<<<< HEAD
1707  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */1562  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */
1708=======1563=======
1709=======1564=======
1724  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (134) */1579  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (134) */
1725>>>>>>> fix: regenerate types after rebase1580>>>>>>> fix: regenerate types after rebase
1726>>>>>>> fix: regenerate types after rebase1581>>>>>>> fix: regenerate types after rebase
1582=======
1583  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */
1584>>>>>>> chore: regenerate types
1727  interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct {1585  interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct {
1728    readonly normal: FrameSystemLimitsWeightsPerClass;1586    readonly normal: FrameSystemLimitsWeightsPerClass;
1729    readonly operational: FrameSystemLimitsWeightsPerClass;1587    readonly operational: FrameSystemLimitsWeightsPerClass;
17321590
1733<<<<<<< HEAD1591<<<<<<< HEAD
1734<<<<<<< HEAD1592<<<<<<< HEAD
1593<<<<<<< HEAD
1735  /** @name FrameSystemLimitsWeightsPerClass (131) */1594  /** @name FrameSystemLimitsWeightsPerClass (131) */
1736=======1595=======
1737=======1596=======
1752  /** @name FrameSystemLimitsWeightsPerClass (135) */1611  /** @name FrameSystemLimitsWeightsPerClass (135) */
1753>>>>>>> fix: regenerate types after rebase1612>>>>>>> fix: regenerate types after rebase
1754>>>>>>> fix: regenerate types after rebase1613>>>>>>> fix: regenerate types after rebase
1614=======
1615  /** @name FrameSystemLimitsWeightsPerClass (131) */
1616>>>>>>> chore: regenerate types
1755  interface FrameSystemLimitsWeightsPerClass extends Struct {1617  interface FrameSystemLimitsWeightsPerClass extends Struct {
1756    readonly baseExtrinsic: SpWeightsWeightV2Weight;1618    readonly baseExtrinsic: SpWeightsWeightV2Weight;
1757    readonly maxExtrinsic: Option<SpWeightsWeightV2Weight>;1619    readonly maxExtrinsic: Option<SpWeightsWeightV2Weight>;
17611623
1762<<<<<<< HEAD1624<<<<<<< HEAD
1763<<<<<<< HEAD1625<<<<<<< HEAD
1626<<<<<<< HEAD
1764  /** @name FrameSystemLimitsBlockLength (133) */1627  /** @name FrameSystemLimitsBlockLength (133) */
1765=======1628=======
1766=======1629=======
1781  /** @name FrameSystemLimitsBlockLength (137) */1644  /** @name FrameSystemLimitsBlockLength (137) */
1782>>>>>>> fix: regenerate types after rebase1645>>>>>>> fix: regenerate types after rebase
1783>>>>>>> fix: regenerate types after rebase1646>>>>>>> fix: regenerate types after rebase
1647=======
1648  /** @name FrameSystemLimitsBlockLength (133) */
1649>>>>>>> chore: regenerate types
1784  interface FrameSystemLimitsBlockLength extends Struct {1650  interface FrameSystemLimitsBlockLength extends Struct {
1785    readonly max: FrameSupportDispatchPerDispatchClassU32;1651    readonly max: FrameSupportDispatchPerDispatchClassU32;
1786  }1652  }
17871653
1788<<<<<<< HEAD1654<<<<<<< HEAD
1789<<<<<<< HEAD1655<<<<<<< HEAD
1656<<<<<<< HEAD
1790  /** @name FrameSupportDispatchPerDispatchClassU32 (134) */1657  /** @name FrameSupportDispatchPerDispatchClassU32 (134) */
1791=======1658=======
1792=======1659=======
1807  /** @name FrameSupportDispatchPerDispatchClassU32 (138) */1674  /** @name FrameSupportDispatchPerDispatchClassU32 (138) */
1808>>>>>>> fix: regenerate types after rebase1675>>>>>>> fix: regenerate types after rebase
1809>>>>>>> fix: regenerate types after rebase1676>>>>>>> fix: regenerate types after rebase
1677=======
1678  /** @name FrameSupportDispatchPerDispatchClassU32 (134) */
1679>>>>>>> chore: regenerate types
1810  interface FrameSupportDispatchPerDispatchClassU32 extends Struct {1680  interface FrameSupportDispatchPerDispatchClassU32 extends Struct {
1811    readonly normal: u32;1681    readonly normal: u32;
1812    readonly operational: u32;1682    readonly operational: u32;
18151685
1816<<<<<<< HEAD1686<<<<<<< HEAD
1817<<<<<<< HEAD1687<<<<<<< HEAD
1688<<<<<<< HEAD
1818  /** @name SpWeightsRuntimeDbWeight (135) */1689  /** @name SpWeightsRuntimeDbWeight (135) */
1819=======1690=======
1820=======1691=======
1835  /** @name SpWeightsRuntimeDbWeight (139) */1706  /** @name SpWeightsRuntimeDbWeight (139) */
1836>>>>>>> fix: regenerate types after rebase1707>>>>>>> fix: regenerate types after rebase
1837>>>>>>> fix: regenerate types after rebase1708>>>>>>> fix: regenerate types after rebase
1709=======
1710  /** @name SpWeightsRuntimeDbWeight (135) */
1711>>>>>>> chore: regenerate types
1838  interface SpWeightsRuntimeDbWeight extends Struct {1712  interface SpWeightsRuntimeDbWeight extends Struct {
1839    readonly read: u64;1713    readonly read: u64;
1840    readonly write: u64;1714    readonly write: u64;
1841  }1715  }
18421716
1843<<<<<<< HEAD1717<<<<<<< HEAD
1844<<<<<<< HEAD1718<<<<<<< HEAD
1719<<<<<<< HEAD
1845  /** @name SpVersionRuntimeVersion (136) */1720  /** @name SpVersionRuntimeVersion (136) */
1846=======1721=======
1847=======1722=======
1862  /** @name SpVersionRuntimeVersion (140) */1737  /** @name SpVersionRuntimeVersion (140) */
1863>>>>>>> fix: regenerate types after rebase1738>>>>>>> fix: regenerate types after rebase
1864>>>>>>> fix: regenerate types after rebase1739>>>>>>> fix: regenerate types after rebase
1740=======
1741  /** @name SpVersionRuntimeVersion (136) */
1742>>>>>>> chore: regenerate types
1865  interface SpVersionRuntimeVersion extends Struct {1743  interface SpVersionRuntimeVersion extends Struct {
1866    readonly specName: Text;1744    readonly specName: Text;
1867    readonly implName: Text;1745    readonly implName: Text;
18751753
1876<<<<<<< HEAD1754<<<<<<< HEAD
1877<<<<<<< HEAD1755<<<<<<< HEAD
1756<<<<<<< HEAD
1878  /** @name FrameSystemError (141) */1757  /** @name FrameSystemError (141) */
1879=======1758=======
1880=======1759=======
1895  /** @name FrameSystemError (145) */1774  /** @name FrameSystemError (145) */
1896>>>>>>> fix: regenerate types after rebase1775>>>>>>> fix: regenerate types after rebase
1897>>>>>>> fix: regenerate types after rebase1776>>>>>>> fix: regenerate types after rebase
1777=======
1778  /** @name FrameSystemError (141) */
1779>>>>>>> chore: regenerate types
1898  interface FrameSystemError extends Enum {1780  interface FrameSystemError extends Enum {
1899    readonly isInvalidSpecName: boolean;1781    readonly isInvalidSpecName: boolean;
1900    readonly isSpecVersionNeedsToIncrease: boolean;1782    readonly isSpecVersionNeedsToIncrease: boolean;
19071789
1908<<<<<<< HEAD1790<<<<<<< HEAD
1909<<<<<<< HEAD1791<<<<<<< HEAD
1792<<<<<<< HEAD
1910  /** @name PolkadotPrimitivesV2PersistedValidationData (142) */1793  /** @name PolkadotPrimitivesV2PersistedValidationData (142) */
1911=======1794=======
1912=======1795=======
1927  /** @name PolkadotPrimitivesV2PersistedValidationData (146) */1810  /** @name PolkadotPrimitivesV2PersistedValidationData (146) */
1928>>>>>>> fix: regenerate types after rebase1811>>>>>>> fix: regenerate types after rebase
1929>>>>>>> fix: regenerate types after rebase1812>>>>>>> fix: regenerate types after rebase
1813=======
1814  /** @name PolkadotPrimitivesV2PersistedValidationData (142) */
1815>>>>>>> chore: regenerate types
1930  interface PolkadotPrimitivesV2PersistedValidationData extends Struct {1816  interface PolkadotPrimitivesV2PersistedValidationData extends Struct {
1931    readonly parentHead: Bytes;1817    readonly parentHead: Bytes;
1932    readonly relayParentNumber: u32;1818    readonly relayParentNumber: u32;
19361822
1937<<<<<<< HEAD1823<<<<<<< HEAD
1938<<<<<<< HEAD1824<<<<<<< HEAD
1825<<<<<<< HEAD
1939  /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */1826  /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */
1940=======1827=======
1941=======1828=======
1956  /** @name PolkadotPrimitivesV2UpgradeRestriction (149) */1843  /** @name PolkadotPrimitivesV2UpgradeRestriction (149) */
1957>>>>>>> fix: regenerate types after rebase1844>>>>>>> fix: regenerate types after rebase
1958>>>>>>> fix: regenerate types after rebase1845>>>>>>> fix: regenerate types after rebase
1846=======
1847  /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */
1848>>>>>>> chore: regenerate types
1959  interface PolkadotPrimitivesV2UpgradeRestriction extends Enum {1849  interface PolkadotPrimitivesV2UpgradeRestriction extends Enum {
1960    readonly isPresent: boolean;1850    readonly isPresent: boolean;
1961    readonly type: 'Present';1851    readonly type: 'Present';
1962  }1852  }
19631853
1964<<<<<<< HEAD1854<<<<<<< HEAD
1965<<<<<<< HEAD1855<<<<<<< HEAD
1856<<<<<<< HEAD
1966  /** @name SpTrieStorageProof (146) */1857  /** @name SpTrieStorageProof (146) */
1967=======1858=======
1968=======1859=======
1983  /** @name SpTrieStorageProof (150) */1874  /** @name SpTrieStorageProof (150) */
1984>>>>>>> fix: regenerate types after rebase1875>>>>>>> fix: regenerate types after rebase
1985>>>>>>> fix: regenerate types after rebase1876>>>>>>> fix: regenerate types after rebase
1877=======
1878  /** @name SpTrieStorageProof (146) */
1879>>>>>>> chore: regenerate types
1986  interface SpTrieStorageProof extends Struct {1880  interface SpTrieStorageProof extends Struct {
1987    readonly trieNodes: BTreeSet<Bytes>;1881    readonly trieNodes: BTreeSet<Bytes>;
1988  }1882  }
19891883
1990<<<<<<< HEAD1884<<<<<<< HEAD
1991<<<<<<< HEAD1885<<<<<<< HEAD
1886<<<<<<< HEAD
1992  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */1887  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */
1993=======1888=======
1994=======1889=======
2009  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (152) */1904  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (152) */
2010>>>>>>> fix: regenerate types after rebase1905>>>>>>> fix: regenerate types after rebase
2011>>>>>>> fix: regenerate types after rebase1906>>>>>>> fix: regenerate types after rebase
1907=======
1908  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */
1909>>>>>>> chore: regenerate types
2012  interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct {1910  interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct {
2013    readonly dmqMqcHead: H256;1911    readonly dmqMqcHead: H256;
2014    readonly relayDispatchQueueSize: ITuple<[u32, u32]>;1912    readonly relayDispatchQueueSize: ITuple<[u32, u32]>;
20181916
2019<<<<<<< HEAD1917<<<<<<< HEAD
2020<<<<<<< HEAD1918<<<<<<< HEAD
1919<<<<<<< HEAD
2021  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */1920  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */
2022=======1921=======
2023=======1922=======
2038  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (155) */1937  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (155) */
2039>>>>>>> fix: regenerate types after rebase1938>>>>>>> fix: regenerate types after rebase
2040>>>>>>> fix: regenerate types after rebase1939>>>>>>> fix: regenerate types after rebase
1940=======
1941  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */
1942>>>>>>> chore: regenerate types
2041  interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct {1943  interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct {
2042    readonly maxCapacity: u32;1944    readonly maxCapacity: u32;
2043    readonly maxTotalSize: u32;1945    readonly maxTotalSize: u32;
20491951
2050<<<<<<< HEAD1952<<<<<<< HEAD
2051<<<<<<< HEAD1953<<<<<<< HEAD
1954<<<<<<< HEAD
2052  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */1955  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */
2053=======1956=======
2054=======1957=======
2069  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (156) */1972  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (156) */
2070>>>>>>> fix: regenerate types after rebase1973>>>>>>> fix: regenerate types after rebase
2071>>>>>>> fix: regenerate types after rebase1974>>>>>>> fix: regenerate types after rebase
1975=======
1976  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */
1977>>>>>>> chore: regenerate types
2072  interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct {1978  interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct {
2073    readonly maxCodeSize: u32;1979    readonly maxCodeSize: u32;
2074    readonly maxHeadDataSize: u32;1980    readonly maxHeadDataSize: u32;
20831989
2084<<<<<<< HEAD1990<<<<<<< HEAD
2085<<<<<<< HEAD1991<<<<<<< HEAD
1992<<<<<<< HEAD
2086  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */1993  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */
2087=======1994=======
2088=======1995=======
2103  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (162) */2010  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (162) */
2104>>>>>>> fix: regenerate types after rebase2011>>>>>>> fix: regenerate types after rebase
2105>>>>>>> fix: regenerate types after rebase2012>>>>>>> fix: regenerate types after rebase
2013=======
2014  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */
2015>>>>>>> chore: regenerate types
2106  interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct {2016  interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct {
2107    readonly recipient: u32;2017    readonly recipient: u32;
2108    readonly data: Bytes;2018    readonly data: Bytes;
2109  }2019  }
21102020
2111<<<<<<< HEAD2021<<<<<<< HEAD
2112<<<<<<< HEAD2022<<<<<<< HEAD
2023<<<<<<< HEAD
2113  /** @name CumulusPalletParachainSystemCall (159) */2024  /** @name CumulusPalletParachainSystemCall (159) */
2114=======2025=======
2115=======2026=======
2130  /** @name CumulusPalletParachainSystemCall (163) */2041  /** @name CumulusPalletParachainSystemCall (163) */
2131>>>>>>> fix: regenerate types after rebase2042>>>>>>> fix: regenerate types after rebase
2132>>>>>>> fix: regenerate types after rebase2043>>>>>>> fix: regenerate types after rebase
2044=======
2045  /** @name CumulusPalletParachainSystemCall (159) */
2046>>>>>>> chore: regenerate types
2133  interface CumulusPalletParachainSystemCall extends Enum {2047  interface CumulusPalletParachainSystemCall extends Enum {
2134    readonly isSetValidationData: boolean;2048    readonly isSetValidationData: boolean;
2135    readonly asSetValidationData: {2049    readonly asSetValidationData: {
21522066
2153<<<<<<< HEAD2067<<<<<<< HEAD
2154<<<<<<< HEAD2068<<<<<<< HEAD
2069<<<<<<< HEAD
2155  /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */2070  /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */
2156=======2071=======
2157=======2072=======
2172  /** @name CumulusPrimitivesParachainInherentParachainInherentData (164) */2087  /** @name CumulusPrimitivesParachainInherentParachainInherentData (164) */
2173>>>>>>> fix: regenerate types after rebase2088>>>>>>> fix: regenerate types after rebase
2174>>>>>>> fix: regenerate types after rebase2089>>>>>>> fix: regenerate types after rebase
2090=======
2091  /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */
2092>>>>>>> chore: regenerate types
2175  interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct {2093  interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct {
2176    readonly validationData: PolkadotPrimitivesV2PersistedValidationData;2094    readonly validationData: PolkadotPrimitivesV2PersistedValidationData;
2177    readonly relayChainState: SpTrieStorageProof;2095    readonly relayChainState: SpTrieStorageProof;
21812099
2182<<<<<<< HEAD2100<<<<<<< HEAD
2183<<<<<<< HEAD2101<<<<<<< HEAD
2102<<<<<<< HEAD
2184  /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */2103  /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */
2185=======2104=======
2186=======2105=======
2201  /** @name PolkadotCorePrimitivesInboundDownwardMessage (166) */2120  /** @name PolkadotCorePrimitivesInboundDownwardMessage (166) */
2202>>>>>>> fix: regenerate types after rebase2121>>>>>>> fix: regenerate types after rebase
2203>>>>>>> fix: regenerate types after rebase2122>>>>>>> fix: regenerate types after rebase
2123=======
2124  /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */
2125>>>>>>> chore: regenerate types
2204  interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct {2126  interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct {
2205    readonly sentAt: u32;2127    readonly sentAt: u32;
2206    readonly msg: Bytes;2128    readonly msg: Bytes;
2207  }2129  }
22082130
2209<<<<<<< HEAD2131<<<<<<< HEAD
2210<<<<<<< HEAD2132<<<<<<< HEAD
2133<<<<<<< HEAD
2211  /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */2134  /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */
2212=======2135=======
2213=======2136=======
2228  /** @name PolkadotCorePrimitivesInboundHrmpMessage (169) */2151  /** @name PolkadotCorePrimitivesInboundHrmpMessage (169) */
2229>>>>>>> fix: regenerate types after rebase2152>>>>>>> fix: regenerate types after rebase
2230>>>>>>> fix: regenerate types after rebase2153>>>>>>> fix: regenerate types after rebase
2154=======
2155  /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */
2156>>>>>>> chore: regenerate types
2231  interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct {2157  interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct {
2232    readonly sentAt: u32;2158    readonly sentAt: u32;
2233    readonly data: Bytes;2159    readonly data: Bytes;
2234  }2160  }
22352161
2236<<<<<<< HEAD2162<<<<<<< HEAD
2237<<<<<<< HEAD2163<<<<<<< HEAD
2164<<<<<<< HEAD
2238  /** @name CumulusPalletParachainSystemError (168) */2165  /** @name CumulusPalletParachainSystemError (168) */
2239=======2166=======
2240=======2167=======
2255  /** @name CumulusPalletParachainSystemError (172) */2182  /** @name CumulusPalletParachainSystemError (172) */
2256>>>>>>> fix: regenerate types after rebase2183>>>>>>> fix: regenerate types after rebase
2257>>>>>>> fix: regenerate types after rebase2184>>>>>>> fix: regenerate types after rebase
2185=======
2186  /** @name CumulusPalletParachainSystemError (168) */
2187>>>>>>> chore: regenerate types
2258  interface CumulusPalletParachainSystemError extends Enum {2188  interface CumulusPalletParachainSystemError extends Enum {
2259    readonly isOverlappingUpgrades: boolean;2189    readonly isOverlappingUpgrades: boolean;
2260    readonly isProhibitedByPolkadot: boolean;2190    readonly isProhibitedByPolkadot: boolean;
22692199
2270<<<<<<< HEAD2200<<<<<<< HEAD
2271<<<<<<< HEAD2201<<<<<<< HEAD
2202<<<<<<< HEAD
2272  /** @name PalletBalancesBalanceLock (170) */2203  /** @name PalletBalancesBalanceLock (170) */
2273=======2204=======
2274=======2205=======
2289  /** @name PalletBalancesBalanceLock (174) */2220  /** @name PalletBalancesBalanceLock (174) */
2290>>>>>>> fix: regenerate types after rebase2221>>>>>>> fix: regenerate types after rebase
2291>>>>>>> fix: regenerate types after rebase2222>>>>>>> fix: regenerate types after rebase
2223=======
2224  /** @name PalletBalancesBalanceLock (170) */
2225>>>>>>> chore: regenerate types
2292  interface PalletBalancesBalanceLock extends Struct {2226  interface PalletBalancesBalanceLock extends Struct {
2293    readonly id: U8aFixed;2227    readonly id: U8aFixed;
2294    readonly amount: u128;2228    readonly amount: u128;
22972231
2298<<<<<<< HEAD2232<<<<<<< HEAD
2299<<<<<<< HEAD2233<<<<<<< HEAD
2234<<<<<<< HEAD
2300  /** @name PalletBalancesReasons (171) */2235  /** @name PalletBalancesReasons (171) */
2301=======2236=======
2302=======2237=======
2317  /** @name PalletBalancesReasons (175) */2252  /** @name PalletBalancesReasons (175) */
2318>>>>>>> fix: regenerate types after rebase2253>>>>>>> fix: regenerate types after rebase
2319>>>>>>> fix: regenerate types after rebase2254>>>>>>> fix: regenerate types after rebase
2255=======
2256  /** @name PalletBalancesReasons (171) */
2257>>>>>>> chore: regenerate types
2320  interface PalletBalancesReasons extends Enum {2258  interface PalletBalancesReasons extends Enum {
2321    readonly isFee: boolean;2259    readonly isFee: boolean;
2322    readonly isMisc: boolean;2260    readonly isMisc: boolean;
23262264
2327<<<<<<< HEAD2265<<<<<<< HEAD
2328<<<<<<< HEAD2266<<<<<<< HEAD
2267<<<<<<< HEAD
2329  /** @name PalletBalancesReserveData (174) */2268  /** @name PalletBalancesReserveData (174) */
2330=======2269=======
2331=======2270=======
2346  /** @name PalletBalancesReserveData (178) */2285  /** @name PalletBalancesReserveData (178) */
2347>>>>>>> fix: regenerate types after rebase2286>>>>>>> fix: regenerate types after rebase
2348>>>>>>> fix: regenerate types after rebase2287>>>>>>> fix: regenerate types after rebase
2288=======
2289  /** @name PalletBalancesReserveData (174) */
2290>>>>>>> chore: regenerate types
2349  interface PalletBalancesReserveData extends Struct {2291  interface PalletBalancesReserveData extends Struct {
2350    readonly id: U8aFixed;2292    readonly id: U8aFixed;
2351    readonly amount: u128;2293    readonly amount: u128;
2352  }2294  }
23532295
2354<<<<<<< HEAD2296<<<<<<< HEAD
2355<<<<<<< HEAD2297<<<<<<< HEAD
2298<<<<<<< HEAD
2356  /** @name PalletBalancesCall (176) */2299  /** @name PalletBalancesCall (176) */
2357=======2300=======
2358=======2301=======
2392  /** @name PalletBalancesCall (181) */2335  /** @name PalletBalancesCall (181) */
2393>>>>>>> fix: regenerate types after rebase2336>>>>>>> fix: regenerate types after rebase
2394>>>>>>> fix: regenerate types after rebase2337>>>>>>> fix: regenerate types after rebase
2338=======
2339  /** @name PalletBalancesCall (176) */
2340>>>>>>> chore: regenerate types
2395  interface PalletBalancesCall extends Enum {2341  interface PalletBalancesCall extends Enum {
2396    readonly isTransfer: boolean;2342    readonly isTransfer: boolean;
2397    readonly asTransfer: {2343    readonly asTransfer: {
24302376
2431<<<<<<< HEAD2377<<<<<<< HEAD
2432<<<<<<< HEAD2378<<<<<<< HEAD
2379<<<<<<< HEAD
2433  /** @name PalletBalancesError (179) */2380  /** @name PalletBalancesError (179) */
2434=======2381=======
2435=======2382=======
2450  /** @name PalletBalancesError (184) */2397  /** @name PalletBalancesError (184) */
2451>>>>>>> fix: regenerate types after rebase2398>>>>>>> fix: regenerate types after rebase
2452>>>>>>> fix: regenerate types after rebase2399>>>>>>> fix: regenerate types after rebase
2400=======
2401  /** @name PalletBalancesError (179) */
2402>>>>>>> chore: regenerate types
2453  interface PalletBalancesError extends Enum {2403  interface PalletBalancesError extends Enum {
2454    readonly isVestingBalance: boolean;2404    readonly isVestingBalance: boolean;
2455    readonly isLiquidityRestrictions: boolean;2405    readonly isLiquidityRestrictions: boolean;
24642414
2465<<<<<<< HEAD2415<<<<<<< HEAD
2466<<<<<<< HEAD2416<<<<<<< HEAD
2417<<<<<<< HEAD
2467  /** @name PalletTimestampCall (181) */2418  /** @name PalletTimestampCall (181) */
2468=======2419=======
2469=======2420=======
2484  /** @name PalletTimestampCall (186) */2435  /** @name PalletTimestampCall (186) */
2485>>>>>>> fix: regenerate types after rebase2436>>>>>>> fix: regenerate types after rebase
2486>>>>>>> fix: regenerate types after rebase2437>>>>>>> fix: regenerate types after rebase
2438=======
2439  /** @name PalletTimestampCall (181) */
2440>>>>>>> chore: regenerate types
2487  interface PalletTimestampCall extends Enum {2441  interface PalletTimestampCall extends Enum {
2488    readonly isSet: boolean;2442    readonly isSet: boolean;
2489    readonly asSet: {2443    readonly asSet: {
24942448
2495<<<<<<< HEAD2449<<<<<<< HEAD
2496<<<<<<< HEAD2450<<<<<<< HEAD
2451<<<<<<< HEAD
2497  /** @name PalletTransactionPaymentReleases (183) */2452  /** @name PalletTransactionPaymentReleases (183) */
2498=======2453=======
2499=======2454=======
2514  /** @name PalletTransactionPaymentReleases (188) */2469  /** @name PalletTransactionPaymentReleases (188) */
2515>>>>>>> fix: regenerate types after rebase2470>>>>>>> fix: regenerate types after rebase
2516>>>>>>> fix: regenerate types after rebase2471>>>>>>> fix: regenerate types after rebase
2472=======
2473  /** @name PalletTransactionPaymentReleases (183) */
2474>>>>>>> chore: regenerate types
2517  interface PalletTransactionPaymentReleases extends Enum {2475  interface PalletTransactionPaymentReleases extends Enum {
2518    readonly isV1Ancient: boolean;2476    readonly isV1Ancient: boolean;
2519    readonly isV2: boolean;2477    readonly isV2: boolean;
25222480
2523<<<<<<< HEAD2481<<<<<<< HEAD
2524<<<<<<< HEAD2482<<<<<<< HEAD
2483<<<<<<< HEAD
2525  /** @name PalletTreasuryProposal (184) */2484  /** @name PalletTreasuryProposal (184) */
2526=======2485=======
2527=======2486=======
2542  /** @name PalletTreasuryProposal (189) */2501  /** @name PalletTreasuryProposal (189) */
2543>>>>>>> fix: regenerate types after rebase2502>>>>>>> fix: regenerate types after rebase
2544>>>>>>> fix: regenerate types after rebase2503>>>>>>> fix: regenerate types after rebase
2504=======
2505  /** @name PalletTreasuryProposal (184) */
2506>>>>>>> chore: regenerate types
2545  interface PalletTreasuryProposal extends Struct {2507  interface PalletTreasuryProposal extends Struct {
2546    readonly proposer: AccountId32;2508    readonly proposer: AccountId32;
2547    readonly value: u128;2509    readonly value: u128;
25512513
2552<<<<<<< HEAD2514<<<<<<< HEAD
2553<<<<<<< HEAD2515<<<<<<< HEAD
2516<<<<<<< HEAD
2554  /** @name PalletTreasuryCall (187) */2517  /** @name PalletTreasuryCall (187) */
2555=======2518=======
2556=======2519=======
2571  /** @name PalletTreasuryCall (192) */2534  /** @name PalletTreasuryCall (192) */
2572>>>>>>> fix: regenerate types after rebase2535>>>>>>> fix: regenerate types after rebase
2573>>>>>>> fix: regenerate types after rebase2536>>>>>>> fix: regenerate types after rebase
2537=======
2538  /** @name PalletTreasuryCall (187) */
2539>>>>>>> chore: regenerate types
2574  interface PalletTreasuryCall extends Enum {2540  interface PalletTreasuryCall extends Enum {
2575    readonly isProposeSpend: boolean;2541    readonly isProposeSpend: boolean;
2576    readonly asProposeSpend: {2542    readonly asProposeSpend: {
25992565
2600<<<<<<< HEAD2566<<<<<<< HEAD
2601<<<<<<< HEAD2567<<<<<<< HEAD
2568<<<<<<< HEAD
2602  /** @name FrameSupportPalletId (190) */2569  /** @name FrameSupportPalletId (190) */
2603  interface FrameSupportPalletId extends U8aFixed {}2570  interface FrameSupportPalletId extends U8aFixed {}
26042571
2633=======2600=======
2634>>>>>>> fix: regenerate types after rebase2601>>>>>>> fix: regenerate types after rebase
2635>>>>>>> fix: regenerate types after rebase2602>>>>>>> fix: regenerate types after rebase
2603=======
2604  /** @name FrameSupportPalletId (190) */
2605  interface FrameSupportPalletId extends U8aFixed {}
2606
2607  /** @name PalletTreasuryError (191) */
2608>>>>>>> chore: regenerate types
2636  interface PalletTreasuryError extends Enum {2609  interface PalletTreasuryError extends Enum {
2637    readonly isInsufficientProposersBalance: boolean;2610    readonly isInsufficientProposersBalance: boolean;
2638    readonly isInvalidIndex: boolean;2611    readonly isInvalidIndex: boolean;
26442617
2645<<<<<<< HEAD2618<<<<<<< HEAD
2646<<<<<<< HEAD2619<<<<<<< HEAD
2620<<<<<<< HEAD
2647  /** @name PalletSudoCall (192) */2621  /** @name PalletSudoCall (192) */
2648=======2622=======
2649=======2623=======
2664  /** @name PalletSudoCall (197) */2638  /** @name PalletSudoCall (197) */
2665>>>>>>> fix: regenerate types after rebase2639>>>>>>> fix: regenerate types after rebase
2666>>>>>>> fix: regenerate types after rebase2640>>>>>>> fix: regenerate types after rebase
2641=======
2642  /** @name PalletSudoCall (192) */
2643>>>>>>> chore: regenerate types
2667  interface PalletSudoCall extends Enum {2644  interface PalletSudoCall extends Enum {
2668    readonly isSudo: boolean;2645    readonly isSudo: boolean;
2669    readonly asSudo: {2646    readonly asSudo: {
26882665
2689<<<<<<< HEAD2666<<<<<<< HEAD
2690<<<<<<< HEAD2667<<<<<<< HEAD
2668<<<<<<< HEAD
2691  /** @name OrmlVestingModuleCall (194) */2669  /** @name OrmlVestingModuleCall (194) */
2692=======2670=======
2693=======2671=======
2708  /** @name OrmlVestingModuleCall (199) */2686  /** @name OrmlVestingModuleCall (199) */
2709>>>>>>> fix: regenerate types after rebase2687>>>>>>> fix: regenerate types after rebase
2710>>>>>>> fix: regenerate types after rebase2688>>>>>>> fix: regenerate types after rebase
2689=======
2690  /** @name OrmlVestingModuleCall (194) */
2691>>>>>>> chore: regenerate types
2711  interface OrmlVestingModuleCall extends Enum {2692  interface OrmlVestingModuleCall extends Enum {
2712    readonly isClaim: boolean;2693    readonly isClaim: boolean;
2713    readonly isVestedTransfer: boolean;2694    readonly isVestedTransfer: boolean;
27292710
2730<<<<<<< HEAD2711<<<<<<< HEAD
2731<<<<<<< HEAD2712<<<<<<< HEAD
2713<<<<<<< HEAD
2732  /** @name OrmlXtokensModuleCall (196) */2714  /** @name OrmlXtokensModuleCall (196) */
2733=======2715=======
2734=======2716=======
2749  /** @name OrmlXtokensModuleCall (201) */2731  /** @name OrmlXtokensModuleCall (201) */
2750>>>>>>> fix: regenerate types after rebase2732>>>>>>> fix: regenerate types after rebase
2751>>>>>>> fix: regenerate types after rebase2733>>>>>>> fix: regenerate types after rebase
2734=======
2735  /** @name OrmlXtokensModuleCall (196) */
2736>>>>>>> chore: regenerate types
2752  interface OrmlXtokensModuleCall extends Enum {2737  interface OrmlXtokensModuleCall extends Enum {
2753    readonly isTransfer: boolean;2738    readonly isTransfer: boolean;
2754    readonly asTransfer: {2739    readonly asTransfer: {
27972782
2798<<<<<<< HEAD2783<<<<<<< HEAD
2799<<<<<<< HEAD2784<<<<<<< HEAD
2785<<<<<<< HEAD
2800  /** @name XcmVersionedMultiAsset (197) */2786  /** @name XcmVersionedMultiAsset (197) */
2801=======2787=======
2802=======2788=======
2817  /** @name XcmVersionedMultiAsset (202) */2803  /** @name XcmVersionedMultiAsset (202) */
2818>>>>>>> fix: regenerate types after rebase2804>>>>>>> fix: regenerate types after rebase
2819>>>>>>> fix: regenerate types after rebase2805>>>>>>> fix: regenerate types after rebase
2806=======
2807  /** @name XcmVersionedMultiAsset (197) */
2808>>>>>>> chore: regenerate types
2820  interface XcmVersionedMultiAsset extends Enum {2809  interface XcmVersionedMultiAsset extends Enum {
2821    readonly isV0: boolean;2810    readonly isV0: boolean;
2822    readonly asV0: XcmV0MultiAsset;2811    readonly asV0: XcmV0MultiAsset;
28272816
2828<<<<<<< HEAD2817<<<<<<< HEAD
2829<<<<<<< HEAD2818<<<<<<< HEAD
2819<<<<<<< HEAD
2830  /** @name OrmlTokensModuleCall (200) */2820  /** @name OrmlTokensModuleCall (200) */
2831=======2821=======
2832=======2822=======
2847  /** @name OrmlTokensModuleCall (205) */2837  /** @name OrmlTokensModuleCall (205) */
2848>>>>>>> fix: regenerate types after rebase2838>>>>>>> fix: regenerate types after rebase
2849>>>>>>> fix: regenerate types after rebase2839>>>>>>> fix: regenerate types after rebase
2840=======
2841  /** @name OrmlTokensModuleCall (200) */
2842>>>>>>> chore: regenerate types
2850  interface OrmlTokensModuleCall extends Enum {2843  interface OrmlTokensModuleCall extends Enum {
2851    readonly isTransfer: boolean;2844    readonly isTransfer: boolean;
2852    readonly asTransfer: {2845    readonly asTransfer: {
28852878
2886<<<<<<< HEAD2879<<<<<<< HEAD
2887<<<<<<< HEAD2880<<<<<<< HEAD
2881<<<<<<< HEAD
2888  /** @name CumulusPalletXcmpQueueCall (201) */2882  /** @name CumulusPalletXcmpQueueCall (201) */
2889=======2883=======
2890=======2884=======
2905  /** @name CumulusPalletXcmpQueueCall (206) */2899  /** @name CumulusPalletXcmpQueueCall (206) */
2906>>>>>>> fix: regenerate types after rebase2900>>>>>>> fix: regenerate types after rebase
2907>>>>>>> fix: regenerate types after rebase2901>>>>>>> fix: regenerate types after rebase
2902=======
2903  /** @name CumulusPalletXcmpQueueCall (201) */
2904>>>>>>> chore: regenerate types
2908  interface CumulusPalletXcmpQueueCall extends Enum {2905  interface CumulusPalletXcmpQueueCall extends Enum {
2909    readonly isServiceOverweight: boolean;2906    readonly isServiceOverweight: boolean;
2910    readonly asServiceOverweight: {2907    readonly asServiceOverweight: {
29422939
2943<<<<<<< HEAD2940<<<<<<< HEAD
2944<<<<<<< HEAD2941<<<<<<< HEAD
2942<<<<<<< HEAD
2945  /** @name PalletXcmCall (202) */2943  /** @name PalletXcmCall (202) */
2946=======2944=======
2947=======2945=======
2962  /** @name PalletXcmCall (207) */2960  /** @name PalletXcmCall (207) */
2963>>>>>>> fix: regenerate types after rebase2961>>>>>>> fix: regenerate types after rebase
2964>>>>>>> fix: regenerate types after rebase2962>>>>>>> fix: regenerate types after rebase
2963=======
2964  /** @name PalletXcmCall (202) */
2965>>>>>>> chore: regenerate types
2965  interface PalletXcmCall extends Enum {2966  interface PalletXcmCall extends Enum {
2966    readonly isSend: boolean;2967    readonly isSend: boolean;
2967    readonly asSend: {2968    readonly asSend: {
30253026
3026<<<<<<< HEAD3027<<<<<<< HEAD
3027<<<<<<< HEAD3028<<<<<<< HEAD
3029<<<<<<< HEAD
3028  /** @name XcmVersionedXcm (203) */3030  /** @name XcmVersionedXcm (203) */
3029=======3031=======
3030=======3032=======
3045  /** @name XcmVersionedXcm (208) */3047  /** @name XcmVersionedXcm (208) */
3046>>>>>>> fix: regenerate types after rebase3048>>>>>>> fix: regenerate types after rebase
3047>>>>>>> fix: regenerate types after rebase3049>>>>>>> fix: regenerate types after rebase
3050=======
3051  /** @name XcmVersionedXcm (203) */
3052>>>>>>> chore: regenerate types
3048  interface XcmVersionedXcm extends Enum {3053  interface XcmVersionedXcm extends Enum {
3049    readonly isV0: boolean;3054    readonly isV0: boolean;
3050    readonly asV0: XcmV0Xcm;3055    readonly asV0: XcmV0Xcm;
30573062
3058<<<<<<< HEAD3063<<<<<<< HEAD
3059<<<<<<< HEAD3064<<<<<<< HEAD
3065<<<<<<< HEAD
3060  /** @name XcmV0Xcm (204) */3066  /** @name XcmV0Xcm (204) */
3061=======3067=======
3062=======3068=======
3077  /** @name XcmV0Xcm (209) */3083  /** @name XcmV0Xcm (209) */
3078>>>>>>> fix: regenerate types after rebase3084>>>>>>> fix: regenerate types after rebase
3079>>>>>>> fix: regenerate types after rebase3085>>>>>>> fix: regenerate types after rebase
3086=======
3087  /** @name XcmV0Xcm (204) */
3088>>>>>>> chore: regenerate types
3080  interface XcmV0Xcm extends Enum {3089  interface XcmV0Xcm extends Enum {
3081    readonly isWithdrawAsset: boolean;3090    readonly isWithdrawAsset: boolean;
3082    readonly asWithdrawAsset: {3091    readonly asWithdrawAsset: {
31413150
3142<<<<<<< HEAD3151<<<<<<< HEAD
3143<<<<<<< HEAD3152<<<<<<< HEAD
3153<<<<<<< HEAD
3144  /** @name XcmV0Order (206) */3154  /** @name XcmV0Order (206) */
3145=======3155=======
3146=======3156=======
3161  /** @name XcmV0Order (211) */3171  /** @name XcmV0Order (211) */
3162>>>>>>> fix: regenerate types after rebase3172>>>>>>> fix: regenerate types after rebase
3163>>>>>>> fix: regenerate types after rebase3173>>>>>>> fix: regenerate types after rebase
3174=======
3175  /** @name XcmV0Order (206) */
3176>>>>>>> chore: regenerate types
3164  interface XcmV0Order extends Enum {3177  interface XcmV0Order extends Enum {
3165    readonly isNull: boolean;3178    readonly isNull: boolean;
3166    readonly isDepositAsset: boolean;3179    readonly isDepositAsset: boolean;
32103223
3211<<<<<<< HEAD3224<<<<<<< HEAD
3212<<<<<<< HEAD3225<<<<<<< HEAD
3226<<<<<<< HEAD
3213  /** @name XcmV0Response (208) */3227  /** @name XcmV0Response (208) */
3214=======3228=======
3215=======3229=======
3230  /** @name XcmV0Response (213) */3244  /** @name XcmV0Response (213) */
3231>>>>>>> fix: regenerate types after rebase3245>>>>>>> fix: regenerate types after rebase
3232>>>>>>> fix: regenerate types after rebase3246>>>>>>> fix: regenerate types after rebase
3247=======
3248  /** @name XcmV0Response (208) */
3249>>>>>>> chore: regenerate types
3233  interface XcmV0Response extends Enum {3250  interface XcmV0Response extends Enum {
3234    readonly isAssets: boolean;3251    readonly isAssets: boolean;
3235    readonly asAssets: Vec<XcmV0MultiAsset>;3252    readonly asAssets: Vec<XcmV0MultiAsset>;
32383255
3239<<<<<<< HEAD3256<<<<<<< HEAD
3240<<<<<<< HEAD3257<<<<<<< HEAD
3258<<<<<<< HEAD
3241  /** @name XcmV1Xcm (209) */3259  /** @name XcmV1Xcm (209) */
3242=======3260=======
3243=======3261=======
3258  /** @name XcmV1Xcm (214) */3276  /** @name XcmV1Xcm (214) */
3259>>>>>>> fix: regenerate types after rebase3277>>>>>>> fix: regenerate types after rebase
3260>>>>>>> fix: regenerate types after rebase3278>>>>>>> fix: regenerate types after rebase
3279=======
3280  /** @name XcmV1Xcm (209) */
3281>>>>>>> chore: regenerate types
3261  interface XcmV1Xcm extends Enum {3282  interface XcmV1Xcm extends Enum {
3262    readonly isWithdrawAsset: boolean;3283    readonly isWithdrawAsset: boolean;
3263    readonly asWithdrawAsset: {3284    readonly asWithdrawAsset: {
33283349
3329<<<<<<< HEAD3350<<<<<<< HEAD
3330<<<<<<< HEAD3351<<<<<<< HEAD
3352<<<<<<< HEAD
3331  /** @name XcmV1Order (211) */3353  /** @name XcmV1Order (211) */
3332=======3354=======
3333=======3355=======
3348  /** @name XcmV1Order (216) */3370  /** @name XcmV1Order (216) */
3349>>>>>>> fix: regenerate types after rebase3371>>>>>>> fix: regenerate types after rebase
3350>>>>>>> fix: regenerate types after rebase3372>>>>>>> fix: regenerate types after rebase
3373=======
3374  /** @name XcmV1Order (211) */
3375>>>>>>> chore: regenerate types
3351  interface XcmV1Order extends Enum {3376  interface XcmV1Order extends Enum {
3352    readonly isNoop: boolean;3377    readonly isNoop: boolean;
3353    readonly isDepositAsset: boolean;3378    readonly isDepositAsset: boolean;
33993424
3400<<<<<<< HEAD3425<<<<<<< HEAD
3401<<<<<<< HEAD3426<<<<<<< HEAD
3427<<<<<<< HEAD
3402  /** @name XcmV1Response (213) */3428  /** @name XcmV1Response (213) */
3403=======3429=======
3404=======3430=======
3419  /** @name XcmV1Response (218) */3445  /** @name XcmV1Response (218) */
3420>>>>>>> fix: regenerate types after rebase3446>>>>>>> fix: regenerate types after rebase
3421>>>>>>> fix: regenerate types after rebase3447>>>>>>> fix: regenerate types after rebase
3448=======
3449  /** @name XcmV1Response (213) */
3450>>>>>>> chore: regenerate types
3422  interface XcmV1Response extends Enum {3451  interface XcmV1Response extends Enum {
3423    readonly isAssets: boolean;3452    readonly isAssets: boolean;
3424    readonly asAssets: XcmV1MultiassetMultiAssets;3453    readonly asAssets: XcmV1MultiassetMultiAssets;
34293458
3430<<<<<<< HEAD3459<<<<<<< HEAD
3431<<<<<<< HEAD3460<<<<<<< HEAD
3461<<<<<<< HEAD
3432  /** @name CumulusPalletXcmCall (227) */3462  /** @name CumulusPalletXcmCall (227) */
3433  type CumulusPalletXcmCall = Null;3463  type CumulusPalletXcmCall = Null;
34343464
3463=======3493=======
3464>>>>>>> fix: regenerate types after rebase3494>>>>>>> fix: regenerate types after rebase
3465>>>>>>> fix: regenerate types after rebase3495>>>>>>> fix: regenerate types after rebase
3496=======
3497  /** @name CumulusPalletXcmCall (227) */
3498  type CumulusPalletXcmCall = Null;
3499
3500  /** @name CumulusPalletDmpQueueCall (228) */
3501>>>>>>> chore: regenerate types
3466  interface CumulusPalletDmpQueueCall extends Enum {3502  interface CumulusPalletDmpQueueCall extends Enum {
3467    readonly isServiceOverweight: boolean;3503    readonly isServiceOverweight: boolean;
3468    readonly asServiceOverweight: {3504    readonly asServiceOverweight: {
34743510
3475<<<<<<< HEAD3511<<<<<<< HEAD
3476<<<<<<< HEAD3512<<<<<<< HEAD
3513<<<<<<< HEAD
3477  /** @name PalletInflationCall (229) */3514  /** @name PalletInflationCall (229) */
3478=======3515=======
3479=======3516=======
3494  /** @name PalletInflationCall (234) */3531  /** @name PalletInflationCall (234) */
3495>>>>>>> fix: regenerate types after rebase3532>>>>>>> fix: regenerate types after rebase
3496>>>>>>> fix: regenerate types after rebase3533>>>>>>> fix: regenerate types after rebase
3534=======
3535  /** @name PalletInflationCall (229) */
3536>>>>>>> chore: regenerate types
3497  interface PalletInflationCall extends Enum {3537  interface PalletInflationCall extends Enum {
3498    readonly isStartInflation: boolean;3538    readonly isStartInflation: boolean;
3499    readonly asStartInflation: {3539    readonly asStartInflation: {
35043544
3505<<<<<<< HEAD3545<<<<<<< HEAD
3506<<<<<<< HEAD3546<<<<<<< HEAD
3547<<<<<<< HEAD
3507  /** @name PalletUniqueCall (230) */3548  /** @name PalletUniqueCall (230) */
3508=======3549=======
3509=======3550=======
3524  /** @name PalletUniqueCall (235) */3565  /** @name PalletUniqueCall (235) */
3525>>>>>>> fix: regenerate types after rebase3566>>>>>>> fix: regenerate types after rebase
3526>>>>>>> fix: regenerate types after rebase3567>>>>>>> fix: regenerate types after rebase
3568=======
3569  /** @name PalletUniqueCall (230) */
3570>>>>>>> chore: regenerate types
3527  interface PalletUniqueCall extends Enum {3571  interface PalletUniqueCall extends Enum {
3528    readonly isCreateCollection: boolean;3572    readonly isCreateCollection: boolean;
3529    readonly asCreateCollection: {3573    readonly asCreateCollection: {
36983742
3699<<<<<<< HEAD3743<<<<<<< HEAD
3700<<<<<<< HEAD3744<<<<<<< HEAD
3745<<<<<<< HEAD
3701  /** @name UpDataStructsCollectionMode (235) */3746  /** @name UpDataStructsCollectionMode (235) */
3702=======3747=======
3703=======3748=======
3718  /** @name UpDataStructsCollectionMode (240) */3763  /** @name UpDataStructsCollectionMode (240) */
3719>>>>>>> fix: regenerate types after rebase3764>>>>>>> fix: regenerate types after rebase
3720>>>>>>> fix: regenerate types after rebase3765>>>>>>> fix: regenerate types after rebase
3766=======
3767  /** @name UpDataStructsCollectionMode (235) */
3768>>>>>>> chore: regenerate types
3721  interface UpDataStructsCollectionMode extends Enum {3769  interface UpDataStructsCollectionMode extends Enum {
3722    readonly isNft: boolean;3770    readonly isNft: boolean;
3723    readonly isFungible: boolean;3771    readonly isFungible: boolean;
37283776
3729<<<<<<< HEAD3777<<<<<<< HEAD
3730<<<<<<< HEAD3778<<<<<<< HEAD
3779<<<<<<< HEAD
3731  /** @name UpDataStructsCreateCollectionData (236) */3780  /** @name UpDataStructsCreateCollectionData (236) */
3732=======3781=======
3733=======3782=======
3748  /** @name UpDataStructsCreateCollectionData (241) */3797  /** @name UpDataStructsCreateCollectionData (241) */
3749>>>>>>> fix: regenerate types after rebase3798>>>>>>> fix: regenerate types after rebase
3750>>>>>>> fix: regenerate types after rebase3799>>>>>>> fix: regenerate types after rebase
3800=======
3801  /** @name UpDataStructsCreateCollectionData (236) */
3802>>>>>>> chore: regenerate types
3751  interface UpDataStructsCreateCollectionData extends Struct {3803  interface UpDataStructsCreateCollectionData extends Struct {
3752    readonly mode: UpDataStructsCollectionMode;3804    readonly mode: UpDataStructsCollectionMode;
3753    readonly access: Option<UpDataStructsAccessMode>;3805    readonly access: Option<UpDataStructsAccessMode>;
37633815
3764<<<<<<< HEAD3816<<<<<<< HEAD
3765<<<<<<< HEAD3817<<<<<<< HEAD
3818<<<<<<< HEAD
3766  /** @name UpDataStructsAccessMode (238) */3819  /** @name UpDataStructsAccessMode (238) */
3767=======3820=======
3768=======3821=======
3783  /** @name UpDataStructsAccessMode (243) */3836  /** @name UpDataStructsAccessMode (243) */
3784>>>>>>> fix: regenerate types after rebase3837>>>>>>> fix: regenerate types after rebase
3785>>>>>>> fix: regenerate types after rebase3838>>>>>>> fix: regenerate types after rebase
3839=======
3840  /** @name UpDataStructsAccessMode (238) */
3841>>>>>>> chore: regenerate types
3786  interface UpDataStructsAccessMode extends Enum {3842  interface UpDataStructsAccessMode extends Enum {
3787    readonly isNormal: boolean;3843    readonly isNormal: boolean;
3788    readonly isAllowList: boolean;3844    readonly isAllowList: boolean;
37913847
3792<<<<<<< HEAD3848<<<<<<< HEAD
3793<<<<<<< HEAD3849<<<<<<< HEAD
3850<<<<<<< HEAD
3794  /** @name UpDataStructsCollectionLimits (240) */3851  /** @name UpDataStructsCollectionLimits (240) */
3795=======3852=======
3796=======3853=======
3811  /** @name UpDataStructsCollectionLimits (245) */3868  /** @name UpDataStructsCollectionLimits (245) */
3812>>>>>>> fix: regenerate types after rebase3869>>>>>>> fix: regenerate types after rebase
3813>>>>>>> fix: regenerate types after rebase3870>>>>>>> fix: regenerate types after rebase
3871=======
3872  /** @name UpDataStructsCollectionLimits (240) */
3873>>>>>>> chore: regenerate types
3814  interface UpDataStructsCollectionLimits extends Struct {3874  interface UpDataStructsCollectionLimits extends Struct {
3815    readonly accountTokenOwnershipLimit: Option<u32>;3875    readonly accountTokenOwnershipLimit: Option<u32>;
3816    readonly sponsoredDataSize: Option<u32>;3876    readonly sponsoredDataSize: Option<u32>;
38253885
3826<<<<<<< HEAD3886<<<<<<< HEAD
3827<<<<<<< HEAD3887<<<<<<< HEAD
3888<<<<<<< HEAD
3828  /** @name UpDataStructsSponsoringRateLimit (242) */3889  /** @name UpDataStructsSponsoringRateLimit (242) */
3829=======3890=======
3830=======3891=======
3845  /** @name UpDataStructsSponsoringRateLimit (247) */3906  /** @name UpDataStructsSponsoringRateLimit (247) */
3846>>>>>>> fix: regenerate types after rebase3907>>>>>>> fix: regenerate types after rebase
3847>>>>>>> fix: regenerate types after rebase3908>>>>>>> fix: regenerate types after rebase
3909=======
3910  /** @name UpDataStructsSponsoringRateLimit (242) */
3911>>>>>>> chore: regenerate types
3848  interface UpDataStructsSponsoringRateLimit extends Enum {3912  interface UpDataStructsSponsoringRateLimit extends Enum {
3849    readonly isSponsoringDisabled: boolean;3913    readonly isSponsoringDisabled: boolean;
3850    readonly isBlocks: boolean;3914    readonly isBlocks: boolean;
38543918
3855<<<<<<< HEAD3919<<<<<<< HEAD
3856<<<<<<< HEAD3920<<<<<<< HEAD
3921<<<<<<< HEAD
3857  /** @name UpDataStructsCollectionPermissions (245) */3922  /** @name UpDataStructsCollectionPermissions (245) */
3858=======3923=======
3859=======3924=======
3874  /** @name UpDataStructsCollectionPermissions (250) */3939  /** @name UpDataStructsCollectionPermissions (250) */
3875>>>>>>> fix: regenerate types after rebase3940>>>>>>> fix: regenerate types after rebase
3876>>>>>>> fix: regenerate types after rebase3941>>>>>>> fix: regenerate types after rebase
3942=======
3943  /** @name UpDataStructsCollectionPermissions (245) */
3944>>>>>>> chore: regenerate types
3877  interface UpDataStructsCollectionPermissions extends Struct {3945  interface UpDataStructsCollectionPermissions extends Struct {
3878    readonly access: Option<UpDataStructsAccessMode>;3946    readonly access: Option<UpDataStructsAccessMode>;
3879    readonly mintMode: Option<bool>;3947    readonly mintMode: Option<bool>;
38823950
3883<<<<<<< HEAD3951<<<<<<< HEAD
3884<<<<<<< HEAD3952<<<<<<< HEAD
3953<<<<<<< HEAD
3885  /** @name UpDataStructsNestingPermissions (247) */3954  /** @name UpDataStructsNestingPermissions (247) */
3886=======3955=======
3887=======3956=======
3902  /** @name UpDataStructsNestingPermissions (252) */3971  /** @name UpDataStructsNestingPermissions (252) */
3903>>>>>>> fix: regenerate types after rebase3972>>>>>>> fix: regenerate types after rebase
3904>>>>>>> fix: regenerate types after rebase3973>>>>>>> fix: regenerate types after rebase
3974=======
3975  /** @name UpDataStructsNestingPermissions (247) */
3976>>>>>>> chore: regenerate types
3905  interface UpDataStructsNestingPermissions extends Struct {3977  interface UpDataStructsNestingPermissions extends Struct {
3906    readonly tokenOwner: bool;3978    readonly tokenOwner: bool;
3907    readonly collectionAdmin: bool;3979    readonly collectionAdmin: bool;
39103982
3911<<<<<<< HEAD3983<<<<<<< HEAD
3912<<<<<<< HEAD3984<<<<<<< HEAD
3985<<<<<<< HEAD
3913  /** @name UpDataStructsOwnerRestrictedSet (249) */3986  /** @name UpDataStructsOwnerRestrictedSet (249) */
3914  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}3987  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
39153988
3944=======4017=======
3945>>>>>>> fix: regenerate types after rebase4018>>>>>>> fix: regenerate types after rebase
3946>>>>>>> fix: regenerate types after rebase4019>>>>>>> fix: regenerate types after rebase
4020=======
4021  /** @name UpDataStructsOwnerRestrictedSet (249) */
4022  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
4023
4024  /** @name UpDataStructsPropertyKeyPermission (254) */
4025>>>>>>> chore: regenerate types
3947  interface UpDataStructsPropertyKeyPermission extends Struct {4026  interface UpDataStructsPropertyKeyPermission extends Struct {
3948    readonly key: Bytes;4027    readonly key: Bytes;
3949    readonly permission: UpDataStructsPropertyPermission;4028    readonly permission: UpDataStructsPropertyPermission;
3950  }4029  }
39514030
3952<<<<<<< HEAD4031<<<<<<< HEAD
3953<<<<<<< HEAD4032<<<<<<< HEAD
4033<<<<<<< HEAD
3954  /** @name UpDataStructsPropertyPermission (255) */4034  /** @name UpDataStructsPropertyPermission (255) */
3955=======4035=======
3956=======4036=======
3971  /** @name UpDataStructsPropertyPermission (260) */4051  /** @name UpDataStructsPropertyPermission (260) */
3972>>>>>>> fix: regenerate types after rebase4052>>>>>>> fix: regenerate types after rebase
3973>>>>>>> fix: regenerate types after rebase4053>>>>>>> fix: regenerate types after rebase
4054=======
4055  /** @name UpDataStructsPropertyPermission (255) */
4056>>>>>>> chore: regenerate types
3974  interface UpDataStructsPropertyPermission extends Struct {4057  interface UpDataStructsPropertyPermission extends Struct {
3975    readonly mutable: bool;4058    readonly mutable: bool;
3976    readonly collectionAdmin: bool;4059    readonly collectionAdmin: bool;
39794062
3980<<<<<<< HEAD4063<<<<<<< HEAD
3981<<<<<<< HEAD4064<<<<<<< HEAD
4065<<<<<<< HEAD
3982  /** @name UpDataStructsProperty (258) */4066  /** @name UpDataStructsProperty (258) */
3983=======4067=======
3984=======4068=======
3999  /** @name UpDataStructsProperty (263) */4083  /** @name UpDataStructsProperty (263) */
4000>>>>>>> fix: regenerate types after rebase4084>>>>>>> fix: regenerate types after rebase
4001>>>>>>> fix: regenerate types after rebase4085>>>>>>> fix: regenerate types after rebase
4086=======
4087  /** @name UpDataStructsProperty (258) */
4088>>>>>>> chore: regenerate types
4002  interface UpDataStructsProperty extends Struct {4089  interface UpDataStructsProperty extends Struct {
4003    readonly key: Bytes;4090    readonly key: Bytes;
4004    readonly value: Bytes;4091    readonly value: Bytes;
4005  }4092  }
40064093
4007<<<<<<< HEAD4094<<<<<<< HEAD
4008<<<<<<< HEAD4095<<<<<<< HEAD
4096<<<<<<< HEAD
4009  /** @name UpDataStructsCreateItemData (261) */4097  /** @name UpDataStructsCreateItemData (261) */
4010=======4098=======
4011=======4099=======
4026  /** @name UpDataStructsCreateItemData (266) */4114  /** @name UpDataStructsCreateItemData (266) */
4027>>>>>>> fix: regenerate types after rebase4115>>>>>>> fix: regenerate types after rebase
4028>>>>>>> fix: regenerate types after rebase4116>>>>>>> fix: regenerate types after rebase
4117=======
4118  /** @name UpDataStructsCreateItemData (261) */
4119>>>>>>> chore: regenerate types
4029  interface UpDataStructsCreateItemData extends Enum {4120  interface UpDataStructsCreateItemData extends Enum {
4030    readonly isNft: boolean;4121    readonly isNft: boolean;
4031    readonly asNft: UpDataStructsCreateNftData;4122    readonly asNft: UpDataStructsCreateNftData;
40384129
4039<<<<<<< HEAD4130<<<<<<< HEAD
4040<<<<<<< HEAD4131<<<<<<< HEAD
4132<<<<<<< HEAD
4041  /** @name UpDataStructsCreateNftData (262) */4133  /** @name UpDataStructsCreateNftData (262) */
4042=======4134=======
4043=======4135=======
4058  /** @name UpDataStructsCreateNftData (267) */4150  /** @name UpDataStructsCreateNftData (267) */
4059>>>>>>> fix: regenerate types after rebase4151>>>>>>> fix: regenerate types after rebase
4060>>>>>>> fix: regenerate types after rebase4152>>>>>>> fix: regenerate types after rebase
4153=======
4154  /** @name UpDataStructsCreateNftData (262) */
4155>>>>>>> chore: regenerate types
4061  interface UpDataStructsCreateNftData extends Struct {4156  interface UpDataStructsCreateNftData extends Struct {
4062    readonly properties: Vec<UpDataStructsProperty>;4157    readonly properties: Vec<UpDataStructsProperty>;
4063  }4158  }
40644159
4065<<<<<<< HEAD4160<<<<<<< HEAD
4066<<<<<<< HEAD4161<<<<<<< HEAD
4162<<<<<<< HEAD
4067  /** @name UpDataStructsCreateFungibleData (263) */4163  /** @name UpDataStructsCreateFungibleData (263) */
4068=======4164=======
4069=======4165=======
4084  /** @name UpDataStructsCreateFungibleData (268) */4180  /** @name UpDataStructsCreateFungibleData (268) */
4085>>>>>>> fix: regenerate types after rebase4181>>>>>>> fix: regenerate types after rebase
4086>>>>>>> fix: regenerate types after rebase4182>>>>>>> fix: regenerate types after rebase
4183=======
4184  /** @name UpDataStructsCreateFungibleData (263) */
4185>>>>>>> chore: regenerate types
4087  interface UpDataStructsCreateFungibleData extends Struct {4186  interface UpDataStructsCreateFungibleData extends Struct {
4088    readonly value: u128;4187    readonly value: u128;
4089  }4188  }
40904189
4091<<<<<<< HEAD4190<<<<<<< HEAD
4092<<<<<<< HEAD4191<<<<<<< HEAD
4192<<<<<<< HEAD
4093  /** @name UpDataStructsCreateReFungibleData (264) */4193  /** @name UpDataStructsCreateReFungibleData (264) */
4094=======4194=======
4095=======4195=======
4110  /** @name UpDataStructsCreateReFungibleData (269) */4210  /** @name UpDataStructsCreateReFungibleData (269) */
4111>>>>>>> fix: regenerate types after rebase4211>>>>>>> fix: regenerate types after rebase
4112>>>>>>> fix: regenerate types after rebase4212>>>>>>> fix: regenerate types after rebase
4213=======
4214  /** @name UpDataStructsCreateReFungibleData (264) */
4215>>>>>>> chore: regenerate types
4113  interface UpDataStructsCreateReFungibleData extends Struct {4216  interface UpDataStructsCreateReFungibleData extends Struct {
4114    readonly pieces: u128;4217    readonly pieces: u128;
4115    readonly properties: Vec<UpDataStructsProperty>;4218    readonly properties: Vec<UpDataStructsProperty>;
4116  }4219  }
41174220
4118<<<<<<< HEAD4221<<<<<<< HEAD
4119<<<<<<< HEAD4222<<<<<<< HEAD
4223<<<<<<< HEAD
4120  /** @name UpDataStructsCreateItemExData (267) */4224  /** @name UpDataStructsCreateItemExData (267) */
4121=======4225=======
4122=======4226=======
4137  /** @name UpDataStructsCreateItemExData (272) */4241  /** @name UpDataStructsCreateItemExData (272) */
4138>>>>>>> fix: regenerate types after rebase4242>>>>>>> fix: regenerate types after rebase
4139>>>>>>> fix: regenerate types after rebase4243>>>>>>> fix: regenerate types after rebase
4244=======
4245  /** @name UpDataStructsCreateItemExData (267) */
4246>>>>>>> chore: regenerate types
4140  interface UpDataStructsCreateItemExData extends Enum {4247  interface UpDataStructsCreateItemExData extends Enum {
4141    readonly isNft: boolean;4248    readonly isNft: boolean;
4142    readonly asNft: Vec<UpDataStructsCreateNftExData>;4249    readonly asNft: Vec<UpDataStructsCreateNftExData>;
41514258
4152<<<<<<< HEAD4259<<<<<<< HEAD
4153<<<<<<< HEAD4260<<<<<<< HEAD
4261<<<<<<< HEAD
4154  /** @name UpDataStructsCreateNftExData (269) */4262  /** @name UpDataStructsCreateNftExData (269) */
4155=======4263=======
4156=======4264=======
4171  /** @name UpDataStructsCreateNftExData (274) */4279  /** @name UpDataStructsCreateNftExData (274) */
4172>>>>>>> fix: regenerate types after rebase4280>>>>>>> fix: regenerate types after rebase
4173>>>>>>> fix: regenerate types after rebase4281>>>>>>> fix: regenerate types after rebase
4282=======
4283  /** @name UpDataStructsCreateNftExData (269) */
4284>>>>>>> chore: regenerate types
4174  interface UpDataStructsCreateNftExData extends Struct {4285  interface UpDataStructsCreateNftExData extends Struct {
4175    readonly properties: Vec<UpDataStructsProperty>;4286    readonly properties: Vec<UpDataStructsProperty>;
4176    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;4287    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
4177  }4288  }
41784289
4179<<<<<<< HEAD4290<<<<<<< HEAD
4180<<<<<<< HEAD4291<<<<<<< HEAD
4292<<<<<<< HEAD
4181  /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */4293  /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */
4182=======4294=======
4183=======4295=======
4198  /** @name UpDataStructsCreateRefungibleExSingleOwner (281) */4310  /** @name UpDataStructsCreateRefungibleExSingleOwner (281) */
4199>>>>>>> fix: regenerate types after rebase4311>>>>>>> fix: regenerate types after rebase
4200>>>>>>> fix: regenerate types after rebase4312>>>>>>> fix: regenerate types after rebase
4313=======
4314  /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */
4315>>>>>>> chore: regenerate types
4201  interface UpDataStructsCreateRefungibleExSingleOwner extends Struct {4316  interface UpDataStructsCreateRefungibleExSingleOwner extends Struct {
4202    readonly user: PalletEvmAccountBasicCrossAccountIdRepr;4317    readonly user: PalletEvmAccountBasicCrossAccountIdRepr;
4203    readonly pieces: u128;4318    readonly pieces: u128;
42064321
4207<<<<<<< HEAD4322<<<<<<< HEAD
4208<<<<<<< HEAD4323<<<<<<< HEAD
4324<<<<<<< HEAD
4209  /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */4325  /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */
4210=======4326=======
4211=======4327=======
4226  /** @name UpDataStructsCreateRefungibleExMultipleOwners (283) */4342  /** @name UpDataStructsCreateRefungibleExMultipleOwners (283) */
4227>>>>>>> fix: regenerate types after rebase4343>>>>>>> fix: regenerate types after rebase
4228>>>>>>> fix: regenerate types after rebase4344>>>>>>> fix: regenerate types after rebase
4345=======
4346  /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */
4347>>>>>>> chore: regenerate types
4229  interface UpDataStructsCreateRefungibleExMultipleOwners extends Struct {4348  interface UpDataStructsCreateRefungibleExMultipleOwners extends Struct {
4230    readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;4349    readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
4231    readonly properties: Vec<UpDataStructsProperty>;4350    readonly properties: Vec<UpDataStructsProperty>;
4232  }4351  }
42334352
4234<<<<<<< HEAD4353<<<<<<< HEAD
4235<<<<<<< HEAD4354<<<<<<< HEAD
4355<<<<<<< HEAD
4236  /** @name PalletConfigurationCall (279) */4356  /** @name PalletConfigurationCall (279) */
4237=======4357=======
4238=======4358=======
4304=======4424=======
4305>>>>>>> fix: regenerate types after rebase4425>>>>>>> fix: regenerate types after rebase
4306>>>>>>> fix: regenerate types after rebase4426>>>>>>> fix: regenerate types after rebase
4427=======
4428  /** @name PalletConfigurationCall (279) */
4429>>>>>>> chore: regenerate types
4307  interface PalletConfigurationCall extends Enum {4430  interface PalletConfigurationCall extends Enum {
4308    readonly isSetWeightToFeeCoefficientOverride: boolean;4431    readonly isSetWeightToFeeCoefficientOverride: boolean;
4309    readonly asSetWeightToFeeCoefficientOverride: {4432    readonly asSetWeightToFeeCoefficientOverride: {
43344457
4335<<<<<<< HEAD4458<<<<<<< HEAD
4336<<<<<<< HEAD4459<<<<<<< HEAD
4460<<<<<<< HEAD
4337  /** @name PalletTemplateTransactionPaymentCall (288) */4461  /** @name PalletTemplateTransactionPaymentCall (288) */
4338=======4462=======
4339<<<<<<< HEAD4463<<<<<<< HEAD
4340=======4464=======
4341>>>>>>> fix: regenerate types after rebase4465>>>>>>> fix: regenerate types after rebase
4342  /** @name PalletTemplateTransactionPaymentCall (289) */4466  /** @name PalletTemplateTransactionPaymentCall (289) */
4343>>>>>>> chore:  regenerate types4467>>>>>>> chore:  regenerate types
4468=======
4469  /** @name PalletTemplateTransactionPaymentCall (288) */
4470>>>>>>> chore: regenerate types
4344  type PalletTemplateTransactionPaymentCall = Null;4471  type PalletTemplateTransactionPaymentCall = Null;
43454472
4346  /** @name PalletStructureCall (289) */4473  /** @name PalletStructureCall (289) */
4347  type PalletStructureCall = Null;4474  type PalletStructureCall = Null;
43484475
4349<<<<<<< HEAD4476<<<<<<< HEAD
4477<<<<<<< HEAD
4350  /** @name PalletRmrkCoreCall (290) */4478  /** @name PalletRmrkCoreCall (290) */
4351=======4479=======
4352  /** @name PalletRmrkCoreCall (291) */4480  /** @name PalletRmrkCoreCall (291) */
4363>>>>>>> chore:  regenerate types4491>>>>>>> chore:  regenerate types
4364=======4492=======
4365>>>>>>> fix: regenerate types after rebase4493>>>>>>> fix: regenerate types after rebase
4494=======
4495  /** @name PalletRmrkCoreCall (290) */
4496>>>>>>> chore: regenerate types
4366  interface PalletRmrkCoreCall extends Enum {4497  interface PalletRmrkCoreCall extends Enum {
4367    readonly isCreateCollection: boolean;4498    readonly isCreateCollection: boolean;
4368    readonly asCreateCollection: {4499    readonly asCreateCollection: {
44704601
4471<<<<<<< HEAD4602<<<<<<< HEAD
4472<<<<<<< HEAD4603<<<<<<< HEAD
4604<<<<<<< HEAD
4473  /** @name RmrkTraitsResourceResourceTypes (296) */4605  /** @name RmrkTraitsResourceResourceTypes (296) */
4474=======4606=======
4475<<<<<<< HEAD4607<<<<<<< HEAD
4481=======4613=======
4482  /** @name RmrkTraitsResourceResourceTypes (297) */4614  /** @name RmrkTraitsResourceResourceTypes (297) */
4483>>>>>>> fix: regenerate types after rebase4615>>>>>>> fix: regenerate types after rebase
4616=======
4617  /** @name RmrkTraitsResourceResourceTypes (296) */
4618>>>>>>> chore: regenerate types
4484  interface RmrkTraitsResourceResourceTypes extends Enum {4619  interface RmrkTraitsResourceResourceTypes extends Enum {
4485    readonly isBasic: boolean;4620    readonly isBasic: boolean;
4486    readonly asBasic: RmrkTraitsResourceBasicResource;4621    readonly asBasic: RmrkTraitsResourceBasicResource;
44934628
4494<<<<<<< HEAD4629<<<<<<< HEAD
4495<<<<<<< HEAD4630<<<<<<< HEAD
4631<<<<<<< HEAD
4496  /** @name RmrkTraitsResourceBasicResource (298) */4632  /** @name RmrkTraitsResourceBasicResource (298) */
4497=======4633=======
4498<<<<<<< HEAD4634<<<<<<< HEAD
4504=======4640=======
4505  /** @name RmrkTraitsResourceBasicResource (299) */4641  /** @name RmrkTraitsResourceBasicResource (299) */
4506>>>>>>> fix: regenerate types after rebase4642>>>>>>> fix: regenerate types after rebase
4643=======
4644  /** @name RmrkTraitsResourceBasicResource (298) */
4645>>>>>>> chore: regenerate types
4507  interface RmrkTraitsResourceBasicResource extends Struct {4646  interface RmrkTraitsResourceBasicResource extends Struct {
4508    readonly src: Option<Bytes>;4647    readonly src: Option<Bytes>;
4509    readonly metadata: Option<Bytes>;4648    readonly metadata: Option<Bytes>;
45134652
4514<<<<<<< HEAD4653<<<<<<< HEAD
4515<<<<<<< HEAD4654<<<<<<< HEAD
4655<<<<<<< HEAD
4516  /** @name RmrkTraitsResourceComposableResource (300) */4656  /** @name RmrkTraitsResourceComposableResource (300) */
4517=======4657=======
4518<<<<<<< HEAD4658<<<<<<< HEAD
4524=======4664=======
4525  /** @name RmrkTraitsResourceComposableResource (301) */4665  /** @name RmrkTraitsResourceComposableResource (301) */
4526>>>>>>> fix: regenerate types after rebase4666>>>>>>> fix: regenerate types after rebase
4667=======
4668  /** @name RmrkTraitsResourceComposableResource (300) */
4669>>>>>>> chore: regenerate types
4527  interface RmrkTraitsResourceComposableResource extends Struct {4670  interface RmrkTraitsResourceComposableResource extends Struct {
4528    readonly parts: Vec<u32>;4671    readonly parts: Vec<u32>;
4529    readonly base: u32;4672    readonly base: u32;
45354678
4536<<<<<<< HEAD4679<<<<<<< HEAD
4537<<<<<<< HEAD4680<<<<<<< HEAD
4681<<<<<<< HEAD
4538  /** @name RmrkTraitsResourceSlotResource (301) */4682  /** @name RmrkTraitsResourceSlotResource (301) */
4539=======4683=======
4540<<<<<<< HEAD4684<<<<<<< HEAD
4546=======4690=======
4547  /** @name RmrkTraitsResourceSlotResource (302) */4691  /** @name RmrkTraitsResourceSlotResource (302) */
4548>>>>>>> fix: regenerate types after rebase4692>>>>>>> fix: regenerate types after rebase
4693=======
4694  /** @name RmrkTraitsResourceSlotResource (301) */
4695>>>>>>> chore: regenerate types
4549  interface RmrkTraitsResourceSlotResource extends Struct {4696  interface RmrkTraitsResourceSlotResource extends Struct {
4550    readonly base: u32;4697    readonly base: u32;
4551    readonly src: Option<Bytes>;4698    readonly src: Option<Bytes>;
45574704
4558<<<<<<< HEAD4705<<<<<<< HEAD
4559<<<<<<< HEAD4706<<<<<<< HEAD
4707<<<<<<< HEAD
4560  /** @name PalletRmrkEquipCall (304) */4708  /** @name PalletRmrkEquipCall (304) */
4561=======4709=======
4562<<<<<<< HEAD4710<<<<<<< HEAD
4568=======4716=======
4569  /** @name PalletRmrkEquipCall (305) */4717  /** @name PalletRmrkEquipCall (305) */
4570>>>>>>> fix: regenerate types after rebase4718>>>>>>> fix: regenerate types after rebase
4719=======
4720  /** @name PalletRmrkEquipCall (304) */
4721>>>>>>> chore: regenerate types
4571  interface PalletRmrkEquipCall extends Enum {4722  interface PalletRmrkEquipCall extends Enum {
4572    readonly isCreateBase: boolean;4723    readonly isCreateBase: boolean;
4573    readonly asCreateBase: {4724    readonly asCreateBase: {
45914742
4592<<<<<<< HEAD4743<<<<<<< HEAD
4593<<<<<<< HEAD4744<<<<<<< HEAD
4745<<<<<<< HEAD
4594  /** @name RmrkTraitsPartPartType (307) */4746  /** @name RmrkTraitsPartPartType (307) */
4595=======4747=======
4596<<<<<<< HEAD4748<<<<<<< HEAD
4602=======4754=======
4603  /** @name RmrkTraitsPartPartType (308) */4755  /** @name RmrkTraitsPartPartType (308) */
4604>>>>>>> fix: regenerate types after rebase4756>>>>>>> fix: regenerate types after rebase
4757=======
4758  /** @name RmrkTraitsPartPartType (307) */
4759>>>>>>> chore: regenerate types
4605  interface RmrkTraitsPartPartType extends Enum {4760  interface RmrkTraitsPartPartType extends Enum {
4606    readonly isFixedPart: boolean;4761    readonly isFixedPart: boolean;
4607    readonly asFixedPart: RmrkTraitsPartFixedPart;4762    readonly asFixedPart: RmrkTraitsPartFixedPart;
46124767
4613<<<<<<< HEAD4768<<<<<<< HEAD
4614<<<<<<< HEAD4769<<<<<<< HEAD
4770<<<<<<< HEAD
4615  /** @name RmrkTraitsPartFixedPart (309) */4771  /** @name RmrkTraitsPartFixedPart (309) */
4616=======4772=======
4617<<<<<<< HEAD4773<<<<<<< HEAD
4623=======4779=======
4624  /** @name RmrkTraitsPartFixedPart (310) */4780  /** @name RmrkTraitsPartFixedPart (310) */
4625>>>>>>> fix: regenerate types after rebase4781>>>>>>> fix: regenerate types after rebase
4782=======
4783  /** @name RmrkTraitsPartFixedPart (309) */
4784>>>>>>> chore: regenerate types
4626  interface RmrkTraitsPartFixedPart extends Struct {4785  interface RmrkTraitsPartFixedPart extends Struct {
4627    readonly id: u32;4786    readonly id: u32;
4628    readonly z: u32;4787    readonly z: u32;
46314790
4632<<<<<<< HEAD4791<<<<<<< HEAD
4633<<<<<<< HEAD4792<<<<<<< HEAD
4793<<<<<<< HEAD
4634  /** @name RmrkTraitsPartSlotPart (310) */4794  /** @name RmrkTraitsPartSlotPart (310) */
4635=======4795=======
4636<<<<<<< HEAD4796<<<<<<< HEAD
4642=======4802=======
4643  /** @name RmrkTraitsPartSlotPart (311) */4803  /** @name RmrkTraitsPartSlotPart (311) */
4644>>>>>>> fix: regenerate types after rebase4804>>>>>>> fix: regenerate types after rebase
4805=======
4806  /** @name RmrkTraitsPartSlotPart (310) */
4807>>>>>>> chore: regenerate types
4645  interface RmrkTraitsPartSlotPart extends Struct {4808  interface RmrkTraitsPartSlotPart extends Struct {
4646    readonly id: u32;4809    readonly id: u32;
4647    readonly equippable: RmrkTraitsPartEquippableList;4810    readonly equippable: RmrkTraitsPartEquippableList;
46514814
4652<<<<<<< HEAD4815<<<<<<< HEAD
4653<<<<<<< HEAD4816<<<<<<< HEAD
4817<<<<<<< HEAD
4654  /** @name RmrkTraitsPartEquippableList (311) */4818  /** @name RmrkTraitsPartEquippableList (311) */
4655=======4819=======
4656<<<<<<< HEAD4820<<<<<<< HEAD
4662=======4826=======
4663  /** @name RmrkTraitsPartEquippableList (312) */4827  /** @name RmrkTraitsPartEquippableList (312) */
4664>>>>>>> fix: regenerate types after rebase4828>>>>>>> fix: regenerate types after rebase
4829=======
4830  /** @name RmrkTraitsPartEquippableList (311) */
4831>>>>>>> chore: regenerate types
4665  interface RmrkTraitsPartEquippableList extends Enum {4832  interface RmrkTraitsPartEquippableList extends Enum {
4666    readonly isAll: boolean;4833    readonly isAll: boolean;
4667    readonly isEmpty: boolean;4834    readonly isEmpty: boolean;
46724839
4673<<<<<<< HEAD4840<<<<<<< HEAD
4674<<<<<<< HEAD4841<<<<<<< HEAD
4842<<<<<<< HEAD
4675  /** @name RmrkTraitsTheme (313) */4843  /** @name RmrkTraitsTheme (313) */
4676=======4844=======
4677<<<<<<< HEAD4845<<<<<<< HEAD
4683=======4851=======
4684  /** @name RmrkTraitsTheme (314) */4852  /** @name RmrkTraitsTheme (314) */
4685>>>>>>> fix: regenerate types after rebase4853>>>>>>> fix: regenerate types after rebase
4854=======
4855  /** @name RmrkTraitsTheme (313) */
4856>>>>>>> chore: regenerate types
4686  interface RmrkTraitsTheme extends Struct {4857  interface RmrkTraitsTheme extends Struct {
4687    readonly name: Bytes;4858    readonly name: Bytes;
4688    readonly properties: Vec<RmrkTraitsThemeThemeProperty>;4859    readonly properties: Vec<RmrkTraitsThemeThemeProperty>;
46914862
4692<<<<<<< HEAD4863<<<<<<< HEAD
4693<<<<<<< HEAD4864<<<<<<< HEAD
4865<<<<<<< HEAD
4694  /** @name RmrkTraitsThemeThemeProperty (315) */4866  /** @name RmrkTraitsThemeThemeProperty (315) */
4695=======4867=======
4696<<<<<<< HEAD4868<<<<<<< HEAD
4702=======4874=======
4703  /** @name RmrkTraitsThemeThemeProperty (316) */4875  /** @name RmrkTraitsThemeThemeProperty (316) */
4704>>>>>>> fix: regenerate types after rebase4876>>>>>>> fix: regenerate types after rebase
4877=======
4878  /** @name RmrkTraitsThemeThemeProperty (315) */
4879>>>>>>> chore: regenerate types
4705  interface RmrkTraitsThemeThemeProperty extends Struct {4880  interface RmrkTraitsThemeThemeProperty extends Struct {
4706    readonly key: Bytes;4881    readonly key: Bytes;
4707    readonly value: Bytes;4882    readonly value: Bytes;
4708  }4883  }
47094884
4710<<<<<<< HEAD4885<<<<<<< HEAD
4711<<<<<<< HEAD4886<<<<<<< HEAD
4887<<<<<<< HEAD
4712  /** @name PalletAppPromotionCall (317) */4888  /** @name PalletAppPromotionCall (317) */
4713=======4889=======
4714<<<<<<< HEAD4890<<<<<<< HEAD
4720=======4896=======
4721  /** @name PalletAppPromotionCall (318) */4897  /** @name PalletAppPromotionCall (318) */
4722>>>>>>> fix: regenerate types after rebase4898>>>>>>> fix: regenerate types after rebase
4899=======
4900  /** @name PalletAppPromotionCall (317) */
4901>>>>>>> chore: regenerate types
4723  interface PalletAppPromotionCall extends Enum {4902  interface PalletAppPromotionCall extends Enum {
4724    readonly isSetAdminAddress: boolean;4903    readonly isSetAdminAddress: boolean;
4725    readonly asSetAdminAddress: {4904    readonly asSetAdminAddress: {
47554934
4756<<<<<<< HEAD4935<<<<<<< HEAD
4757<<<<<<< HEAD4936<<<<<<< HEAD
4937<<<<<<< HEAD
4758  /** @name PalletForeignAssetsModuleCall (318) */4938  /** @name PalletForeignAssetsModuleCall (318) */
4759=======4939=======
4760<<<<<<< HEAD4940<<<<<<< HEAD
4766=======4946=======
4767  /** @name PalletForeignAssetsModuleCall (319) */4947  /** @name PalletForeignAssetsModuleCall (319) */
4768>>>>>>> fix: regenerate types after rebase4948>>>>>>> fix: regenerate types after rebase
4949=======
4950  /** @name PalletForeignAssetsModuleCall (318) */
4951>>>>>>> chore: regenerate types
4769  interface PalletForeignAssetsModuleCall extends Enum {4952  interface PalletForeignAssetsModuleCall extends Enum {
4770    readonly isRegisterForeignAsset: boolean;4953    readonly isRegisterForeignAsset: boolean;
4771    readonly asRegisterForeignAsset: {4954    readonly asRegisterForeignAsset: {
47844967
4785<<<<<<< HEAD4968<<<<<<< HEAD
4786<<<<<<< HEAD4969<<<<<<< HEAD
4970<<<<<<< HEAD
4787  /** @name PalletEvmCall (319) */4971  /** @name PalletEvmCall (319) */
4788=======4972=======
4789<<<<<<< HEAD4973<<<<<<< HEAD
4795=======4979=======
4796  /** @name PalletEvmCall (320) */4980  /** @name PalletEvmCall (320) */
4797>>>>>>> fix: regenerate types after rebase4981>>>>>>> fix: regenerate types after rebase
4982=======
4983  /** @name PalletEvmCall (319) */
4984>>>>>>> chore: regenerate types
4798  interface PalletEvmCall extends Enum {4985  interface PalletEvmCall extends Enum {
4799    readonly isWithdraw: boolean;4986    readonly isWithdraw: boolean;
4800    readonly asWithdraw: {4987    readonly asWithdraw: {
48415028
4842<<<<<<< HEAD5029<<<<<<< HEAD
4843<<<<<<< HEAD5030<<<<<<< HEAD
5031<<<<<<< HEAD
4844  /** @name PalletEthereumCall (325) */5032  /** @name PalletEthereumCall (325) */
4845=======5033=======
4846<<<<<<< HEAD5034<<<<<<< HEAD
4852=======5040=======
4853  /** @name PalletEthereumCall (326) */5041  /** @name PalletEthereumCall (326) */
4854>>>>>>> fix: regenerate types after rebase5042>>>>>>> fix: regenerate types after rebase
5043=======
5044  /** @name PalletEthereumCall (325) */
5045>>>>>>> chore: regenerate types
4855  interface PalletEthereumCall extends Enum {5046  interface PalletEthereumCall extends Enum {
4856    readonly isTransact: boolean;5047    readonly isTransact: boolean;
4857    readonly asTransact: {5048    readonly asTransact: {
48625053
4863<<<<<<< HEAD5054<<<<<<< HEAD
4864<<<<<<< HEAD5055<<<<<<< HEAD
5056<<<<<<< HEAD
4865  /** @name EthereumTransactionTransactionV2 (326) */5057  /** @name EthereumTransactionTransactionV2 (326) */
4866=======5058=======
4867<<<<<<< HEAD5059<<<<<<< HEAD
4873=======5065=======
4874  /** @name EthereumTransactionTransactionV2 (327) */5066  /** @name EthereumTransactionTransactionV2 (327) */
4875>>>>>>> fix: regenerate types after rebase5067>>>>>>> fix: regenerate types after rebase
5068=======
5069  /** @name EthereumTransactionTransactionV2 (326) */
5070>>>>>>> chore: regenerate types
4876  interface EthereumTransactionTransactionV2 extends Enum {5071  interface EthereumTransactionTransactionV2 extends Enum {
4877    readonly isLegacy: boolean;5072    readonly isLegacy: boolean;
4878    readonly asLegacy: EthereumTransactionLegacyTransaction;5073    readonly asLegacy: EthereumTransactionLegacyTransaction;
48855080
4886<<<<<<< HEAD5081<<<<<<< HEAD
4887<<<<<<< HEAD5082<<<<<<< HEAD
5083<<<<<<< HEAD
4888  /** @name EthereumTransactionLegacyTransaction (327) */5084  /** @name EthereumTransactionLegacyTransaction (327) */
4889=======5085=======
4890<<<<<<< HEAD5086<<<<<<< HEAD
4896=======5092=======
4897  /** @name EthereumTransactionLegacyTransaction (328) */5093  /** @name EthereumTransactionLegacyTransaction (328) */
4898>>>>>>> fix: regenerate types after rebase5094>>>>>>> fix: regenerate types after rebase
5095=======
5096  /** @name EthereumTransactionLegacyTransaction (327) */
5097>>>>>>> chore: regenerate types
4899  interface EthereumTransactionLegacyTransaction extends Struct {5098  interface EthereumTransactionLegacyTransaction extends Struct {
4900    readonly nonce: U256;5099    readonly nonce: U256;
4901    readonly gasPrice: U256;5100    readonly gasPrice: U256;
49085107
4909<<<<<<< HEAD5108<<<<<<< HEAD
4910<<<<<<< HEAD5109<<<<<<< HEAD
5110<<<<<<< HEAD
4911  /** @name EthereumTransactionTransactionAction (328) */5111  /** @name EthereumTransactionTransactionAction (328) */
4912=======5112=======
4913<<<<<<< HEAD5113<<<<<<< HEAD
4919=======5119=======
4920  /** @name EthereumTransactionTransactionAction (329) */5120  /** @name EthereumTransactionTransactionAction (329) */
4921>>>>>>> fix: regenerate types after rebase5121>>>>>>> fix: regenerate types after rebase
5122=======
5123  /** @name EthereumTransactionTransactionAction (328) */
5124>>>>>>> chore: regenerate types
4922  interface EthereumTransactionTransactionAction extends Enum {5125  interface EthereumTransactionTransactionAction extends Enum {
4923    readonly isCall: boolean;5126    readonly isCall: boolean;
4924    readonly asCall: H160;5127    readonly asCall: H160;
49285131
4929<<<<<<< HEAD5132<<<<<<< HEAD
4930<<<<<<< HEAD5133<<<<<<< HEAD
5134<<<<<<< HEAD
4931  /** @name EthereumTransactionTransactionSignature (329) */5135  /** @name EthereumTransactionTransactionSignature (329) */
4932=======5136=======
4933<<<<<<< HEAD5137<<<<<<< HEAD
4939=======5143=======
4940  /** @name EthereumTransactionTransactionSignature (330) */5144  /** @name EthereumTransactionTransactionSignature (330) */
4941>>>>>>> fix: regenerate types after rebase5145>>>>>>> fix: regenerate types after rebase
5146=======
5147  /** @name EthereumTransactionTransactionSignature (329) */
5148>>>>>>> chore: regenerate types
4942  interface EthereumTransactionTransactionSignature extends Struct {5149  interface EthereumTransactionTransactionSignature extends Struct {
4943    readonly v: u64;5150    readonly v: u64;
4944    readonly r: H256;5151    readonly r: H256;
49475154
4948<<<<<<< HEAD5155<<<<<<< HEAD
4949<<<<<<< HEAD5156<<<<<<< HEAD
5157<<<<<<< HEAD
4950  /** @name EthereumTransactionEip2930Transaction (331) */5158  /** @name EthereumTransactionEip2930Transaction (331) */
4951=======5159=======
4952<<<<<<< HEAD5160<<<<<<< HEAD
4958=======5166=======
4959  /** @name EthereumTransactionEip2930Transaction (332) */5167  /** @name EthereumTransactionEip2930Transaction (332) */
4960>>>>>>> fix: regenerate types after rebase5168>>>>>>> fix: regenerate types after rebase
5169=======
5170  /** @name EthereumTransactionEip2930Transaction (331) */
5171>>>>>>> chore: regenerate types
4961  interface EthereumTransactionEip2930Transaction extends Struct {5172  interface EthereumTransactionEip2930Transaction extends Struct {
4962    readonly chainId: u64;5173    readonly chainId: u64;
4963    readonly nonce: U256;5174    readonly nonce: U256;
49745185
4975<<<<<<< HEAD5186<<<<<<< HEAD
4976<<<<<<< HEAD5187<<<<<<< HEAD
5188<<<<<<< HEAD
4977  /** @name EthereumTransactionAccessListItem (333) */5189  /** @name EthereumTransactionAccessListItem (333) */
4978=======5190=======
4979<<<<<<< HEAD5191<<<<<<< HEAD
4985=======5197=======
4986  /** @name EthereumTransactionAccessListItem (334) */5198  /** @name EthereumTransactionAccessListItem (334) */
4987>>>>>>> fix: regenerate types after rebase5199>>>>>>> fix: regenerate types after rebase
5200=======
5201  /** @name EthereumTransactionAccessListItem (333) */
5202>>>>>>> chore: regenerate types
4988  interface EthereumTransactionAccessListItem extends Struct {5203  interface EthereumTransactionAccessListItem extends Struct {
4989    readonly address: H160;5204    readonly address: H160;
4990    readonly storageKeys: Vec<H256>;5205    readonly storageKeys: Vec<H256>;
4991  }5206  }
49925207
4993<<<<<<< HEAD5208<<<<<<< HEAD
4994<<<<<<< HEAD5209<<<<<<< HEAD
5210<<<<<<< HEAD
4995  /** @name EthereumTransactionEip1559Transaction (334) */5211  /** @name EthereumTransactionEip1559Transaction (334) */
4996=======5212=======
4997<<<<<<< HEAD5213<<<<<<< HEAD
5003=======5219=======
5004  /** @name EthereumTransactionEip1559Transaction (335) */5220  /** @name EthereumTransactionEip1559Transaction (335) */
5005>>>>>>> fix: regenerate types after rebase5221>>>>>>> fix: regenerate types after rebase
5222=======
5223  /** @name EthereumTransactionEip1559Transaction (334) */
5224>>>>>>> chore: regenerate types
5006  interface EthereumTransactionEip1559Transaction extends Struct {5225  interface EthereumTransactionEip1559Transaction extends Struct {
5007    readonly chainId: u64;5226    readonly chainId: u64;
5008    readonly nonce: U256;5227    readonly nonce: U256;
50205239
5021<<<<<<< HEAD5240<<<<<<< HEAD
5022<<<<<<< HEAD5241<<<<<<< HEAD
5242<<<<<<< HEAD
5023  /** @name PalletEvmMigrationCall (335) */5243  /** @name PalletEvmMigrationCall (335) */
5024=======5244=======
5025<<<<<<< HEAD5245<<<<<<< HEAD
5031=======5251=======
5032  /** @name PalletEvmMigrationCall (336) */5252  /** @name PalletEvmMigrationCall (336) */
5033>>>>>>> fix: regenerate types after rebase5253>>>>>>> fix: regenerate types after rebase
5254=======
5255  /** @name PalletEvmMigrationCall (335) */
5256>>>>>>> chore: regenerate types
5034  interface PalletEvmMigrationCall extends Enum {5257  interface PalletEvmMigrationCall extends Enum {
5035    readonly isBegin: boolean;5258    readonly isBegin: boolean;
5036    readonly asBegin: {5259    readonly asBegin: {
50595282
5060<<<<<<< HEAD5283<<<<<<< HEAD
5061<<<<<<< HEAD5284<<<<<<< HEAD
5285<<<<<<< HEAD
5062  /** @name PalletMaintenanceCall (339) */5286  /** @name PalletMaintenanceCall (339) */
5063=======5287=======
5064  /** @name PalletMaintenanceCall (338) */5288  /** @name PalletMaintenanceCall (338) */
5065>>>>>>> chore:  regenerate types5289>>>>>>> chore:  regenerate types
5066=======5290=======
5067  /** @name PalletMaintenanceCall (340) */5291  /** @name PalletMaintenanceCall (340) */
5068>>>>>>> fix: regenerate types after rebase5292>>>>>>> fix: regenerate types after rebase
5293=======
5294  /** @name PalletMaintenanceCall (339) */
5295>>>>>>> chore: regenerate types
5069  interface PalletMaintenanceCall extends Enum {5296  interface PalletMaintenanceCall extends Enum {
5070    readonly isEnable: boolean;5297    readonly isEnable: boolean;
5071    readonly isDisable: boolean;5298    readonly isDisable: boolean;
50745301
5075<<<<<<< HEAD5302<<<<<<< HEAD
5076<<<<<<< HEAD5303<<<<<<< HEAD
5304<<<<<<< HEAD
5077  /** @name PalletTestUtilsCall (340) */5305  /** @name PalletTestUtilsCall (340) */
5078=======5306=======
5079  /** @name PalletTestUtilsCall (339) */5307  /** @name PalletTestUtilsCall (339) */
5080>>>>>>> chore:  regenerate types5308>>>>>>> chore:  regenerate types
5081=======5309=======
5082  /** @name PalletTestUtilsCall (341) */5310  /** @name PalletTestUtilsCall (341) */
5083>>>>>>> fix: regenerate types after rebase5311>>>>>>> fix: regenerate types after rebase
5312=======
5313  /** @name PalletTestUtilsCall (340) */
5314>>>>>>> chore: regenerate types
5084  interface PalletTestUtilsCall extends Enum {5315  interface PalletTestUtilsCall extends Enum {
5085    readonly isEnable: boolean;5316    readonly isEnable: boolean;
5086    readonly isSetTestValue: boolean;5317    readonly isSetTestValue: boolean;
51025333
5103<<<<<<< HEAD5334<<<<<<< HEAD
5104<<<<<<< HEAD5335<<<<<<< HEAD
5336<<<<<<< HEAD
5105  /** @name PalletSudoError (342) */5337  /** @name PalletSudoError (342) */
5106=======5338=======
5107<<<<<<< HEAD5339<<<<<<< HEAD
5113=======5345=======
5114  /** @name PalletSudoError (343) */5346  /** @name PalletSudoError (343) */
5115>>>>>>> fix: regenerate types after rebase5347>>>>>>> fix: regenerate types after rebase
5348=======
5349  /** @name PalletSudoError (342) */
5350>>>>>>> chore: regenerate types
5116  interface PalletSudoError extends Enum {5351  interface PalletSudoError extends Enum {
5117    readonly isRequireSudo: boolean;5352    readonly isRequireSudo: boolean;
5118    readonly type: 'RequireSudo';5353    readonly type: 'RequireSudo';
5119  }5354  }
51205355
5121<<<<<<< HEAD5356<<<<<<< HEAD
5122<<<<<<< HEAD5357<<<<<<< HEAD
5358<<<<<<< HEAD
5123  /** @name OrmlVestingModuleError (344) */5359  /** @name OrmlVestingModuleError (344) */
5124=======5360=======
5125<<<<<<< HEAD5361<<<<<<< HEAD
5131=======5367=======
5132  /** @name OrmlVestingModuleError (345) */5368  /** @name OrmlVestingModuleError (345) */
5133>>>>>>> fix: regenerate types after rebase5369>>>>>>> fix: regenerate types after rebase
5370=======
5371  /** @name OrmlVestingModuleError (344) */
5372>>>>>>> chore: regenerate types
5134  interface OrmlVestingModuleError extends Enum {5373  interface OrmlVestingModuleError extends Enum {
5135    readonly isZeroVestingPeriod: boolean;5374    readonly isZeroVestingPeriod: boolean;
5136    readonly isZeroVestingPeriodCount: boolean;5375    readonly isZeroVestingPeriodCount: boolean;
51435382
5144<<<<<<< HEAD5383<<<<<<< HEAD
5145<<<<<<< HEAD5384<<<<<<< HEAD
5385<<<<<<< HEAD
5146  /** @name OrmlXtokensModuleError (345) */5386  /** @name OrmlXtokensModuleError (345) */
5147=======5387=======
5148<<<<<<< HEAD5388<<<<<<< HEAD
5154=======5394=======
5155  /** @name OrmlXtokensModuleError (346) */5395  /** @name OrmlXtokensModuleError (346) */
5156>>>>>>> fix: regenerate types after rebase5396>>>>>>> fix: regenerate types after rebase
5397=======
5398  /** @name OrmlXtokensModuleError (345) */
5399>>>>>>> chore: regenerate types
5157  interface OrmlXtokensModuleError extends Enum {5400  interface OrmlXtokensModuleError extends Enum {
5158    readonly isAssetHasNoReserve: boolean;5401    readonly isAssetHasNoReserve: boolean;
5159    readonly isNotCrossChainTransfer: boolean;5402    readonly isNotCrossChainTransfer: boolean;
51795422
5180<<<<<<< HEAD5423<<<<<<< HEAD
5181<<<<<<< HEAD5424<<<<<<< HEAD
5425<<<<<<< HEAD
5182  /** @name OrmlTokensBalanceLock (348) */5426  /** @name OrmlTokensBalanceLock (348) */
5183=======5427=======
5184<<<<<<< HEAD5428<<<<<<< HEAD
5190=======5434=======
5191  /** @name OrmlTokensBalanceLock (349) */5435  /** @name OrmlTokensBalanceLock (349) */
5192>>>>>>> fix: regenerate types after rebase5436>>>>>>> fix: regenerate types after rebase
5437=======
5438  /** @name OrmlTokensBalanceLock (348) */
5439>>>>>>> chore: regenerate types
5193  interface OrmlTokensBalanceLock extends Struct {5440  interface OrmlTokensBalanceLock extends Struct {
5194    readonly id: U8aFixed;5441    readonly id: U8aFixed;
5195    readonly amount: u128;5442    readonly amount: u128;
5196  }5443  }
51975444
5198<<<<<<< HEAD5445<<<<<<< HEAD
5199<<<<<<< HEAD5446<<<<<<< HEAD
5447<<<<<<< HEAD
5200  /** @name OrmlTokensAccountData (350) */5448  /** @name OrmlTokensAccountData (350) */
5201=======5449=======
5202<<<<<<< HEAD5450<<<<<<< HEAD
5208=======5456=======
5209  /** @name OrmlTokensAccountData (351) */5457  /** @name OrmlTokensAccountData (351) */
5210>>>>>>> fix: regenerate types after rebase5458>>>>>>> fix: regenerate types after rebase
5459=======
5460  /** @name OrmlTokensAccountData (350) */
5461>>>>>>> chore: regenerate types
5211  interface OrmlTokensAccountData extends Struct {5462  interface OrmlTokensAccountData extends Struct {
5212    readonly free: u128;5463    readonly free: u128;
5213    readonly reserved: u128;5464    readonly reserved: u128;
52165467
5217<<<<<<< HEAD5468<<<<<<< HEAD
5218<<<<<<< HEAD5469<<<<<<< HEAD
5470<<<<<<< HEAD
5219  /** @name OrmlTokensReserveData (352) */5471  /** @name OrmlTokensReserveData (352) */
5220=======5472=======
5221<<<<<<< HEAD5473<<<<<<< HEAD
5227=======5479=======
5228  /** @name OrmlTokensReserveData (353) */5480  /** @name OrmlTokensReserveData (353) */
5229>>>>>>> fix: regenerate types after rebase5481>>>>>>> fix: regenerate types after rebase
5482=======
5483  /** @name OrmlTokensReserveData (352) */
5484>>>>>>> chore: regenerate types
5230  interface OrmlTokensReserveData extends Struct {5485  interface OrmlTokensReserveData extends Struct {
5231    readonly id: Null;5486    readonly id: Null;
5232    readonly amount: u128;5487    readonly amount: u128;
5233  }5488  }
52345489
5235<<<<<<< HEAD5490<<<<<<< HEAD
5236<<<<<<< HEAD5491<<<<<<< HEAD
5492<<<<<<< HEAD
5237  /** @name OrmlTokensModuleError (354) */5493  /** @name OrmlTokensModuleError (354) */
5238=======5494=======
5239<<<<<<< HEAD5495<<<<<<< HEAD
5245=======5501=======
5246  /** @name OrmlTokensModuleError (355) */5502  /** @name OrmlTokensModuleError (355) */
5247>>>>>>> fix: regenerate types after rebase5503>>>>>>> fix: regenerate types after rebase
5504=======
5505  /** @name OrmlTokensModuleError (354) */
5506>>>>>>> chore: regenerate types
5248  interface OrmlTokensModuleError extends Enum {5507  interface OrmlTokensModuleError extends Enum {
5249    readonly isBalanceTooLow: boolean;5508    readonly isBalanceTooLow: boolean;
5250    readonly isAmountIntoBalanceFailed: boolean;5509    readonly isAmountIntoBalanceFailed: boolean;
52595518
5260<<<<<<< HEAD5519<<<<<<< HEAD
5261<<<<<<< HEAD5520<<<<<<< HEAD
5521<<<<<<< HEAD
5262  /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */5522  /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */
5263=======5523=======
5264<<<<<<< HEAD5524<<<<<<< HEAD
5270=======5530=======
5271  /** @name CumulusPalletXcmpQueueInboundChannelDetails (357) */5531  /** @name CumulusPalletXcmpQueueInboundChannelDetails (357) */
5272>>>>>>> fix: regenerate types after rebase5532>>>>>>> fix: regenerate types after rebase
5533=======
5534  /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */
5535>>>>>>> chore: regenerate types
5273  interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct {5536  interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct {
5274    readonly sender: u32;5537    readonly sender: u32;
5275    readonly state: CumulusPalletXcmpQueueInboundState;5538    readonly state: CumulusPalletXcmpQueueInboundState;
52785541
5279<<<<<<< HEAD5542<<<<<<< HEAD
5280<<<<<<< HEAD5543<<<<<<< HEAD
5544<<<<<<< HEAD
5281  /** @name CumulusPalletXcmpQueueInboundState (357) */5545  /** @name CumulusPalletXcmpQueueInboundState (357) */
5282=======5546=======
5283<<<<<<< HEAD5547<<<<<<< HEAD
5289=======5553=======
5290  /** @name CumulusPalletXcmpQueueInboundState (358) */5554  /** @name CumulusPalletXcmpQueueInboundState (358) */
5291>>>>>>> fix: regenerate types after rebase5555>>>>>>> fix: regenerate types after rebase
5556=======
5557  /** @name CumulusPalletXcmpQueueInboundState (357) */
5558>>>>>>> chore: regenerate types
5292  interface CumulusPalletXcmpQueueInboundState extends Enum {5559  interface CumulusPalletXcmpQueueInboundState extends Enum {
5293    readonly isOk: boolean;5560    readonly isOk: boolean;
5294    readonly isSuspended: boolean;5561    readonly isSuspended: boolean;
52975564
5298<<<<<<< HEAD5565<<<<<<< HEAD
5299<<<<<<< HEAD5566<<<<<<< HEAD
5567<<<<<<< HEAD
5300  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */5568  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */
5301=======5569=======
5302<<<<<<< HEAD5570<<<<<<< HEAD
5308=======5576=======
5309  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (361) */5577  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (361) */
5310>>>>>>> fix: regenerate types after rebase5578>>>>>>> fix: regenerate types after rebase
5579=======
5580  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */
5581>>>>>>> chore: regenerate types
5311  interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum {5582  interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum {
5312    readonly isConcatenatedVersionedXcm: boolean;5583    readonly isConcatenatedVersionedXcm: boolean;
5313    readonly isConcatenatedEncodedBlob: boolean;5584    readonly isConcatenatedEncodedBlob: boolean;
53175588
5318<<<<<<< HEAD5589<<<<<<< HEAD
5319<<<<<<< HEAD5590<<<<<<< HEAD
5591<<<<<<< HEAD
5320  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */5592  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */
5321=======5593=======
5322<<<<<<< HEAD5594<<<<<<< HEAD
5328=======5600=======
5329  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (364) */5601  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (364) */
5330>>>>>>> fix: regenerate types after rebase5602>>>>>>> fix: regenerate types after rebase
5603=======
5604  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */
5605>>>>>>> chore: regenerate types
5331  interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct {5606  interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct {
5332    readonly recipient: u32;5607    readonly recipient: u32;
5333    readonly state: CumulusPalletXcmpQueueOutboundState;5608    readonly state: CumulusPalletXcmpQueueOutboundState;
53385613
5339<<<<<<< HEAD5614<<<<<<< HEAD
5340<<<<<<< HEAD5615<<<<<<< HEAD
5616<<<<<<< HEAD
5341  /** @name CumulusPalletXcmpQueueOutboundState (364) */5617  /** @name CumulusPalletXcmpQueueOutboundState (364) */
5342=======5618=======
5343<<<<<<< HEAD5619<<<<<<< HEAD
5349=======5625=======
5350  /** @name CumulusPalletXcmpQueueOutboundState (365) */5626  /** @name CumulusPalletXcmpQueueOutboundState (365) */
5351>>>>>>> fix: regenerate types after rebase5627>>>>>>> fix: regenerate types after rebase
5628=======
5629  /** @name CumulusPalletXcmpQueueOutboundState (364) */
5630>>>>>>> chore: regenerate types
5352  interface CumulusPalletXcmpQueueOutboundState extends Enum {5631  interface CumulusPalletXcmpQueueOutboundState extends Enum {
5353    readonly isOk: boolean;5632    readonly isOk: boolean;
5354    readonly isSuspended: boolean;5633    readonly isSuspended: boolean;
53575636
5358<<<<<<< HEAD5637<<<<<<< HEAD
5359<<<<<<< HEAD5638<<<<<<< HEAD
5639<<<<<<< HEAD
5360  /** @name CumulusPalletXcmpQueueQueueConfigData (366) */5640  /** @name CumulusPalletXcmpQueueQueueConfigData (366) */
5361=======5641=======
5362<<<<<<< HEAD5642<<<<<<< HEAD
5368=======5648=======
5369  /** @name CumulusPalletXcmpQueueQueueConfigData (367) */5649  /** @name CumulusPalletXcmpQueueQueueConfigData (367) */
5370>>>>>>> fix: regenerate types after rebase5650>>>>>>> fix: regenerate types after rebase
5651=======
5652  /** @name CumulusPalletXcmpQueueQueueConfigData (366) */
5653>>>>>>> chore: regenerate types
5371  interface CumulusPalletXcmpQueueQueueConfigData extends Struct {5654  interface CumulusPalletXcmpQueueQueueConfigData extends Struct {
5372    readonly suspendThreshold: u32;5655    readonly suspendThreshold: u32;
5373    readonly dropThreshold: u32;5656    readonly dropThreshold: u32;
53795662
5380<<<<<<< HEAD5663<<<<<<< HEAD
5381<<<<<<< HEAD5664<<<<<<< HEAD
5665<<<<<<< HEAD
5382  /** @name CumulusPalletXcmpQueueError (368) */5666  /** @name CumulusPalletXcmpQueueError (368) */
5383=======5667=======
5384<<<<<<< HEAD5668<<<<<<< HEAD
5390=======5674=======
5391  /** @name CumulusPalletXcmpQueueError (369) */5675  /** @name CumulusPalletXcmpQueueError (369) */
5392>>>>>>> fix: regenerate types after rebase5676>>>>>>> fix: regenerate types after rebase
5677=======
5678  /** @name CumulusPalletXcmpQueueError (368) */
5679>>>>>>> chore: regenerate types
5393  interface CumulusPalletXcmpQueueError extends Enum {5680  interface CumulusPalletXcmpQueueError extends Enum {
5394    readonly isFailedToSend: boolean;5681    readonly isFailedToSend: boolean;
5395    readonly isBadXcmOrigin: boolean;5682    readonly isBadXcmOrigin: boolean;
54015688
5402<<<<<<< HEAD5689<<<<<<< HEAD
5403<<<<<<< HEAD5690<<<<<<< HEAD
5691<<<<<<< HEAD
5404  /** @name PalletXcmError (369) */5692  /** @name PalletXcmError (369) */
5405=======5693=======
5406<<<<<<< HEAD5694<<<<<<< HEAD
5412=======5700=======
5413  /** @name PalletXcmError (370) */5701  /** @name PalletXcmError (370) */
5414>>>>>>> fix: regenerate types after rebase5702>>>>>>> fix: regenerate types after rebase
5703=======
5704  /** @name PalletXcmError (369) */
5705>>>>>>> chore: regenerate types
5415  interface PalletXcmError extends Enum {5706  interface PalletXcmError extends Enum {
5416    readonly isUnreachable: boolean;5707    readonly isUnreachable: boolean;
5417    readonly isSendFailure: boolean;5708    readonly isSendFailure: boolean;
54315722
5432<<<<<<< HEAD5723<<<<<<< HEAD
5433<<<<<<< HEAD5724<<<<<<< HEAD
5725<<<<<<< HEAD
5434  /** @name CumulusPalletXcmError (370) */5726  /** @name CumulusPalletXcmError (370) */
5435  type CumulusPalletXcmError = Null;5727  type CumulusPalletXcmError = Null;
54365728
5453>>>>>>> chore:  regenerate types5745>>>>>>> chore:  regenerate types
5454=======5746=======
5455>>>>>>> fix: regenerate types after rebase5747>>>>>>> fix: regenerate types after rebase
5748=======
5749  /** @name CumulusPalletXcmError (370) */
5750  type CumulusPalletXcmError = Null;
5751
5752  /** @name CumulusPalletDmpQueueConfigData (371) */
5753>>>>>>> chore: regenerate types
5456  interface CumulusPalletDmpQueueConfigData extends Struct {5754  interface CumulusPalletDmpQueueConfigData extends Struct {
5457    readonly maxIndividual: SpWeightsWeightV2Weight;5755    readonly maxIndividual: SpWeightsWeightV2Weight;
5458  }5756  }
54595757
5460<<<<<<< HEAD5758<<<<<<< HEAD
5461<<<<<<< HEAD5759<<<<<<< HEAD
5760<<<<<<< HEAD
5462  /** @name CumulusPalletDmpQueuePageIndexData (372) */5761  /** @name CumulusPalletDmpQueuePageIndexData (372) */
5463=======5762=======
5464<<<<<<< HEAD5763<<<<<<< HEAD
5470=======5769=======
5471  /** @name CumulusPalletDmpQueuePageIndexData (373) */5770  /** @name CumulusPalletDmpQueuePageIndexData (373) */
5472>>>>>>> fix: regenerate types after rebase5771>>>>>>> fix: regenerate types after rebase
5772=======
5773  /** @name CumulusPalletDmpQueuePageIndexData (372) */
5774>>>>>>> chore: regenerate types
5473  interface CumulusPalletDmpQueuePageIndexData extends Struct {5775  interface CumulusPalletDmpQueuePageIndexData extends Struct {
5474    readonly beginUsed: u32;5776    readonly beginUsed: u32;
5475    readonly endUsed: u32;5777    readonly endUsed: u32;
54785780
5479<<<<<<< HEAD5781<<<<<<< HEAD
5480<<<<<<< HEAD5782<<<<<<< HEAD
5783<<<<<<< HEAD
5481  /** @name CumulusPalletDmpQueueError (375) */5784  /** @name CumulusPalletDmpQueueError (375) */
5482=======5785=======
5483<<<<<<< HEAD5786<<<<<<< HEAD
5489=======5792=======
5490  /** @name CumulusPalletDmpQueueError (376) */5793  /** @name CumulusPalletDmpQueueError (376) */
5491>>>>>>> fix: regenerate types after rebase5794>>>>>>> fix: regenerate types after rebase
5795=======
5796  /** @name CumulusPalletDmpQueueError (375) */
5797>>>>>>> chore: regenerate types
5492  interface CumulusPalletDmpQueueError extends Enum {5798  interface CumulusPalletDmpQueueError extends Enum {
5493    readonly isUnknown: boolean;5799    readonly isUnknown: boolean;
5494    readonly isOverLimit: boolean;5800    readonly isOverLimit: boolean;
54975803
5498<<<<<<< HEAD5804<<<<<<< HEAD
5499<<<<<<< HEAD5805<<<<<<< HEAD
5806<<<<<<< HEAD
5500  /** @name PalletUniqueError (379) */5807  /** @name PalletUniqueError (379) */
5501=======5808=======
5502<<<<<<< HEAD5809<<<<<<< HEAD
5508=======5815=======
5509  /** @name PalletUniqueError (380) */5816  /** @name PalletUniqueError (380) */
5510>>>>>>> fix: regenerate types after rebase5817>>>>>>> fix: regenerate types after rebase
5818=======
5819  /** @name PalletUniqueError (379) */
5820>>>>>>> chore: regenerate types
5511  interface PalletUniqueError extends Enum {5821  interface PalletUniqueError extends Enum {
5512    readonly isCollectionDecimalPointLimitExceeded: boolean;5822    readonly isCollectionDecimalPointLimitExceeded: boolean;
5513    readonly isEmptyArgument: boolean;5823    readonly isEmptyArgument: boolean;
5514    readonly isRepartitionCalledOnNonRefungibleCollection: boolean;5824    readonly isRepartitionCalledOnNonRefungibleCollection: boolean;
5515<<<<<<< HEAD
5516    readonly type: 'CollectionDecimalPointLimitExceeded' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection';5825    readonly type: 'CollectionDecimalPointLimitExceeded' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection';
5517  }5826  }
55185827
5523  }5832  }
55245833
5525<<<<<<< HEAD5834<<<<<<< HEAD
5835<<<<<<< HEAD
5526  /** @name UpDataStructsCollection (381) */5836  /** @name UpDataStructsCollection (381) */
5527=======5837=======
5528  /** @name UpDataStructsCollection (382) */5838  /** @name UpDataStructsCollection (382) */
5632=======5942=======
5633>>>>>>> fix: regenerate types after rebase5943>>>>>>> fix: regenerate types after rebase
5634>>>>>>> fix: regenerate types after rebase5944>>>>>>> fix: regenerate types after rebase
5945=======
5946  /** @name UpDataStructsCollection (381) */
5947>>>>>>> chore: regenerate types
5635  interface UpDataStructsCollection extends Struct {5948  interface UpDataStructsCollection extends Struct {
5636    readonly owner: AccountId32;5949    readonly owner: AccountId32;
5637    readonly mode: UpDataStructsCollectionMode;5950    readonly mode: UpDataStructsCollectionMode;
56465959
5647<<<<<<< HEAD5960<<<<<<< HEAD
5648<<<<<<< HEAD5961<<<<<<< HEAD
5962<<<<<<< HEAD
5649  /** @name UpDataStructsSponsorshipStateAccountId32 (382) */5963  /** @name UpDataStructsSponsorshipStateAccountId32 (382) */
5650=======5964=======
5651=======5965=======
5666  /** @name UpDataStructsSponsorshipStateAccountId32 (396) */5980  /** @name UpDataStructsSponsorshipStateAccountId32 (396) */
5667>>>>>>> fix: regenerate types after rebase5981>>>>>>> fix: regenerate types after rebase
5668>>>>>>> fix: regenerate types after rebase5982>>>>>>> fix: regenerate types after rebase
5983=======
5984  /** @name UpDataStructsSponsorshipStateAccountId32 (382) */
5985>>>>>>> chore: regenerate types
5669  interface UpDataStructsSponsorshipStateAccountId32 extends Enum {5986  interface UpDataStructsSponsorshipStateAccountId32 extends Enum {
5670    readonly isDisabled: boolean;5987    readonly isDisabled: boolean;
5671    readonly isUnconfirmed: boolean;5988    readonly isUnconfirmed: boolean;
56775994
5678<<<<<<< HEAD5995<<<<<<< HEAD
5679<<<<<<< HEAD5996<<<<<<< HEAD
5997<<<<<<< HEAD
5680  /** @name UpDataStructsProperties (384) */5998  /** @name UpDataStructsProperties (384) */
5681=======5999=======
5682=======6000=======
5697  /** @name UpDataStructsProperties (398) */6015  /** @name UpDataStructsProperties (398) */
5698>>>>>>> fix: regenerate types after rebase6016>>>>>>> fix: regenerate types after rebase
5699>>>>>>> fix: regenerate types after rebase6017>>>>>>> fix: regenerate types after rebase
6018=======
6019  /** @name UpDataStructsProperties (384) */
6020>>>>>>> chore: regenerate types
5700  interface UpDataStructsProperties extends Struct {6021  interface UpDataStructsProperties extends Struct {
5701    readonly map: UpDataStructsPropertiesMapBoundedVec;6022    readonly map: UpDataStructsPropertiesMapBoundedVec;
5702    readonly consumedSpace: u32;6023    readonly consumedSpace: u32;
57056026
5706<<<<<<< HEAD6027<<<<<<< HEAD
5707<<<<<<< HEAD6028<<<<<<< HEAD
6029<<<<<<< HEAD
5708  /** @name UpDataStructsPropertiesMapBoundedVec (385) */6030  /** @name UpDataStructsPropertiesMapBoundedVec (385) */
5709=======6031=======
5710=======6032=======
5733<<<<<<< HEAD6055<<<<<<< HEAD
5734=======6056=======
5735  /** @name UpDataStructsPropertiesMapBoundedVec (397) */6057  /** @name UpDataStructsPropertiesMapBoundedVec (397) */
6058=======
6059  /** @name UpDataStructsPropertiesMapBoundedVec (385) */
6060>>>>>>> chore: regenerate types
5736  interface UpDataStructsPropertiesMapBoundedVec extends BTreeMap<Bytes, Bytes> {}6061  interface UpDataStructsPropertiesMapBoundedVec extends BTreeMap<Bytes, Bytes> {}
57376062
5738  /** @name UpDataStructsPropertiesMapPropertyPermission (402) */6063  /** @name UpDataStructsPropertiesMapPropertyPermission (390) */
5739  interface UpDataStructsPropertiesMapPropertyPermission extends BTreeMap<Bytes, UpDataStructsPropertyPermission> {}6064  interface UpDataStructsPropertiesMapPropertyPermission extends BTreeMap<Bytes, UpDataStructsPropertyPermission> {}
57406065
6066<<<<<<< HEAD
5741  /** @name UpDataStructsCollectionStats (409) */6067  /** @name UpDataStructsCollectionStats (409) */
5742>>>>>>> chore:  regenerate types6068>>>>>>> chore:  regenerate types
5743>>>>>>> chore:  regenerate types6069>>>>>>> chore:  regenerate types
5747=======6073=======
5748>>>>>>> fix: regenerate types after rebase6074>>>>>>> fix: regenerate types after rebase
5749>>>>>>> fix: regenerate types after rebase6075>>>>>>> fix: regenerate types after rebase
6076=======
6077  /** @name UpDataStructsCollectionStats (397) */
6078>>>>>>> chore: regenerate types
5750  interface UpDataStructsCollectionStats extends Struct {6079  interface UpDataStructsCollectionStats extends Struct {
5751    readonly created: u32;6080    readonly created: u32;
5752    readonly destroyed: u32;6081    readonly destroyed: u32;
57556084
5756<<<<<<< HEAD6085<<<<<<< HEAD
5757<<<<<<< HEAD6086<<<<<<< HEAD
6087<<<<<<< HEAD
5758  /** @name UpDataStructsTokenChild (398) */6088  /** @name UpDataStructsTokenChild (398) */
5759=======6089=======
5760=======6090=======
5775  /** @name UpDataStructsTokenChild (412) */6105  /** @name UpDataStructsTokenChild (412) */
5776>>>>>>> fix: regenerate types after rebase6106>>>>>>> fix: regenerate types after rebase
5777>>>>>>> fix: regenerate types after rebase6107>>>>>>> fix: regenerate types after rebase
6108=======
6109  /** @name UpDataStructsTokenChild (398) */
6110>>>>>>> chore: regenerate types
5778  interface UpDataStructsTokenChild extends Struct {6111  interface UpDataStructsTokenChild extends Struct {
5779    readonly token: u32;6112    readonly token: u32;
5780    readonly collection: u32;6113    readonly collection: u32;
5783<<<<<<< HEAD6116<<<<<<< HEAD
5784<<<<<<< HEAD6117<<<<<<< HEAD
5785<<<<<<< HEAD6118<<<<<<< HEAD
6119<<<<<<< HEAD
5786  /** @name PhantomTypeUpDataStructs (399) */6120  /** @name PhantomTypeUpDataStructs (399) */
5787=======6121=======
5788=======6122=======
5831  /** @name UpDataStructsTokenData (415) */6165  /** @name UpDataStructsTokenData (415) */
5832>>>>>>> fix: regenerate types after rebase6166>>>>>>> fix: regenerate types after rebase
5833>>>>>>> fix: regenerate types after rebase6167>>>>>>> fix: regenerate types after rebase
6168=======
6169  /** @name PhantomTypeUpDataStructs (399) */
6170  interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftNftInfo, RmrkTraitsResourceResourceInfo, RmrkTraitsPropertyPropertyInfo, RmrkTraitsBaseBaseInfo, RmrkTraitsPartPartType, RmrkTraitsTheme, RmrkTraitsNftNftChild, UpPovEstimateRpcPovInfo]>> {}
6171
6172  /** @name UpDataStructsTokenData (401) */
6173>>>>>>> chore: regenerate types
5834  interface UpDataStructsTokenData extends Struct {6174  interface UpDataStructsTokenData extends Struct {
5835    readonly properties: Vec<UpDataStructsProperty>;6175    readonly properties: Vec<UpDataStructsProperty>;
5836    readonly owner: Option<PalletEvmAccountBasicCrossAccountIdRepr>;6176    readonly owner: Option<PalletEvmAccountBasicCrossAccountIdRepr>;
58396179
5840<<<<<<< HEAD6180<<<<<<< HEAD
5841<<<<<<< HEAD6181<<<<<<< HEAD
6182<<<<<<< HEAD
5842  /** @name UpDataStructsRpcCollection (403) */6183  /** @name UpDataStructsRpcCollection (403) */
5843=======6184=======
5844=======6185=======
5859  /** @name UpDataStructsRpcCollection (417) */6200  /** @name UpDataStructsRpcCollection (417) */
5860>>>>>>> fix: regenerate types after rebase6201>>>>>>> fix: regenerate types after rebase
5861>>>>>>> fix: regenerate types after rebase6202>>>>>>> fix: regenerate types after rebase
6203=======
6204  /** @name UpDataStructsRpcCollection (403) */
6205>>>>>>> chore: regenerate types
5862  interface UpDataStructsRpcCollection extends Struct {6206  interface UpDataStructsRpcCollection extends Struct {
5863    readonly owner: AccountId32;6207    readonly owner: AccountId32;
5864    readonly mode: UpDataStructsCollectionMode;6208    readonly mode: UpDataStructsCollectionMode;
58766220
5877<<<<<<< HEAD6221<<<<<<< HEAD
5878<<<<<<< HEAD6222<<<<<<< HEAD
6223<<<<<<< HEAD
5879  /** @name UpDataStructsRpcCollectionFlags (404) */6224  /** @name UpDataStructsRpcCollectionFlags (404) */
5880=======6225=======
5881=======6226=======
5896  /** @name UpDataStructsRpcCollectionFlags (418) */6241  /** @name UpDataStructsRpcCollectionFlags (418) */
5897>>>>>>> fix: regenerate types after rebase6242>>>>>>> fix: regenerate types after rebase
5898>>>>>>> fix: regenerate types after rebase6243>>>>>>> fix: regenerate types after rebase
6244=======
6245  /** @name UpDataStructsRpcCollectionFlags (404) */
6246>>>>>>> chore: regenerate types
5899  interface UpDataStructsRpcCollectionFlags extends Struct {6247  interface UpDataStructsRpcCollectionFlags extends Struct {
5900    readonly foreign: bool;6248    readonly foreign: bool;
5901    readonly erc721metadata: bool;6249    readonly erc721metadata: bool;
5902  }6250  }
59036251
5904<<<<<<< HEAD6252<<<<<<< HEAD
5905<<<<<<< HEAD6253<<<<<<< HEAD
6254<<<<<<< HEAD
5906  /** @name RmrkTraitsCollectionCollectionInfo (405) */6255  /** @name RmrkTraitsCollectionCollectionInfo (405) */
5907=======6256=======
5908=======6257=======
5923  /** @name RmrkTraitsCollectionCollectionInfo (419) */6272  /** @name RmrkTraitsCollectionCollectionInfo (419) */
5924>>>>>>> fix: regenerate types after rebase6273>>>>>>> fix: regenerate types after rebase
5925>>>>>>> fix: regenerate types after rebase6274>>>>>>> fix: regenerate types after rebase
6275=======
6276  /** @name RmrkTraitsCollectionCollectionInfo (405) */
6277>>>>>>> chore: regenerate types
5926  interface RmrkTraitsCollectionCollectionInfo extends Struct {6278  interface RmrkTraitsCollectionCollectionInfo extends Struct {
5927    readonly issuer: AccountId32;6279    readonly issuer: AccountId32;
5928    readonly metadata: Bytes;6280    readonly metadata: Bytes;
59336285
5934<<<<<<< HEAD6286<<<<<<< HEAD
5935<<<<<<< HEAD6287<<<<<<< HEAD
6288<<<<<<< HEAD
5936  /** @name RmrkTraitsNftNftInfo (406) */6289  /** @name RmrkTraitsNftNftInfo (406) */
5937=======6290=======
5938=======6291=======
5953  /** @name RmrkTraitsNftNftInfo (420) */6306  /** @name RmrkTraitsNftNftInfo (420) */
5954>>>>>>> fix: regenerate types after rebase6307>>>>>>> fix: regenerate types after rebase
5955>>>>>>> fix: regenerate types after rebase6308>>>>>>> fix: regenerate types after rebase
6309=======
6310  /** @name RmrkTraitsNftNftInfo (406) */
6311>>>>>>> chore: regenerate types
5956  interface RmrkTraitsNftNftInfo extends Struct {6312  interface RmrkTraitsNftNftInfo extends Struct {
5957    readonly owner: RmrkTraitsNftAccountIdOrCollectionNftTuple;6313    readonly owner: RmrkTraitsNftAccountIdOrCollectionNftTuple;
5958    readonly royalty: Option<RmrkTraitsNftRoyaltyInfo>;6314    readonly royalty: Option<RmrkTraitsNftRoyaltyInfo>;
59636319
5964<<<<<<< HEAD6320<<<<<<< HEAD
5965<<<<<<< HEAD6321<<<<<<< HEAD
6322<<<<<<< HEAD
5966  /** @name RmrkTraitsNftRoyaltyInfo (408) */6323  /** @name RmrkTraitsNftRoyaltyInfo (408) */
5967=======6324=======
5968=======6325=======
5983  /** @name RmrkTraitsNftRoyaltyInfo (422) */6340  /** @name RmrkTraitsNftRoyaltyInfo (422) */
5984>>>>>>> fix: regenerate types after rebase6341>>>>>>> fix: regenerate types after rebase
5985>>>>>>> fix: regenerate types after rebase6342>>>>>>> fix: regenerate types after rebase
6343=======
6344  /** @name RmrkTraitsNftRoyaltyInfo (408) */
6345>>>>>>> chore: regenerate types
5986  interface RmrkTraitsNftRoyaltyInfo extends Struct {6346  interface RmrkTraitsNftRoyaltyInfo extends Struct {
5987    readonly recipient: AccountId32;6347    readonly recipient: AccountId32;
5988    readonly amount: Permill;6348    readonly amount: Permill;
5989  }6349  }
59906350
5991<<<<<<< HEAD6351<<<<<<< HEAD
5992<<<<<<< HEAD6352<<<<<<< HEAD
6353<<<<<<< HEAD
5993  /** @name RmrkTraitsResourceResourceInfo (409) */6354  /** @name RmrkTraitsResourceResourceInfo (409) */
5994=======6355=======
5995=======6356=======
6010  /** @name RmrkTraitsResourceResourceInfo (423) */6371  /** @name RmrkTraitsResourceResourceInfo (423) */
6011>>>>>>> fix: regenerate types after rebase6372>>>>>>> fix: regenerate types after rebase
6012>>>>>>> fix: regenerate types after rebase6373>>>>>>> fix: regenerate types after rebase
6374=======
6375  /** @name RmrkTraitsResourceResourceInfo (409) */
6376>>>>>>> chore: regenerate types
6013  interface RmrkTraitsResourceResourceInfo extends Struct {6377  interface RmrkTraitsResourceResourceInfo extends Struct {
6014    readonly id: u32;6378    readonly id: u32;
6015    readonly resource: RmrkTraitsResourceResourceTypes;6379    readonly resource: RmrkTraitsResourceResourceTypes;
60196383
6020<<<<<<< HEAD6384<<<<<<< HEAD
6021<<<<<<< HEAD6385<<<<<<< HEAD
6386<<<<<<< HEAD
6022  /** @name RmrkTraitsPropertyPropertyInfo (410) */6387  /** @name RmrkTraitsPropertyPropertyInfo (410) */
6023=======6388=======
6024=======6389=======
6039  /** @name RmrkTraitsPropertyPropertyInfo (424) */6404  /** @name RmrkTraitsPropertyPropertyInfo (424) */
6040>>>>>>> fix: regenerate types after rebase6405>>>>>>> fix: regenerate types after rebase
6041>>>>>>> fix: regenerate types after rebase6406>>>>>>> fix: regenerate types after rebase
6407=======
6408  /** @name RmrkTraitsPropertyPropertyInfo (410) */
6409>>>>>>> chore: regenerate types
6042  interface RmrkTraitsPropertyPropertyInfo extends Struct {6410  interface RmrkTraitsPropertyPropertyInfo extends Struct {
6043    readonly key: Bytes;6411    readonly key: Bytes;
6044    readonly value: Bytes;6412    readonly value: Bytes;
6045  }6413  }
60466414
6047<<<<<<< HEAD6415<<<<<<< HEAD
6048<<<<<<< HEAD6416<<<<<<< HEAD
6417<<<<<<< HEAD
6049  /** @name RmrkTraitsBaseBaseInfo (411) */6418  /** @name RmrkTraitsBaseBaseInfo (411) */
6050=======6419=======
6051=======6420=======
6066  /** @name RmrkTraitsBaseBaseInfo (425) */6435  /** @name RmrkTraitsBaseBaseInfo (425) */
6067>>>>>>> fix: regenerate types after rebase6436>>>>>>> fix: regenerate types after rebase
6068>>>>>>> fix: regenerate types after rebase6437>>>>>>> fix: regenerate types after rebase
6438=======
6439  /** @name RmrkTraitsBaseBaseInfo (411) */
6440>>>>>>> chore: regenerate types
6069  interface RmrkTraitsBaseBaseInfo extends Struct {6441  interface RmrkTraitsBaseBaseInfo extends Struct {
6070    readonly issuer: AccountId32;6442    readonly issuer: AccountId32;
6071    readonly baseType: Bytes;6443    readonly baseType: Bytes;
60746446
6075<<<<<<< HEAD6447<<<<<<< HEAD
6076<<<<<<< HEAD6448<<<<<<< HEAD
6449<<<<<<< HEAD
6077  /** @name RmrkTraitsNftNftChild (412) */6450  /** @name RmrkTraitsNftNftChild (412) */
6078=======6451=======
6079=======6452=======
6094  /** @name RmrkTraitsNftNftChild (426) */6467  /** @name RmrkTraitsNftNftChild (426) */
6095>>>>>>> fix: regenerate types after rebase6468>>>>>>> fix: regenerate types after rebase
6096>>>>>>> fix: regenerate types after rebase6469>>>>>>> fix: regenerate types after rebase
6470=======
6471  /** @name RmrkTraitsNftNftChild (412) */
6472>>>>>>> chore: regenerate types
6097  interface RmrkTraitsNftNftChild extends Struct {6473  interface RmrkTraitsNftNftChild extends Struct {
6098    readonly collectionId: u32;6474    readonly collectionId: u32;
6099    readonly nftId: u32;6475    readonly nftId: u32;
6102<<<<<<< HEAD6478<<<<<<< HEAD
6103<<<<<<< HEAD6479<<<<<<< HEAD
6104<<<<<<< HEAD6480<<<<<<< HEAD
6481<<<<<<< HEAD
6105  /** @name PalletCommonError (414) */6482  /** @name PalletCommonError (414) */
6106=======6483=======
6107=======6484=======
6123=======6500=======
6124  /** @name UpPovEstimateRpcPovInfo (427) */6501  /** @name UpPovEstimateRpcPovInfo (427) */
6125>>>>>>> fix: regenerate types after rebase6502>>>>>>> fix: regenerate types after rebase
6503=======
6504  /** @name UpPovEstimateRpcPovInfo (413) */
6505>>>>>>> chore: regenerate types
6126  interface UpPovEstimateRpcPovInfo extends Struct {6506  interface UpPovEstimateRpcPovInfo extends Struct {
6127    readonly proofSize: u64;6507    readonly proofSize: u64;
6128    readonly compactProofSize: u64;6508    readonly compactProofSize: u64;
6134<<<<<<< HEAD6514<<<<<<< HEAD
6135<<<<<<< HEAD6515<<<<<<< HEAD
6136<<<<<<< HEAD6516<<<<<<< HEAD
6517<<<<<<< HEAD
6137  /** @name PalletCommonError (424) */6518  /** @name PalletCommonError (424) */
6138>>>>>>> fix: update polkadot types and definitions6519>>>>>>> fix: update polkadot types and definitions
6139<<<<<<< HEAD6520<<<<<<< HEAD
6150=======6531=======
6151  /** @name SpRuntimeTransactionValidityTransactionValidityError (430) */6532  /** @name SpRuntimeTransactionValidityTransactionValidityError (430) */
6152>>>>>>> fix: regenerate types after rebase6533>>>>>>> fix: regenerate types after rebase
6534=======
6535  /** @name SpRuntimeTransactionValidityTransactionValidityError (416) */
6536>>>>>>> chore: regenerate types
6153  interface SpRuntimeTransactionValidityTransactionValidityError extends Enum {6537  interface SpRuntimeTransactionValidityTransactionValidityError extends Enum {
6154    readonly isInvalid: boolean;6538    readonly isInvalid: boolean;
6155    readonly asInvalid: SpRuntimeTransactionValidityInvalidTransaction;6539    readonly asInvalid: SpRuntimeTransactionValidityInvalidTransaction;
6158    readonly type: 'Invalid' | 'Unknown';6542    readonly type: 'Invalid' | 'Unknown';
6159  }6543  }
61606544
6161  /** @name SpRuntimeTransactionValidityInvalidTransaction (431) */6545  /** @name SpRuntimeTransactionValidityInvalidTransaction (417) */
6162  interface SpRuntimeTransactionValidityInvalidTransaction extends Enum {6546  interface SpRuntimeTransactionValidityInvalidTransaction extends Enum {
6163    readonly isCall: boolean;6547    readonly isCall: boolean;
6164    readonly isPayment: boolean;6548    readonly isPayment: boolean;
6170    readonly isCustom: boolean;6554    readonly isCustom: boolean;
6171    readonly asCustom: u8;6555    readonly asCustom: u8;
6172    readonly isBadMandatory: boolean;6556    readonly isBadMandatory: boolean;
6173    readonly isMandatoryDispatch: boolean;6557    readonly isMandatoryValidation: boolean;
6174    readonly isBadSigner: boolean;6558    readonly isBadSigner: boolean;
6175    readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryDispatch' | 'BadSigner';6559    readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryValidation' | 'BadSigner';
6176  }6560  }
61776561
6178  /** @name SpRuntimeTransactionValidityUnknownTransaction (432) */6562  /** @name SpRuntimeTransactionValidityUnknownTransaction (418) */
6179  interface SpRuntimeTransactionValidityUnknownTransaction extends Enum {6563  interface SpRuntimeTransactionValidityUnknownTransaction extends Enum {
6180    readonly isCannotLookup: boolean;6564    readonly isCannotLookup: boolean;
6181    readonly isNoUnsignedValidator: boolean;6565    readonly isNoUnsignedValidator: boolean;
61866570
6187<<<<<<< HEAD6571<<<<<<< HEAD
6188<<<<<<< HEAD6572<<<<<<< HEAD
6573<<<<<<< HEAD
6189  /** @name PalletCommonError (428) */6574  /** @name PalletCommonError (428) */
6190>>>>>>> chore: regenerate types6575>>>>>>> chore: regenerate types
6191<<<<<<< HEAD6576<<<<<<< HEAD
6199=======6584=======
6200  /** @name UpPovEstimateRpcTrieKeyValue (434) */6585  /** @name UpPovEstimateRpcTrieKeyValue (434) */
6201>>>>>>> fix: regenerate types after rebase6586>>>>>>> fix: regenerate types after rebase
6587=======
6588  /** @name UpPovEstimateRpcTrieKeyValue (420) */
6589>>>>>>> chore: regenerate types
6202  interface UpPovEstimateRpcTrieKeyValue extends Struct {6590  interface UpPovEstimateRpcTrieKeyValue extends Struct {
6203    readonly key: Bytes;6591    readonly key: Bytes;
6204    readonly value: Bytes;6592    readonly value: Bytes;
6205  }6593  }
62066594
6207<<<<<<< HEAD6595<<<<<<< HEAD
6596<<<<<<< HEAD
6208  /** @name PalletCommonError (434) */6597  /** @name PalletCommonError (434) */
6209>>>>>>> chore:  regenerate types6598>>>>>>> chore:  regenerate types
6210>>>>>>> chore:  regenerate types6599>>>>>>> chore:  regenerate types
6215  /** @name PalletCommonError (436) */6604  /** @name PalletCommonError (436) */
6216>>>>>>> fix: regenerate types after rebase6605>>>>>>> fix: regenerate types after rebase
6217>>>>>>> fix: regenerate types after rebase6606>>>>>>> fix: regenerate types after rebase
6607=======
6608  /** @name PalletCommonError (422) */
6609>>>>>>> chore: regenerate types
6218  interface PalletCommonError extends Enum {6610  interface PalletCommonError extends Enum {
6219    readonly isCollectionNotFound: boolean;6611    readonly isCollectionNotFound: boolean;
6220    readonly isMustBeTokenOwner: boolean;6612    readonly isMustBeTokenOwner: boolean;
6259<<<<<<< HEAD6651<<<<<<< HEAD
6260<<<<<<< HEAD6652<<<<<<< HEAD
6261<<<<<<< HEAD6653<<<<<<< HEAD
6654<<<<<<< HEAD
6262  /** @name PalletFungibleError (416) */6655  /** @name PalletFungibleError (416) */
6263=======6656=======
6264=======6657=======
6305  /** @name PalletFungibleError (438) */6698  /** @name PalletFungibleError (438) */
6306>>>>>>> fix: regenerate types after rebase6699>>>>>>> fix: regenerate types after rebase
6307>>>>>>> fix: regenerate types after rebase6700>>>>>>> fix: regenerate types after rebase
6701=======
6702  /** @name PalletFungibleError (424) */
6703>>>>>>> chore: regenerate types
6308  interface PalletFungibleError extends Enum {6704  interface PalletFungibleError extends Enum {
6309    readonly isNotFungibleDataUsedToMintFungibleCollectionToken: boolean;6705    readonly isNotFungibleDataUsedToMintFungibleCollectionToken: boolean;
6310    readonly isFungibleItemsHaveNoId: boolean;6706    readonly isFungibleItemsHaveNoId: boolean;
6320<<<<<<< HEAD6716<<<<<<< HEAD
6321<<<<<<< HEAD6717<<<<<<< HEAD
6322<<<<<<< HEAD6718<<<<<<< HEAD
6719<<<<<<< HEAD
6323  /** @name PalletRefungibleError (420) */6720  /** @name PalletRefungibleError (420) */
6324=======6721=======
6325=======6722=======
6328>>>>>>> chore:  regenerate types6725>>>>>>> chore:  regenerate types
6329=======6726=======
6330>>>>>>> fix: regenerate types after rebase6727>>>>>>> fix: regenerate types after rebase
6728=======
6729>>>>>>> chore: regenerate types
6331<<<<<<< HEAD6730<<<<<<< HEAD
6332  /** @name PalletRefungibleItemData (417) */6731  /** @name PalletRefungibleItemData (417) */
6333=======6732=======
6375  /** @name PalletRefungibleItemData (439) */6774  /** @name PalletRefungibleItemData (439) */
6376>>>>>>> fix: regenerate types after rebase6775>>>>>>> fix: regenerate types after rebase
6377>>>>>>> fix: regenerate types after rebase6776>>>>>>> fix: regenerate types after rebase
6777=======
6778  /** @name PalletRefungibleItemData (425) */
6779>>>>>>> chore: regenerate types
6378  interface PalletRefungibleItemData extends Struct {6780  interface PalletRefungibleItemData extends Struct {
6379    readonly constData: Bytes;6781    readonly constData: Bytes;
6380  }6782  }
6383<<<<<<< HEAD6785<<<<<<< HEAD
6384<<<<<<< HEAD6786<<<<<<< HEAD
6385<<<<<<< HEAD6787<<<<<<< HEAD
6788<<<<<<< HEAD
6386  /** @name PalletRefungibleError (422) */6789  /** @name PalletRefungibleError (422) */
6387=======6790=======
6388=======6791=======
6438  /** @name PalletRefungibleError (444) */6841  /** @name PalletRefungibleError (444) */
6439>>>>>>> fix: regenerate types after rebase6842>>>>>>> fix: regenerate types after rebase
6440>>>>>>> fix: regenerate types after rebase6843>>>>>>> fix: regenerate types after rebase
6844<<<<<<< HEAD
6441>>>>>>> fix: regenerate types after rebase6845>>>>>>> fix: regenerate types after rebase
6846=======
6847=======
6848  /** @name PalletRefungibleError (430) */
6849>>>>>>> chore: regenerate types
6850>>>>>>> chore: regenerate types
6442  interface PalletRefungibleError extends Enum {6851  interface PalletRefungibleError extends Enum {
6443    readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean;6852    readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean;
6444    readonly isWrongRefungiblePieces: boolean;6853    readonly isWrongRefungiblePieces: boolean;
6452<<<<<<< HEAD6861<<<<<<< HEAD
6453<<<<<<< HEAD6862<<<<<<< HEAD
6454<<<<<<< HEAD6863<<<<<<< HEAD
6864<<<<<<< HEAD
6455  /** @name PalletNonfungibleItemData (421) */6865  /** @name PalletNonfungibleItemData (421) */
6456=======6866=======
6457=======6867=======
6460>>>>>>> chore:  regenerate types6870>>>>>>> chore:  regenerate types
6461=======6871=======
6462>>>>>>> fix: regenerate types after rebase6872>>>>>>> fix: regenerate types after rebase
6873=======
6874>>>>>>> chore: regenerate types
6463<<<<<<< HEAD6875<<<<<<< HEAD
6464  /** @name PalletNonfungibleItemData (423) */6876  /** @name PalletNonfungibleItemData (423) */
6465=======6877=======
6516  /** @name PalletNonfungibleItemData (445) */6928  /** @name PalletNonfungibleItemData (445) */
6517>>>>>>> fix: regenerate types after rebase6929>>>>>>> fix: regenerate types after rebase
6518>>>>>>> fix: regenerate types after rebase6930>>>>>>> fix: regenerate types after rebase
6931<<<<<<< HEAD
6519>>>>>>> fix: regenerate types after rebase6932>>>>>>> fix: regenerate types after rebase
6933=======
6934=======
6935  /** @name PalletNonfungibleItemData (431) */
6936>>>>>>> chore: regenerate types
6937>>>>>>> chore: regenerate types
6520  interface PalletNonfungibleItemData extends Struct {6938  interface PalletNonfungibleItemData extends Struct {
6521    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;6939    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
6522  }6940  }
6525<<<<<<< HEAD6943<<<<<<< HEAD
6526<<<<<<< HEAD6944<<<<<<< HEAD
6527<<<<<<< HEAD6945<<<<<<< HEAD
6946<<<<<<< HEAD
6528  /** @name UpDataStructsPropertyScope (423) */6947  /** @name UpDataStructsPropertyScope (423) */
6529=======6948=======
6530=======6949=======
6533>>>>>>> chore:  regenerate types6952>>>>>>> chore:  regenerate types
6534=======6953=======
6535>>>>>>> fix: regenerate types after rebase6954>>>>>>> fix: regenerate types after rebase
6955=======
6956>>>>>>> chore: regenerate types
6536<<<<<<< HEAD6957<<<<<<< HEAD
6537  /** @name UpDataStructsPropertyScope (425) */6958  /** @name UpDataStructsPropertyScope (425) */
6538=======6959=======
6589  /** @name UpDataStructsPropertyScope (447) */7010  /** @name UpDataStructsPropertyScope (447) */
6590>>>>>>> fix: regenerate types after rebase7011>>>>>>> fix: regenerate types after rebase
6591>>>>>>> fix: regenerate types after rebase7012>>>>>>> fix: regenerate types after rebase
7013<<<<<<< HEAD
6592>>>>>>> fix: regenerate types after rebase7014>>>>>>> fix: regenerate types after rebase
7015=======
7016=======
7017  /** @name UpDataStructsPropertyScope (433) */
7018>>>>>>> chore: regenerate types
7019>>>>>>> chore: regenerate types
6593  interface UpDataStructsPropertyScope extends Enum {7020  interface UpDataStructsPropertyScope extends Enum {
6594    readonly isNone: boolean;7021    readonly isNone: boolean;
6595    readonly isRmrk: boolean;7022    readonly isRmrk: boolean;
6600<<<<<<< HEAD7027<<<<<<< HEAD
6601<<<<<<< HEAD7028<<<<<<< HEAD
6602<<<<<<< HEAD7029<<<<<<< HEAD
7030<<<<<<< HEAD
6603  /** @name PalletNonfungibleError (426) */7031  /** @name PalletNonfungibleError (426) */
6604=======7032=======
6605=======7033=======
6608>>>>>>> chore:  regenerate types7036>>>>>>> chore:  regenerate types
6609=======7037=======
6610>>>>>>> fix: regenerate types after rebase7038>>>>>>> fix: regenerate types after rebase
7039=======
7040>>>>>>> chore: regenerate types
6611<<<<<<< HEAD7041<<<<<<< HEAD
6612  /** @name PalletNonfungibleError (427) */7042  /** @name PalletNonfungibleError (427) */
6613=======7043=======
6664  /** @name PalletNonfungibleError (449) */7094  /** @name PalletNonfungibleError (449) */
6665>>>>>>> fix: regenerate types after rebase7095>>>>>>> fix: regenerate types after rebase
6666>>>>>>> fix: regenerate types after rebase7096>>>>>>> fix: regenerate types after rebase
7097<<<<<<< HEAD
6667>>>>>>> fix: regenerate types after rebase7098>>>>>>> fix: regenerate types after rebase
7099=======
7100=======
7101  /** @name PalletNonfungibleError (435) */
7102>>>>>>> chore: regenerate types
7103>>>>>>> chore: regenerate types
6668  interface PalletNonfungibleError extends Enum {7104  interface PalletNonfungibleError extends Enum {
6669    readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean;7105    readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean;
6670    readonly isNonfungibleItemsHaveNoAmount: boolean;7106    readonly isNonfungibleItemsHaveNoAmount: boolean;
6676<<<<<<< HEAD7112<<<<<<< HEAD
6677<<<<<<< HEAD7113<<<<<<< HEAD
6678<<<<<<< HEAD7114<<<<<<< HEAD
7115<<<<<<< HEAD
6679  /** @name PalletStructureError (427) */7116  /** @name PalletStructureError (427) */
6680=======7117=======
6681=======7118=======
6684>>>>>>> chore:  regenerate types7121>>>>>>> chore:  regenerate types
6685=======7122=======
6686>>>>>>> fix: regenerate types after rebase7123>>>>>>> fix: regenerate types after rebase
7124=======
7125>>>>>>> chore: regenerate types
6687<<<<<<< HEAD7126<<<<<<< HEAD
6688  /** @name PalletStructureError (428) */7127  /** @name PalletStructureError (428) */
6689=======7128=======
6740  /** @name PalletStructureError (450) */7179  /** @name PalletStructureError (450) */
6741>>>>>>> fix: regenerate types after rebase7180>>>>>>> fix: regenerate types after rebase
6742>>>>>>> fix: regenerate types after rebase7181>>>>>>> fix: regenerate types after rebase
7182<<<<<<< HEAD
6743>>>>>>> fix: regenerate types after rebase7183>>>>>>> fix: regenerate types after rebase
7184=======
7185=======
7186  /** @name PalletStructureError (436) */
7187>>>>>>> chore: regenerate types
7188>>>>>>> chore: regenerate types
6744  interface PalletStructureError extends Enum {7189  interface PalletStructureError extends Enum {
6745    readonly isOuroborosDetected: boolean;7190    readonly isOuroborosDetected: boolean;
6746    readonly isDepthLimit: boolean;7191    readonly isDepthLimit: boolean;
6753<<<<<<< HEAD7198<<<<<<< HEAD
6754<<<<<<< HEAD7199<<<<<<< HEAD
6755<<<<<<< HEAD7200<<<<<<< HEAD
7201<<<<<<< HEAD
6756  /** @name PalletRmrkCoreError (428) */7202  /** @name PalletRmrkCoreError (428) */
6757=======7203=======
6758=======7204=======
6761>>>>>>> chore:  regenerate types7207>>>>>>> chore:  regenerate types
6762=======7208=======
6763>>>>>>> fix: regenerate types after rebase7209>>>>>>> fix: regenerate types after rebase
7210=======
7211>>>>>>> chore: regenerate types
6764<<<<<<< HEAD7212<<<<<<< HEAD
6765  /** @name PalletRmrkCoreError (429) */7213  /** @name PalletRmrkCoreError (429) */
6766=======7214=======
6817  /** @name PalletRmrkCoreError (451) */7265  /** @name PalletRmrkCoreError (451) */
6818>>>>>>> fix: regenerate types after rebase7266>>>>>>> fix: regenerate types after rebase
6819>>>>>>> fix: regenerate types after rebase7267>>>>>>> fix: regenerate types after rebase
7268<<<<<<< HEAD
6820>>>>>>> fix: regenerate types after rebase7269>>>>>>> fix: regenerate types after rebase
7270=======
7271=======
7272  /** @name PalletRmrkCoreError (437) */
7273>>>>>>> chore: regenerate types
7274>>>>>>> chore: regenerate types
6821  interface PalletRmrkCoreError extends Enum {7275  interface PalletRmrkCoreError extends Enum {
6822    readonly isCorruptedCollectionType: boolean;7276    readonly isCorruptedCollectionType: boolean;
6823    readonly isRmrkPropertyKeyIsTooLong: boolean;7277    readonly isRmrkPropertyKeyIsTooLong: boolean;
6845<<<<<<< HEAD7299<<<<<<< HEAD
6846<<<<<<< HEAD7300<<<<<<< HEAD
6847<<<<<<< HEAD7301<<<<<<< HEAD
7302<<<<<<< HEAD
6848  /** @name PalletRmrkEquipError (430) */7303  /** @name PalletRmrkEquipError (430) */
6849=======7304=======
6850=======7305=======
6853>>>>>>> chore:  regenerate types7308>>>>>>> chore:  regenerate types
6854=======7309=======
6855>>>>>>> fix: regenerate types after rebase7310>>>>>>> fix: regenerate types after rebase
7311=======
7312>>>>>>> chore: regenerate types
6856<<<<<<< HEAD7313<<<<<<< HEAD
6857  /** @name PalletRmrkEquipError (431) */7314  /** @name PalletRmrkEquipError (431) */
6858=======7315=======
6909  /** @name PalletRmrkEquipError (453) */7366  /** @name PalletRmrkEquipError (453) */
6910>>>>>>> fix: regenerate types after rebase7367>>>>>>> fix: regenerate types after rebase
6911>>>>>>> fix: regenerate types after rebase7368>>>>>>> fix: regenerate types after rebase
7369<<<<<<< HEAD
6912>>>>>>> fix: regenerate types after rebase7370>>>>>>> fix: regenerate types after rebase
7371=======
7372=======
7373  /** @name PalletRmrkEquipError (439) */
7374>>>>>>> chore: regenerate types
7375>>>>>>> chore: regenerate types
6913  interface PalletRmrkEquipError extends Enum {7376  interface PalletRmrkEquipError extends Enum {
6914    readonly isPermissionError: boolean;7377    readonly isPermissionError: boolean;
6915    readonly isNoAvailableBaseId: boolean;7378    readonly isNoAvailableBaseId: boolean;
6925<<<<<<< HEAD7388<<<<<<< HEAD
6926<<<<<<< HEAD7389<<<<<<< HEAD
6927<<<<<<< HEAD7390<<<<<<< HEAD
7391<<<<<<< HEAD
6928  /** @name PalletAppPromotionError (436) */7392  /** @name PalletAppPromotionError (436) */
6929=======7393=======
6930=======7394=======
6933>>>>>>> chore:  regenerate types7397>>>>>>> chore:  regenerate types
6934=======7398=======
6935>>>>>>> fix: regenerate types after rebase7399>>>>>>> fix: regenerate types after rebase
7400=======
7401>>>>>>> chore: regenerate types
6936<<<<<<< HEAD7402<<<<<<< HEAD
6937  /** @name PalletAppPromotionError (437) */7403  /** @name PalletAppPromotionError (437) */
6938=======7404=======
6989  /** @name PalletAppPromotionError (459) */7455  /** @name PalletAppPromotionError (459) */
6990>>>>>>> fix: regenerate types after rebase7456>>>>>>> fix: regenerate types after rebase
6991>>>>>>> fix: regenerate types after rebase7457>>>>>>> fix: regenerate types after rebase
7458<<<<<<< HEAD
6992>>>>>>> fix: regenerate types after rebase7459>>>>>>> fix: regenerate types after rebase
7460=======
7461=======
7462  /** @name PalletAppPromotionError (445) */
7463>>>>>>> chore: regenerate types
7464>>>>>>> chore: regenerate types
6993  interface PalletAppPromotionError extends Enum {7465  interface PalletAppPromotionError extends Enum {
6994    readonly isAdminNotSet: boolean;7466    readonly isAdminNotSet: boolean;
6995    readonly isNoPermission: boolean;7467    readonly isNoPermission: boolean;
7004<<<<<<< HEAD7476<<<<<<< HEAD
7005<<<<<<< HEAD7477<<<<<<< HEAD
7006<<<<<<< HEAD7478<<<<<<< HEAD
7479<<<<<<< HEAD
7007  /** @name PalletForeignAssetsModuleError (437) */7480  /** @name PalletForeignAssetsModuleError (437) */
7008=======7481=======
7009=======7482=======
7012>>>>>>> chore:  regenerate types7485>>>>>>> chore:  regenerate types
7013=======7486=======
7014>>>>>>> fix: regenerate types after rebase7487>>>>>>> fix: regenerate types after rebase
7488=======
7489>>>>>>> chore: regenerate types
7015<<<<<<< HEAD7490<<<<<<< HEAD
7016  /** @name PalletForeignAssetsModuleError (438) */7491  /** @name PalletForeignAssetsModuleError (438) */
7017=======7492=======
7068  /** @name PalletForeignAssetsModuleError (460) */7543  /** @name PalletForeignAssetsModuleError (460) */
7069>>>>>>> fix: regenerate types after rebase7544>>>>>>> fix: regenerate types after rebase
7070>>>>>>> fix: regenerate types after rebase7545>>>>>>> fix: regenerate types after rebase
7546<<<<<<< HEAD
7071>>>>>>> fix: regenerate types after rebase7547>>>>>>> fix: regenerate types after rebase
7548=======
7549=======
7550  /** @name PalletForeignAssetsModuleError (446) */
7551>>>>>>> chore: regenerate types
7552>>>>>>> chore: regenerate types
7072  interface PalletForeignAssetsModuleError extends Enum {7553  interface PalletForeignAssetsModuleError extends Enum {
7073    readonly isBadLocation: boolean;7554    readonly isBadLocation: boolean;
7074    readonly isMultiLocationExisted: boolean;7555    readonly isMultiLocationExisted: boolean;
7081<<<<<<< HEAD7562<<<<<<< HEAD
7082<<<<<<< HEAD7563<<<<<<< HEAD
7083<<<<<<< HEAD7564<<<<<<< HEAD
7565<<<<<<< HEAD
7084  /** @name PalletEvmError (439) */7566  /** @name PalletEvmError (439) */
7085=======7567=======
7086=======7568=======
7089>>>>>>> chore:  regenerate types7571>>>>>>> chore:  regenerate types
7090=======7572=======
7091>>>>>>> fix: regenerate types after rebase7573>>>>>>> fix: regenerate types after rebase
7574=======
7575>>>>>>> chore: regenerate types
7092<<<<<<< HEAD7576<<<<<<< HEAD
7093  /** @name PalletEvmError (440) */7577  /** @name PalletEvmError (440) */
7094=======7578=======
7145  /** @name PalletEvmError (462) */7629  /** @name PalletEvmError (462) */
7146>>>>>>> fix: regenerate types after rebase7630>>>>>>> fix: regenerate types after rebase
7147>>>>>>> fix: regenerate types after rebase7631>>>>>>> fix: regenerate types after rebase
7632<<<<<<< HEAD
7148>>>>>>> fix: regenerate types after rebase7633>>>>>>> fix: regenerate types after rebase
7634=======
7635=======
7636  /** @name PalletEvmError (448) */
7637>>>>>>> chore: regenerate types
7638>>>>>>> chore: regenerate types
7149  interface PalletEvmError extends Enum {7639  interface PalletEvmError extends Enum {
7150    readonly isBalanceLow: boolean;7640    readonly isBalanceLow: boolean;
7151    readonly isFeeOverflow: boolean;7641    readonly isFeeOverflow: boolean;
7165<<<<<<< HEAD7655<<<<<<< HEAD
7166<<<<<<< HEAD7656<<<<<<< HEAD
7167<<<<<<< HEAD7657<<<<<<< HEAD
7658<<<<<<< HEAD
7168  /** @name FpRpcTransactionStatus (442) */7659  /** @name FpRpcTransactionStatus (442) */
7169=======7660=======
7170=======7661=======
7173>>>>>>> chore:  regenerate types7664>>>>>>> chore:  regenerate types
7174=======7665=======
7175>>>>>>> fix: regenerate types after rebase7666>>>>>>> fix: regenerate types after rebase
7667=======
7668>>>>>>> chore: regenerate types
7176<<<<<<< HEAD7669<<<<<<< HEAD
7177  /** @name FpRpcTransactionStatus (443) */7670  /** @name FpRpcTransactionStatus (443) */
7178=======7671=======
7229  /** @name FpRpcTransactionStatus (465) */7722  /** @name FpRpcTransactionStatus (465) */
7230>>>>>>> fix: regenerate types after rebase7723>>>>>>> fix: regenerate types after rebase
7231>>>>>>> fix: regenerate types after rebase7724>>>>>>> fix: regenerate types after rebase
7725<<<<<<< HEAD
7232>>>>>>> fix: regenerate types after rebase7726>>>>>>> fix: regenerate types after rebase
7727=======
7728=======
7729  /** @name FpRpcTransactionStatus (451) */
7730>>>>>>> chore: regenerate types
7731>>>>>>> chore: regenerate types
7233  interface FpRpcTransactionStatus extends Struct {7732  interface FpRpcTransactionStatus extends Struct {
7234    readonly transactionHash: H256;7733    readonly transactionHash: H256;
7235    readonly transactionIndex: u32;7734    readonly transactionIndex: u32;
7244<<<<<<< HEAD7743<<<<<<< HEAD
7245<<<<<<< HEAD7744<<<<<<< HEAD
7246<<<<<<< HEAD7745<<<<<<< HEAD
7746<<<<<<< HEAD
7247  /** @name EthbloomBloom (444) */7747  /** @name EthbloomBloom (444) */
7248  interface EthbloomBloom extends U8aFixed {}7748  interface EthbloomBloom extends U8aFixed {}
72497749
7255>>>>>>> chore:  regenerate types7755>>>>>>> chore:  regenerate types
7256=======7756=======
7257>>>>>>> fix: regenerate types after rebase7757>>>>>>> fix: regenerate types after rebase
7758=======
7759>>>>>>> chore: regenerate types
7258<<<<<<< HEAD7760<<<<<<< HEAD
7259  /** @name EthbloomBloom (445) */7761  /** @name EthbloomBloom (445) */
7260  interface EthbloomBloom extends U8aFixed {}7762  interface EthbloomBloom extends U8aFixed {}
7332  /** @name EthereumReceiptReceiptV3 (469) */7834  /** @name EthereumReceiptReceiptV3 (469) */
7333>>>>>>> fix: regenerate types after rebase7835>>>>>>> fix: regenerate types after rebase
7334>>>>>>> fix: regenerate types after rebase7836>>>>>>> fix: regenerate types after rebase
7837<<<<<<< HEAD
7335>>>>>>> fix: regenerate types after rebase7838>>>>>>> fix: regenerate types after rebase
7839=======
7840=======
7841  /** @name EthbloomBloom (453) */
7842  interface EthbloomBloom extends U8aFixed {}
7843
7844  /** @name EthereumReceiptReceiptV3 (455) */
7845>>>>>>> chore: regenerate types
7846>>>>>>> chore: regenerate types
7336  interface EthereumReceiptReceiptV3 extends Enum {7847  interface EthereumReceiptReceiptV3 extends Enum {
7337    readonly isLegacy: boolean;7848    readonly isLegacy: boolean;
7338    readonly asLegacy: EthereumReceiptEip658ReceiptData;7849    readonly asLegacy: EthereumReceiptEip658ReceiptData;
7347<<<<<<< HEAD7858<<<<<<< HEAD
7348<<<<<<< HEAD7859<<<<<<< HEAD
7349<<<<<<< HEAD7860<<<<<<< HEAD
7861<<<<<<< HEAD
7350  /** @name EthereumReceiptEip658ReceiptData (447) */7862  /** @name EthereumReceiptEip658ReceiptData (447) */
7351=======7863=======
7352=======7864=======
7355>>>>>>> chore:  regenerate types7867>>>>>>> chore:  regenerate types
7356=======7868=======
7357>>>>>>> fix: regenerate types after rebase7869>>>>>>> fix: regenerate types after rebase
7870=======
7871>>>>>>> chore: regenerate types
7358<<<<<<< HEAD7872<<<<<<< HEAD
7359  /** @name EthereumReceiptEip658ReceiptData (448) */7873  /** @name EthereumReceiptEip658ReceiptData (448) */
7360=======7874=======
7411  /** @name EthereumReceiptEip658ReceiptData (470) */7925  /** @name EthereumReceiptEip658ReceiptData (470) */
7412>>>>>>> fix: regenerate types after rebase7926>>>>>>> fix: regenerate types after rebase
7413>>>>>>> fix: regenerate types after rebase7927>>>>>>> fix: regenerate types after rebase
7928<<<<<<< HEAD
7414>>>>>>> fix: regenerate types after rebase7929>>>>>>> fix: regenerate types after rebase
7930=======
7931=======
7932  /** @name EthereumReceiptEip658ReceiptData (456) */
7933>>>>>>> chore: regenerate types
7934>>>>>>> chore: regenerate types
7415  interface EthereumReceiptEip658ReceiptData extends Struct {7935  interface EthereumReceiptEip658ReceiptData extends Struct {
7416    readonly statusCode: u8;7936    readonly statusCode: u8;
7417    readonly usedGas: U256;7937    readonly usedGas: U256;
7423<<<<<<< HEAD7943<<<<<<< HEAD
7424<<<<<<< HEAD7944<<<<<<< HEAD
7425<<<<<<< HEAD7945<<<<<<< HEAD
7946<<<<<<< HEAD
7426  /** @name EthereumBlock (448) */7947  /** @name EthereumBlock (448) */
7427=======7948=======
7428=======7949=======
7431>>>>>>> chore:  regenerate types7952>>>>>>> chore:  regenerate types
7432=======7953=======
7433>>>>>>> fix: regenerate types after rebase7954>>>>>>> fix: regenerate types after rebase
7955=======
7956>>>>>>> chore: regenerate types
7434<<<<<<< HEAD7957<<<<<<< HEAD
7435  /** @name EthereumBlock (449) */7958  /** @name EthereumBlock (449) */
7436=======7959=======
7487  /** @name EthereumBlock (471) */8010  /** @name EthereumBlock (471) */
7488>>>>>>> fix: regenerate types after rebase8011>>>>>>> fix: regenerate types after rebase
7489>>>>>>> fix: regenerate types after rebase8012>>>>>>> fix: regenerate types after rebase
8013<<<<<<< HEAD
7490>>>>>>> fix: regenerate types after rebase8014>>>>>>> fix: regenerate types after rebase
8015=======
8016=======
8017  /** @name EthereumBlock (457) */
8018>>>>>>> chore: regenerate types
8019>>>>>>> chore: regenerate types
7491  interface EthereumBlock extends Struct {8020  interface EthereumBlock extends Struct {
7492    readonly header: EthereumHeader;8021    readonly header: EthereumHeader;
7493    readonly transactions: Vec<EthereumTransactionTransactionV2>;8022    readonly transactions: Vec<EthereumTransactionTransactionV2>;
7498<<<<<<< HEAD8027<<<<<<< HEAD
7499<<<<<<< HEAD8028<<<<<<< HEAD
7500<<<<<<< HEAD8029<<<<<<< HEAD
8030<<<<<<< HEAD
7501  /** @name EthereumHeader (449) */8031  /** @name EthereumHeader (449) */
7502=======8032=======
7503=======8033=======
7506>>>>>>> chore:  regenerate types8036>>>>>>> chore:  regenerate types
7507=======8037=======
7508>>>>>>> fix: regenerate types after rebase8038>>>>>>> fix: regenerate types after rebase
8039=======
8040>>>>>>> chore: regenerate types
7509<<<<<<< HEAD8041<<<<<<< HEAD
7510  /** @name EthereumHeader (450) */8042  /** @name EthereumHeader (450) */
7511=======8043=======
7562  /** @name EthereumHeader (472) */8094  /** @name EthereumHeader (472) */
7563>>>>>>> fix: regenerate types after rebase8095>>>>>>> fix: regenerate types after rebase
7564>>>>>>> fix: regenerate types after rebase8096>>>>>>> fix: regenerate types after rebase
8097<<<<<<< HEAD
7565>>>>>>> fix: regenerate types after rebase8098>>>>>>> fix: regenerate types after rebase
8099=======
8100=======
8101  /** @name EthereumHeader (458) */
8102>>>>>>> chore: regenerate types
8103>>>>>>> chore: regenerate types
7566  interface EthereumHeader extends Struct {8104  interface EthereumHeader extends Struct {
7567    readonly parentHash: H256;8105    readonly parentHash: H256;
7568    readonly ommersHash: H256;8106    readonly ommersHash: H256;
7585<<<<<<< HEAD8123<<<<<<< HEAD
7586<<<<<<< HEAD8124<<<<<<< HEAD
7587<<<<<<< HEAD8125<<<<<<< HEAD
8126<<<<<<< HEAD
7588  /** @name EthereumTypesHashH64 (450) */8127  /** @name EthereumTypesHashH64 (450) */
7589  interface EthereumTypesHashH64 extends U8aFixed {}8128  interface EthereumTypesHashH64 extends U8aFixed {}
75908129
7596>>>>>>> chore:  regenerate types8135>>>>>>> chore:  regenerate types
7597=======8136=======
7598>>>>>>> fix: regenerate types after rebase8137>>>>>>> fix: regenerate types after rebase
8138=======
8139>>>>>>> chore: regenerate types
7599<<<<<<< HEAD8140<<<<<<< HEAD
7600  /** @name EthereumTypesHashH64 (451) */8141  /** @name EthereumTypesHashH64 (451) */
7601  interface EthereumTypesHashH64 extends U8aFixed {}8142  interface EthereumTypesHashH64 extends U8aFixed {}
7673  /** @name PalletEthereumError (478) */8214  /** @name PalletEthereumError (478) */
7674>>>>>>> fix: regenerate types after rebase8215>>>>>>> fix: regenerate types after rebase
7675>>>>>>> fix: regenerate types after rebase8216>>>>>>> fix: regenerate types after rebase
8217<<<<<<< HEAD
7676>>>>>>> fix: regenerate types after rebase8218>>>>>>> fix: regenerate types after rebase
8219=======
8220=======
8221  /** @name EthereumTypesHashH64 (459) */
8222  interface EthereumTypesHashH64 extends U8aFixed {}
8223
8224  /** @name PalletEthereumError (464) */
8225>>>>>>> chore: regenerate types
8226>>>>>>> chore: regenerate types
7677  interface PalletEthereumError extends Enum {8227  interface PalletEthereumError extends Enum {
7678    readonly isInvalidSignature: boolean;8228    readonly isInvalidSignature: boolean;
7679    readonly isPreLogExists: boolean;8229    readonly isPreLogExists: boolean;
7684<<<<<<< HEAD8234<<<<<<< HEAD
7685<<<<<<< HEAD8235<<<<<<< HEAD
7686<<<<<<< HEAD8236<<<<<<< HEAD
8237<<<<<<< HEAD
7687  /** @name PalletEvmCoderSubstrateError (456) */8238  /** @name PalletEvmCoderSubstrateError (456) */
7688=======8239=======
7689=======8240=======
7692>>>>>>> chore:  regenerate types8243>>>>>>> chore:  regenerate types
7693=======8244=======
7694>>>>>>> fix: regenerate types after rebase8245>>>>>>> fix: regenerate types after rebase
8246=======
8247>>>>>>> chore: regenerate types
7695<<<<<<< HEAD8248<<<<<<< HEAD
7696  /** @name PalletEvmCoderSubstrateError (457) */8249  /** @name PalletEvmCoderSubstrateError (457) */
7697=======8250=======
7748  /** @name PalletEvmCoderSubstrateError (479) */8301  /** @name PalletEvmCoderSubstrateError (479) */
7749>>>>>>> fix: regenerate types after rebase8302>>>>>>> fix: regenerate types after rebase
7750>>>>>>> fix: regenerate types after rebase8303>>>>>>> fix: regenerate types after rebase
8304<<<<<<< HEAD
7751>>>>>>> fix: regenerate types after rebase8305>>>>>>> fix: regenerate types after rebase
8306=======
8307=======
8308  /** @name PalletEvmCoderSubstrateError (465) */
8309>>>>>>> chore: regenerate types
8310>>>>>>> chore: regenerate types
7752  interface PalletEvmCoderSubstrateError extends Enum {8311  interface PalletEvmCoderSubstrateError extends Enum {
7753    readonly isOutOfGas: boolean;8312    readonly isOutOfGas: boolean;
7754    readonly isOutOfFund: boolean;8313    readonly isOutOfFund: boolean;
7759<<<<<<< HEAD8318<<<<<<< HEAD
7760<<<<<<< HEAD8319<<<<<<< HEAD
7761<<<<<<< HEAD8320<<<<<<< HEAD
8321<<<<<<< HEAD
7762  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (457) */8322  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (457) */
7763=======8323=======
7764=======8324=======
7767>>>>>>> chore:  regenerate types8327>>>>>>> chore:  regenerate types
7768=======8328=======
7769>>>>>>> fix: regenerate types after rebase8329>>>>>>> fix: regenerate types after rebase
8330=======
8331>>>>>>> chore: regenerate types
7770<<<<<<< HEAD8332<<<<<<< HEAD
7771  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (458) */8333  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (458) */
7772=======8334=======
7823  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (480) */8385  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (480) */
7824>>>>>>> fix: regenerate types after rebase8386>>>>>>> fix: regenerate types after rebase
7825>>>>>>> fix: regenerate types after rebase8387>>>>>>> fix: regenerate types after rebase
8388<<<<<<< HEAD
7826>>>>>>> fix: regenerate types after rebase8389>>>>>>> fix: regenerate types after rebase
8390=======
8391=======
8392  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (466) */
8393>>>>>>> chore: regenerate types
8394>>>>>>> chore: regenerate types
7827  interface UpDataStructsSponsorshipStateBasicCrossAccountIdRepr extends Enum {8395  interface UpDataStructsSponsorshipStateBasicCrossAccountIdRepr extends Enum {
7828    readonly isDisabled: boolean;8396    readonly isDisabled: boolean;
7829    readonly isUnconfirmed: boolean;8397    readonly isUnconfirmed: boolean;
7837<<<<<<< HEAD8405<<<<<<< HEAD
7838<<<<<<< HEAD8406<<<<<<< HEAD
7839<<<<<<< HEAD8407<<<<<<< HEAD
8408<<<<<<< HEAD
7840  /** @name PalletEvmContractHelpersSponsoringModeT (458) */8409  /** @name PalletEvmContractHelpersSponsoringModeT (458) */
7841=======8410=======
7842=======8411=======
7845>>>>>>> chore:  regenerate types8414>>>>>>> chore:  regenerate types
7846=======8415=======
7847>>>>>>> fix: regenerate types after rebase8416>>>>>>> fix: regenerate types after rebase
8417=======
8418>>>>>>> chore: regenerate types
7848<<<<<<< HEAD8419<<<<<<< HEAD
7849  /** @name PalletEvmContractHelpersSponsoringModeT (459) */8420  /** @name PalletEvmContractHelpersSponsoringModeT (459) */
7850=======8421=======
7901  /** @name PalletEvmContractHelpersSponsoringModeT (481) */8472  /** @name PalletEvmContractHelpersSponsoringModeT (481) */
7902>>>>>>> fix: regenerate types after rebase8473>>>>>>> fix: regenerate types after rebase
7903>>>>>>> fix: regenerate types after rebase8474>>>>>>> fix: regenerate types after rebase
8475<<<<<<< HEAD
7904>>>>>>> fix: regenerate types after rebase8476>>>>>>> fix: regenerate types after rebase
8477=======
8478=======
8479  /** @name PalletEvmContractHelpersSponsoringModeT (467) */
8480>>>>>>> chore: regenerate types
8481>>>>>>> chore: regenerate types
7905  interface PalletEvmContractHelpersSponsoringModeT extends Enum {8482  interface PalletEvmContractHelpersSponsoringModeT extends Enum {
7906    readonly isDisabled: boolean;8483    readonly isDisabled: boolean;
7907    readonly isAllowlisted: boolean;8484    readonly isAllowlisted: boolean;
7913<<<<<<< HEAD8490<<<<<<< HEAD
7914<<<<<<< HEAD8491<<<<<<< HEAD
7915<<<<<<< HEAD8492<<<<<<< HEAD
8493<<<<<<< HEAD
7916  /** @name PalletEvmContractHelpersError (464) */8494  /** @name PalletEvmContractHelpersError (464) */
7917=======8495=======
7918=======8496=======
7921>>>>>>> chore:  regenerate types8499>>>>>>> chore:  regenerate types
7922=======8500=======
7923>>>>>>> fix: regenerate types after rebase8501>>>>>>> fix: regenerate types after rebase
8502=======
8503>>>>>>> chore: regenerate types
7924<<<<<<< HEAD8504<<<<<<< HEAD
7925  /** @name PalletEvmContractHelpersError (465) */8505  /** @name PalletEvmContractHelpersError (465) */
7926=======8506=======
7977  /** @name PalletEvmContractHelpersError (487) */8557  /** @name PalletEvmContractHelpersError (487) */
7978>>>>>>> fix: regenerate types after rebase8558>>>>>>> fix: regenerate types after rebase
7979>>>>>>> fix: regenerate types after rebase8559>>>>>>> fix: regenerate types after rebase
8560<<<<<<< HEAD
7980>>>>>>> fix: regenerate types after rebase8561>>>>>>> fix: regenerate types after rebase
8562=======
8563=======
8564  /** @name PalletEvmContractHelpersError (473) */
8565>>>>>>> chore: regenerate types
8566>>>>>>> chore: regenerate types
7981  interface PalletEvmContractHelpersError extends Enum {8567  interface PalletEvmContractHelpersError extends Enum {
7982    readonly isNoPermission: boolean;8568    readonly isNoPermission: boolean;
7983    readonly isNoPendingSponsor: boolean;8569    readonly isNoPendingSponsor: boolean;
7989<<<<<<< HEAD8575<<<<<<< HEAD
7990<<<<<<< HEAD8576<<<<<<< HEAD
7991<<<<<<< HEAD8577<<<<<<< HEAD
8578<<<<<<< HEAD
7992  /** @name PalletEvmMigrationError (465) */8579  /** @name PalletEvmMigrationError (465) */
7993=======8580=======
7994=======8581=======
7997>>>>>>> chore:  regenerate types8584>>>>>>> chore:  regenerate types
7998=======8585=======
7999>>>>>>> fix: regenerate types after rebase8586>>>>>>> fix: regenerate types after rebase
8587=======
8588>>>>>>> chore: regenerate types
8000<<<<<<< HEAD8589<<<<<<< HEAD
8001  /** @name PalletEvmMigrationError (466) */8590  /** @name PalletEvmMigrationError (466) */
8002=======8591=======
8053  /** @name PalletEvmMigrationError (488) */8642  /** @name PalletEvmMigrationError (488) */
8054>>>>>>> fix: regenerate types after rebase8643>>>>>>> fix: regenerate types after rebase
8055>>>>>>> fix: regenerate types after rebase8644>>>>>>> fix: regenerate types after rebase
8645<<<<<<< HEAD
8056>>>>>>> fix: regenerate types after rebase8646>>>>>>> fix: regenerate types after rebase
8647=======
8648=======
8649  /** @name PalletEvmMigrationError (474) */
8650>>>>>>> chore: regenerate types
8651>>>>>>> chore: regenerate types
8057  interface PalletEvmMigrationError extends Enum {8652  interface PalletEvmMigrationError extends Enum {
8058    readonly isAccountNotEmpty: boolean;8653    readonly isAccountNotEmpty: boolean;
8059    readonly isAccountIsNotMigrating: boolean;8654    readonly isAccountIsNotMigrating: boolean;
8065<<<<<<< HEAD8660<<<<<<< HEAD
8066<<<<<<< HEAD8661<<<<<<< HEAD
8067<<<<<<< HEAD8662<<<<<<< HEAD
8663<<<<<<< HEAD
8068  /** @name PalletMaintenanceError (466) */8664  /** @name PalletMaintenanceError (466) */
8069  type PalletMaintenanceError = Null;8665  type PalletMaintenanceError = Null;
80708666
8076>>>>>>> chore:  regenerate types8672>>>>>>> chore:  regenerate types
8077=======8673=======
8078>>>>>>> fix: regenerate types after rebase8674>>>>>>> fix: regenerate types after rebase
8675=======
8676>>>>>>> chore: regenerate types
8079<<<<<<< HEAD8677<<<<<<< HEAD
8080  /** @name PalletMaintenanceError (467) */8678  /** @name PalletMaintenanceError (467) */
8081  type PalletMaintenanceError = Null;8679  type PalletMaintenanceError = Null;
8153  /** @name PalletTestUtilsError (490) */8751  /** @name PalletTestUtilsError (490) */
8154>>>>>>> fix: regenerate types after rebase8752>>>>>>> fix: regenerate types after rebase
8155>>>>>>> fix: regenerate types after rebase8753>>>>>>> fix: regenerate types after rebase
8754<<<<<<< HEAD
8156>>>>>>> fix: regenerate types after rebase8755>>>>>>> fix: regenerate types after rebase
8756=======
8757=======
8758  /** @name PalletMaintenanceError (475) */
8759  type PalletMaintenanceError = Null;
8760
8761  /** @name PalletTestUtilsError (476) */
8762>>>>>>> chore: regenerate types
8763>>>>>>> chore: regenerate types
8157  interface PalletTestUtilsError extends Enum {8764  interface PalletTestUtilsError extends Enum {
8158    readonly isTestPalletDisabled: boolean;8765    readonly isTestPalletDisabled: boolean;
8159    readonly isTriggerRollback: boolean;8766    readonly isTriggerRollback: boolean;
8164<<<<<<< HEAD8771<<<<<<< HEAD
8165<<<<<<< HEAD8772<<<<<<< HEAD
8166<<<<<<< HEAD8773<<<<<<< HEAD
8774<<<<<<< HEAD
8167  /** @name SpRuntimeMultiSignature (469) */8775  /** @name SpRuntimeMultiSignature (469) */
8168=======8776=======
8169=======8777=======
8172>>>>>>> chore:  regenerate types8780>>>>>>> chore:  regenerate types
8173=======8781=======
8174>>>>>>> fix: regenerate types after rebase8782>>>>>>> fix: regenerate types after rebase
8783=======
8784>>>>>>> chore: regenerate types
8175<<<<<<< HEAD8785<<<<<<< HEAD
8176  /** @name SpRuntimeMultiSignature (470) */8786  /** @name SpRuntimeMultiSignature (470) */
8177=======8787=======
8228  /** @name SpRuntimeMultiSignature (492) */8838  /** @name SpRuntimeMultiSignature (492) */
8229>>>>>>> fix: regenerate types after rebase8839>>>>>>> fix: regenerate types after rebase
8230>>>>>>> fix: regenerate types after rebase8840>>>>>>> fix: regenerate types after rebase
8841<<<<<<< HEAD
8231>>>>>>> fix: regenerate types after rebase8842>>>>>>> fix: regenerate types after rebase
8843=======
8844=======
8845  /** @name SpRuntimeMultiSignature (478) */
8846>>>>>>> chore: regenerate types
8847>>>>>>> chore: regenerate types
8232  interface SpRuntimeMultiSignature extends Enum {8848  interface SpRuntimeMultiSignature extends Enum {
8233    readonly isEd25519: boolean;8849    readonly isEd25519: boolean;
8234    readonly asEd25519: SpCoreEd25519Signature;8850    readonly asEd25519: SpCoreEd25519Signature;
8243<<<<<<< HEAD8859<<<<<<< HEAD
8244<<<<<<< HEAD8860<<<<<<< HEAD
8245<<<<<<< HEAD8861<<<<<<< HEAD
8862<<<<<<< HEAD
8246  /** @name SpCoreEd25519Signature (470) */8863  /** @name SpCoreEd25519Signature (470) */
8247=======8864=======
8248=======8865=======
8251>>>>>>> chore:  regenerate types8868>>>>>>> chore:  regenerate types
8252=======8869=======
8253>>>>>>> fix: regenerate types after rebase8870>>>>>>> fix: regenerate types after rebase
8871=======
8872>>>>>>> chore: regenerate types
8254<<<<<<< HEAD8873<<<<<<< HEAD
8255  /** @name SpCoreEd25519Signature (471) */8874  /** @name SpCoreEd25519Signature (471) */
8256=======8875=======
8325=======8944=======
8326  /** @name SpCoreEd25519Signature (493) */8945  /** @name SpCoreEd25519Signature (493) */
8327>>>>>>> fix: regenerate types after rebase8946>>>>>>> fix: regenerate types after rebase
8947=======
8948  /** @name SpCoreEd25519Signature (479) */
8949>>>>>>> chore: regenerate types
8328  interface SpCoreEd25519Signature extends U8aFixed {}8950  interface SpCoreEd25519Signature extends U8aFixed {}
83298951
8330  /** @name SpCoreSr25519Signature (495) */8952  /** @name SpCoreSr25519Signature (481) */
8331  interface SpCoreSr25519Signature extends U8aFixed {}8953  interface SpCoreSr25519Signature extends U8aFixed {}
83328954
8333  /** @name SpCoreEcdsaSignature (496) */8955  /** @name SpCoreEcdsaSignature (482) */
8334  interface SpCoreEcdsaSignature extends U8aFixed {}8956  interface SpCoreEcdsaSignature extends U8aFixed {}
83358957
8336  /** @name FrameSystemExtensionsCheckSpecVersion (499) */8958  /** @name FrameSystemExtensionsCheckSpecVersion (485) */
8337  type FrameSystemExtensionsCheckSpecVersion = Null;8959  type FrameSystemExtensionsCheckSpecVersion = Null;
83388960
8339  /** @name FrameSystemExtensionsCheckTxVersion (500) */8961  /** @name FrameSystemExtensionsCheckTxVersion (486) */
8340  type FrameSystemExtensionsCheckTxVersion = Null;8962  type FrameSystemExtensionsCheckTxVersion = Null;
83418963
8342  /** @name FrameSystemExtensionsCheckGenesis (501) */8964  /** @name FrameSystemExtensionsCheckGenesis (487) */
8343  type FrameSystemExtensionsCheckGenesis = Null;8965  type FrameSystemExtensionsCheckGenesis = Null;
83448966
8345  /** @name FrameSystemExtensionsCheckNonce (504) */8967  /** @name FrameSystemExtensionsCheckNonce (490) */
8346  interface FrameSystemExtensionsCheckNonce extends Compact<u32> {}8968  interface FrameSystemExtensionsCheckNonce extends Compact<u32> {}
83478969
8348  /** @name FrameSystemExtensionsCheckWeight (505) */8970  /** @name FrameSystemExtensionsCheckWeight (491) */
8349  type FrameSystemExtensionsCheckWeight = Null;8971  type FrameSystemExtensionsCheckWeight = Null;
83508972
8351  /** @name OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance (506) */8973  /** @name OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance (492) */
8352  type OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance = Null;8974  type OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance = Null;
83538975
8354  /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (507) */8976  /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (493) */
8355  interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact<u128> {}8977  interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact<u128> {}
83568978
8357  /** @name OpalRuntimeRuntime (508) */8979  /** @name OpalRuntimeRuntime (494) */
8358  type OpalRuntimeRuntime = Null;8980  type OpalRuntimeRuntime = Null;
83598981
8360<<<<<<< HEAD8982<<<<<<< HEAD
8361<<<<<<< HEAD8983<<<<<<< HEAD
8362<<<<<<< HEAD8984<<<<<<< HEAD
8985<<<<<<< HEAD
8363  /** @name PalletEthereumFakeTransactionFinalizer (498) */8986  /** @name PalletEthereumFakeTransactionFinalizer (498) */
8364>>>>>>> fix: update polkadot types and definitions8987>>>>>>> fix: update polkadot types and definitions
8365<<<<<<< HEAD8988<<<<<<< HEAD
8397  /** @name PalletEthereumFakeTransactionFinalizer (509) */9020  /** @name PalletEthereumFakeTransactionFinalizer (509) */
8398>>>>>>> fix: regenerate types after rebase9021>>>>>>> fix: regenerate types after rebase
8399>>>>>>> fix: regenerate types after rebase9022>>>>>>> fix: regenerate types after rebase
9023<<<<<<< HEAD
8400>>>>>>> fix: regenerate types after rebase9024>>>>>>> fix: regenerate types after rebase
9025=======
9026=======
9027  /** @name PalletEthereumFakeTransactionFinalizer (495) */
9028>>>>>>> chore: regenerate types
9029>>>>>>> chore: regenerate types
8401  type PalletEthereumFakeTransactionFinalizer = Null;9030  type PalletEthereumFakeTransactionFinalizer = Null;
84029031
8403} // declare module9032} // declare module