git.delta.rocks / unique-network / refs/commits / c207e159ead5

difftreelog

fix regenerate types after rebase

Daniel Shiposha2022-11-25parent: #c0e5e77.patch.diff
in: master

5 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
@@ -17,12 +17,14 @@
 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, 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';
 =======
 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
 
 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
@@ -8,12 +8,15 @@
 <<<<<<< 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';
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< 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';
 =======
@@ -21,6 +24,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< 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, PalletBalancesReleases, 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';
 =======
@@ -58,8 +63,17 @@
 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, 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';
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+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
+>>>>>>> fix: regenerate types after rebase
 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/lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -1212,6 +1212,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup109: pallet_ethereum::pallet::Event
 =======
 <<<<<<< HEAD
@@ -1220,6 +1221,9 @@
    * Lookup115: pallet_ethereum::pallet::Event
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup113: pallet_ethereum::pallet::Event
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEthereumEvent: {
     _enum: {
@@ -1233,6 +1237,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup110: evm_core::error::ExitReason
 =======
 <<<<<<< HEAD
@@ -1241,6 +1246,9 @@
    * Lookup116: evm_core::error::ExitReason
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup114: evm_core::error::ExitReason
+>>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitReason: {
     _enum: {
@@ -1252,6 +1260,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup111: evm_core::error::ExitSucceed
 =======
 <<<<<<< HEAD
@@ -1260,12 +1269,16 @@
    * 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
@@ -1274,6 +1287,9 @@
    * Lookup118: evm_core::error::ExitError
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup116: evm_core::error::ExitError
+>>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitError: {
     _enum: {
@@ -1296,6 +1312,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup115: evm_core::error::ExitRevert
 =======
 <<<<<<< HEAD
@@ -1304,12 +1321,16 @@
    * 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
@@ -1318,6 +1339,9 @@
    * Lookup122: evm_core::error::ExitFatal
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup120: evm_core::error::ExitFatal
+>>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitFatal: {
     _enum: {
@@ -1329,6 +1353,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup117: pallet_evm_contract_helpers::pallet::Event<T>
 =======
 <<<<<<< HEAD
@@ -1337,6 +1362,9 @@
    * 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: {
@@ -1347,9 +1375,12 @@
   },
   /**
 <<<<<<< 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
    **/
@@ -1361,16 +1392,20 @@
    * 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
@@ -1379,12 +1414,16 @@
    * 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
@@ -1393,6 +1432,9 @@
    * Lookup126: frame_system::Phase
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup125: frame_system::Phase
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemPhase: {
     _enum: {
@@ -1403,6 +1445,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup124: frame_system::LastRuntimeUpgradeInfo
 =======
 <<<<<<< HEAD
@@ -1411,6 +1454,9 @@
    * Lookup128: frame_system::LastRuntimeUpgradeInfo
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup127: frame_system::LastRuntimeUpgradeInfo
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemLastRuntimeUpgradeInfo: {
     specVersion: 'Compact<u32>',
@@ -1418,6 +1464,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup125: frame_system::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -1426,6 +1473,9 @@
    * 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: {
@@ -1461,8 +1511,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup129: frame_system::limits::BlockWeights
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup130: frame_system::limits::BlockWeights
 =======
@@ -1472,7 +1525,13 @@
    * Lookup134: frame_system::limits::BlockWeights
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup133: frame_system::limits::BlockWeights
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemLimitsBlockWeights: {
     baseBlock: 'SpWeightsWeightV2Weight',
@@ -1481,8 +1540,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup130: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup131: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
 =======
@@ -1492,7 +1554,13 @@
    * Lookup135: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup134: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSupportDispatchPerDispatchClassWeightsPerClass: {
     normal: 'FrameSystemLimitsWeightsPerClass',
@@ -1501,8 +1569,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup131: frame_system::limits::WeightsPerClass
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup132: frame_system::limits::WeightsPerClass
 =======
@@ -1512,7 +1583,13 @@
    * Lookup136: frame_system::limits::WeightsPerClass
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup135: frame_system::limits::WeightsPerClass
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemLimitsWeightsPerClass: {
     baseExtrinsic: 'SpWeightsWeightV2Weight',
@@ -1522,8 +1599,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup133: frame_system::limits::BlockLength
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup134: frame_system::limits::BlockLength
 =======
@@ -1533,15 +1613,24 @@
    * Lookup138: frame_system::limits::BlockLength
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup137: frame_system::limits::BlockLength
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemLimitsBlockLength: {
     max: 'FrameSupportDispatchPerDispatchClassU32'
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup134: frame_support::dispatch::PerDispatchClass<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup135: frame_support::dispatch::PerDispatchClass<T>
 =======
@@ -1551,7 +1640,13 @@
    * Lookup139: frame_support::dispatch::PerDispatchClass<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup138: frame_support::dispatch::PerDispatchClass<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSupportDispatchPerDispatchClassU32: {
     normal: 'u32',
@@ -1560,8 +1655,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup135: sp_weights::RuntimeDbWeight
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup136: sp_weights::RuntimeDbWeight
 =======
@@ -1571,7 +1669,13 @@
    * Lookup140: sp_weights::RuntimeDbWeight
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup139: sp_weights::RuntimeDbWeight
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   SpWeightsRuntimeDbWeight: {
     read: 'u64',
@@ -1579,8 +1683,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup136: sp_version::RuntimeVersion
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup137: sp_version::RuntimeVersion
 =======
@@ -1590,7 +1697,13 @@
    * Lookup141: sp_version::RuntimeVersion
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup140: sp_version::RuntimeVersion
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   SpVersionRuntimeVersion: {
     specName: 'Text',
@@ -1604,8 +1717,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup141: frame_system::pallet::Error<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup142: frame_system::pallet::Error<T>
 =======
@@ -1615,15 +1731,24 @@
    * Lookup146: frame_system::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup145: frame_system::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemError: {
     _enum: ['InvalidSpecName', 'SpecVersionNeedsToIncrease', 'FailedToExtractRuntimeVersion', 'NonDefaultComposite', 'NonZeroRefCount', 'CallFiltered']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup142: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup143: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
 =======
@@ -1633,7 +1758,13 @@
    * Lookup147: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup146: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotPrimitivesV2PersistedValidationData: {
     parentHead: 'Bytes',
@@ -1643,8 +1774,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup145: polkadot_primitives::v2::UpgradeRestriction
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup146: polkadot_primitives::v2::UpgradeRestriction
 =======
@@ -1654,15 +1788,24 @@
    * Lookup150: polkadot_primitives::v2::UpgradeRestriction
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup149: polkadot_primitives::v2::UpgradeRestriction
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotPrimitivesV2UpgradeRestriction: {
     _enum: ['Present']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup146: sp_trie::storage_proof::StorageProof
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup147: sp_trie::storage_proof::StorageProof
 =======
@@ -1672,15 +1815,24 @@
    * Lookup151: sp_trie::storage_proof::StorageProof
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup150: sp_trie::storage_proof::StorageProof
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   SpTrieStorageProof: {
     trieNodes: 'BTreeSet<Bytes>'
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup148: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup149: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
 =======
@@ -1690,7 +1842,13 @@
    * Lookup153: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup152: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: {
     dmqMqcHead: 'H256',
@@ -1700,8 +1858,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup151: polkadot_primitives::v2::AbridgedHrmpChannel
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup152: polkadot_primitives::v2::AbridgedHrmpChannel
 =======
@@ -1711,7 +1872,13 @@
    * Lookup156: polkadot_primitives::v2::AbridgedHrmpChannel
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup155: polkadot_primitives::v2::AbridgedHrmpChannel
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotPrimitivesV2AbridgedHrmpChannel: {
     maxCapacity: 'u32',
@@ -1723,8 +1890,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup152: polkadot_primitives::v2::AbridgedHostConfiguration
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup153: polkadot_primitives::v2::AbridgedHostConfiguration
 =======
@@ -1734,7 +1904,13 @@
    * Lookup157: polkadot_primitives::v2::AbridgedHostConfiguration
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup156: polkadot_primitives::v2::AbridgedHostConfiguration
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotPrimitivesV2AbridgedHostConfiguration: {
     maxCodeSize: 'u32',
@@ -1749,8 +1925,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup158: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup159: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
 =======
@@ -1760,7 +1939,13 @@
    * Lookup163: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup162: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotCorePrimitivesOutboundHrmpMessage: {
     recipient: 'u32',
@@ -1768,8 +1953,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup159: cumulus_pallet_parachain_system::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup160: cumulus_pallet_parachain_system::pallet::Call<T>
 =======
@@ -1779,7 +1967,13 @@
    * Lookup164: cumulus_pallet_parachain_system::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup163: cumulus_pallet_parachain_system::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletParachainSystemCall: {
     _enum: {
@@ -1799,8 +1993,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup160: cumulus_primitives_parachain_inherent::ParachainInherentData
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup161: cumulus_primitives_parachain_inherent::ParachainInherentData
 =======
@@ -1810,7 +2007,13 @@
    * Lookup165: cumulus_primitives_parachain_inherent::ParachainInherentData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup164: cumulus_primitives_parachain_inherent::ParachainInherentData
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPrimitivesParachainInherentParachainInherentData: {
     validationData: 'PolkadotPrimitivesV2PersistedValidationData',
@@ -1820,8 +2023,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup162: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup163: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
 =======
@@ -1831,7 +2037,13 @@
    * Lookup167: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup166: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotCorePrimitivesInboundDownwardMessage: {
     sentAt: 'u32',
@@ -1839,8 +2051,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup165: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup166: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
 =======
@@ -1850,7 +2065,13 @@
    * Lookup170: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup169: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotCorePrimitivesInboundHrmpMessage: {
     sentAt: 'u32',
@@ -1858,8 +2079,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup168: cumulus_pallet_parachain_system::pallet::Error<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup169: cumulus_pallet_parachain_system::pallet::Error<T>
 =======
@@ -1869,15 +2093,24 @@
    * Lookup173: cumulus_pallet_parachain_system::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup172: cumulus_pallet_parachain_system::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletParachainSystemError: {
     _enum: ['OverlappingUpgrades', 'ProhibitedByPolkadot', 'TooBig', 'ValidationDataNotAvailable', 'HostConfigurationNotAvailable', 'NotScheduled', 'NothingAuthorized', 'Unauthorized']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup170: pallet_balances::BalanceLock<Balance>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup171: pallet_balances::BalanceLock<Balance>
 =======
@@ -1887,7 +2120,13 @@
    * Lookup175: pallet_balances::BalanceLock<Balance>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup174: pallet_balances::BalanceLock<Balance>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletBalancesBalanceLock: {
     id: '[u8;8]',
@@ -1896,8 +2135,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup171: pallet_balances::Reasons
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup172: pallet_balances::Reasons
 =======
@@ -1907,15 +2149,24 @@
    * Lookup176: pallet_balances::Reasons
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup175: pallet_balances::Reasons
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletBalancesReasons: {
     _enum: ['Fee', 'Misc', 'All']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup174: pallet_balances::ReserveData<ReserveIdentifier, Balance>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup175: pallet_balances::ReserveData<ReserveIdentifier, Balance>
 =======
@@ -1925,7 +2176,13 @@
    * Lookup179: pallet_balances::ReserveData<ReserveIdentifier, Balance>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup178: pallet_balances::ReserveData<ReserveIdentifier, Balance>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletBalancesReserveData: {
     id: '[u8;16]',
@@ -1933,8 +2190,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup176: pallet_balances::pallet::Call<T, I>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup177: pallet_balances::Releases
 =======
@@ -1944,12 +2204,16 @@
    * Lookup181: pallet_balances::Releases
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup180: pallet_balances::Releases
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletBalancesReleases: {
     _enum: ['V1_0_0', 'V2_0_0']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup178: pallet_balances::pallet::Call<T, I>
 =======
 <<<<<<< HEAD
@@ -1958,7 +2222,13 @@
    * Lookup182: pallet_balances::pallet::Call<T, I>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup181: pallet_balances::pallet::Call<T, I>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletBalancesCall: {
     _enum: {
@@ -1992,8 +2262,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup179: pallet_balances::pallet::Error<T, I>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup181: pallet_balances::pallet::Error<T, I>
 =======
@@ -2003,15 +2276,24 @@
    * Lookup185: pallet_balances::pallet::Error<T, I>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup184: pallet_balances::pallet::Error<T, I>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletBalancesError: {
     _enum: ['VestingBalance', 'LiquidityRestrictions', 'InsufficientBalance', 'ExistentialDeposit', 'KeepAlive', 'ExistingVestingSchedule', 'DeadAccount', 'TooManyReserves']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup181: pallet_timestamp::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup183: pallet_timestamp::pallet::Call<T>
 =======
@@ -2021,7 +2303,13 @@
    * Lookup187: pallet_timestamp::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup186: pallet_timestamp::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletTimestampCall: {
     _enum: {
@@ -2032,8 +2320,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup183: pallet_transaction_payment::Releases
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup185: pallet_transaction_payment::Releases
 =======
@@ -2043,15 +2334,24 @@
    * Lookup189: pallet_transaction_payment::Releases
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup188: pallet_transaction_payment::Releases
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletTransactionPaymentReleases: {
     _enum: ['V1Ancient', 'V2']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup184: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup186: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
 =======
@@ -2061,7 +2361,13 @@
    * Lookup190: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup189: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletTreasuryProposal: {
     proposer: 'AccountId32',
@@ -2071,8 +2377,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup187: pallet_treasury::pallet::Call<T, I>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup189: pallet_treasury::pallet::Call<T, I>
 =======
@@ -2082,7 +2391,13 @@
    * Lookup193: pallet_treasury::pallet::Call<T, I>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup192: pallet_treasury::pallet::Call<T, I>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletTreasuryCall: {
     _enum: {
@@ -2107,12 +2422,15 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup190: frame_support::PalletId
    **/
   FrameSupportPalletId: '[u8;8]',
   /**
    * Lookup191: pallet_treasury::pallet::Error<T, I>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup192: frame_support::PalletId
    **/
@@ -2121,11 +2439,14 @@
    * Lookup193: pallet_treasury::pallet::Error<T, I>
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup195: frame_support::PalletId
    **/
   FrameSupportPalletId: '[u8;8]',
   /**
    * Lookup196: pallet_treasury::pallet::Error<T, I>
+<<<<<<< HEAD
 =======
    * Lookup196: frame_support::PalletId
    **/
@@ -2134,15 +2455,23 @@
    * Lookup197: pallet_treasury::pallet::Error<T, I>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletTreasuryError: {
     _enum: ['InsufficientProposersBalance', 'InvalidIndex', 'TooManyApprovals', 'InsufficientPermission', 'ProposalNotApproved']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup192: pallet_sudo::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup194: pallet_sudo::pallet::Call<T>
 =======
@@ -2152,7 +2481,13 @@
    * Lookup198: pallet_sudo::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup197: pallet_sudo::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletSudoCall: {
     _enum: {
@@ -2177,8 +2512,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup194: orml_vesting::module::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup196: orml_vesting::module::Call<T>
 =======
@@ -2188,7 +2526,13 @@
    * Lookup200: orml_vesting::module::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup199: orml_vesting::module::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlVestingModuleCall: {
     _enum: {
@@ -2208,8 +2552,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup196: orml_xtokens::module::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup198: orml_xtokens::module::Call<T>
 =======
@@ -2219,7 +2566,13 @@
    * Lookup202: orml_xtokens::module::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup201: orml_xtokens::module::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlXtokensModuleCall: {
     _enum: {
@@ -2263,8 +2616,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup197: xcm::VersionedMultiAsset
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup199: xcm::VersionedMultiAsset
 =======
@@ -2274,7 +2630,13 @@
    * Lookup203: xcm::VersionedMultiAsset
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup202: xcm::VersionedMultiAsset
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmVersionedMultiAsset: {
     _enum: {
@@ -2284,8 +2646,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup200: orml_tokens::module::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup202: orml_tokens::module::Call<T>
 =======
@@ -2295,7 +2660,13 @@
    * Lookup206: orml_tokens::module::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup205: orml_tokens::module::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlTokensModuleCall: {
     _enum: {
@@ -2330,8 +2701,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup201: cumulus_pallet_xcmp_queue::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup203: cumulus_pallet_xcmp_queue::pallet::Call<T>
 =======
@@ -2341,7 +2715,13 @@
    * Lookup207: cumulus_pallet_xcmp_queue::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup206: cumulus_pallet_xcmp_queue::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletXcmpQueueCall: {
     _enum: {
@@ -2391,8 +2771,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup202: pallet_xcm::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup204: pallet_xcm::pallet::Call<T>
 =======
@@ -2402,7 +2785,13 @@
    * Lookup208: pallet_xcm::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup207: pallet_xcm::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletXcmCall: {
     _enum: {
@@ -2457,8 +2846,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup203: xcm::VersionedXcm<RuntimeCall>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup205: xcm::VersionedXcm<RuntimeCall>
 =======
@@ -2468,7 +2860,13 @@
    * Lookup209: xcm::VersionedXcm<RuntimeCall>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup208: xcm::VersionedXcm<RuntimeCall>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmVersionedXcm: {
     _enum: {
@@ -2479,8 +2877,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup204: xcm::v0::Xcm<RuntimeCall>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup206: xcm::v0::Xcm<RuntimeCall>
 =======
@@ -2490,7 +2891,13 @@
    * Lookup210: xcm::v0::Xcm<RuntimeCall>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup209: xcm::v0::Xcm<RuntimeCall>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmV0Xcm: {
     _enum: {
@@ -2545,8 +2952,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup206: xcm::v0::order::Order<RuntimeCall>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup208: xcm::v0::order::Order<RuntimeCall>
 =======
@@ -2556,7 +2966,13 @@
    * Lookup212: xcm::v0::order::Order<RuntimeCall>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup211: xcm::v0::order::Order<RuntimeCall>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmV0Order: {
     _enum: {
@@ -2600,8 +3016,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup208: xcm::v0::Response
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup210: xcm::v0::Response
 =======
@@ -2611,7 +3030,13 @@
    * Lookup214: xcm::v0::Response
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup213: xcm::v0::Response
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmV0Response: {
     _enum: {
@@ -2620,8 +3045,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup209: xcm::v1::Xcm<RuntimeCall>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup211: xcm::v1::Xcm<RuntimeCall>
 =======
@@ -2631,7 +3059,13 @@
    * Lookup215: xcm::v1::Xcm<RuntimeCall>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup214: xcm::v1::Xcm<RuntimeCall>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmV1Xcm: {
     _enum: {
@@ -2691,8 +3125,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup211: xcm::v1::order::Order<RuntimeCall>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup213: xcm::v1::order::Order<RuntimeCall>
 =======
@@ -2702,7 +3139,13 @@
    * Lookup217: xcm::v1::order::Order<RuntimeCall>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup216: xcm::v1::order::Order<RuntimeCall>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmV1Order: {
     _enum: {
@@ -2748,8 +3191,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup213: xcm::v1::Response
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup215: xcm::v1::Response
 =======
@@ -2759,7 +3205,13 @@
    * Lookup219: xcm::v1::Response
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup218: xcm::v1::Response
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   XcmV1Response: {
     _enum: {
@@ -2769,12 +3221,15 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup227: cumulus_pallet_xcm::pallet::Call<T>
    **/
   CumulusPalletXcmCall: 'Null',
   /**
    * Lookup228: cumulus_pallet_dmp_queue::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup229: cumulus_pallet_xcm::pallet::Call<T>
    **/
@@ -2783,11 +3238,14 @@
    * Lookup230: cumulus_pallet_dmp_queue::pallet::Call<T>
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup232: cumulus_pallet_xcm::pallet::Call<T>
    **/
   CumulusPalletXcmCall: 'Null',
   /**
    * Lookup233: cumulus_pallet_dmp_queue::pallet::Call<T>
+<<<<<<< HEAD
 =======
    * Lookup233: cumulus_pallet_xcm::pallet::Call<T>
    **/
@@ -2796,7 +3254,12 @@
    * Lookup234: cumulus_pallet_dmp_queue::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletDmpQueueCall: {
     _enum: {
@@ -2808,8 +3271,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup229: pallet_inflation::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup231: pallet_inflation::pallet::Call<T>
 =======
@@ -2819,7 +3285,13 @@
    * Lookup235: pallet_inflation::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup234: pallet_inflation::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletInflationCall: {
     _enum: {
@@ -2830,8 +3302,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup230: pallet_unique::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup232: pallet_unique::Call<T>
 =======
@@ -2841,7 +3316,13 @@
    * Lookup236: pallet_unique::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup235: pallet_unique::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletUniqueCall: {
     _enum: {
@@ -2986,8 +3467,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup235: up_data_structs::CollectionMode
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup237: up_data_structs::CollectionMode
 =======
@@ -2997,7 +3481,13 @@
    * Lookup241: up_data_structs::CollectionMode
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup240: up_data_structs::CollectionMode
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCollectionMode: {
     _enum: {
@@ -3008,8 +3498,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup236: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup238: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
 =======
@@ -3019,7 +3512,13 @@
    * Lookup242: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup241: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateCollectionData: {
     mode: 'UpDataStructsCollectionMode',
@@ -3035,8 +3534,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup238: up_data_structs::AccessMode
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup240: up_data_structs::AccessMode
 =======
@@ -3046,15 +3548,24 @@
    * Lookup244: up_data_structs::AccessMode
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup243: up_data_structs::AccessMode
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsAccessMode: {
     _enum: ['Normal', 'AllowList']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup240: up_data_structs::CollectionLimits
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup242: up_data_structs::CollectionLimits
 =======
@@ -3064,7 +3575,13 @@
    * Lookup246: up_data_structs::CollectionLimits
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup245: up_data_structs::CollectionLimits
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCollectionLimits: {
     accountTokenOwnershipLimit: 'Option<u32>',
@@ -3079,8 +3596,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup242: up_data_structs::SponsoringRateLimit
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup244: up_data_structs::SponsoringRateLimit
 =======
@@ -3090,7 +3610,13 @@
    * Lookup248: up_data_structs::SponsoringRateLimit
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup247: up_data_structs::SponsoringRateLimit
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsSponsoringRateLimit: {
     _enum: {
@@ -3100,8 +3626,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup245: up_data_structs::CollectionPermissions
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup247: up_data_structs::CollectionPermissions
 =======
@@ -3111,7 +3640,13 @@
    * Lookup251: up_data_structs::CollectionPermissions
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup250: up_data_structs::CollectionPermissions
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCollectionPermissions: {
     access: 'Option<UpDataStructsAccessMode>',
@@ -3120,8 +3655,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup247: up_data_structs::NestingPermissions
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup249: up_data_structs::NestingPermissions
 =======
@@ -3131,7 +3669,13 @@
    * Lookup253: up_data_structs::NestingPermissions
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup252: up_data_structs::NestingPermissions
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsNestingPermissions: {
     tokenOwner: 'bool',
@@ -3140,12 +3684,15 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup249: up_data_structs::OwnerRestrictedSet
    **/
   UpDataStructsOwnerRestrictedSet: 'BTreeSet<u32>',
   /**
    * Lookup254: up_data_structs::PropertyKeyPermission
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup251: up_data_structs::OwnerRestrictedSet
    **/
@@ -3154,11 +3701,14 @@
    * Lookup256: up_data_structs::PropertyKeyPermission
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup254: up_data_structs::OwnerRestrictedSet
    **/
   UpDataStructsOwnerRestrictedSet: 'BTreeSet<u32>',
   /**
    * Lookup259: up_data_structs::PropertyKeyPermission
+<<<<<<< HEAD
 =======
    * Lookup255: up_data_structs::OwnerRestrictedSet
    **/
@@ -3167,7 +3717,12 @@
    * Lookup260: up_data_structs::PropertyKeyPermission
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsPropertyKeyPermission: {
     key: 'Bytes',
@@ -3175,8 +3730,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup255: up_data_structs::PropertyPermission
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup257: up_data_structs::PropertyPermission
 =======
@@ -3186,7 +3744,13 @@
    * Lookup261: up_data_structs::PropertyPermission
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup260: up_data_structs::PropertyPermission
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsPropertyPermission: {
     mutable: 'bool',
@@ -3195,8 +3759,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup258: up_data_structs::Property
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup260: up_data_structs::Property
 =======
@@ -3206,7 +3773,13 @@
    * Lookup264: up_data_structs::Property
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup263: up_data_structs::Property
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsProperty: {
     key: 'Bytes',
@@ -3214,8 +3787,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup261: up_data_structs::CreateItemData
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup263: up_data_structs::CreateItemData
 =======
@@ -3225,7 +3801,13 @@
    * Lookup267: up_data_structs::CreateItemData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup266: up_data_structs::CreateItemData
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateItemData: {
     _enum: {
@@ -3236,8 +3818,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup262: up_data_structs::CreateNftData
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup264: up_data_structs::CreateNftData
 =======
@@ -3247,15 +3832,24 @@
    * Lookup268: up_data_structs::CreateNftData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup267: up_data_structs::CreateNftData
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateNftData: {
     properties: 'Vec<UpDataStructsProperty>'
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup263: up_data_structs::CreateFungibleData
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup265: up_data_structs::CreateFungibleData
 =======
@@ -3265,15 +3859,24 @@
    * Lookup269: up_data_structs::CreateFungibleData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup268: up_data_structs::CreateFungibleData
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateFungibleData: {
     value: 'u128'
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup264: up_data_structs::CreateReFungibleData
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup266: up_data_structs::CreateReFungibleData
 =======
@@ -3283,7 +3886,13 @@
    * Lookup270: up_data_structs::CreateReFungibleData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup269: up_data_structs::CreateReFungibleData
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateReFungibleData: {
     pieces: 'u128',
@@ -3291,8 +3900,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup267: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup269: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -3302,7 +3914,13 @@
    * Lookup273: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup272: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateItemExData: {
     _enum: {
@@ -3314,8 +3932,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup269: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup271: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -3325,7 +3946,13 @@
    * Lookup275: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup274: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateNftExData: {
     properties: 'Vec<UpDataStructsProperty>',
@@ -3333,8 +3960,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup276: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup278: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -3344,7 +3974,13 @@
    * Lookup282: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup281: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateRefungibleExSingleOwner: {
     user: 'PalletEvmAccountBasicCrossAccountIdRepr',
@@ -3353,8 +3989,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup278: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup280: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -3364,7 +4003,13 @@
    * Lookup284: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup283: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCreateRefungibleExMultipleOwners: {
     users: 'BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>',
@@ -3372,8 +4017,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup279: pallet_configuration::pallet::Call<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup281: pallet_configuration::pallet::Call<T>
 =======
@@ -3383,7 +4031,13 @@
    * Lookup285: pallet_unique_scheduler_v2::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup284: pallet_unique_scheduler_v2::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletConfigurationCall: {
     _enum: {
@@ -3403,8 +4057,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup284: pallet_configuration::AppPromotionConfiguration<BlockNumber>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup286: pallet_configuration::AppPromotionConfiguration<BlockNumber>
 =======
@@ -3414,7 +4071,13 @@
    * Lookup288: pallet_configuration::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup287: pallet_configuration::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletConfigurationAppPromotionConfiguration: {
     recalculationInterval: 'Option<u32>',
@@ -3424,9 +4087,12 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup288: pallet_template_transaction_payment::Call<T>
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup289: pallet_template_transaction_payment::Call<T>
 >>>>>>> chore:  regenerate types
    **/
@@ -3440,6 +4106,7 @@
    * Lookup290: pallet_rmrk_core::pallet::Call<T>
 =======
    * Lookup291: pallet_rmrk_core::pallet::Call<T>
+<<<<<<< HEAD
 =======
    * Lookup290: pallet_template_transaction_payment::Call<T>
    **/
@@ -3452,6 +4119,8 @@
    * Lookup292: pallet_rmrk_core::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletRmrkCoreCall: {
     _enum: {
@@ -3543,6 +4212,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup296: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3551,6 +4221,9 @@
    * Lookup298: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * 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
    **/
   RmrkTraitsResourceResourceTypes: {
     _enum: {
@@ -3561,6 +4234,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup298: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3569,6 +4243,9 @@
    * Lookup300: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup299: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> fix: regenerate types after rebase
    **/
   RmrkTraitsResourceBasicResource: {
     src: 'Option<Bytes>',
@@ -3578,6 +4255,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup300: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3586,6 +4264,9 @@
    * Lookup302: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * 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
    **/
   RmrkTraitsResourceComposableResource: {
     parts: 'Vec<u32>',
@@ -3597,6 +4278,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup301: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3605,6 +4287,9 @@
    * Lookup303: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup302: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> fix: regenerate types after rebase
    **/
   RmrkTraitsResourceSlotResource: {
     base: 'u32',
@@ -3616,6 +4301,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup304: pallet_rmrk_equip::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -3624,6 +4310,9 @@
    * Lookup306: pallet_rmrk_equip::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup305: pallet_rmrk_equip::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletRmrkEquipCall: {
     _enum: {
@@ -3645,6 +4334,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup307: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3653,6 +4343,9 @@
    * Lookup309: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * 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
    **/
   RmrkTraitsPartPartType: {
     _enum: {
@@ -3662,6 +4355,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup309: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3670,6 +4364,9 @@
    * Lookup311: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup310: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> fix: regenerate types after rebase
    **/
   RmrkTraitsPartFixedPart: {
     id: 'u32',
@@ -3678,6 +4375,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup310: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3686,6 +4384,9 @@
    * Lookup312: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * 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
    **/
   RmrkTraitsPartSlotPart: {
     id: 'u32',
@@ -3695,6 +4396,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup311: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3703,6 +4405,9 @@
    * Lookup313: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup312: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> fix: regenerate types after rebase
    **/
   RmrkTraitsPartEquippableList: {
     _enum: {
@@ -3713,6 +4418,7 @@
   },
   /**
 <<<<<<< 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
@@ -3721,6 +4427,9 @@
    * Lookup315: 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
 >>>>>>> chore:  regenerate types
+=======
+   * 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
    **/
   RmrkTraitsTheme: {
     name: 'Bytes',
@@ -3729,6 +4438,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup315: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -3737,6 +4447,9 @@
    * Lookup317: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup316: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> fix: regenerate types after rebase
    **/
   RmrkTraitsThemeThemeProperty: {
     key: 'Bytes',
@@ -3744,6 +4457,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup317: pallet_app_promotion::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -3752,6 +4466,9 @@
    * Lookup319: pallet_app_promotion::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup318: pallet_app_promotion::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletAppPromotionCall: {
     _enum: {
@@ -3781,6 +4498,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup318: pallet_foreign_assets::module::Call<T>
 =======
 <<<<<<< HEAD
@@ -3789,6 +4507,9 @@
    * Lookup320: pallet_foreign_assets::module::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup319: pallet_foreign_assets::module::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletForeignAssetsModuleCall: {
     _enum: {
@@ -3806,6 +4527,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup319: pallet_evm::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -3814,6 +4536,9 @@
    * Lookup321: pallet_evm::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup320: pallet_evm::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmCall: {
     _enum: {
@@ -3857,6 +4582,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup325: pallet_ethereum::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -3865,6 +4591,9 @@
    * Lookup325: pallet_ethereum::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup326: pallet_ethereum::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEthereumCall: {
     _enum: {
@@ -3875,6 +4604,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup326: ethereum::transaction::TransactionV2
 =======
 <<<<<<< HEAD
@@ -3883,6 +4613,9 @@
    * Lookup326: ethereum::transaction::TransactionV2
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup327: ethereum::transaction::TransactionV2
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumTransactionTransactionV2: {
     _enum: {
@@ -3893,6 +4626,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup327: ethereum::transaction::LegacyTransaction
 =======
 <<<<<<< HEAD
@@ -3901,6 +4635,9 @@
    * Lookup327: ethereum::transaction::LegacyTransaction
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup328: ethereum::transaction::LegacyTransaction
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumTransactionLegacyTransaction: {
     nonce: 'U256',
@@ -3913,6 +4650,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup328: ethereum::transaction::TransactionAction
 =======
 <<<<<<< HEAD
@@ -3921,6 +4659,9 @@
    * Lookup328: ethereum::transaction::TransactionAction
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup329: ethereum::transaction::TransactionAction
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumTransactionTransactionAction: {
     _enum: {
@@ -3930,6 +4671,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup329: ethereum::transaction::TransactionSignature
 =======
 <<<<<<< HEAD
@@ -3938,6 +4680,9 @@
    * Lookup329: ethereum::transaction::TransactionSignature
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup330: ethereum::transaction::TransactionSignature
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumTransactionTransactionSignature: {
     v: 'u64',
@@ -3946,6 +4691,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup331: ethereum::transaction::EIP2930Transaction
 =======
 <<<<<<< HEAD
@@ -3954,6 +4700,9 @@
    * Lookup331: ethereum::transaction::EIP2930Transaction
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup332: ethereum::transaction::EIP2930Transaction
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumTransactionEip2930Transaction: {
     chainId: 'u64',
@@ -3970,6 +4719,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup333: ethereum::transaction::AccessListItem
 =======
 <<<<<<< HEAD
@@ -3978,6 +4728,9 @@
    * Lookup333: ethereum::transaction::AccessListItem
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup334: ethereum::transaction::AccessListItem
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumTransactionAccessListItem: {
     address: 'H160',
@@ -3985,6 +4738,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup334: ethereum::transaction::EIP1559Transaction
 =======
 <<<<<<< HEAD
@@ -3993,6 +4747,9 @@
    * Lookup334: ethereum::transaction::EIP1559Transaction
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup335: ethereum::transaction::EIP1559Transaction
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumTransactionEip1559Transaction: {
     chainId: 'u64',
@@ -4010,6 +4767,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup335: pallet_evm_migration::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4018,6 +4776,9 @@
    * Lookup335: pallet_evm_migration::pallet::Call<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup336: pallet_evm_migration::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmMigrationCall: {
     _enum: {
@@ -4042,20 +4803,28 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup339: pallet_maintenance::pallet::Call<T>
 =======
    * Lookup338: pallet_maintenance::pallet::Call<T>
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup340: pallet_maintenance::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletMaintenanceCall: {
     _enum: ['enable', 'disable']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup340: pallet_test_utils::pallet::Call<T>
 =======
    * Lookup339: pallet_test_utils::pallet::Call<T>
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup341: pallet_test_utils::pallet::Call<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletTestUtilsCall: {
     _enum: {
@@ -4075,6 +4844,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup342: pallet_sudo::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -4083,12 +4853,16 @@
    * Lookup341: pallet_sudo::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup343: pallet_sudo::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletSudoError: {
     _enum: ['RequireSudo']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup344: orml_vesting::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4097,12 +4871,16 @@
    * Lookup343: orml_vesting::module::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup345: orml_vesting::module::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlVestingModuleError: {
     _enum: ['ZeroVestingPeriod', 'ZeroVestingPeriodCount', 'InsufficientBalanceToLock', 'TooManyVestingSchedules', 'AmountLow', 'MaxVestingSchedulesExceeded']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup345: orml_xtokens::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4111,12 +4889,16 @@
    * Lookup344: orml_xtokens::module::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup346: orml_xtokens::module::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlXtokensModuleError: {
     _enum: ['AssetHasNoReserve', 'NotCrossChainTransfer', 'InvalidDest', 'NotCrossChainTransferableCurrency', 'UnweighableMessage', 'XcmExecutionFailed', 'CannotReanchor', 'InvalidAncestry', 'InvalidAsset', 'DestinationNotInvertible', 'BadVersion', 'DistinctReserveForAssetAndFee', 'ZeroFee', 'ZeroAmount', 'TooManyAssetsBeingSent', 'AssetIndexNonExistent', 'FeeNotEnough', 'NotSupportedMultiLocation', 'MinXcmFeeNotDefined']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup348: orml_tokens::BalanceLock<Balance>
 =======
 <<<<<<< HEAD
@@ -4125,6 +4907,9 @@
    * Lookup347: orml_tokens::BalanceLock<Balance>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup349: orml_tokens::BalanceLock<Balance>
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlTokensBalanceLock: {
     id: '[u8;8]',
@@ -4132,6 +4917,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup350: orml_tokens::AccountData<Balance>
 =======
 <<<<<<< HEAD
@@ -4140,6 +4926,9 @@
    * Lookup349: orml_tokens::AccountData<Balance>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup351: orml_tokens::AccountData<Balance>
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlTokensAccountData: {
     free: 'u128',
@@ -4148,6 +4937,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup352: orml_tokens::ReserveData<ReserveIdentifier, Balance>
 =======
 <<<<<<< HEAD
@@ -4156,6 +4946,9 @@
    * Lookup351: orml_tokens::ReserveData<ReserveIdentifier, Balance>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup353: orml_tokens::ReserveData<ReserveIdentifier, Balance>
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlTokensReserveData: {
     id: 'Null',
@@ -4163,6 +4956,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup354: orml_tokens::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4171,12 +4965,16 @@
    * Lookup353: orml_tokens::module::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup355: orml_tokens::module::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   OrmlTokensModuleError: {
     _enum: ['BalanceTooLow', 'AmountIntoBalanceFailed', 'LiquidityRestrictions', 'MaxLocksExceeded', 'KeepAlive', 'ExistentialDeposit', 'DeadAccount', 'TooManyReserves']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup356: cumulus_pallet_xcmp_queue::InboundChannelDetails
 =======
 <<<<<<< HEAD
@@ -4185,6 +4983,9 @@
    * Lookup355: cumulus_pallet_xcmp_queue::InboundChannelDetails
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup357: cumulus_pallet_xcmp_queue::InboundChannelDetails
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletXcmpQueueInboundChannelDetails: {
     sender: 'u32',
@@ -4193,6 +4994,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup357: cumulus_pallet_xcmp_queue::InboundState
 =======
 <<<<<<< HEAD
@@ -4201,12 +5003,16 @@
    * Lookup356: cumulus_pallet_xcmp_queue::InboundState
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup358: cumulus_pallet_xcmp_queue::InboundState
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletXcmpQueueInboundState: {
     _enum: ['Ok', 'Suspended']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup360: polkadot_parachain::primitives::XcmpMessageFormat
 =======
 <<<<<<< HEAD
@@ -4215,12 +5021,16 @@
    * Lookup359: polkadot_parachain::primitives::XcmpMessageFormat
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup361: polkadot_parachain::primitives::XcmpMessageFormat
+>>>>>>> fix: regenerate types after rebase
    **/
   PolkadotParachainPrimitivesXcmpMessageFormat: {
     _enum: ['ConcatenatedVersionedXcm', 'ConcatenatedEncodedBlob', 'Signals']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup363: cumulus_pallet_xcmp_queue::OutboundChannelDetails
 =======
 <<<<<<< HEAD
@@ -4229,6 +5039,9 @@
    * Lookup362: cumulus_pallet_xcmp_queue::OutboundChannelDetails
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup364: cumulus_pallet_xcmp_queue::OutboundChannelDetails
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletXcmpQueueOutboundChannelDetails: {
     recipient: 'u32',
@@ -4239,6 +5052,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup364: cumulus_pallet_xcmp_queue::OutboundState
 =======
 <<<<<<< HEAD
@@ -4247,12 +5061,16 @@
    * Lookup363: cumulus_pallet_xcmp_queue::OutboundState
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup365: cumulus_pallet_xcmp_queue::OutboundState
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletXcmpQueueOutboundState: {
     _enum: ['Ok', 'Suspended']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup366: cumulus_pallet_xcmp_queue::QueueConfigData
 =======
 <<<<<<< HEAD
@@ -4261,6 +5079,9 @@
    * Lookup365: cumulus_pallet_xcmp_queue::QueueConfigData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup367: cumulus_pallet_xcmp_queue::QueueConfigData
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletXcmpQueueQueueConfigData: {
     suspendThreshold: 'u32',
@@ -4272,6 +5093,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup368: cumulus_pallet_xcmp_queue::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -4280,12 +5102,16 @@
    * Lookup367: cumulus_pallet_xcmp_queue::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup369: cumulus_pallet_xcmp_queue::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletXcmpQueueError: {
     _enum: ['FailedToSend', 'BadXcmOrigin', 'BadXcm', 'BadOverweightIndex', 'WeightOverLimit']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup369: pallet_xcm::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -4294,12 +5120,16 @@
    * Lookup368: pallet_xcm::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup370: pallet_xcm::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletXcmError: {
     _enum: ['Unreachable', 'SendFailure', 'Filtered', 'UnweighableMessage', 'DestinationNotInvertible', 'Empty', 'CannotReanchor', 'TooManyAssets', 'InvalidOrigin', 'BadVersion', 'BadLocation', 'NoSubscription', 'AlreadySubscribed']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup370: cumulus_pallet_xcm::pallet::Error<T>
    **/
   CumulusPalletXcmError: 'Null',
@@ -4307,11 +5137,14 @@
    * Lookup371: cumulus_pallet_dmp_queue::ConfigData
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup371: cumulus_pallet_xcm::pallet::Error<T>
    **/
   CumulusPalletXcmError: 'Null',
   /**
    * Lookup372: cumulus_pallet_dmp_queue::ConfigData
+<<<<<<< HEAD
 =======
    * Lookup369: cumulus_pallet_xcm::pallet::Error<T>
    **/
@@ -4320,12 +5153,15 @@
    * Lookup370: cumulus_pallet_dmp_queue::ConfigData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletDmpQueueConfigData: {
     maxIndividual: 'SpWeightsWeightV2Weight'
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup372: cumulus_pallet_dmp_queue::PageIndexData
 =======
 <<<<<<< HEAD
@@ -4334,6 +5170,9 @@
    * Lookup371: cumulus_pallet_dmp_queue::PageIndexData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup373: cumulus_pallet_dmp_queue::PageIndexData
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletDmpQueuePageIndexData: {
     beginUsed: 'u32',
@@ -4342,6 +5181,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup375: cumulus_pallet_dmp_queue::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -4350,12 +5190,16 @@
    * Lookup374: cumulus_pallet_dmp_queue::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup376: cumulus_pallet_dmp_queue::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   CumulusPalletDmpQueueError: {
     _enum: ['Unknown', 'OverLimit']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup379: pallet_unique::Error<T>
 =======
 <<<<<<< HEAD
@@ -4364,18 +5208,26 @@
    * Lookup378: pallet_unique::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup380: pallet_unique::Error<T>
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletUniqueError: {
     _enum: ['CollectionDecimalPointLimitExceeded', 'EmptyArgument', 'RepartitionCalledOnNonRefungibleCollection']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup380: pallet_configuration::pallet::Error<T>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup381: pallet_configuration::pallet::Error<T>
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup381: pallet_unique_scheduler_v2::BlockAgenda<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
@@ -4391,18 +5243,7 @@
    * Lookup382: up_data_structs::Collection<sp_core::crypto::AccountId32>
 =======
    * Lookup384: pallet_unique_scheduler_v2::Scheduled<Name, pallet_unique_scheduler_v2::ScheduledCall<T>, BlockNumber, opal_runtime::OriginCaller, sp_core::crypto::AccountId32>
-   **/
-=======
-   * Lookup379: pallet_unique_scheduler_v2::BlockAgenda<T>
-   **/
-  PalletUniqueSchedulerV2BlockAgenda: {
-    agenda: 'Vec<Option<PalletUniqueSchedulerV2Scheduled>>',
-    freePlaces: 'u32'
-  },
-  /**
-   * Lookup382: pallet_unique_scheduler_v2::Scheduled<Name, pallet_unique_scheduler_v2::ScheduledCall<T>, BlockNumber, opal_runtime::OriginCaller, sp_core::crypto::AccountId32>
    **/
->>>>>>> chore:  regenerate types
   PalletUniqueSchedulerV2Scheduled: {
     maybeId: 'Option<[u8;32]>',
     priority: 'u8',
@@ -4411,11 +5252,7 @@
     origin: 'OpalRuntimeOriginCaller'
   },
   /**
-<<<<<<< HEAD
    * Lookup385: pallet_unique_scheduler_v2::ScheduledCall<T>
-=======
-   * Lookup383: pallet_unique_scheduler_v2::ScheduledCall<T>
->>>>>>> chore:  regenerate types
    **/
   PalletUniqueSchedulerV2ScheduledCall: {
     _enum: {
@@ -4430,11 +5267,7 @@
     }
   },
   /**
-<<<<<<< HEAD
    * Lookup387: opal_runtime::OriginCaller
-=======
-   * Lookup385: opal_runtime::OriginCaller
->>>>>>> chore:  regenerate types
    **/
   OpalRuntimeOriginCaller: {
     _enum: {
@@ -4543,11 +5376,7 @@
     }
   },
   /**
-<<<<<<< HEAD
    * Lookup388: frame_support::dispatch::RawOrigin<sp_core::crypto::AccountId32>
-=======
-   * Lookup386: frame_support::dispatch::RawOrigin<sp_core::crypto::AccountId32>
->>>>>>> chore:  regenerate types
    **/
   FrameSupportDispatchRawOrigin: {
     _enum: {
@@ -4557,11 +5386,7 @@
     }
   },
   /**
-<<<<<<< HEAD
    * Lookup389: pallet_xcm::pallet::Origin
-=======
-   * Lookup387: pallet_xcm::pallet::Origin
->>>>>>> chore:  regenerate types
    **/
   PalletXcmOrigin: {
     _enum: {
@@ -4570,11 +5395,7 @@
     }
   },
   /**
-<<<<<<< HEAD
    * Lookup390: cumulus_pallet_xcm::pallet::Origin
-=======
-   * Lookup388: cumulus_pallet_xcm::pallet::Origin
->>>>>>> chore:  regenerate types
    **/
   CumulusPalletXcmOrigin: {
     _enum: {
@@ -4583,11 +5404,7 @@
     }
   },
   /**
-<<<<<<< HEAD
    * Lookup391: pallet_ethereum::RawOrigin
-=======
-   * Lookup389: pallet_ethereum::RawOrigin
->>>>>>> chore:  regenerate types
    **/
   PalletEthereumRawOrigin: {
     _enum: {
@@ -4595,31 +5412,28 @@
     }
   },
   /**
-<<<<<<< HEAD
    * Lookup392: sp_core::Void
    **/
   SpCoreVoid: 'Null',
   /**
    * Lookup394: pallet_unique_scheduler_v2::pallet::Error<T>
-=======
-   * Lookup390: sp_core::Void
-   **/
-  SpCoreVoid: 'Null',
-  /**
-   * Lookup392: pallet_unique_scheduler_v2::pallet::Error<T>
->>>>>>> chore:  regenerate types
    **/
   PalletUniqueSchedulerV2Error: {
     _enum: ['FailedToSchedule', 'AgendaIsExhausted', 'ScheduledCallCorrupted', 'PreimageNotFound', 'TooBigScheduledCall', 'NotFound', 'TargetBlockNumberInPast', 'Named']
   },
   /**
-<<<<<<< HEAD
    * Lookup395: up_data_structs::Collection<sp_core::crypto::AccountId32>
+<<<<<<< HEAD
 =======
    * Lookup393: up_data_structs::Collection<sp_core::crypto::AccountId32>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCollection: {
     owner: 'AccountId32',
@@ -4634,8 +5448,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup382: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup383: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
 =======
@@ -4645,7 +5462,13 @@
    * Lookup394: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup396: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsSponsorshipStateAccountId32: {
     _enum: {
@@ -4656,8 +5479,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup384: up_data_structs::Properties
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup385: up_data_structs::Properties
 =======
@@ -4667,7 +5493,13 @@
    * Lookup396: up_data_structs::Properties
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup398: up_data_structs::Properties
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsProperties: {
     map: 'UpDataStructsPropertiesMapBoundedVec',
@@ -4676,12 +5508,17 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup385: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup386: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup399: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
@@ -4699,6 +5536,7 @@
    * Lookup398: up_data_structs::CollectionStats
 =======
    * Lookup411: up_data_structs::CollectionStats
+<<<<<<< HEAD
 =======
    * Lookup397: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
    **/
@@ -4711,7 +5549,12 @@
    * Lookup409: up_data_structs::CollectionStats
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsCollectionStats: {
     created: 'u32',
@@ -4720,8 +5563,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup398: up_data_structs::TokenChild
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup399: up_data_structs::TokenChild
 =======
@@ -4731,7 +5577,13 @@
    * Lookup410: up_data_structs::TokenChild
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup412: up_data_structs::TokenChild
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsTokenChild: {
     token: 'u32',
@@ -4739,12 +5591,15 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * 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>>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup400: PhantomType::up_data_structs<T>
    **/
@@ -4753,11 +5608,14 @@
    * Lookup402: up_data_structs::TokenData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
    * Lookup413: PhantomType::up_data_structs<T>
    **/
   PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]',
   /**
    * Lookup415: up_data_structs::TokenData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+<<<<<<< HEAD
 =======
    * Lookup411: PhantomType::up_data_structs<T>
    **/
@@ -4766,7 +5624,12 @@
    * Lookup413: up_data_structs::TokenData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsTokenData: {
     properties: 'Vec<UpDataStructsProperty>',
@@ -4775,8 +5638,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup403: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup404: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
 =======
@@ -4786,7 +5652,13 @@
    * Lookup415: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup417: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsRpcCollection: {
     owner: 'AccountId32',
@@ -4804,8 +5676,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup404: up_data_structs::RpcCollectionFlags
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup405: up_data_structs::RpcCollectionFlags
 =======
@@ -4815,7 +5690,13 @@
    * Lookup416: up_data_structs::RpcCollectionFlags
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup418: up_data_structs::RpcCollectionFlags
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsRpcCollectionFlags: {
     foreign: 'bool',
@@ -4823,8 +5704,11 @@
   },
   /**
 <<<<<<< 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>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup406: rmrk_traits::collection::CollectionInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
 =======
@@ -4834,7 +5718,13 @@
    * Lookup417: 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
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * 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
    **/
   RmrkTraitsCollectionCollectionInfo: {
     issuer: 'AccountId32',
@@ -4845,8 +5735,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup406: 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
 <<<<<<< HEAD
    * Lookup407: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
@@ -4856,7 +5749,13 @@
    * Lookup418: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * 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
    **/
   RmrkTraitsNftNftInfo: {
     owner: 'RmrkTraitsNftAccountIdOrCollectionNftTuple',
@@ -4867,8 +5766,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup408: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup409: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
 =======
@@ -4878,7 +5780,13 @@
    * Lookup420: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup422: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   RmrkTraitsNftRoyaltyInfo: {
     recipient: 'AccountId32',
@@ -4886,8 +5794,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup409: 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
 <<<<<<< HEAD
    * Lookup410: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
@@ -4897,7 +5808,13 @@
    * Lookup421: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * 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
    **/
   RmrkTraitsResourceResourceInfo: {
     id: 'u32',
@@ -4907,8 +5824,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup410: 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
 <<<<<<< HEAD
    * Lookup411: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
@@ -4918,7 +5838,13 @@
    * Lookup422: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * 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
    **/
   RmrkTraitsPropertyPropertyInfo: {
     key: 'Bytes',
@@ -4926,8 +5852,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup411: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup412: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
@@ -4937,7 +5866,13 @@
    * Lookup423: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * 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
    **/
   RmrkTraitsBaseBaseInfo: {
     issuer: 'AccountId32',
@@ -4946,8 +5881,11 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup412: rmrk_traits::nft::NftChild
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup413: rmrk_traits::nft::NftChild
 =======
@@ -4957,7 +5895,13 @@
    * Lookup424: rmrk_traits::nft::NftChild
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup426: rmrk_traits::nft::NftChild
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   RmrkTraitsNftNftChild: {
     collectionId: 'u32',
@@ -4966,10 +5910,13 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup414: pallet_common::pallet::Error<T>
 =======
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup415: pallet_common::pallet::Error<T>
 =======
@@ -4982,6 +5929,9 @@
 =======
    * Lookup425: up_pov_estimate_rpc::PovInfo
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup427: up_pov_estimate_rpc::PovInfo
+>>>>>>> fix: regenerate types after rebase
    **/
   UpPovEstimateRpcPovInfo: {
     proofSize: 'u64',
@@ -4993,6 +5943,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup424: pallet_common::pallet::Error<T>
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -5006,6 +5957,9 @@
 =======
    * Lookup428: sp_runtime::transaction_validity::TransactionValidityError
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup430: sp_runtime::transaction_validity::TransactionValidityError
+>>>>>>> fix: regenerate types after rebase
    **/
   SpRuntimeTransactionValidityTransactionValidityError: {
     _enum: {
@@ -5014,7 +5968,7 @@
     }
   },
   /**
-   * Lookup429: sp_runtime::transaction_validity::InvalidTransaction
+   * Lookup431: sp_runtime::transaction_validity::InvalidTransaction
    **/
   SpRuntimeTransactionValidityInvalidTransaction: {
     _enum: {
@@ -5032,7 +5986,7 @@
     }
   },
   /**
-   * Lookup430: sp_runtime::transaction_validity::UnknownTransaction
+   * Lookup432: sp_runtime::transaction_validity::UnknownTransaction
    **/
   SpRuntimeTransactionValidityUnknownTransaction: {
     _enum: {
@@ -5043,6 +5997,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup428: pallet_common::pallet::Error<T>
 >>>>>>> chore: regenerate types
 <<<<<<< HEAD
@@ -5053,16 +6008,26 @@
 =======
 =======
    * Lookup432: up_pov_estimate_rpc::TrieKeyValue
+=======
+   * Lookup434: up_pov_estimate_rpc::TrieKeyValue
+>>>>>>> fix: regenerate types after rebase
    **/
   UpPovEstimateRpcTrieKeyValue: {
     key: 'Bytes',
     value: 'Bytes'
   },
   /**
+<<<<<<< HEAD
    * Lookup434: pallet_common::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup436: pallet_common::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   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']
@@ -5071,12 +6036,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup416: pallet_fungible::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup417: pallet_fungible::pallet::Error<T>
 =======
@@ -5108,7 +6076,13 @@
    * Lookup436: pallet_fungible::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup438: pallet_fungible::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletFungibleError: {
     _enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed', 'SettingAllowanceForAllNotAllowed', 'FungibleTokensAreAlwaysValid']
@@ -5117,12 +6091,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup420: pallet_refungible::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup417: pallet_refungible::ItemData
 =======
@@ -5130,6 +6107,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup418: pallet_refungible::ItemData
 =======
@@ -5161,7 +6140,13 @@
    * Lookup437: pallet_refungible::ItemData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+   * Lookup439: pallet_refungible::ItemData
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletRefungibleItemData: {
     constData: 'Bytes'
@@ -5170,12 +6155,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup422: pallet_refungible::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup423: pallet_refungible::pallet::Error<T>
 =======
@@ -5213,8 +6201,17 @@
    * Lookup442: pallet_refungible::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup444: pallet_refungible::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletRefungibleError: {
     _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RepartitionWhileNotOwningAllPieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed']
@@ -5223,12 +6220,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup421: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup423: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -5236,6 +6236,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup424: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -5273,8 +6275,17 @@
    * Lookup443: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup445: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletNonfungibleItemData: {
     owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
@@ -5283,12 +6294,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup423: up_data_structs::PropertyScope
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup425: up_data_structs::PropertyScope
 =======
@@ -5296,6 +6310,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup426: up_data_structs::PropertyScope
 =======
@@ -5333,8 +6349,17 @@
    * Lookup445: up_data_structs::PropertyScope
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup447: up_data_structs::PropertyScope
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsPropertyScope: {
     _enum: ['None', 'Rmrk']
@@ -5343,12 +6368,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup426: pallet_nonfungible::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup427: pallet_nonfungible::pallet::Error<T>
 =======
@@ -5356,6 +6384,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup428: pallet_nonfungible::pallet::Error<T>
 =======
@@ -5393,8 +6423,17 @@
    * Lookup447: pallet_nonfungible::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup449: pallet_nonfungible::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletNonfungibleError: {
     _enum: ['NotNonfungibleDataUsedToMintFungibleCollectionToken', 'NonfungibleItemsHaveNoAmount', 'CantBurnNftWithChildren']
@@ -5403,12 +6442,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup427: pallet_structure::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup428: pallet_structure::pallet::Error<T>
 =======
@@ -5416,6 +6458,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup429: pallet_structure::pallet::Error<T>
 =======
@@ -5453,8 +6497,17 @@
    * Lookup448: pallet_structure::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup450: pallet_structure::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletStructureError: {
     _enum: ['OuroborosDetected', 'DepthLimit', 'BreadthLimit', 'TokenNotFound']
@@ -5463,12 +6516,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup428: pallet_rmrk_core::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup429: pallet_rmrk_core::pallet::Error<T>
 =======
@@ -5476,6 +6532,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup430: pallet_rmrk_core::pallet::Error<T>
 =======
@@ -5513,8 +6571,17 @@
    * Lookup449: pallet_rmrk_core::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup451: pallet_rmrk_core::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletRmrkCoreError: {
     _enum: ['CorruptedCollectionType', 'RmrkPropertyKeyIsTooLong', 'RmrkPropertyValueIsTooLong', 'RmrkPropertyIsNotFound', 'UnableToDecodeRmrkData', 'CollectionNotEmpty', 'NoAvailableCollectionId', 'NoAvailableNftId', 'CollectionUnknown', 'NoPermission', 'NonTransferable', 'CollectionFullOrLocked', 'ResourceDoesntExist', 'CannotSendToDescendentOrSelf', 'CannotAcceptNonOwnedNft', 'CannotRejectNonOwnedNft', 'CannotRejectNonPendingNft', 'ResourceNotPending', 'NoAvailableResourceId']
@@ -5523,12 +6590,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup430: pallet_rmrk_equip::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup431: pallet_rmrk_equip::pallet::Error<T>
 =======
@@ -5536,6 +6606,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup432: pallet_rmrk_equip::pallet::Error<T>
 =======
@@ -5573,8 +6645,17 @@
    * Lookup451: pallet_rmrk_equip::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup453: pallet_rmrk_equip::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletRmrkEquipError: {
     _enum: ['PermissionError', 'NoAvailableBaseId', 'NoAvailablePartId', 'BaseDoesntExist', 'NeedsDefaultThemeFirst', 'PartDoesntExist', 'NoEquippableOnFixedPart']
@@ -5583,12 +6664,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup436: pallet_app_promotion::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup437: pallet_app_promotion::pallet::Error<T>
 =======
@@ -5596,6 +6680,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup438: pallet_app_promotion::pallet::Error<T>
 =======
@@ -5633,8 +6719,17 @@
    * Lookup457: pallet_app_promotion::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup459: pallet_app_promotion::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletAppPromotionError: {
     _enum: ['AdminNotSet', 'NoPermission', 'NotSufficientFunds', 'PendingForBlockOverflow', 'SponsorNotSet', 'IncorrectLockedBalanceOperation']
@@ -5643,12 +6738,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup437: pallet_foreign_assets::module::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup438: pallet_foreign_assets::module::Error<T>
 =======
@@ -5656,6 +6754,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup439: pallet_foreign_assets::module::Error<T>
 =======
@@ -5693,8 +6793,17 @@
    * Lookup458: pallet_foreign_assets::module::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup460: pallet_foreign_assets::module::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletForeignAssetsModuleError: {
     _enum: ['BadLocation', 'MultiLocationExisted', 'AssetIdNotExists', 'AssetIdExisted']
@@ -5703,12 +6812,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup439: pallet_evm::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup440: pallet_evm::pallet::Error<T>
 =======
@@ -5716,6 +6828,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup441: pallet_evm::pallet::Error<T>
 =======
@@ -5753,8 +6867,17 @@
    * Lookup461: pallet_evm::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup462: pallet_evm::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmError: {
     _enum: ['BalanceLow', 'FeeOverflow', 'PaymentOverflow', 'WithdrawFailed', 'GasPriceTooLow', 'InvalidNonce', 'GasLimitTooLow', 'GasLimitTooHigh', 'Undefined', 'Reentrancy', 'TransactionMustComeFromEOA']
@@ -5763,12 +6886,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup442: fp_rpc::TransactionStatus
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup443: fp_rpc::TransactionStatus
 =======
@@ -5776,6 +6902,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup444: fp_rpc::TransactionStatus
 =======
@@ -5813,8 +6941,17 @@
    * Lookup464: fp_rpc::TransactionStatus
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup465: fp_rpc::TransactionStatus
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   FpRpcTransactionStatus: {
     transactionHash: 'H256',
@@ -5829,6 +6966,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup444: ethbloom::Bloom
    **/
   EthbloomBloom: '[u8;256]',
@@ -5839,6 +6977,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup445: ethbloom::Bloom
    **/
@@ -5850,6 +6990,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup446: ethbloom::Bloom
    **/
@@ -5907,9 +7049,22 @@
    * Lookup468: ethereum::receipt::ReceiptV3
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup467: ethbloom::Bloom
    **/
+  EthbloomBloom: '[u8;256]',
+  /**
+   * Lookup469: ethereum::receipt::ReceiptV3
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+   **/
   EthereumReceiptReceiptV3: {
     _enum: {
       Legacy: 'EthereumReceiptEip658ReceiptData',
@@ -5921,12 +7076,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup447: ethereum::receipt::EIP658ReceiptData
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup448: ethereum::receipt::EIP658ReceiptData
 =======
@@ -5934,6 +7092,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup449: ethereum::receipt::EIP658ReceiptData
 =======
@@ -5971,8 +7131,17 @@
    * Lookup469: ethereum::receipt::EIP658ReceiptData
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup470: ethereum::receipt::EIP658ReceiptData
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumReceiptEip658ReceiptData: {
     statusCode: 'u8',
@@ -5984,12 +7153,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup448: ethereum::block::Block<ethereum::transaction::TransactionV2>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup449: ethereum::block::Block<ethereum::transaction::TransactionV2>
 =======
@@ -5997,6 +7169,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup450: ethereum::block::Block<ethereum::transaction::TransactionV2>
 =======
@@ -6034,8 +7208,17 @@
    * Lookup470: ethereum::block::Block<ethereum::transaction::TransactionV2>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup471: ethereum::block::Block<ethereum::transaction::TransactionV2>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumBlock: {
     header: 'EthereumHeader',
@@ -6046,12 +7229,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup449: ethereum::header::Header
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup450: ethereum::header::Header
 =======
@@ -6059,6 +7245,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup451: ethereum::header::Header
 =======
@@ -6096,8 +7284,17 @@
    * Lookup471: ethereum::header::Header
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup472: ethereum::header::Header
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   EthereumHeader: {
     parentHash: 'H256',
@@ -6120,6 +7317,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup450: ethereum_types::hash::H64
    **/
   EthereumTypesHashH64: '[u8;8]',
@@ -6130,6 +7328,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup451: ethereum_types::hash::H64
    **/
@@ -6141,6 +7341,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup452: ethereum_types::hash::H64
    **/
@@ -6198,8 +7400,21 @@
    * Lookup477: pallet_ethereum::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup473: ethereum_types::hash::H64
+   **/
+  EthereumTypesHashH64: '[u8;8]',
+  /**
+   * Lookup478: pallet_ethereum::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEthereumError: {
     _enum: ['InvalidSignature', 'PreLogExists']
@@ -6208,12 +7423,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup456: pallet_evm_coder_substrate::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup457: pallet_evm_coder_substrate::pallet::Error<T>
 =======
@@ -6221,6 +7439,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup458: pallet_evm_coder_substrate::pallet::Error<T>
 =======
@@ -6258,8 +7478,17 @@
    * Lookup478: pallet_evm_coder_substrate::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup479: pallet_evm_coder_substrate::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmCoderSubstrateError: {
     _enum: ['OutOfGas', 'OutOfFund']
@@ -6268,12 +7497,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup457: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup458: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -6281,6 +7513,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup459: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -6318,8 +7552,17 @@
    * Lookup479: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup480: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   UpDataStructsSponsorshipStateBasicCrossAccountIdRepr: {
     _enum: {
@@ -6332,12 +7575,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup458: pallet_evm_contract_helpers::SponsoringModeT
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup459: pallet_evm_contract_helpers::SponsoringModeT
 =======
@@ -6345,6 +7591,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup460: pallet_evm_contract_helpers::SponsoringModeT
 =======
@@ -6382,8 +7630,17 @@
    * Lookup480: pallet_evm_contract_helpers::SponsoringModeT
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup481: pallet_evm_contract_helpers::SponsoringModeT
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmContractHelpersSponsoringModeT: {
     _enum: ['Disabled', 'Allowlisted', 'Generous']
@@ -6392,12 +7649,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup464: pallet_evm_contract_helpers::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup465: pallet_evm_contract_helpers::pallet::Error<T>
 =======
@@ -6405,6 +7665,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup466: pallet_evm_contract_helpers::pallet::Error<T>
 =======
@@ -6442,8 +7704,17 @@
    * Lookup486: pallet_evm_contract_helpers::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup487: pallet_evm_contract_helpers::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmContractHelpersError: {
     _enum: ['NoPermission', 'NoPendingSponsor', 'TooManyMethodsHaveSponsoredLimit']
@@ -6452,12 +7723,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup465: pallet_evm_migration::pallet::Error<T>
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup466: pallet_evm_migration::pallet::Error<T>
 =======
@@ -6465,6 +7739,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup467: pallet_evm_migration::pallet::Error<T>
 =======
@@ -6502,8 +7778,17 @@
    * Lookup487: pallet_evm_migration::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup488: pallet_evm_migration::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmMigrationError: {
     _enum: ['AccountNotEmpty', 'AccountIsNotMigrating', 'BadEvent']
@@ -6512,6 +7797,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup466: pallet_maintenance::pallet::Error<T>
    **/
   PalletMaintenanceError: 'Null',
@@ -6522,6 +7808,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup467: pallet_maintenance::pallet::Error<T>
    **/
@@ -6533,6 +7821,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup468: pallet_maintenance::pallet::Error<T>
    **/
@@ -6590,8 +7880,21 @@
    * Lookup489: pallet_test_utils::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup489: pallet_maintenance::pallet::Error<T>
+   **/
+  PalletMaintenanceError: 'Null',
+  /**
+   * Lookup490: pallet_test_utils::pallet::Error<T>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletTestUtilsError: {
     _enum: ['TestPalletDisabled', 'TriggerRollback']
@@ -6600,12 +7903,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup469: sp_runtime::MultiSignature
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup470: sp_runtime::MultiSignature
 =======
@@ -6613,6 +7919,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup471: sp_runtime::MultiSignature
 =======
@@ -6650,8 +7958,17 @@
    * Lookup491: sp_runtime::MultiSignature
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup492: sp_runtime::MultiSignature
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   SpRuntimeMultiSignature: {
     _enum: {
@@ -6664,12 +7981,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup470: sp_core::ed25519::Signature
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup471: sp_core::ed25519::Signature
 =======
@@ -6677,6 +7997,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
    * Lookup472: sp_core::ed25519::Signature
 =======
@@ -6750,51 +8072,55 @@
 =======
    * Lookup492: sp_core::ed25519::Signature
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup493: sp_core::ed25519::Signature
+>>>>>>> fix: regenerate types after rebase
    **/
   SpCoreEd25519Signature: '[u8;64]',
   /**
-   * Lookup494: sp_core::sr25519::Signature
+   * Lookup495: sp_core::sr25519::Signature
    **/
   SpCoreSr25519Signature: '[u8;64]',
   /**
-   * Lookup495: sp_core::ecdsa::Signature
+   * Lookup496: sp_core::ecdsa::Signature
    **/
   SpCoreEcdsaSignature: '[u8;65]',
   /**
-   * Lookup498: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
+   * Lookup499: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
    **/
   FrameSystemExtensionsCheckSpecVersion: 'Null',
   /**
-   * Lookup499: frame_system::extensions::check_tx_version::CheckTxVersion<T>
+   * Lookup500: frame_system::extensions::check_tx_version::CheckTxVersion<T>
    **/
   FrameSystemExtensionsCheckTxVersion: 'Null',
   /**
-   * Lookup500: frame_system::extensions::check_genesis::CheckGenesis<T>
+   * Lookup501: frame_system::extensions::check_genesis::CheckGenesis<T>
    **/
   FrameSystemExtensionsCheckGenesis: 'Null',
   /**
-   * Lookup503: frame_system::extensions::check_nonce::CheckNonce<T>
+   * Lookup504: frame_system::extensions::check_nonce::CheckNonce<T>
    **/
   FrameSystemExtensionsCheckNonce: 'Compact<u32>',
   /**
-   * Lookup504: frame_system::extensions::check_weight::CheckWeight<T>
+   * Lookup505: frame_system::extensions::check_weight::CheckWeight<T>
    **/
   FrameSystemExtensionsCheckWeight: 'Null',
   /**
-   * Lookup505: opal_runtime::runtime_common::maintenance::CheckMaintenance
+   * Lookup506: opal_runtime::runtime_common::maintenance::CheckMaintenance
    **/
   OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance: 'Null',
   /**
-   * Lookup506: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
+   * Lookup507: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
    **/
   PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
   /**
-   * Lookup507: opal_runtime::Runtime
+   * Lookup508: opal_runtime::Runtime
    **/
   OpalRuntimeRuntime: 'Null',
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup498: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -6822,8 +8148,17 @@
    * Lookup508: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+   * Lookup509: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
    **/
   PalletEthereumFakeTransactionFinalizer: 'Null'
 };
modifiedtests/src/interfaces/registry.tsdiffbeforeafterboth
--- a/tests/src/interfaces/registry.ts
+++ b/tests/src/interfaces/registry.ts
@@ -8,12 +8,15 @@
 <<<<<<< 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';
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< 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';
 =======
@@ -21,6 +24,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< 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, PalletBalancesReleases, 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';
 =======
@@ -58,8 +63,17 @@
 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, 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';
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+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
+>>>>>>> fix: regenerate types after rebase
 
 declare module '@polkadot/types/types/registry' {
   interface InterfaceTypes {
modifiedtests/src/interfaces/types-lookup.tsdiffbeforeafterboth
1369  }1369  }
13701370
1371<<<<<<< HEAD1371<<<<<<< HEAD
1372<<<<<<< HEAD
1372  /** @name PalletEthereumEvent (109) */1373  /** @name PalletEthereumEvent (109) */
1373=======1374=======
1374<<<<<<< HEAD1375<<<<<<< HEAD
1377  /** @name PalletEthereumEvent (115) */1378  /** @name PalletEthereumEvent (115) */
1378>>>>>>> chore:  regenerate types1379>>>>>>> chore:  regenerate types
1379>>>>>>> chore:  regenerate types1380>>>>>>> chore:  regenerate types
1381=======
1382  /** @name PalletEthereumEvent (113) */
1383>>>>>>> fix: regenerate types after rebase
1380  interface PalletEthereumEvent extends Enum {1384  interface PalletEthereumEvent extends Enum {
1381    readonly isExecuted: boolean;1385    readonly isExecuted: boolean;
1382    readonly asExecuted: {1386    readonly asExecuted: {
1389  }1393  }
13901394
1391<<<<<<< HEAD1395<<<<<<< HEAD
1396<<<<<<< HEAD
1392  /** @name EvmCoreErrorExitReason (110) */1397  /** @name EvmCoreErrorExitReason (110) */
1393=======1398=======
1394<<<<<<< HEAD1399<<<<<<< HEAD
1397  /** @name EvmCoreErrorExitReason (116) */1402  /** @name EvmCoreErrorExitReason (116) */
1398>>>>>>> chore:  regenerate types1403>>>>>>> chore:  regenerate types
1399>>>>>>> chore:  regenerate types1404>>>>>>> chore:  regenerate types
1405=======
1406  /** @name EvmCoreErrorExitReason (114) */
1407>>>>>>> fix: regenerate types after rebase
1400  interface EvmCoreErrorExitReason extends Enum {1408  interface EvmCoreErrorExitReason extends Enum {
1401    readonly isSucceed: boolean;1409    readonly isSucceed: boolean;
1402    readonly asSucceed: EvmCoreErrorExitSucceed;1410    readonly asSucceed: EvmCoreErrorExitSucceed;
1410  }1418  }
14111419
1412<<<<<<< HEAD1420<<<<<<< HEAD
1421<<<<<<< HEAD
1413  /** @name EvmCoreErrorExitSucceed (111) */1422  /** @name EvmCoreErrorExitSucceed (111) */
1414=======1423=======
1415<<<<<<< HEAD1424<<<<<<< HEAD
1418  /** @name EvmCoreErrorExitSucceed (117) */1427  /** @name EvmCoreErrorExitSucceed (117) */
1419>>>>>>> chore:  regenerate types1428>>>>>>> chore:  regenerate types
1420>>>>>>> chore:  regenerate types1429>>>>>>> chore:  regenerate types
1430=======
1431  /** @name EvmCoreErrorExitSucceed (115) */
1432>>>>>>> fix: regenerate types after rebase
1421  interface EvmCoreErrorExitSucceed extends Enum {1433  interface EvmCoreErrorExitSucceed extends Enum {
1422    readonly isStopped: boolean;1434    readonly isStopped: boolean;
1423    readonly isReturned: boolean;1435    readonly isReturned: boolean;
1426  }1438  }
14271439
1428<<<<<<< HEAD1440<<<<<<< HEAD
1441<<<<<<< HEAD
1429  /** @name EvmCoreErrorExitError (112) */1442  /** @name EvmCoreErrorExitError (112) */
1430=======1443=======
1431<<<<<<< HEAD1444<<<<<<< HEAD
1434  /** @name EvmCoreErrorExitError (118) */1447  /** @name EvmCoreErrorExitError (118) */
1435>>>>>>> chore:  regenerate types1448>>>>>>> chore:  regenerate types
1436>>>>>>> chore:  regenerate types1449>>>>>>> chore:  regenerate types
1450=======
1451  /** @name EvmCoreErrorExitError (116) */
1452>>>>>>> fix: regenerate types after rebase
1437  interface EvmCoreErrorExitError extends Enum {1453  interface EvmCoreErrorExitError extends Enum {
1438    readonly isStackUnderflow: boolean;1454    readonly isStackUnderflow: boolean;
1439    readonly isStackOverflow: boolean;1455    readonly isStackOverflow: boolean;
1455  }1471  }
14561472
1457<<<<<<< HEAD1473<<<<<<< HEAD
1474<<<<<<< HEAD
1458  /** @name EvmCoreErrorExitRevert (115) */1475  /** @name EvmCoreErrorExitRevert (115) */
1459=======1476=======
1460<<<<<<< HEAD1477<<<<<<< HEAD
1463  /** @name EvmCoreErrorExitRevert (121) */1480  /** @name EvmCoreErrorExitRevert (121) */
1464>>>>>>> chore:  regenerate types1481>>>>>>> chore:  regenerate types
1465>>>>>>> chore:  regenerate types1482>>>>>>> chore:  regenerate types
1483=======
1484  /** @name EvmCoreErrorExitRevert (119) */
1485>>>>>>> fix: regenerate types after rebase
1466  interface EvmCoreErrorExitRevert extends Enum {1486  interface EvmCoreErrorExitRevert extends Enum {
1467    readonly isReverted: boolean;1487    readonly isReverted: boolean;
1468    readonly type: 'Reverted';1488    readonly type: 'Reverted';
1469  }1489  }
14701490
1471<<<<<<< HEAD1491<<<<<<< HEAD
1492<<<<<<< HEAD
1472  /** @name EvmCoreErrorExitFatal (116) */1493  /** @name EvmCoreErrorExitFatal (116) */
1473=======1494=======
1474<<<<<<< HEAD1495<<<<<<< HEAD
1477  /** @name EvmCoreErrorExitFatal (122) */1498  /** @name EvmCoreErrorExitFatal (122) */
1478>>>>>>> chore:  regenerate types1499>>>>>>> chore:  regenerate types
1479>>>>>>> chore:  regenerate types1500>>>>>>> chore:  regenerate types
1501=======
1502  /** @name EvmCoreErrorExitFatal (120) */
1503>>>>>>> fix: regenerate types after rebase
1480  interface EvmCoreErrorExitFatal extends Enum {1504  interface EvmCoreErrorExitFatal extends Enum {
1481    readonly isNotSupported: boolean;1505    readonly isNotSupported: boolean;
1482    readonly isUnhandledInterrupt: boolean;1506    readonly isUnhandledInterrupt: boolean;
1488  }1512  }
14891513
1490<<<<<<< HEAD1514<<<<<<< HEAD
1515<<<<<<< HEAD
1491  /** @name PalletEvmContractHelpersEvent (117) */1516  /** @name PalletEvmContractHelpersEvent (117) */
1492=======1517=======
1493<<<<<<< HEAD1518<<<<<<< HEAD
1496  /** @name PalletEvmContractHelpersEvent (123) */1521  /** @name PalletEvmContractHelpersEvent (123) */
1497>>>>>>> chore:  regenerate types1522>>>>>>> chore:  regenerate types
1498>>>>>>> chore:  regenerate types1523>>>>>>> chore:  regenerate types
1524=======
1525  /** @name PalletEvmContractHelpersEvent (121) */
1526>>>>>>> fix: regenerate types after rebase
1499  interface PalletEvmContractHelpersEvent extends Enum {1527  interface PalletEvmContractHelpersEvent extends Enum {
1500    readonly isContractSponsorSet: boolean;1528    readonly isContractSponsorSet: boolean;
1501    readonly asContractSponsorSet: ITuple<[H160, AccountId32]>;1529    readonly asContractSponsorSet: ITuple<[H160, AccountId32]>;
1507  }1535  }
15081536
1509<<<<<<< HEAD1537<<<<<<< HEAD
1538<<<<<<< HEAD
1510  /** @name PalletEvmMigrationEvent (118) */1539  /** @name PalletEvmMigrationEvent (118) */
1511=======1540=======
1512<<<<<<< HEAD1541<<<<<<< HEAD
1542=======
1543>>>>>>> fix: regenerate types after rebase
1513  /** @name PalletEvmMigrationEvent (122) */1544  /** @name PalletEvmMigrationEvent (122) */
1514>>>>>>> chore:  regenerate types1545>>>>>>> chore:  regenerate types
1515  interface PalletEvmMigrationEvent extends Enum {1546  interface PalletEvmMigrationEvent extends Enum {
1521  /** @name PalletMaintenanceEvent (119) */1552  /** @name PalletMaintenanceEvent (119) */
1522=======1553=======
1523  /** @name PalletMaintenanceEvent (123) */1554  /** @name PalletMaintenanceEvent (123) */
1555<<<<<<< HEAD
1524=======1556=======
1525  /** @name PalletMaintenanceEvent (124) */1557  /** @name PalletMaintenanceEvent (124) */
1526>>>>>>> chore:  regenerate types1558>>>>>>> chore:  regenerate types
1527>>>>>>> chore:  regenerate types1559>>>>>>> chore:  regenerate types
1560=======
1561>>>>>>> fix: regenerate types after rebase
1528  interface PalletMaintenanceEvent extends Enum {1562  interface PalletMaintenanceEvent extends Enum {
1529    readonly isMaintenanceEnabled: boolean;1563    readonly isMaintenanceEnabled: boolean;
1530    readonly isMaintenanceDisabled: boolean;1564    readonly isMaintenanceDisabled: boolean;
1531    readonly type: 'MaintenanceEnabled' | 'MaintenanceDisabled';1565    readonly type: 'MaintenanceEnabled' | 'MaintenanceDisabled';
1532  }1566  }
15331567
1534<<<<<<< HEAD1568<<<<<<< HEAD
1569<<<<<<< HEAD
1535  /** @name PalletTestUtilsEvent (120) */1570  /** @name PalletTestUtilsEvent (120) */
1536=======1571=======
1537<<<<<<< HEAD1572<<<<<<< HEAD
1540  /** @name PalletTestUtilsEvent (125) */1575  /** @name PalletTestUtilsEvent (125) */
1541>>>>>>> chore:  regenerate types1576>>>>>>> chore:  regenerate types
1542>>>>>>> chore:  regenerate types1577>>>>>>> chore:  regenerate types
1578=======
1579  /** @name PalletTestUtilsEvent (124) */
1580>>>>>>> fix: regenerate types after rebase
1543  interface PalletTestUtilsEvent extends Enum {1581  interface PalletTestUtilsEvent extends Enum {
1544    readonly isValueIsSet: boolean;1582    readonly isValueIsSet: boolean;
1545    readonly isShouldRollback: boolean;1583    readonly isShouldRollback: boolean;
1548  }1586  }
15491587
1550<<<<<<< HEAD1588<<<<<<< HEAD
1589<<<<<<< HEAD
1551  /** @name FrameSystemPhase (121) */1590  /** @name FrameSystemPhase (121) */
1552=======1591=======
1553<<<<<<< HEAD1592<<<<<<< HEAD
1556  /** @name FrameSystemPhase (126) */1595  /** @name FrameSystemPhase (126) */
1557>>>>>>> chore:  regenerate types1596>>>>>>> chore:  regenerate types
1558>>>>>>> chore:  regenerate types1597>>>>>>> chore:  regenerate types
1598=======
1599  /** @name FrameSystemPhase (125) */
1600>>>>>>> fix: regenerate types after rebase
1559  interface FrameSystemPhase extends Enum {1601  interface FrameSystemPhase extends Enum {
1560    readonly isApplyExtrinsic: boolean;1602    readonly isApplyExtrinsic: boolean;
1561    readonly asApplyExtrinsic: u32;1603    readonly asApplyExtrinsic: u32;
1565  }1607  }
15661608
1567<<<<<<< HEAD1609<<<<<<< HEAD
1610<<<<<<< HEAD
1568  /** @name FrameSystemLastRuntimeUpgradeInfo (124) */1611  /** @name FrameSystemLastRuntimeUpgradeInfo (124) */
1569=======1612=======
1570<<<<<<< HEAD1613<<<<<<< HEAD
1573  /** @name FrameSystemLastRuntimeUpgradeInfo (128) */1616  /** @name FrameSystemLastRuntimeUpgradeInfo (128) */
1574>>>>>>> chore:  regenerate types1617>>>>>>> chore:  regenerate types
1575>>>>>>> chore:  regenerate types1618>>>>>>> chore:  regenerate types
1619=======
1620  /** @name FrameSystemLastRuntimeUpgradeInfo (127) */
1621>>>>>>> fix: regenerate types after rebase
1576  interface FrameSystemLastRuntimeUpgradeInfo extends Struct {1622  interface FrameSystemLastRuntimeUpgradeInfo extends Struct {
1577    readonly specVersion: Compact<u32>;1623    readonly specVersion: Compact<u32>;
1578    readonly specName: Text;1624    readonly specName: Text;
1579  }1625  }
15801626
1581<<<<<<< HEAD1627<<<<<<< HEAD
1628<<<<<<< HEAD
1582  /** @name FrameSystemCall (125) */1629  /** @name FrameSystemCall (125) */
1583=======1630=======
1584<<<<<<< HEAD1631<<<<<<< HEAD
1587  /** @name FrameSystemCall (129) */1634  /** @name FrameSystemCall (129) */
1588>>>>>>> chore:  regenerate types1635>>>>>>> chore:  regenerate types
1589>>>>>>> chore:  regenerate types1636>>>>>>> chore:  regenerate types
1637=======
1638  /** @name FrameSystemCall (128) */
1639>>>>>>> fix: regenerate types after rebase
1590  interface FrameSystemCall extends Enum {1640  interface FrameSystemCall extends Enum {
1591    readonly isRemark: boolean;1641    readonly isRemark: boolean;
1592    readonly asRemark: {1642    readonly asRemark: {
1625  }1675  }
16261676
1627<<<<<<< HEAD1677<<<<<<< HEAD
1678<<<<<<< HEAD
1628  /** @name FrameSystemLimitsBlockWeights (129) */1679  /** @name FrameSystemLimitsBlockWeights (129) */
1629=======1680=======
1681=======
1682>>>>>>> fix: regenerate types after rebase
1630<<<<<<< HEAD1683<<<<<<< HEAD
1631  /** @name FrameSystemLimitsBlockWeights (130) */1684  /** @name FrameSystemLimitsBlockWeights (130) */
1632=======1685=======
1636  /** @name FrameSystemLimitsBlockWeights (134) */1689  /** @name FrameSystemLimitsBlockWeights (134) */
1637>>>>>>> chore:  regenerate types1690>>>>>>> chore:  regenerate types
1638>>>>>>> chore:  regenerate types1691>>>>>>> chore:  regenerate types
1692<<<<<<< HEAD
1639>>>>>>> chore:  regenerate types1693>>>>>>> chore:  regenerate types
1694=======
1695=======
1696  /** @name FrameSystemLimitsBlockWeights (133) */
1697>>>>>>> fix: regenerate types after rebase
1698>>>>>>> fix: regenerate types after rebase
1640  interface FrameSystemLimitsBlockWeights extends Struct {1699  interface FrameSystemLimitsBlockWeights extends Struct {
1641    readonly baseBlock: SpWeightsWeightV2Weight;1700    readonly baseBlock: SpWeightsWeightV2Weight;
1642    readonly maxBlock: SpWeightsWeightV2Weight;1701    readonly maxBlock: SpWeightsWeightV2Weight;
1643    readonly perClass: FrameSupportDispatchPerDispatchClassWeightsPerClass;1702    readonly perClass: FrameSupportDispatchPerDispatchClassWeightsPerClass;
1644  }1703  }
16451704
1646<<<<<<< HEAD1705<<<<<<< HEAD
1706<<<<<<< HEAD
1647  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */1707  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */
1648=======1708=======
1709=======
1710>>>>>>> fix: regenerate types after rebase
1649<<<<<<< HEAD1711<<<<<<< HEAD
1650  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (131) */1712  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (131) */
1651=======1713=======
1655  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (135) */1717  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (135) */
1656>>>>>>> chore:  regenerate types1718>>>>>>> chore:  regenerate types
1657>>>>>>> chore:  regenerate types1719>>>>>>> chore:  regenerate types
1720<<<<<<< HEAD
1658>>>>>>> chore:  regenerate types1721>>>>>>> chore:  regenerate types
1722=======
1723=======
1724  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (134) */
1725>>>>>>> fix: regenerate types after rebase
1726>>>>>>> fix: regenerate types after rebase
1659  interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct {1727  interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct {
1660    readonly normal: FrameSystemLimitsWeightsPerClass;1728    readonly normal: FrameSystemLimitsWeightsPerClass;
1661    readonly operational: FrameSystemLimitsWeightsPerClass;1729    readonly operational: FrameSystemLimitsWeightsPerClass;
1662    readonly mandatory: FrameSystemLimitsWeightsPerClass;1730    readonly mandatory: FrameSystemLimitsWeightsPerClass;
1663  }1731  }
16641732
1665<<<<<<< HEAD1733<<<<<<< HEAD
1734<<<<<<< HEAD
1666  /** @name FrameSystemLimitsWeightsPerClass (131) */1735  /** @name FrameSystemLimitsWeightsPerClass (131) */
1667=======1736=======
1737=======
1738>>>>>>> fix: regenerate types after rebase
1668<<<<<<< HEAD1739<<<<<<< HEAD
1669  /** @name FrameSystemLimitsWeightsPerClass (132) */1740  /** @name FrameSystemLimitsWeightsPerClass (132) */
1670=======1741=======
1674  /** @name FrameSystemLimitsWeightsPerClass (136) */1745  /** @name FrameSystemLimitsWeightsPerClass (136) */
1675>>>>>>> chore:  regenerate types1746>>>>>>> chore:  regenerate types
1676>>>>>>> chore:  regenerate types1747>>>>>>> chore:  regenerate types
1748<<<<<<< HEAD
1677>>>>>>> chore:  regenerate types1749>>>>>>> chore:  regenerate types
1750=======
1751=======
1752  /** @name FrameSystemLimitsWeightsPerClass (135) */
1753>>>>>>> fix: regenerate types after rebase
1754>>>>>>> fix: regenerate types after rebase
1678  interface FrameSystemLimitsWeightsPerClass extends Struct {1755  interface FrameSystemLimitsWeightsPerClass extends Struct {
1679    readonly baseExtrinsic: SpWeightsWeightV2Weight;1756    readonly baseExtrinsic: SpWeightsWeightV2Weight;
1680    readonly maxExtrinsic: Option<SpWeightsWeightV2Weight>;1757    readonly maxExtrinsic: Option<SpWeightsWeightV2Weight>;
1683  }1760  }
16841761
1685<<<<<<< HEAD1762<<<<<<< HEAD
1763<<<<<<< HEAD
1686  /** @name FrameSystemLimitsBlockLength (133) */1764  /** @name FrameSystemLimitsBlockLength (133) */
1687=======1765=======
1766=======
1767>>>>>>> fix: regenerate types after rebase
1688<<<<<<< HEAD1768<<<<<<< HEAD
1689  /** @name FrameSystemLimitsBlockLength (134) */1769  /** @name FrameSystemLimitsBlockLength (134) */
1690=======1770=======
1694  /** @name FrameSystemLimitsBlockLength (138) */1774  /** @name FrameSystemLimitsBlockLength (138) */
1695>>>>>>> chore:  regenerate types1775>>>>>>> chore:  regenerate types
1696>>>>>>> chore:  regenerate types1776>>>>>>> chore:  regenerate types
1777<<<<<<< HEAD
1697>>>>>>> chore:  regenerate types1778>>>>>>> chore:  regenerate types
1779=======
1780=======
1781  /** @name FrameSystemLimitsBlockLength (137) */
1782>>>>>>> fix: regenerate types after rebase
1783>>>>>>> fix: regenerate types after rebase
1698  interface FrameSystemLimitsBlockLength extends Struct {1784  interface FrameSystemLimitsBlockLength extends Struct {
1699    readonly max: FrameSupportDispatchPerDispatchClassU32;1785    readonly max: FrameSupportDispatchPerDispatchClassU32;
1700  }1786  }
17011787
1702<<<<<<< HEAD1788<<<<<<< HEAD
1789<<<<<<< HEAD
1703  /** @name FrameSupportDispatchPerDispatchClassU32 (134) */1790  /** @name FrameSupportDispatchPerDispatchClassU32 (134) */
1704=======1791=======
1792=======
1793>>>>>>> fix: regenerate types after rebase
1705<<<<<<< HEAD1794<<<<<<< HEAD
1706  /** @name FrameSupportDispatchPerDispatchClassU32 (135) */1795  /** @name FrameSupportDispatchPerDispatchClassU32 (135) */
1707=======1796=======
1711  /** @name FrameSupportDispatchPerDispatchClassU32 (139) */1800  /** @name FrameSupportDispatchPerDispatchClassU32 (139) */
1712>>>>>>> chore:  regenerate types1801>>>>>>> chore:  regenerate types
1713>>>>>>> chore:  regenerate types1802>>>>>>> chore:  regenerate types
1803<<<<<<< HEAD
1714>>>>>>> chore:  regenerate types1804>>>>>>> chore:  regenerate types
1805=======
1806=======
1807  /** @name FrameSupportDispatchPerDispatchClassU32 (138) */
1808>>>>>>> fix: regenerate types after rebase
1809>>>>>>> fix: regenerate types after rebase
1715  interface FrameSupportDispatchPerDispatchClassU32 extends Struct {1810  interface FrameSupportDispatchPerDispatchClassU32 extends Struct {
1716    readonly normal: u32;1811    readonly normal: u32;
1717    readonly operational: u32;1812    readonly operational: u32;
1718    readonly mandatory: u32;1813    readonly mandatory: u32;
1719  }1814  }
17201815
1721<<<<<<< HEAD1816<<<<<<< HEAD
1817<<<<<<< HEAD
1722  /** @name SpWeightsRuntimeDbWeight (135) */1818  /** @name SpWeightsRuntimeDbWeight (135) */
1723=======1819=======
1820=======
1821>>>>>>> fix: regenerate types after rebase
1724<<<<<<< HEAD1822<<<<<<< HEAD
1725  /** @name SpWeightsRuntimeDbWeight (136) */1823  /** @name SpWeightsRuntimeDbWeight (136) */
1726=======1824=======
1730  /** @name SpWeightsRuntimeDbWeight (140) */1828  /** @name SpWeightsRuntimeDbWeight (140) */
1731>>>>>>> chore:  regenerate types1829>>>>>>> chore:  regenerate types
1732>>>>>>> chore:  regenerate types1830>>>>>>> chore:  regenerate types
1831<<<<<<< HEAD
1733>>>>>>> chore:  regenerate types1832>>>>>>> chore:  regenerate types
1833=======
1834=======
1835  /** @name SpWeightsRuntimeDbWeight (139) */
1836>>>>>>> fix: regenerate types after rebase
1837>>>>>>> fix: regenerate types after rebase
1734  interface SpWeightsRuntimeDbWeight extends Struct {1838  interface SpWeightsRuntimeDbWeight extends Struct {
1735    readonly read: u64;1839    readonly read: u64;
1736    readonly write: u64;1840    readonly write: u64;
1737  }1841  }
17381842
1739<<<<<<< HEAD1843<<<<<<< HEAD
1844<<<<<<< HEAD
1740  /** @name SpVersionRuntimeVersion (136) */1845  /** @name SpVersionRuntimeVersion (136) */
1741=======1846=======
1847=======
1848>>>>>>> fix: regenerate types after rebase
1742<<<<<<< HEAD1849<<<<<<< HEAD
1743  /** @name SpVersionRuntimeVersion (137) */1850  /** @name SpVersionRuntimeVersion (137) */
1744=======1851=======
1748  /** @name SpVersionRuntimeVersion (141) */1855  /** @name SpVersionRuntimeVersion (141) */
1749>>>>>>> chore:  regenerate types1856>>>>>>> chore:  regenerate types
1750>>>>>>> chore:  regenerate types1857>>>>>>> chore:  regenerate types
1858<<<<<<< HEAD
1751>>>>>>> chore:  regenerate types1859>>>>>>> chore:  regenerate types
1860=======
1861=======
1862  /** @name SpVersionRuntimeVersion (140) */
1863>>>>>>> fix: regenerate types after rebase
1864>>>>>>> fix: regenerate types after rebase
1752  interface SpVersionRuntimeVersion extends Struct {1865  interface SpVersionRuntimeVersion extends Struct {
1753    readonly specName: Text;1866    readonly specName: Text;
1754    readonly implName: Text;1867    readonly implName: Text;
1761  }1874  }
17621875
1763<<<<<<< HEAD1876<<<<<<< HEAD
1877<<<<<<< HEAD
1764  /** @name FrameSystemError (141) */1878  /** @name FrameSystemError (141) */
1765=======1879=======
1880=======
1881>>>>>>> fix: regenerate types after rebase
1766<<<<<<< HEAD1882<<<<<<< HEAD
1767  /** @name FrameSystemError (142) */1883  /** @name FrameSystemError (142) */
1768=======1884=======
1772  /** @name FrameSystemError (146) */1888  /** @name FrameSystemError (146) */
1773>>>>>>> chore:  regenerate types1889>>>>>>> chore:  regenerate types
1774>>>>>>> chore:  regenerate types1890>>>>>>> chore:  regenerate types
1891<<<<<<< HEAD
1775>>>>>>> chore:  regenerate types1892>>>>>>> chore:  regenerate types
1893=======
1894=======
1895  /** @name FrameSystemError (145) */
1896>>>>>>> fix: regenerate types after rebase
1897>>>>>>> fix: regenerate types after rebase
1776  interface FrameSystemError extends Enum {1898  interface FrameSystemError extends Enum {
1777    readonly isInvalidSpecName: boolean;1899    readonly isInvalidSpecName: boolean;
1778    readonly isSpecVersionNeedsToIncrease: boolean;1900    readonly isSpecVersionNeedsToIncrease: boolean;
1784  }1906  }
17851907
1786<<<<<<< HEAD1908<<<<<<< HEAD
1909<<<<<<< HEAD
1787  /** @name PolkadotPrimitivesV2PersistedValidationData (142) */1910  /** @name PolkadotPrimitivesV2PersistedValidationData (142) */
1788=======1911=======
1912=======
1913>>>>>>> fix: regenerate types after rebase
1789<<<<<<< HEAD1914<<<<<<< HEAD
1790  /** @name PolkadotPrimitivesV2PersistedValidationData (143) */1915  /** @name PolkadotPrimitivesV2PersistedValidationData (143) */
1791=======1916=======
1795  /** @name PolkadotPrimitivesV2PersistedValidationData (147) */1920  /** @name PolkadotPrimitivesV2PersistedValidationData (147) */
1796>>>>>>> chore:  regenerate types1921>>>>>>> chore:  regenerate types
1797>>>>>>> chore:  regenerate types1922>>>>>>> chore:  regenerate types
1923<<<<<<< HEAD
1798>>>>>>> chore:  regenerate types1924>>>>>>> chore:  regenerate types
1925=======
1926=======
1927  /** @name PolkadotPrimitivesV2PersistedValidationData (146) */
1928>>>>>>> fix: regenerate types after rebase
1929>>>>>>> fix: regenerate types after rebase
1799  interface PolkadotPrimitivesV2PersistedValidationData extends Struct {1930  interface PolkadotPrimitivesV2PersistedValidationData extends Struct {
1800    readonly parentHead: Bytes;1931    readonly parentHead: Bytes;
1801    readonly relayParentNumber: u32;1932    readonly relayParentNumber: u32;
1804  }1935  }
18051936
1806<<<<<<< HEAD1937<<<<<<< HEAD
1938<<<<<<< HEAD
1807  /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */1939  /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */
1808=======1940=======
1941=======
1942>>>>>>> fix: regenerate types after rebase
1809<<<<<<< HEAD1943<<<<<<< HEAD
1810  /** @name PolkadotPrimitivesV2UpgradeRestriction (146) */1944  /** @name PolkadotPrimitivesV2UpgradeRestriction (146) */
1811=======1945=======
1815  /** @name PolkadotPrimitivesV2UpgradeRestriction (150) */1949  /** @name PolkadotPrimitivesV2UpgradeRestriction (150) */
1816>>>>>>> chore:  regenerate types1950>>>>>>> chore:  regenerate types
1817>>>>>>> chore:  regenerate types1951>>>>>>> chore:  regenerate types
1952<<<<<<< HEAD
1818>>>>>>> chore:  regenerate types1953>>>>>>> chore:  regenerate types
1954=======
1955=======
1956  /** @name PolkadotPrimitivesV2UpgradeRestriction (149) */
1957>>>>>>> fix: regenerate types after rebase
1958>>>>>>> fix: regenerate types after rebase
1819  interface PolkadotPrimitivesV2UpgradeRestriction extends Enum {1959  interface PolkadotPrimitivesV2UpgradeRestriction extends Enum {
1820    readonly isPresent: boolean;1960    readonly isPresent: boolean;
1821    readonly type: 'Present';1961    readonly type: 'Present';
1822  }1962  }
18231963
1824<<<<<<< HEAD1964<<<<<<< HEAD
1965<<<<<<< HEAD
1825  /** @name SpTrieStorageProof (146) */1966  /** @name SpTrieStorageProof (146) */
1826=======1967=======
1968=======
1969>>>>>>> fix: regenerate types after rebase
1827<<<<<<< HEAD1970<<<<<<< HEAD
1828  /** @name SpTrieStorageProof (147) */1971  /** @name SpTrieStorageProof (147) */
1829=======1972=======
1833  /** @name SpTrieStorageProof (151) */1976  /** @name SpTrieStorageProof (151) */
1834>>>>>>> chore:  regenerate types1977>>>>>>> chore:  regenerate types
1835>>>>>>> chore:  regenerate types1978>>>>>>> chore:  regenerate types
1979<<<<<<< HEAD
1836>>>>>>> chore:  regenerate types1980>>>>>>> chore:  regenerate types
1981=======
1982=======
1983  /** @name SpTrieStorageProof (150) */
1984>>>>>>> fix: regenerate types after rebase
1985>>>>>>> fix: regenerate types after rebase
1837  interface SpTrieStorageProof extends Struct {1986  interface SpTrieStorageProof extends Struct {
1838    readonly trieNodes: BTreeSet<Bytes>;1987    readonly trieNodes: BTreeSet<Bytes>;
1839  }1988  }
18401989
1841<<<<<<< HEAD1990<<<<<<< HEAD
1991<<<<<<< HEAD
1842  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */1992  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */
1843=======1993=======
1994=======
1995>>>>>>> fix: regenerate types after rebase
1844<<<<<<< HEAD1996<<<<<<< HEAD
1845  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (149) */1997  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (149) */
1846=======1998=======
1850  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (153) */2002  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (153) */
1851>>>>>>> chore:  regenerate types2003>>>>>>> chore:  regenerate types
1852>>>>>>> chore:  regenerate types2004>>>>>>> chore:  regenerate types
2005<<<<<<< HEAD
1853>>>>>>> chore:  regenerate types2006>>>>>>> chore:  regenerate types
2007=======
2008=======
2009  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (152) */
2010>>>>>>> fix: regenerate types after rebase
2011>>>>>>> fix: regenerate types after rebase
1854  interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct {2012  interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct {
1855    readonly dmqMqcHead: H256;2013    readonly dmqMqcHead: H256;
1856    readonly relayDispatchQueueSize: ITuple<[u32, u32]>;2014    readonly relayDispatchQueueSize: ITuple<[u32, u32]>;
1859  }2017  }
18602018
1861<<<<<<< HEAD2019<<<<<<< HEAD
2020<<<<<<< HEAD
1862  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */2021  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */
1863=======2022=======
2023=======
2024>>>>>>> fix: regenerate types after rebase
1864<<<<<<< HEAD2025<<<<<<< HEAD
1865  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (152) */2026  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (152) */
1866=======2027=======
1870  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (156) */2031  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (156) */
1871>>>>>>> chore:  regenerate types2032>>>>>>> chore:  regenerate types
1872>>>>>>> chore:  regenerate types2033>>>>>>> chore:  regenerate types
2034<<<<<<< HEAD
1873>>>>>>> chore:  regenerate types2035>>>>>>> chore:  regenerate types
2036=======
2037=======
2038  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (155) */
2039>>>>>>> fix: regenerate types after rebase
2040>>>>>>> fix: regenerate types after rebase
1874  interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct {2041  interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct {
1875    readonly maxCapacity: u32;2042    readonly maxCapacity: u32;
1876    readonly maxTotalSize: u32;2043    readonly maxTotalSize: u32;
1881  }2048  }
18822049
1883<<<<<<< HEAD2050<<<<<<< HEAD
2051<<<<<<< HEAD
1884  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */2052  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */
1885=======2053=======
2054=======
2055>>>>>>> fix: regenerate types after rebase
1886<<<<<<< HEAD2056<<<<<<< HEAD
1887  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (153) */2057  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (153) */
1888=======2058=======
1892  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (157) */2062  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (157) */
1893>>>>>>> chore:  regenerate types2063>>>>>>> chore:  regenerate types
1894>>>>>>> chore:  regenerate types2064>>>>>>> chore:  regenerate types
2065<<<<<<< HEAD
1895>>>>>>> chore:  regenerate types2066>>>>>>> chore:  regenerate types
2067=======
2068=======
2069  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (156) */
2070>>>>>>> fix: regenerate types after rebase
2071>>>>>>> fix: regenerate types after rebase
1896  interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct {2072  interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct {
1897    readonly maxCodeSize: u32;2073    readonly maxCodeSize: u32;
1898    readonly maxHeadDataSize: u32;2074    readonly maxHeadDataSize: u32;
1906  }2082  }
19072083
1908<<<<<<< HEAD2084<<<<<<< HEAD
2085<<<<<<< HEAD
1909  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */2086  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */
1910=======2087=======
2088=======
2089>>>>>>> fix: regenerate types after rebase
1911<<<<<<< HEAD2090<<<<<<< HEAD
1912  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (159) */2091  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (159) */
1913=======2092=======
1917  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (163) */2096  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (163) */
1918>>>>>>> chore:  regenerate types2097>>>>>>> chore:  regenerate types
1919>>>>>>> chore:  regenerate types2098>>>>>>> chore:  regenerate types
2099<<<<<<< HEAD
1920>>>>>>> chore:  regenerate types2100>>>>>>> chore:  regenerate types
2101=======
2102=======
2103  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (162) */
2104>>>>>>> fix: regenerate types after rebase
2105>>>>>>> fix: regenerate types after rebase
1921  interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct {2106  interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct {
1922    readonly recipient: u32;2107    readonly recipient: u32;
1923    readonly data: Bytes;2108    readonly data: Bytes;
1924  }2109  }
19252110
1926<<<<<<< HEAD2111<<<<<<< HEAD
2112<<<<<<< HEAD
1927  /** @name CumulusPalletParachainSystemCall (159) */2113  /** @name CumulusPalletParachainSystemCall (159) */
1928=======2114=======
2115=======
2116>>>>>>> fix: regenerate types after rebase
1929<<<<<<< HEAD2117<<<<<<< HEAD
1930  /** @name CumulusPalletParachainSystemCall (160) */2118  /** @name CumulusPalletParachainSystemCall (160) */
1931=======2119=======
1935  /** @name CumulusPalletParachainSystemCall (164) */2123  /** @name CumulusPalletParachainSystemCall (164) */
1936>>>>>>> chore:  regenerate types2124>>>>>>> chore:  regenerate types
1937>>>>>>> chore:  regenerate types2125>>>>>>> chore:  regenerate types
2126<<<<<<< HEAD
1938>>>>>>> chore:  regenerate types2127>>>>>>> chore:  regenerate types
2128=======
2129=======
2130  /** @name CumulusPalletParachainSystemCall (163) */
2131>>>>>>> fix: regenerate types after rebase
2132>>>>>>> fix: regenerate types after rebase
1939  interface CumulusPalletParachainSystemCall extends Enum {2133  interface CumulusPalletParachainSystemCall extends Enum {
1940    readonly isSetValidationData: boolean;2134    readonly isSetValidationData: boolean;
1941    readonly asSetValidationData: {2135    readonly asSetValidationData: {
1957  }2151  }
19582152
1959<<<<<<< HEAD2153<<<<<<< HEAD
2154<<<<<<< HEAD
1960  /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */2155  /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */
1961=======2156=======
2157=======
2158>>>>>>> fix: regenerate types after rebase
1962<<<<<<< HEAD2159<<<<<<< HEAD
1963  /** @name CumulusPrimitivesParachainInherentParachainInherentData (161) */2160  /** @name CumulusPrimitivesParachainInherentParachainInherentData (161) */
1964=======2161=======
1968  /** @name CumulusPrimitivesParachainInherentParachainInherentData (165) */2165  /** @name CumulusPrimitivesParachainInherentParachainInherentData (165) */
1969>>>>>>> chore:  regenerate types2166>>>>>>> chore:  regenerate types
1970>>>>>>> chore:  regenerate types2167>>>>>>> chore:  regenerate types
2168<<<<<<< HEAD
1971>>>>>>> chore:  regenerate types2169>>>>>>> chore:  regenerate types
2170=======
2171=======
2172  /** @name CumulusPrimitivesParachainInherentParachainInherentData (164) */
2173>>>>>>> fix: regenerate types after rebase
2174>>>>>>> fix: regenerate types after rebase
1972  interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct {2175  interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct {
1973    readonly validationData: PolkadotPrimitivesV2PersistedValidationData;2176    readonly validationData: PolkadotPrimitivesV2PersistedValidationData;
1974    readonly relayChainState: SpTrieStorageProof;2177    readonly relayChainState: SpTrieStorageProof;
1977  }2180  }
19782181
1979<<<<<<< HEAD2182<<<<<<< HEAD
2183<<<<<<< HEAD
1980  /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */2184  /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */
1981=======2185=======
2186=======
2187>>>>>>> fix: regenerate types after rebase
1982<<<<<<< HEAD2188<<<<<<< HEAD
1983  /** @name PolkadotCorePrimitivesInboundDownwardMessage (163) */2189  /** @name PolkadotCorePrimitivesInboundDownwardMessage (163) */
1984=======2190=======
1988  /** @name PolkadotCorePrimitivesInboundDownwardMessage (167) */2194  /** @name PolkadotCorePrimitivesInboundDownwardMessage (167) */
1989>>>>>>> chore:  regenerate types2195>>>>>>> chore:  regenerate types
1990>>>>>>> chore:  regenerate types2196>>>>>>> chore:  regenerate types
2197<<<<<<< HEAD
1991>>>>>>> chore:  regenerate types2198>>>>>>> chore:  regenerate types
2199=======
2200=======
2201  /** @name PolkadotCorePrimitivesInboundDownwardMessage (166) */
2202>>>>>>> fix: regenerate types after rebase
2203>>>>>>> fix: regenerate types after rebase
1992  interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct {2204  interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct {
1993    readonly sentAt: u32;2205    readonly sentAt: u32;
1994    readonly msg: Bytes;2206    readonly msg: Bytes;
1995  }2207  }
19962208
1997<<<<<<< HEAD2209<<<<<<< HEAD
2210<<<<<<< HEAD
1998  /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */2211  /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */
1999=======2212=======
2213=======
2214>>>>>>> fix: regenerate types after rebase
2000<<<<<<< HEAD2215<<<<<<< HEAD
2001  /** @name PolkadotCorePrimitivesInboundHrmpMessage (166) */2216  /** @name PolkadotCorePrimitivesInboundHrmpMessage (166) */
2002=======2217=======
2006  /** @name PolkadotCorePrimitivesInboundHrmpMessage (170) */2221  /** @name PolkadotCorePrimitivesInboundHrmpMessage (170) */
2007>>>>>>> chore:  regenerate types2222>>>>>>> chore:  regenerate types
2008>>>>>>> chore:  regenerate types2223>>>>>>> chore:  regenerate types
2224<<<<<<< HEAD
2009>>>>>>> chore:  regenerate types2225>>>>>>> chore:  regenerate types
2226=======
2227=======
2228  /** @name PolkadotCorePrimitivesInboundHrmpMessage (169) */
2229>>>>>>> fix: regenerate types after rebase
2230>>>>>>> fix: regenerate types after rebase
2010  interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct {2231  interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct {
2011    readonly sentAt: u32;2232    readonly sentAt: u32;
2012    readonly data: Bytes;2233    readonly data: Bytes;
2013  }2234  }
20142235
2015<<<<<<< HEAD2236<<<<<<< HEAD
2237<<<<<<< HEAD
2016  /** @name CumulusPalletParachainSystemError (168) */2238  /** @name CumulusPalletParachainSystemError (168) */
2017=======2239=======
2240=======
2241>>>>>>> fix: regenerate types after rebase
2018<<<<<<< HEAD2242<<<<<<< HEAD
2019  /** @name CumulusPalletParachainSystemError (169) */2243  /** @name CumulusPalletParachainSystemError (169) */
2020=======2244=======
2024  /** @name CumulusPalletParachainSystemError (173) */2248  /** @name CumulusPalletParachainSystemError (173) */
2025>>>>>>> chore:  regenerate types2249>>>>>>> chore:  regenerate types
2026>>>>>>> chore:  regenerate types2250>>>>>>> chore:  regenerate types
2251<<<<<<< HEAD
2027>>>>>>> chore:  regenerate types2252>>>>>>> chore:  regenerate types
2253=======
2254=======
2255  /** @name CumulusPalletParachainSystemError (172) */
2256>>>>>>> fix: regenerate types after rebase
2257>>>>>>> fix: regenerate types after rebase
2028  interface CumulusPalletParachainSystemError extends Enum {2258  interface CumulusPalletParachainSystemError extends Enum {
2029    readonly isOverlappingUpgrades: boolean;2259    readonly isOverlappingUpgrades: boolean;
2030    readonly isProhibitedByPolkadot: boolean;2260    readonly isProhibitedByPolkadot: boolean;
2038  }2268  }
20392269
2040<<<<<<< HEAD2270<<<<<<< HEAD
2271<<<<<<< HEAD
2041  /** @name PalletBalancesBalanceLock (170) */2272  /** @name PalletBalancesBalanceLock (170) */
2042=======2273=======
2274=======
2275>>>>>>> fix: regenerate types after rebase
2043<<<<<<< HEAD2276<<<<<<< HEAD
2044  /** @name PalletBalancesBalanceLock (171) */2277  /** @name PalletBalancesBalanceLock (171) */
2045=======2278=======
2049  /** @name PalletBalancesBalanceLock (175) */2282  /** @name PalletBalancesBalanceLock (175) */
2050>>>>>>> chore:  regenerate types2283>>>>>>> chore:  regenerate types
2051>>>>>>> chore:  regenerate types2284>>>>>>> chore:  regenerate types
2285<<<<<<< HEAD
2052>>>>>>> chore:  regenerate types2286>>>>>>> chore:  regenerate types
2287=======
2288=======
2289  /** @name PalletBalancesBalanceLock (174) */
2290>>>>>>> fix: regenerate types after rebase
2291>>>>>>> fix: regenerate types after rebase
2053  interface PalletBalancesBalanceLock extends Struct {2292  interface PalletBalancesBalanceLock extends Struct {
2054    readonly id: U8aFixed;2293    readonly id: U8aFixed;
2055    readonly amount: u128;2294    readonly amount: u128;
2056    readonly reasons: PalletBalancesReasons;2295    readonly reasons: PalletBalancesReasons;
2057  }2296  }
20582297
2059<<<<<<< HEAD2298<<<<<<< HEAD
2299<<<<<<< HEAD
2060  /** @name PalletBalancesReasons (171) */2300  /** @name PalletBalancesReasons (171) */
2061=======2301=======
2302=======
2303>>>>>>> fix: regenerate types after rebase
2062<<<<<<< HEAD2304<<<<<<< HEAD
2063  /** @name PalletBalancesReasons (172) */2305  /** @name PalletBalancesReasons (172) */
2064=======2306=======
2068  /** @name PalletBalancesReasons (176) */2310  /** @name PalletBalancesReasons (176) */
2069>>>>>>> chore:  regenerate types2311>>>>>>> chore:  regenerate types
2070>>>>>>> chore:  regenerate types2312>>>>>>> chore:  regenerate types
2313<<<<<<< HEAD
2071>>>>>>> chore:  regenerate types2314>>>>>>> chore:  regenerate types
2315=======
2316=======
2317  /** @name PalletBalancesReasons (175) */
2318>>>>>>> fix: regenerate types after rebase
2319>>>>>>> fix: regenerate types after rebase
2072  interface PalletBalancesReasons extends Enum {2320  interface PalletBalancesReasons extends Enum {
2073    readonly isFee: boolean;2321    readonly isFee: boolean;
2074    readonly isMisc: boolean;2322    readonly isMisc: boolean;
2077  }2325  }
20782326
2079<<<<<<< HEAD2327<<<<<<< HEAD
2328<<<<<<< HEAD
2080  /** @name PalletBalancesReserveData (174) */2329  /** @name PalletBalancesReserveData (174) */
2081=======2330=======
2331=======
2332>>>>>>> fix: regenerate types after rebase
2082<<<<<<< HEAD2333<<<<<<< HEAD
2083  /** @name PalletBalancesReserveData (175) */2334  /** @name PalletBalancesReserveData (175) */
2084=======2335=======
2088  /** @name PalletBalancesReserveData (179) */2339  /** @name PalletBalancesReserveData (179) */
2089>>>>>>> chore:  regenerate types2340>>>>>>> chore:  regenerate types
2090>>>>>>> chore:  regenerate types2341>>>>>>> chore:  regenerate types
2342<<<<<<< HEAD
2091>>>>>>> chore:  regenerate types2343>>>>>>> chore:  regenerate types
2344=======
2345=======
2346  /** @name PalletBalancesReserveData (178) */
2347>>>>>>> fix: regenerate types after rebase
2348>>>>>>> fix: regenerate types after rebase
2092  interface PalletBalancesReserveData extends Struct {2349  interface PalletBalancesReserveData extends Struct {
2093    readonly id: U8aFixed;2350    readonly id: U8aFixed;
2094    readonly amount: u128;2351    readonly amount: u128;
2095  }2352  }
20962353
2097<<<<<<< HEAD2354<<<<<<< HEAD
2355<<<<<<< HEAD
2098  /** @name PalletBalancesCall (176) */2356  /** @name PalletBalancesCall (176) */
2099=======2357=======
2358=======
2359>>>>>>> fix: regenerate types after rebase
2100<<<<<<< HEAD2360<<<<<<< HEAD
2101  /** @name PalletBalancesReleases (177) */2361  /** @name PalletBalancesReleases (177) */
2102=======2362=======
2106  /** @name PalletBalancesReleases (181) */2366  /** @name PalletBalancesReleases (181) */
2107>>>>>>> chore:  regenerate types2367>>>>>>> chore:  regenerate types
2108>>>>>>> chore:  regenerate types2368>>>>>>> chore:  regenerate types
2369=======
2370  /** @name PalletBalancesReleases (180) */
2371>>>>>>> fix: regenerate types after rebase
2109  interface PalletBalancesReleases extends Enum {2372  interface PalletBalancesReleases extends Enum {
2110    readonly isV100: boolean;2373    readonly isV100: boolean;
2111    readonly isV200: boolean;2374    readonly isV200: boolean;
2112    readonly type: 'V100' | 'V200';2375    readonly type: 'V100' | 'V200';
2113  }2376  }
21142377
2115<<<<<<< HEAD2378<<<<<<< HEAD
2379<<<<<<< HEAD
2116  /** @name PalletBalancesCall (178) */2380  /** @name PalletBalancesCall (178) */
2117=======2381=======
2118<<<<<<< HEAD2382<<<<<<< HEAD
2121  /** @name PalletBalancesCall (182) */2385  /** @name PalletBalancesCall (182) */
2122>>>>>>> chore:  regenerate types2386>>>>>>> chore:  regenerate types
2123>>>>>>> chore:  regenerate types2387>>>>>>> chore:  regenerate types
2388<<<<<<< HEAD
2124>>>>>>> chore:  regenerate types2389>>>>>>> chore:  regenerate types
2390=======
2391=======
2392  /** @name PalletBalancesCall (181) */
2393>>>>>>> fix: regenerate types after rebase
2394>>>>>>> fix: regenerate types after rebase
2125  interface PalletBalancesCall extends Enum {2395  interface PalletBalancesCall extends Enum {
2126    readonly isTransfer: boolean;2396    readonly isTransfer: boolean;
2127    readonly asTransfer: {2397    readonly asTransfer: {
2159  }2429  }
21602430
2161<<<<<<< HEAD2431<<<<<<< HEAD
2432<<<<<<< HEAD
2162  /** @name PalletBalancesError (179) */2433  /** @name PalletBalancesError (179) */
2163=======2434=======
2435=======
2436>>>>>>> fix: regenerate types after rebase
2164<<<<<<< HEAD2437<<<<<<< HEAD
2165  /** @name PalletBalancesError (181) */2438  /** @name PalletBalancesError (181) */
2166=======2439=======
2170  /** @name PalletBalancesError (185) */2443  /** @name PalletBalancesError (185) */
2171>>>>>>> chore:  regenerate types2444>>>>>>> chore:  regenerate types
2172>>>>>>> chore:  regenerate types2445>>>>>>> chore:  regenerate types
2446<<<<<<< HEAD
2173>>>>>>> chore:  regenerate types2447>>>>>>> chore:  regenerate types
2448=======
2449=======
2450  /** @name PalletBalancesError (184) */
2451>>>>>>> fix: regenerate types after rebase
2452>>>>>>> fix: regenerate types after rebase
2174  interface PalletBalancesError extends Enum {2453  interface PalletBalancesError extends Enum {
2175    readonly isVestingBalance: boolean;2454    readonly isVestingBalance: boolean;
2176    readonly isLiquidityRestrictions: boolean;2455    readonly isLiquidityRestrictions: boolean;
2184  }2463  }
21852464
2186<<<<<<< HEAD2465<<<<<<< HEAD
2466<<<<<<< HEAD
2187  /** @name PalletTimestampCall (181) */2467  /** @name PalletTimestampCall (181) */
2188=======2468=======
2469=======
2470>>>>>>> fix: regenerate types after rebase
2189<<<<<<< HEAD2471<<<<<<< HEAD
2190  /** @name PalletTimestampCall (183) */2472  /** @name PalletTimestampCall (183) */
2191=======2473=======
2195  /** @name PalletTimestampCall (187) */2477  /** @name PalletTimestampCall (187) */
2196>>>>>>> chore:  regenerate types2478>>>>>>> chore:  regenerate types
2197>>>>>>> chore:  regenerate types2479>>>>>>> chore:  regenerate types
2480<<<<<<< HEAD
2198>>>>>>> chore:  regenerate types2481>>>>>>> chore:  regenerate types
2482=======
2483=======
2484  /** @name PalletTimestampCall (186) */
2485>>>>>>> fix: regenerate types after rebase
2486>>>>>>> fix: regenerate types after rebase
2199  interface PalletTimestampCall extends Enum {2487  interface PalletTimestampCall extends Enum {
2200    readonly isSet: boolean;2488    readonly isSet: boolean;
2201    readonly asSet: {2489    readonly asSet: {
2205  }2493  }
22062494
2207<<<<<<< HEAD2495<<<<<<< HEAD
2496<<<<<<< HEAD
2208  /** @name PalletTransactionPaymentReleases (183) */2497  /** @name PalletTransactionPaymentReleases (183) */
2209=======2498=======
2499=======
2500>>>>>>> fix: regenerate types after rebase
2210<<<<<<< HEAD2501<<<<<<< HEAD
2211  /** @name PalletTransactionPaymentReleases (185) */2502  /** @name PalletTransactionPaymentReleases (185) */
2212=======2503=======
2216  /** @name PalletTransactionPaymentReleases (189) */2507  /** @name PalletTransactionPaymentReleases (189) */
2217>>>>>>> chore:  regenerate types2508>>>>>>> chore:  regenerate types
2218>>>>>>> chore:  regenerate types2509>>>>>>> chore:  regenerate types
2510<<<<<<< HEAD
2219>>>>>>> chore:  regenerate types2511>>>>>>> chore:  regenerate types
2512=======
2513=======
2514  /** @name PalletTransactionPaymentReleases (188) */
2515>>>>>>> fix: regenerate types after rebase
2516>>>>>>> fix: regenerate types after rebase
2220  interface PalletTransactionPaymentReleases extends Enum {2517  interface PalletTransactionPaymentReleases extends Enum {
2221    readonly isV1Ancient: boolean;2518    readonly isV1Ancient: boolean;
2222    readonly isV2: boolean;2519    readonly isV2: boolean;
2223    readonly type: 'V1Ancient' | 'V2';2520    readonly type: 'V1Ancient' | 'V2';
2224  }2521  }
22252522
2226<<<<<<< HEAD2523<<<<<<< HEAD
2524<<<<<<< HEAD
2227  /** @name PalletTreasuryProposal (184) */2525  /** @name PalletTreasuryProposal (184) */
2228=======2526=======
2527=======
2528>>>>>>> fix: regenerate types after rebase
2229<<<<<<< HEAD2529<<<<<<< HEAD
2230  /** @name PalletTreasuryProposal (186) */2530  /** @name PalletTreasuryProposal (186) */
2231=======2531=======
2235  /** @name PalletTreasuryProposal (190) */2535  /** @name PalletTreasuryProposal (190) */
2236>>>>>>> chore:  regenerate types2536>>>>>>> chore:  regenerate types
2237>>>>>>> chore:  regenerate types2537>>>>>>> chore:  regenerate types
2538<<<<<<< HEAD
2238>>>>>>> chore:  regenerate types2539>>>>>>> chore:  regenerate types
2540=======
2541=======
2542  /** @name PalletTreasuryProposal (189) */
2543>>>>>>> fix: regenerate types after rebase
2544>>>>>>> fix: regenerate types after rebase
2239  interface PalletTreasuryProposal extends Struct {2545  interface PalletTreasuryProposal extends Struct {
2240    readonly proposer: AccountId32;2546    readonly proposer: AccountId32;
2241    readonly value: u128;2547    readonly value: u128;
2244  }2550  }
22452551
2246<<<<<<< HEAD2552<<<<<<< HEAD
2553<<<<<<< HEAD
2247  /** @name PalletTreasuryCall (187) */2554  /** @name PalletTreasuryCall (187) */
2248=======2555=======
2556=======
2557>>>>>>> fix: regenerate types after rebase
2249<<<<<<< HEAD2558<<<<<<< HEAD
2250  /** @name PalletTreasuryCall (189) */2559  /** @name PalletTreasuryCall (189) */
2251=======2560=======
2255  /** @name PalletTreasuryCall (193) */2564  /** @name PalletTreasuryCall (193) */
2256>>>>>>> chore:  regenerate types2565>>>>>>> chore:  regenerate types
2257>>>>>>> chore:  regenerate types2566>>>>>>> chore:  regenerate types
2567<<<<<<< HEAD
2258>>>>>>> chore:  regenerate types2568>>>>>>> chore:  regenerate types
2569=======
2570=======
2571  /** @name PalletTreasuryCall (192) */
2572>>>>>>> fix: regenerate types after rebase
2573>>>>>>> fix: regenerate types after rebase
2259  interface PalletTreasuryCall extends Enum {2574  interface PalletTreasuryCall extends Enum {
2260    readonly isProposeSpend: boolean;2575    readonly isProposeSpend: boolean;
2261    readonly asProposeSpend: {2576    readonly asProposeSpend: {
2283  }2598  }
22842599
2285<<<<<<< HEAD2600<<<<<<< HEAD
2601<<<<<<< HEAD
2286  /** @name FrameSupportPalletId (190) */2602  /** @name FrameSupportPalletId (190) */
2287  interface FrameSupportPalletId extends U8aFixed {}2603  interface FrameSupportPalletId extends U8aFixed {}
22882604
2289  /** @name PalletTreasuryError (191) */2605  /** @name PalletTreasuryError (191) */
2290=======2606=======
2607=======
2608>>>>>>> fix: regenerate types after rebase
2291<<<<<<< HEAD2609<<<<<<< HEAD
2292  /** @name FrameSupportPalletId (192) */2610  /** @name FrameSupportPalletId (192) */
2293  interface FrameSupportPalletId extends U8aFixed {}2611  interface FrameSupportPalletId extends U8aFixed {}
22942612
2295  /** @name PalletTreasuryError (193) */2613  /** @name PalletTreasuryError (193) */
2296=======2614=======
2297<<<<<<< HEAD2615<<<<<<< HEAD
2616=======
2617>>>>>>> fix: regenerate types after rebase
2298  /** @name FrameSupportPalletId (195) */2618  /** @name FrameSupportPalletId (195) */
2299  interface FrameSupportPalletId extends U8aFixed {}2619  interface FrameSupportPalletId extends U8aFixed {}
23002620
2301  /** @name PalletTreasuryError (196) */2621  /** @name PalletTreasuryError (196) */
2622<<<<<<< HEAD
2302=======2623=======
2303  /** @name FrameSupportPalletId (196) */2624  /** @name FrameSupportPalletId (196) */
2304  interface FrameSupportPalletId extends U8aFixed {}2625  interface FrameSupportPalletId extends U8aFixed {}
23052626
2306  /** @name PalletTreasuryError (197) */2627  /** @name PalletTreasuryError (197) */
2307>>>>>>> chore:  regenerate types2628>>>>>>> chore:  regenerate types
2308>>>>>>> chore:  regenerate types2629>>>>>>> chore:  regenerate types
2630<<<<<<< HEAD
2309>>>>>>> chore:  regenerate types2631>>>>>>> chore:  regenerate types
2632=======
2633=======
2634>>>>>>> fix: regenerate types after rebase
2635>>>>>>> fix: regenerate types after rebase
2310  interface PalletTreasuryError extends Enum {2636  interface PalletTreasuryError extends Enum {
2311    readonly isInsufficientProposersBalance: boolean;2637    readonly isInsufficientProposersBalance: boolean;
2312    readonly isInvalidIndex: boolean;2638    readonly isInvalidIndex: boolean;
2317  }2643  }
23182644
2319<<<<<<< HEAD2645<<<<<<< HEAD
2646<<<<<<< HEAD
2320  /** @name PalletSudoCall (192) */2647  /** @name PalletSudoCall (192) */
2321=======2648=======
2649=======
2650>>>>>>> fix: regenerate types after rebase
2322<<<<<<< HEAD2651<<<<<<< HEAD
2323  /** @name PalletSudoCall (194) */2652  /** @name PalletSudoCall (194) */
2324=======2653=======
2328  /** @name PalletSudoCall (198) */2657  /** @name PalletSudoCall (198) */
2329>>>>>>> chore:  regenerate types2658>>>>>>> chore:  regenerate types
2330>>>>>>> chore:  regenerate types2659>>>>>>> chore:  regenerate types
2660<<<<<<< HEAD
2331>>>>>>> chore:  regenerate types2661>>>>>>> chore:  regenerate types
2662=======
2663=======
2664  /** @name PalletSudoCall (197) */
2665>>>>>>> fix: regenerate types after rebase
2666>>>>>>> fix: regenerate types after rebase
2332  interface PalletSudoCall extends Enum {2667  interface PalletSudoCall extends Enum {
2333    readonly isSudo: boolean;2668    readonly isSudo: boolean;
2334    readonly asSudo: {2669    readonly asSudo: {
2352  }2687  }
23532688
2354<<<<<<< HEAD2689<<<<<<< HEAD
2690<<<<<<< HEAD
2355  /** @name OrmlVestingModuleCall (194) */2691  /** @name OrmlVestingModuleCall (194) */
2356=======2692=======
2693=======
2694>>>>>>> fix: regenerate types after rebase
2357<<<<<<< HEAD2695<<<<<<< HEAD
2358  /** @name OrmlVestingModuleCall (196) */2696  /** @name OrmlVestingModuleCall (196) */
2359=======2697=======
2363  /** @name OrmlVestingModuleCall (200) */2701  /** @name OrmlVestingModuleCall (200) */
2364>>>>>>> chore:  regenerate types2702>>>>>>> chore:  regenerate types
2365>>>>>>> chore:  regenerate types2703>>>>>>> chore:  regenerate types
2704<<<<<<< HEAD
2366>>>>>>> chore:  regenerate types2705>>>>>>> chore:  regenerate types
2706=======
2707=======
2708  /** @name OrmlVestingModuleCall (199) */
2709>>>>>>> fix: regenerate types after rebase
2710>>>>>>> fix: regenerate types after rebase
2367  interface OrmlVestingModuleCall extends Enum {2711  interface OrmlVestingModuleCall extends Enum {
2368    readonly isClaim: boolean;2712    readonly isClaim: boolean;
2369    readonly isVestedTransfer: boolean;2713    readonly isVestedTransfer: boolean;
2384  }2728  }
23852729
2386<<<<<<< HEAD2730<<<<<<< HEAD
2731<<<<<<< HEAD
2387  /** @name OrmlXtokensModuleCall (196) */2732  /** @name OrmlXtokensModuleCall (196) */
2388=======2733=======
2734=======
2735>>>>>>> fix: regenerate types after rebase
2389<<<<<<< HEAD2736<<<<<<< HEAD
2390  /** @name OrmlXtokensModuleCall (198) */2737  /** @name OrmlXtokensModuleCall (198) */
2391=======2738=======
2395  /** @name OrmlXtokensModuleCall (202) */2742  /** @name OrmlXtokensModuleCall (202) */
2396>>>>>>> chore:  regenerate types2743>>>>>>> chore:  regenerate types
2397>>>>>>> chore:  regenerate types2744>>>>>>> chore:  regenerate types
2745<<<<<<< HEAD
2398>>>>>>> chore:  regenerate types2746>>>>>>> chore:  regenerate types
2747=======
2748=======
2749  /** @name OrmlXtokensModuleCall (201) */
2750>>>>>>> fix: regenerate types after rebase
2751>>>>>>> fix: regenerate types after rebase
2399  interface OrmlXtokensModuleCall extends Enum {2752  interface OrmlXtokensModuleCall extends Enum {
2400    readonly isTransfer: boolean;2753    readonly isTransfer: boolean;
2401    readonly asTransfer: {2754    readonly asTransfer: {
2443  }2796  }
24442797
2445<<<<<<< HEAD2798<<<<<<< HEAD
2799<<<<<<< HEAD
2446  /** @name XcmVersionedMultiAsset (197) */2800  /** @name XcmVersionedMultiAsset (197) */
2447=======2801=======
2802=======
2803>>>>>>> fix: regenerate types after rebase
2448<<<<<<< HEAD2804<<<<<<< HEAD
2449  /** @name XcmVersionedMultiAsset (199) */2805  /** @name XcmVersionedMultiAsset (199) */
2450=======2806=======
2454  /** @name XcmVersionedMultiAsset (203) */2810  /** @name XcmVersionedMultiAsset (203) */
2455>>>>>>> chore:  regenerate types2811>>>>>>> chore:  regenerate types
2456>>>>>>> chore:  regenerate types2812>>>>>>> chore:  regenerate types
2813<<<<<<< HEAD
2457>>>>>>> chore:  regenerate types2814>>>>>>> chore:  regenerate types
2815=======
2816=======
2817  /** @name XcmVersionedMultiAsset (202) */
2818>>>>>>> fix: regenerate types after rebase
2819>>>>>>> fix: regenerate types after rebase
2458  interface XcmVersionedMultiAsset extends Enum {2820  interface XcmVersionedMultiAsset extends Enum {
2459    readonly isV0: boolean;2821    readonly isV0: boolean;
2460    readonly asV0: XcmV0MultiAsset;2822    readonly asV0: XcmV0MultiAsset;
2464  }2826  }
24652827
2466<<<<<<< HEAD2828<<<<<<< HEAD
2829<<<<<<< HEAD
2467  /** @name OrmlTokensModuleCall (200) */2830  /** @name OrmlTokensModuleCall (200) */
2468=======2831=======
2832=======
2833>>>>>>> fix: regenerate types after rebase
2469<<<<<<< HEAD2834<<<<<<< HEAD
2470  /** @name OrmlTokensModuleCall (202) */2835  /** @name OrmlTokensModuleCall (202) */
2471=======2836=======
2475  /** @name OrmlTokensModuleCall (206) */2840  /** @name OrmlTokensModuleCall (206) */
2476>>>>>>> chore:  regenerate types2841>>>>>>> chore:  regenerate types
2477>>>>>>> chore:  regenerate types2842>>>>>>> chore:  regenerate types
2843<<<<<<< HEAD
2478>>>>>>> chore:  regenerate types2844>>>>>>> chore:  regenerate types
2845=======
2846=======
2847  /** @name OrmlTokensModuleCall (205) */
2848>>>>>>> fix: regenerate types after rebase
2849>>>>>>> fix: regenerate types after rebase
2479  interface OrmlTokensModuleCall extends Enum {2850  interface OrmlTokensModuleCall extends Enum {
2480    readonly isTransfer: boolean;2851    readonly isTransfer: boolean;
2481    readonly asTransfer: {2852    readonly asTransfer: {
2513  }2884  }
25142885
2515<<<<<<< HEAD2886<<<<<<< HEAD
2887<<<<<<< HEAD
2516  /** @name CumulusPalletXcmpQueueCall (201) */2888  /** @name CumulusPalletXcmpQueueCall (201) */
2517=======2889=======
2890=======
2891>>>>>>> fix: regenerate types after rebase
2518<<<<<<< HEAD2892<<<<<<< HEAD
2519  /** @name CumulusPalletXcmpQueueCall (203) */2893  /** @name CumulusPalletXcmpQueueCall (203) */
2520=======2894=======
2524  /** @name CumulusPalletXcmpQueueCall (207) */2898  /** @name CumulusPalletXcmpQueueCall (207) */
2525>>>>>>> chore:  regenerate types2899>>>>>>> chore:  regenerate types
2526>>>>>>> chore:  regenerate types2900>>>>>>> chore:  regenerate types
2901<<<<<<< HEAD
2527>>>>>>> chore:  regenerate types2902>>>>>>> chore:  regenerate types
2903=======
2904=======
2905  /** @name CumulusPalletXcmpQueueCall (206) */
2906>>>>>>> fix: regenerate types after rebase
2907>>>>>>> fix: regenerate types after rebase
2528  interface CumulusPalletXcmpQueueCall extends Enum {2908  interface CumulusPalletXcmpQueueCall extends Enum {
2529    readonly isServiceOverweight: boolean;2909    readonly isServiceOverweight: boolean;
2530    readonly asServiceOverweight: {2910    readonly asServiceOverweight: {
2561  }2941  }
25622942
2563<<<<<<< HEAD2943<<<<<<< HEAD
2944<<<<<<< HEAD
2564  /** @name PalletXcmCall (202) */2945  /** @name PalletXcmCall (202) */
2565=======2946=======
2947=======
2948>>>>>>> fix: regenerate types after rebase
2566<<<<<<< HEAD2949<<<<<<< HEAD
2567  /** @name PalletXcmCall (204) */2950  /** @name PalletXcmCall (204) */
2568=======2951=======
2572  /** @name PalletXcmCall (208) */2955  /** @name PalletXcmCall (208) */
2573>>>>>>> chore:  regenerate types2956>>>>>>> chore:  regenerate types
2574>>>>>>> chore:  regenerate types2957>>>>>>> chore:  regenerate types
2958<<<<<<< HEAD
2575>>>>>>> chore:  regenerate types2959>>>>>>> chore:  regenerate types
2960=======
2961=======
2962  /** @name PalletXcmCall (207) */
2963>>>>>>> fix: regenerate types after rebase
2964>>>>>>> fix: regenerate types after rebase
2576  interface PalletXcmCall extends Enum {2965  interface PalletXcmCall extends Enum {
2577    readonly isSend: boolean;2966    readonly isSend: boolean;
2578    readonly asSend: {2967    readonly asSend: {
2635  }3024  }
26363025
2637<<<<<<< HEAD3026<<<<<<< HEAD
3027<<<<<<< HEAD
2638  /** @name XcmVersionedXcm (203) */3028  /** @name XcmVersionedXcm (203) */
2639=======3029=======
3030=======
3031>>>>>>> fix: regenerate types after rebase
2640<<<<<<< HEAD3032<<<<<<< HEAD
2641  /** @name XcmVersionedXcm (205) */3033  /** @name XcmVersionedXcm (205) */
2642=======3034=======
2646  /** @name XcmVersionedXcm (209) */3038  /** @name XcmVersionedXcm (209) */
2647>>>>>>> chore:  regenerate types3039>>>>>>> chore:  regenerate types
2648>>>>>>> chore:  regenerate types3040>>>>>>> chore:  regenerate types
3041<<<<<<< HEAD
2649>>>>>>> chore:  regenerate types3042>>>>>>> chore:  regenerate types
3043=======
3044=======
3045  /** @name XcmVersionedXcm (208) */
3046>>>>>>> fix: regenerate types after rebase
3047>>>>>>> fix: regenerate types after rebase
2650  interface XcmVersionedXcm extends Enum {3048  interface XcmVersionedXcm extends Enum {
2651    readonly isV0: boolean;3049    readonly isV0: boolean;
2652    readonly asV0: XcmV0Xcm;3050    readonly asV0: XcmV0Xcm;
2658  }3056  }
26593057
2660<<<<<<< HEAD3058<<<<<<< HEAD
3059<<<<<<< HEAD
2661  /** @name XcmV0Xcm (204) */3060  /** @name XcmV0Xcm (204) */
2662=======3061=======
3062=======
3063>>>>>>> fix: regenerate types after rebase
2663<<<<<<< HEAD3064<<<<<<< HEAD
2664  /** @name XcmV0Xcm (206) */3065  /** @name XcmV0Xcm (206) */
2665=======3066=======
2669  /** @name XcmV0Xcm (210) */3070  /** @name XcmV0Xcm (210) */
2670>>>>>>> chore:  regenerate types3071>>>>>>> chore:  regenerate types
2671>>>>>>> chore:  regenerate types3072>>>>>>> chore:  regenerate types
3073<<<<<<< HEAD
2672>>>>>>> chore:  regenerate types3074>>>>>>> chore:  regenerate types
3075=======
3076=======
3077  /** @name XcmV0Xcm (209) */
3078>>>>>>> fix: regenerate types after rebase
3079>>>>>>> fix: regenerate types after rebase
2673  interface XcmV0Xcm extends Enum {3080  interface XcmV0Xcm extends Enum {
2674    readonly isWithdrawAsset: boolean;3081    readonly isWithdrawAsset: boolean;
2675    readonly asWithdrawAsset: {3082    readonly asWithdrawAsset: {
2733  }3140  }
27343141
2735<<<<<<< HEAD3142<<<<<<< HEAD
3143<<<<<<< HEAD
2736  /** @name XcmV0Order (206) */3144  /** @name XcmV0Order (206) */
2737=======3145=======
3146=======
3147>>>>>>> fix: regenerate types after rebase
2738<<<<<<< HEAD3148<<<<<<< HEAD
2739  /** @name XcmV0Order (208) */3149  /** @name XcmV0Order (208) */
2740=======3150=======
2744  /** @name XcmV0Order (212) */3154  /** @name XcmV0Order (212) */
2745>>>>>>> chore:  regenerate types3155>>>>>>> chore:  regenerate types
2746>>>>>>> chore:  regenerate types3156>>>>>>> chore:  regenerate types
3157<<<<<<< HEAD
2747>>>>>>> chore:  regenerate types3158>>>>>>> chore:  regenerate types
3159=======
3160=======
3161  /** @name XcmV0Order (211) */
3162>>>>>>> fix: regenerate types after rebase
3163>>>>>>> fix: regenerate types after rebase
2748  interface XcmV0Order extends Enum {3164  interface XcmV0Order extends Enum {
2749    readonly isNull: boolean;3165    readonly isNull: boolean;
2750    readonly isDepositAsset: boolean;3166    readonly isDepositAsset: boolean;
2793  }3209  }
27943210
2795<<<<<<< HEAD3211<<<<<<< HEAD
3212<<<<<<< HEAD
2796  /** @name XcmV0Response (208) */3213  /** @name XcmV0Response (208) */
2797=======3214=======
3215=======
3216>>>>>>> fix: regenerate types after rebase
2798<<<<<<< HEAD3217<<<<<<< HEAD
2799  /** @name XcmV0Response (210) */3218  /** @name XcmV0Response (210) */
2800=======3219=======
2804  /** @name XcmV0Response (214) */3223  /** @name XcmV0Response (214) */
2805>>>>>>> chore:  regenerate types3224>>>>>>> chore:  regenerate types
2806>>>>>>> chore:  regenerate types3225>>>>>>> chore:  regenerate types
3226<<<<<<< HEAD
2807>>>>>>> chore:  regenerate types3227>>>>>>> chore:  regenerate types
3228=======
3229=======
3230  /** @name XcmV0Response (213) */
3231>>>>>>> fix: regenerate types after rebase
3232>>>>>>> fix: regenerate types after rebase
2808  interface XcmV0Response extends Enum {3233  interface XcmV0Response extends Enum {
2809    readonly isAssets: boolean;3234    readonly isAssets: boolean;
2810    readonly asAssets: Vec<XcmV0MultiAsset>;3235    readonly asAssets: Vec<XcmV0MultiAsset>;
2811    readonly type: 'Assets';3236    readonly type: 'Assets';
2812  }3237  }
28133238
2814<<<<<<< HEAD3239<<<<<<< HEAD
3240<<<<<<< HEAD
2815  /** @name XcmV1Xcm (209) */3241  /** @name XcmV1Xcm (209) */
2816=======3242=======
3243=======
3244>>>>>>> fix: regenerate types after rebase
2817<<<<<<< HEAD3245<<<<<<< HEAD
2818  /** @name XcmV1Xcm (211) */3246  /** @name XcmV1Xcm (211) */
2819=======3247=======
2823  /** @name XcmV1Xcm (215) */3251  /** @name XcmV1Xcm (215) */
2824>>>>>>> chore:  regenerate types3252>>>>>>> chore:  regenerate types
2825>>>>>>> chore:  regenerate types3253>>>>>>> chore:  regenerate types
3254<<<<<<< HEAD
2826>>>>>>> chore:  regenerate types3255>>>>>>> chore:  regenerate types
3256=======
3257=======
3258  /** @name XcmV1Xcm (214) */
3259>>>>>>> fix: regenerate types after rebase
3260>>>>>>> fix: regenerate types after rebase
2827  interface XcmV1Xcm extends Enum {3261  interface XcmV1Xcm extends Enum {
2828    readonly isWithdrawAsset: boolean;3262    readonly isWithdrawAsset: boolean;
2829    readonly asWithdrawAsset: {3263    readonly asWithdrawAsset: {
2893  }3327  }
28943328
2895<<<<<<< HEAD3329<<<<<<< HEAD
3330<<<<<<< HEAD
2896  /** @name XcmV1Order (211) */3331  /** @name XcmV1Order (211) */
2897=======3332=======
3333=======
3334>>>>>>> fix: regenerate types after rebase
2898<<<<<<< HEAD3335<<<<<<< HEAD
2899  /** @name XcmV1Order (213) */3336  /** @name XcmV1Order (213) */
2900=======3337=======
2904  /** @name XcmV1Order (217) */3341  /** @name XcmV1Order (217) */
2905>>>>>>> chore:  regenerate types3342>>>>>>> chore:  regenerate types
2906>>>>>>> chore:  regenerate types3343>>>>>>> chore:  regenerate types
3344<<<<<<< HEAD
2907>>>>>>> chore:  regenerate types3345>>>>>>> chore:  regenerate types
3346=======
3347=======
3348  /** @name XcmV1Order (216) */
3349>>>>>>> fix: regenerate types after rebase
3350>>>>>>> fix: regenerate types after rebase
2908  interface XcmV1Order extends Enum {3351  interface XcmV1Order extends Enum {
2909    readonly isNoop: boolean;3352    readonly isNoop: boolean;
2910    readonly isDepositAsset: boolean;3353    readonly isDepositAsset: boolean;
2955  }3398  }
29563399
2957<<<<<<< HEAD3400<<<<<<< HEAD
3401<<<<<<< HEAD
2958  /** @name XcmV1Response (213) */3402  /** @name XcmV1Response (213) */
2959=======3403=======
3404=======
3405>>>>>>> fix: regenerate types after rebase
2960<<<<<<< HEAD3406<<<<<<< HEAD
2961  /** @name XcmV1Response (215) */3407  /** @name XcmV1Response (215) */
2962=======3408=======
2966  /** @name XcmV1Response (219) */3412  /** @name XcmV1Response (219) */
2967>>>>>>> chore:  regenerate types3413>>>>>>> chore:  regenerate types
2968>>>>>>> chore:  regenerate types3414>>>>>>> chore:  regenerate types
3415<<<<<<< HEAD
2969>>>>>>> chore:  regenerate types3416>>>>>>> chore:  regenerate types
3417=======
3418=======
3419  /** @name XcmV1Response (218) */
3420>>>>>>> fix: regenerate types after rebase
3421>>>>>>> fix: regenerate types after rebase
2970  interface XcmV1Response extends Enum {3422  interface XcmV1Response extends Enum {
2971    readonly isAssets: boolean;3423    readonly isAssets: boolean;
2972    readonly asAssets: XcmV1MultiassetMultiAssets;3424    readonly asAssets: XcmV1MultiassetMultiAssets;
2976  }3428  }
29773429
2978<<<<<<< HEAD3430<<<<<<< HEAD
3431<<<<<<< HEAD
2979  /** @name CumulusPalletXcmCall (227) */3432  /** @name CumulusPalletXcmCall (227) */
2980  type CumulusPalletXcmCall = Null;3433  type CumulusPalletXcmCall = Null;
29813434
2982  /** @name CumulusPalletDmpQueueCall (228) */3435  /** @name CumulusPalletDmpQueueCall (228) */
2983=======3436=======
3437=======
3438>>>>>>> fix: regenerate types after rebase
2984<<<<<<< HEAD3439<<<<<<< HEAD
2985  /** @name CumulusPalletXcmCall (229) */3440  /** @name CumulusPalletXcmCall (229) */
2986  type CumulusPalletXcmCall = Null;3441  type CumulusPalletXcmCall = Null;
29873442
2988  /** @name CumulusPalletDmpQueueCall (230) */3443  /** @name CumulusPalletDmpQueueCall (230) */
2989=======3444=======
2990<<<<<<< HEAD3445<<<<<<< HEAD
3446=======
3447>>>>>>> fix: regenerate types after rebase
2991  /** @name CumulusPalletXcmCall (232) */3448  /** @name CumulusPalletXcmCall (232) */
2992  type CumulusPalletXcmCall = Null;3449  type CumulusPalletXcmCall = Null;
29933450
2994  /** @name CumulusPalletDmpQueueCall (233) */3451  /** @name CumulusPalletDmpQueueCall (233) */
3452<<<<<<< HEAD
2995=======3453=======
2996  /** @name CumulusPalletXcmCall (233) */3454  /** @name CumulusPalletXcmCall (233) */
2997  type CumulusPalletXcmCall = Null;3455  type CumulusPalletXcmCall = Null;
29983456
2999  /** @name CumulusPalletDmpQueueCall (234) */3457  /** @name CumulusPalletDmpQueueCall (234) */
3000>>>>>>> chore:  regenerate types3458>>>>>>> chore:  regenerate types
3001>>>>>>> chore:  regenerate types3459>>>>>>> chore:  regenerate types
3460<<<<<<< HEAD
3002>>>>>>> chore:  regenerate types3461>>>>>>> chore:  regenerate types
3462=======
3463=======
3464>>>>>>> fix: regenerate types after rebase
3465>>>>>>> fix: regenerate types after rebase
3003  interface CumulusPalletDmpQueueCall extends Enum {3466  interface CumulusPalletDmpQueueCall extends Enum {
3004    readonly isServiceOverweight: boolean;3467    readonly isServiceOverweight: boolean;
3005    readonly asServiceOverweight: {3468    readonly asServiceOverweight: {
3010  }3473  }
30113474
3012<<<<<<< HEAD3475<<<<<<< HEAD
3476<<<<<<< HEAD
3013  /** @name PalletInflationCall (229) */3477  /** @name PalletInflationCall (229) */
3014=======3478=======
3479=======
3480>>>>>>> fix: regenerate types after rebase
3015<<<<<<< HEAD3481<<<<<<< HEAD
3016  /** @name PalletInflationCall (231) */3482  /** @name PalletInflationCall (231) */
3017=======3483=======
3021  /** @name PalletInflationCall (235) */3487  /** @name PalletInflationCall (235) */
3022>>>>>>> chore:  regenerate types3488>>>>>>> chore:  regenerate types
3023>>>>>>> chore:  regenerate types3489>>>>>>> chore:  regenerate types
3490<<<<<<< HEAD
3024>>>>>>> chore:  regenerate types3491>>>>>>> chore:  regenerate types
3492=======
3493=======
3494  /** @name PalletInflationCall (234) */
3495>>>>>>> fix: regenerate types after rebase
3496>>>>>>> fix: regenerate types after rebase
3025  interface PalletInflationCall extends Enum {3497  interface PalletInflationCall extends Enum {
3026    readonly isStartInflation: boolean;3498    readonly isStartInflation: boolean;
3027    readonly asStartInflation: {3499    readonly asStartInflation: {
3031  }3503  }
30323504
3033<<<<<<< HEAD3505<<<<<<< HEAD
3506<<<<<<< HEAD
3034  /** @name PalletUniqueCall (230) */3507  /** @name PalletUniqueCall (230) */
3035=======3508=======
3509=======
3510>>>>>>> fix: regenerate types after rebase
3036<<<<<<< HEAD3511<<<<<<< HEAD
3037  /** @name PalletUniqueCall (232) */3512  /** @name PalletUniqueCall (232) */
3038=======3513=======
3042  /** @name PalletUniqueCall (236) */3517  /** @name PalletUniqueCall (236) */
3043>>>>>>> chore:  regenerate types3518>>>>>>> chore:  regenerate types
3044>>>>>>> chore:  regenerate types3519>>>>>>> chore:  regenerate types
3520<<<<<<< HEAD
3045>>>>>>> chore:  regenerate types3521>>>>>>> chore:  regenerate types
3522=======
3523=======
3524  /** @name PalletUniqueCall (235) */
3525>>>>>>> fix: regenerate types after rebase
3526>>>>>>> fix: regenerate types after rebase
3046  interface PalletUniqueCall extends Enum {3527  interface PalletUniqueCall extends Enum {
3047    readonly isCreateCollection: boolean;3528    readonly isCreateCollection: boolean;
3048    readonly asCreateCollection: {3529    readonly asCreateCollection: {
3216  }3697  }
32173698
3218<<<<<<< HEAD3699<<<<<<< HEAD
3700<<<<<<< HEAD
3219  /** @name UpDataStructsCollectionMode (235) */3701  /** @name UpDataStructsCollectionMode (235) */
3220=======3702=======
3703=======
3704>>>>>>> fix: regenerate types after rebase
3221<<<<<<< HEAD3705<<<<<<< HEAD
3222  /** @name UpDataStructsCollectionMode (237) */3706  /** @name UpDataStructsCollectionMode (237) */
3223=======3707=======
3227  /** @name UpDataStructsCollectionMode (241) */3711  /** @name UpDataStructsCollectionMode (241) */
3228>>>>>>> chore:  regenerate types3712>>>>>>> chore:  regenerate types
3229>>>>>>> chore:  regenerate types3713>>>>>>> chore:  regenerate types
3714<<<<<<< HEAD
3230>>>>>>> chore:  regenerate types3715>>>>>>> chore:  regenerate types
3716=======
3717=======
3718  /** @name UpDataStructsCollectionMode (240) */
3719>>>>>>> fix: regenerate types after rebase
3720>>>>>>> fix: regenerate types after rebase
3231  interface UpDataStructsCollectionMode extends Enum {3721  interface UpDataStructsCollectionMode extends Enum {
3232    readonly isNft: boolean;3722    readonly isNft: boolean;
3233    readonly isFungible: boolean;3723    readonly isFungible: boolean;
3237  }3727  }
32383728
3239<<<<<<< HEAD3729<<<<<<< HEAD
3730<<<<<<< HEAD
3240  /** @name UpDataStructsCreateCollectionData (236) */3731  /** @name UpDataStructsCreateCollectionData (236) */
3241=======3732=======
3733=======
3734>>>>>>> fix: regenerate types after rebase
3242<<<<<<< HEAD3735<<<<<<< HEAD
3243  /** @name UpDataStructsCreateCollectionData (238) */3736  /** @name UpDataStructsCreateCollectionData (238) */
3244=======3737=======
3248  /** @name UpDataStructsCreateCollectionData (242) */3741  /** @name UpDataStructsCreateCollectionData (242) */
3249>>>>>>> chore:  regenerate types3742>>>>>>> chore:  regenerate types
3250>>>>>>> chore:  regenerate types3743>>>>>>> chore:  regenerate types
3744<<<<<<< HEAD
3251>>>>>>> chore:  regenerate types3745>>>>>>> chore:  regenerate types
3746=======
3747=======
3748  /** @name UpDataStructsCreateCollectionData (241) */
3749>>>>>>> fix: regenerate types after rebase
3750>>>>>>> fix: regenerate types after rebase
3252  interface UpDataStructsCreateCollectionData extends Struct {3751  interface UpDataStructsCreateCollectionData extends Struct {
3253    readonly mode: UpDataStructsCollectionMode;3752    readonly mode: UpDataStructsCollectionMode;
3254    readonly access: Option<UpDataStructsAccessMode>;3753    readonly access: Option<UpDataStructsAccessMode>;
3263  }3762  }
32643763
3265<<<<<<< HEAD3764<<<<<<< HEAD
3765<<<<<<< HEAD
3266  /** @name UpDataStructsAccessMode (238) */3766  /** @name UpDataStructsAccessMode (238) */
3267=======3767=======
3768=======
3769>>>>>>> fix: regenerate types after rebase
3268<<<<<<< HEAD3770<<<<<<< HEAD
3269  /** @name UpDataStructsAccessMode (240) */3771  /** @name UpDataStructsAccessMode (240) */
3270=======3772=======
3274  /** @name UpDataStructsAccessMode (244) */3776  /** @name UpDataStructsAccessMode (244) */
3275>>>>>>> chore:  regenerate types3777>>>>>>> chore:  regenerate types
3276>>>>>>> chore:  regenerate types3778>>>>>>> chore:  regenerate types
3779<<<<<<< HEAD
3277>>>>>>> chore:  regenerate types3780>>>>>>> chore:  regenerate types
3781=======
3782=======
3783  /** @name UpDataStructsAccessMode (243) */
3784>>>>>>> fix: regenerate types after rebase
3785>>>>>>> fix: regenerate types after rebase
3278  interface UpDataStructsAccessMode extends Enum {3786  interface UpDataStructsAccessMode extends Enum {
3279    readonly isNormal: boolean;3787    readonly isNormal: boolean;
3280    readonly isAllowList: boolean;3788    readonly isAllowList: boolean;
3281    readonly type: 'Normal' | 'AllowList';3789    readonly type: 'Normal' | 'AllowList';
3282  }3790  }
32833791
3284<<<<<<< HEAD3792<<<<<<< HEAD
3793<<<<<<< HEAD
3285  /** @name UpDataStructsCollectionLimits (240) */3794  /** @name UpDataStructsCollectionLimits (240) */
3286=======3795=======
3796=======
3797>>>>>>> fix: regenerate types after rebase
3287<<<<<<< HEAD3798<<<<<<< HEAD
3288  /** @name UpDataStructsCollectionLimits (242) */3799  /** @name UpDataStructsCollectionLimits (242) */
3289=======3800=======
3293  /** @name UpDataStructsCollectionLimits (246) */3804  /** @name UpDataStructsCollectionLimits (246) */
3294>>>>>>> chore:  regenerate types3805>>>>>>> chore:  regenerate types
3295>>>>>>> chore:  regenerate types3806>>>>>>> chore:  regenerate types
3807<<<<<<< HEAD
3296>>>>>>> chore:  regenerate types3808>>>>>>> chore:  regenerate types
3809=======
3810=======
3811  /** @name UpDataStructsCollectionLimits (245) */
3812>>>>>>> fix: regenerate types after rebase
3813>>>>>>> fix: regenerate types after rebase
3297  interface UpDataStructsCollectionLimits extends Struct {3814  interface UpDataStructsCollectionLimits extends Struct {
3298    readonly accountTokenOwnershipLimit: Option<u32>;3815    readonly accountTokenOwnershipLimit: Option<u32>;
3299    readonly sponsoredDataSize: Option<u32>;3816    readonly sponsoredDataSize: Option<u32>;
3307  }3824  }
33083825
3309<<<<<<< HEAD3826<<<<<<< HEAD
3827<<<<<<< HEAD
3310  /** @name UpDataStructsSponsoringRateLimit (242) */3828  /** @name UpDataStructsSponsoringRateLimit (242) */
3311=======3829=======
3830=======
3831>>>>>>> fix: regenerate types after rebase
3312<<<<<<< HEAD3832<<<<<<< HEAD
3313  /** @name UpDataStructsSponsoringRateLimit (244) */3833  /** @name UpDataStructsSponsoringRateLimit (244) */
3314=======3834=======
3318  /** @name UpDataStructsSponsoringRateLimit (248) */3838  /** @name UpDataStructsSponsoringRateLimit (248) */
3319>>>>>>> chore:  regenerate types3839>>>>>>> chore:  regenerate types
3320>>>>>>> chore:  regenerate types3840>>>>>>> chore:  regenerate types
3841<<<<<<< HEAD
3321>>>>>>> chore:  regenerate types3842>>>>>>> chore:  regenerate types
3843=======
3844=======
3845  /** @name UpDataStructsSponsoringRateLimit (247) */
3846>>>>>>> fix: regenerate types after rebase
3847>>>>>>> fix: regenerate types after rebase
3322  interface UpDataStructsSponsoringRateLimit extends Enum {3848  interface UpDataStructsSponsoringRateLimit extends Enum {
3323    readonly isSponsoringDisabled: boolean;3849    readonly isSponsoringDisabled: boolean;
3324    readonly isBlocks: boolean;3850    readonly isBlocks: boolean;
3327  }3853  }
33283854
3329<<<<<<< HEAD3855<<<<<<< HEAD
3856<<<<<<< HEAD
3330  /** @name UpDataStructsCollectionPermissions (245) */3857  /** @name UpDataStructsCollectionPermissions (245) */
3331=======3858=======
3859=======
3860>>>>>>> fix: regenerate types after rebase
3332<<<<<<< HEAD3861<<<<<<< HEAD
3333  /** @name UpDataStructsCollectionPermissions (247) */3862  /** @name UpDataStructsCollectionPermissions (247) */
3334=======3863=======
3338  /** @name UpDataStructsCollectionPermissions (251) */3867  /** @name UpDataStructsCollectionPermissions (251) */
3339>>>>>>> chore:  regenerate types3868>>>>>>> chore:  regenerate types
3340>>>>>>> chore:  regenerate types3869>>>>>>> chore:  regenerate types
3870<<<<<<< HEAD
3341>>>>>>> chore:  regenerate types3871>>>>>>> chore:  regenerate types
3872=======
3873=======
3874  /** @name UpDataStructsCollectionPermissions (250) */
3875>>>>>>> fix: regenerate types after rebase
3876>>>>>>> fix: regenerate types after rebase
3342  interface UpDataStructsCollectionPermissions extends Struct {3877  interface UpDataStructsCollectionPermissions extends Struct {
3343    readonly access: Option<UpDataStructsAccessMode>;3878    readonly access: Option<UpDataStructsAccessMode>;
3344    readonly mintMode: Option<bool>;3879    readonly mintMode: Option<bool>;
3345    readonly nesting: Option<UpDataStructsNestingPermissions>;3880    readonly nesting: Option<UpDataStructsNestingPermissions>;
3346  }3881  }
33473882
3348<<<<<<< HEAD3883<<<<<<< HEAD
3884<<<<<<< HEAD
3349  /** @name UpDataStructsNestingPermissions (247) */3885  /** @name UpDataStructsNestingPermissions (247) */
3350=======3886=======
3887=======
3888>>>>>>> fix: regenerate types after rebase
3351<<<<<<< HEAD3889<<<<<<< HEAD
3352  /** @name UpDataStructsNestingPermissions (249) */3890  /** @name UpDataStructsNestingPermissions (249) */
3353=======3891=======
3357  /** @name UpDataStructsNestingPermissions (253) */3895  /** @name UpDataStructsNestingPermissions (253) */
3358>>>>>>> chore:  regenerate types3896>>>>>>> chore:  regenerate types
3359>>>>>>> chore:  regenerate types3897>>>>>>> chore:  regenerate types
3898<<<<<<< HEAD
3360>>>>>>> chore:  regenerate types3899>>>>>>> chore:  regenerate types
3900=======
3901=======
3902  /** @name UpDataStructsNestingPermissions (252) */
3903>>>>>>> fix: regenerate types after rebase
3904>>>>>>> fix: regenerate types after rebase
3361  interface UpDataStructsNestingPermissions extends Struct {3905  interface UpDataStructsNestingPermissions extends Struct {
3362    readonly tokenOwner: bool;3906    readonly tokenOwner: bool;
3363    readonly collectionAdmin: bool;3907    readonly collectionAdmin: bool;
3364    readonly restricted: Option<UpDataStructsOwnerRestrictedSet>;3908    readonly restricted: Option<UpDataStructsOwnerRestrictedSet>;
3365  }3909  }
33663910
3367<<<<<<< HEAD3911<<<<<<< HEAD
3912<<<<<<< HEAD
3368  /** @name UpDataStructsOwnerRestrictedSet (249) */3913  /** @name UpDataStructsOwnerRestrictedSet (249) */
3369  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}3914  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
33703915
3371  /** @name UpDataStructsPropertyKeyPermission (254) */3916  /** @name UpDataStructsPropertyKeyPermission (254) */
3372=======3917=======
3918=======
3919>>>>>>> fix: regenerate types after rebase
3373<<<<<<< HEAD3920<<<<<<< HEAD
3374  /** @name UpDataStructsOwnerRestrictedSet (251) */3921  /** @name UpDataStructsOwnerRestrictedSet (251) */
3375  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}3922  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
33763923
3377  /** @name UpDataStructsPropertyKeyPermission (256) */3924  /** @name UpDataStructsPropertyKeyPermission (256) */
3378=======3925=======
3379<<<<<<< HEAD3926<<<<<<< HEAD
3927=======
3928>>>>>>> fix: regenerate types after rebase
3380  /** @name UpDataStructsOwnerRestrictedSet (254) */3929  /** @name UpDataStructsOwnerRestrictedSet (254) */
3381  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}3930  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
33823931
3383  /** @name UpDataStructsPropertyKeyPermission (259) */3932  /** @name UpDataStructsPropertyKeyPermission (259) */
3933<<<<<<< HEAD
3384=======3934=======
3385  /** @name UpDataStructsOwnerRestrictedSet (255) */3935  /** @name UpDataStructsOwnerRestrictedSet (255) */
3386  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}3936  interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
33873937
3388  /** @name UpDataStructsPropertyKeyPermission (260) */3938  /** @name UpDataStructsPropertyKeyPermission (260) */
3389>>>>>>> chore:  regenerate types3939>>>>>>> chore:  regenerate types
3390>>>>>>> chore:  regenerate types3940>>>>>>> chore:  regenerate types
3941<<<<<<< HEAD
3391>>>>>>> chore:  regenerate types3942>>>>>>> chore:  regenerate types
3943=======
3944=======
3945>>>>>>> fix: regenerate types after rebase
3946>>>>>>> fix: regenerate types after rebase
3392  interface UpDataStructsPropertyKeyPermission extends Struct {3947  interface UpDataStructsPropertyKeyPermission extends Struct {
3393    readonly key: Bytes;3948    readonly key: Bytes;
3394    readonly permission: UpDataStructsPropertyPermission;3949    readonly permission: UpDataStructsPropertyPermission;
3395  }3950  }
33963951
3397<<<<<<< HEAD3952<<<<<<< HEAD
3953<<<<<<< HEAD
3398  /** @name UpDataStructsPropertyPermission (255) */3954  /** @name UpDataStructsPropertyPermission (255) */
3399=======3955=======
3956=======
3957>>>>>>> fix: regenerate types after rebase
3400<<<<<<< HEAD3958<<<<<<< HEAD
3401  /** @name UpDataStructsPropertyPermission (257) */3959  /** @name UpDataStructsPropertyPermission (257) */
3402=======3960=======
3406  /** @name UpDataStructsPropertyPermission (261) */3964  /** @name UpDataStructsPropertyPermission (261) */
3407>>>>>>> chore:  regenerate types3965>>>>>>> chore:  regenerate types
3408>>>>>>> chore:  regenerate types3966>>>>>>> chore:  regenerate types
3967<<<<<<< HEAD
3409>>>>>>> chore:  regenerate types3968>>>>>>> chore:  regenerate types
3969=======
3970=======
3971  /** @name UpDataStructsPropertyPermission (260) */
3972>>>>>>> fix: regenerate types after rebase
3973>>>>>>> fix: regenerate types after rebase
3410  interface UpDataStructsPropertyPermission extends Struct {3974  interface UpDataStructsPropertyPermission extends Struct {
3411    readonly mutable: bool;3975    readonly mutable: bool;
3412    readonly collectionAdmin: bool;3976    readonly collectionAdmin: bool;
3413    readonly tokenOwner: bool;3977    readonly tokenOwner: bool;
3414  }3978  }
34153979
3416<<<<<<< HEAD3980<<<<<<< HEAD
3981<<<<<<< HEAD
3417  /** @name UpDataStructsProperty (258) */3982  /** @name UpDataStructsProperty (258) */
3418=======3983=======
3984=======
3985>>>>>>> fix: regenerate types after rebase
3419<<<<<<< HEAD3986<<<<<<< HEAD
3420  /** @name UpDataStructsProperty (260) */3987  /** @name UpDataStructsProperty (260) */
3421=======3988=======
3425  /** @name UpDataStructsProperty (264) */3992  /** @name UpDataStructsProperty (264) */
3426>>>>>>> chore:  regenerate types3993>>>>>>> chore:  regenerate types
3427>>>>>>> chore:  regenerate types3994>>>>>>> chore:  regenerate types
3995<<<<<<< HEAD
3428>>>>>>> chore:  regenerate types3996>>>>>>> chore:  regenerate types
3997=======
3998=======
3999  /** @name UpDataStructsProperty (263) */
4000>>>>>>> fix: regenerate types after rebase
4001>>>>>>> fix: regenerate types after rebase
3429  interface UpDataStructsProperty extends Struct {4002  interface UpDataStructsProperty extends Struct {
3430    readonly key: Bytes;4003    readonly key: Bytes;
3431    readonly value: Bytes;4004    readonly value: Bytes;
3432  }4005  }
34334006
3434<<<<<<< HEAD4007<<<<<<< HEAD
4008<<<<<<< HEAD
3435  /** @name UpDataStructsCreateItemData (261) */4009  /** @name UpDataStructsCreateItemData (261) */
3436=======4010=======
4011=======
4012>>>>>>> fix: regenerate types after rebase
3437<<<<<<< HEAD4013<<<<<<< HEAD
3438  /** @name UpDataStructsCreateItemData (263) */4014  /** @name UpDataStructsCreateItemData (263) */
3439=======4015=======
3443  /** @name UpDataStructsCreateItemData (267) */4019  /** @name UpDataStructsCreateItemData (267) */
3444>>>>>>> chore:  regenerate types4020>>>>>>> chore:  regenerate types
3445>>>>>>> chore:  regenerate types4021>>>>>>> chore:  regenerate types
4022<<<<<<< HEAD
3446>>>>>>> chore:  regenerate types4023>>>>>>> chore:  regenerate types
4024=======
4025=======
4026  /** @name UpDataStructsCreateItemData (266) */
4027>>>>>>> fix: regenerate types after rebase
4028>>>>>>> fix: regenerate types after rebase
3447  interface UpDataStructsCreateItemData extends Enum {4029  interface UpDataStructsCreateItemData extends Enum {
3448    readonly isNft: boolean;4030    readonly isNft: boolean;
3449    readonly asNft: UpDataStructsCreateNftData;4031    readonly asNft: UpDataStructsCreateNftData;
3455  }4037  }
34564038
3457<<<<<<< HEAD4039<<<<<<< HEAD
4040<<<<<<< HEAD
3458  /** @name UpDataStructsCreateNftData (262) */4041  /** @name UpDataStructsCreateNftData (262) */
3459=======4042=======
4043=======
4044>>>>>>> fix: regenerate types after rebase
3460<<<<<<< HEAD4045<<<<<<< HEAD
3461  /** @name UpDataStructsCreateNftData (264) */4046  /** @name UpDataStructsCreateNftData (264) */
3462=======4047=======
3466  /** @name UpDataStructsCreateNftData (268) */4051  /** @name UpDataStructsCreateNftData (268) */
3467>>>>>>> chore:  regenerate types4052>>>>>>> chore:  regenerate types
3468>>>>>>> chore:  regenerate types4053>>>>>>> chore:  regenerate types
4054<<<<<<< HEAD
3469>>>>>>> chore:  regenerate types4055>>>>>>> chore:  regenerate types
4056=======
4057=======
4058  /** @name UpDataStructsCreateNftData (267) */
4059>>>>>>> fix: regenerate types after rebase
4060>>>>>>> fix: regenerate types after rebase
3470  interface UpDataStructsCreateNftData extends Struct {4061  interface UpDataStructsCreateNftData extends Struct {
3471    readonly properties: Vec<UpDataStructsProperty>;4062    readonly properties: Vec<UpDataStructsProperty>;
3472  }4063  }
34734064
3474<<<<<<< HEAD4065<<<<<<< HEAD
4066<<<<<<< HEAD
3475  /** @name UpDataStructsCreateFungibleData (263) */4067  /** @name UpDataStructsCreateFungibleData (263) */
3476=======4068=======
4069=======
4070>>>>>>> fix: regenerate types after rebase
3477<<<<<<< HEAD4071<<<<<<< HEAD
3478  /** @name UpDataStructsCreateFungibleData (265) */4072  /** @name UpDataStructsCreateFungibleData (265) */
3479=======4073=======
3483  /** @name UpDataStructsCreateFungibleData (269) */4077  /** @name UpDataStructsCreateFungibleData (269) */
3484>>>>>>> chore:  regenerate types4078>>>>>>> chore:  regenerate types
3485>>>>>>> chore:  regenerate types4079>>>>>>> chore:  regenerate types
4080<<<<<<< HEAD
3486>>>>>>> chore:  regenerate types4081>>>>>>> chore:  regenerate types
4082=======
4083=======
4084  /** @name UpDataStructsCreateFungibleData (268) */
4085>>>>>>> fix: regenerate types after rebase
4086>>>>>>> fix: regenerate types after rebase
3487  interface UpDataStructsCreateFungibleData extends Struct {4087  interface UpDataStructsCreateFungibleData extends Struct {
3488    readonly value: u128;4088    readonly value: u128;
3489  }4089  }
34904090
3491<<<<<<< HEAD4091<<<<<<< HEAD
4092<<<<<<< HEAD
3492  /** @name UpDataStructsCreateReFungibleData (264) */4093  /** @name UpDataStructsCreateReFungibleData (264) */
3493=======4094=======
4095=======
4096>>>>>>> fix: regenerate types after rebase
3494<<<<<<< HEAD4097<<<<<<< HEAD
3495  /** @name UpDataStructsCreateReFungibleData (266) */4098  /** @name UpDataStructsCreateReFungibleData (266) */
3496=======4099=======
3500  /** @name UpDataStructsCreateReFungibleData (270) */4103  /** @name UpDataStructsCreateReFungibleData (270) */
3501>>>>>>> chore:  regenerate types4104>>>>>>> chore:  regenerate types
3502>>>>>>> chore:  regenerate types4105>>>>>>> chore:  regenerate types
4106<<<<<<< HEAD
3503>>>>>>> chore:  regenerate types4107>>>>>>> chore:  regenerate types
4108=======
4109=======
4110  /** @name UpDataStructsCreateReFungibleData (269) */
4111>>>>>>> fix: regenerate types after rebase
4112>>>>>>> fix: regenerate types after rebase
3504  interface UpDataStructsCreateReFungibleData extends Struct {4113  interface UpDataStructsCreateReFungibleData extends Struct {
3505    readonly pieces: u128;4114    readonly pieces: u128;
3506    readonly properties: Vec<UpDataStructsProperty>;4115    readonly properties: Vec<UpDataStructsProperty>;
3507  }4116  }
35084117
3509<<<<<<< HEAD4118<<<<<<< HEAD
4119<<<<<<< HEAD
3510  /** @name UpDataStructsCreateItemExData (267) */4120  /** @name UpDataStructsCreateItemExData (267) */
3511=======4121=======
4122=======
4123>>>>>>> fix: regenerate types after rebase
3512<<<<<<< HEAD4124<<<<<<< HEAD
3513  /** @name UpDataStructsCreateItemExData (269) */4125  /** @name UpDataStructsCreateItemExData (269) */
3514=======4126=======
3518  /** @name UpDataStructsCreateItemExData (273) */4130  /** @name UpDataStructsCreateItemExData (273) */
3519>>>>>>> chore:  regenerate types4131>>>>>>> chore:  regenerate types
3520>>>>>>> chore:  regenerate types4132>>>>>>> chore:  regenerate types
4133<<<<<<< HEAD
3521>>>>>>> chore:  regenerate types4134>>>>>>> chore:  regenerate types
4135=======
4136=======
4137  /** @name UpDataStructsCreateItemExData (272) */
4138>>>>>>> fix: regenerate types after rebase
4139>>>>>>> fix: regenerate types after rebase
3522  interface UpDataStructsCreateItemExData extends Enum {4140  interface UpDataStructsCreateItemExData extends Enum {
3523    readonly isNft: boolean;4141    readonly isNft: boolean;
3524    readonly asNft: Vec<UpDataStructsCreateNftExData>;4142    readonly asNft: Vec<UpDataStructsCreateNftExData>;
3532  }4150  }
35334151
3534<<<<<<< HEAD4152<<<<<<< HEAD
4153<<<<<<< HEAD
3535  /** @name UpDataStructsCreateNftExData (269) */4154  /** @name UpDataStructsCreateNftExData (269) */
3536=======4155=======
4156=======
4157>>>>>>> fix: regenerate types after rebase
3537<<<<<<< HEAD4158<<<<<<< HEAD
3538  /** @name UpDataStructsCreateNftExData (271) */4159  /** @name UpDataStructsCreateNftExData (271) */
3539=======4160=======
3543  /** @name UpDataStructsCreateNftExData (275) */4164  /** @name UpDataStructsCreateNftExData (275) */
3544>>>>>>> chore:  regenerate types4165>>>>>>> chore:  regenerate types
3545>>>>>>> chore:  regenerate types4166>>>>>>> chore:  regenerate types
4167<<<<<<< HEAD
3546>>>>>>> chore:  regenerate types4168>>>>>>> chore:  regenerate types
4169=======
4170=======
4171  /** @name UpDataStructsCreateNftExData (274) */
4172>>>>>>> fix: regenerate types after rebase
4173>>>>>>> fix: regenerate types after rebase
3547  interface UpDataStructsCreateNftExData extends Struct {4174  interface UpDataStructsCreateNftExData extends Struct {
3548    readonly properties: Vec<UpDataStructsProperty>;4175    readonly properties: Vec<UpDataStructsProperty>;
3549    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;4176    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
3550  }4177  }
35514178
3552<<<<<<< HEAD4179<<<<<<< HEAD
4180<<<<<<< HEAD
3553  /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */4181  /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */
3554=======4182=======
4183=======
4184>>>>>>> fix: regenerate types after rebase
3555<<<<<<< HEAD4185<<<<<<< HEAD
3556  /** @name UpDataStructsCreateRefungibleExSingleOwner (278) */4186  /** @name UpDataStructsCreateRefungibleExSingleOwner (278) */
3557=======4187=======
3561  /** @name UpDataStructsCreateRefungibleExSingleOwner (282) */4191  /** @name UpDataStructsCreateRefungibleExSingleOwner (282) */
3562>>>>>>> chore:  regenerate types4192>>>>>>> chore:  regenerate types
3563>>>>>>> chore:  regenerate types4193>>>>>>> chore:  regenerate types
4194<<<<<<< HEAD
3564>>>>>>> chore:  regenerate types4195>>>>>>> chore:  regenerate types
4196=======
4197=======
4198  /** @name UpDataStructsCreateRefungibleExSingleOwner (281) */
4199>>>>>>> fix: regenerate types after rebase
4200>>>>>>> fix: regenerate types after rebase
3565  interface UpDataStructsCreateRefungibleExSingleOwner extends Struct {4201  interface UpDataStructsCreateRefungibleExSingleOwner extends Struct {
3566    readonly user: PalletEvmAccountBasicCrossAccountIdRepr;4202    readonly user: PalletEvmAccountBasicCrossAccountIdRepr;
3567    readonly pieces: u128;4203    readonly pieces: u128;
3568    readonly properties: Vec<UpDataStructsProperty>;4204    readonly properties: Vec<UpDataStructsProperty>;
3569  }4205  }
35704206
3571<<<<<<< HEAD4207<<<<<<< HEAD
4208<<<<<<< HEAD
3572  /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */4209  /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */
3573=======4210=======
4211=======
4212>>>>>>> fix: regenerate types after rebase
3574<<<<<<< HEAD4213<<<<<<< HEAD
3575  /** @name UpDataStructsCreateRefungibleExMultipleOwners (280) */4214  /** @name UpDataStructsCreateRefungibleExMultipleOwners (280) */
3576=======4215=======
3580  /** @name UpDataStructsCreateRefungibleExMultipleOwners (284) */4219  /** @name UpDataStructsCreateRefungibleExMultipleOwners (284) */
3581>>>>>>> chore:  regenerate types4220>>>>>>> chore:  regenerate types
3582>>>>>>> chore:  regenerate types4221>>>>>>> chore:  regenerate types
4222<<<<<<< HEAD
3583>>>>>>> chore:  regenerate types4223>>>>>>> chore:  regenerate types
4224=======
4225=======
4226  /** @name UpDataStructsCreateRefungibleExMultipleOwners (283) */
4227>>>>>>> fix: regenerate types after rebase
4228>>>>>>> fix: regenerate types after rebase
3584  interface UpDataStructsCreateRefungibleExMultipleOwners extends Struct {4229  interface UpDataStructsCreateRefungibleExMultipleOwners extends Struct {
3585    readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;4230    readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
3586    readonly properties: Vec<UpDataStructsProperty>;4231    readonly properties: Vec<UpDataStructsProperty>;
3587  }4232  }
35884233
3589<<<<<<< HEAD4234<<<<<<< HEAD
4235<<<<<<< HEAD
3590  /** @name PalletConfigurationCall (279) */4236  /** @name PalletConfigurationCall (279) */
3591=======4237=======
4238=======
4239>>>>>>> fix: regenerate types after rebase
3592<<<<<<< HEAD4240<<<<<<< HEAD
3593  /** @name PalletConfigurationCall (281) */4241  /** @name PalletConfigurationCall (281) */
3594=======4242=======
3595<<<<<<< HEAD4243<<<<<<< HEAD
4244=======
4245>>>>>>> fix: regenerate types after rebase
3596  /** @name PalletUniqueSchedulerV2Call (284) */4246  /** @name PalletUniqueSchedulerV2Call (284) */
3597=======
3598  /** @name PalletUniqueSchedulerV2Call (285) */
3599>>>>>>> chore:  regenerate types
3600  interface PalletUniqueSchedulerV2Call extends Enum {4247  interface PalletUniqueSchedulerV2Call extends Enum {
3601    readonly isSchedule: boolean;4248    readonly isSchedule: boolean;
3602    readonly asSchedule: {4249    readonly asSchedule: {
3645    readonly type: 'Schedule' | 'Cancel' | 'ScheduleNamed' | 'CancelNamed' | 'ScheduleAfter' | 'ScheduleNamedAfter' | 'ChangeNamedPriority';4292    readonly type: 'Schedule' | 'Cancel' | 'ScheduleNamed' | 'CancelNamed' | 'ScheduleAfter' | 'ScheduleNamedAfter' | 'ChangeNamedPriority';
3646  }4293  }
36474294
4295  /** @name PalletConfigurationCall (287) */
3648<<<<<<< HEAD4296<<<<<<< HEAD
3649  /** @name PalletConfigurationCall (287) */
3650=======4297=======
3651  /** @name PalletConfigurationCall (288) */4298  /** @name PalletConfigurationCall (288) */
3652>>>>>>> chore:  regenerate types4299>>>>>>> chore:  regenerate types
3653>>>>>>> chore:  regenerate types4300>>>>>>> chore:  regenerate types
4301<<<<<<< HEAD
3654>>>>>>> chore:  regenerate types4302>>>>>>> chore:  regenerate types
4303=======
4304=======
4305>>>>>>> fix: regenerate types after rebase
4306>>>>>>> fix: regenerate types after rebase
3655  interface PalletConfigurationCall extends Enum {4307  interface PalletConfigurationCall extends Enum {
3656    readonly isSetWeightToFeeCoefficientOverride: boolean;4308    readonly isSetWeightToFeeCoefficientOverride: boolean;
3657    readonly asSetWeightToFeeCoefficientOverride: {4309    readonly asSetWeightToFeeCoefficientOverride: {
3681  }4333  }
36824334
3683<<<<<<< HEAD4335<<<<<<< HEAD
4336<<<<<<< HEAD
3684  /** @name PalletTemplateTransactionPaymentCall (288) */4337  /** @name PalletTemplateTransactionPaymentCall (288) */
3685=======4338=======
3686<<<<<<< HEAD4339<<<<<<< HEAD
4340=======
4341>>>>>>> fix: regenerate types after rebase
3687  /** @name PalletTemplateTransactionPaymentCall (289) */4342  /** @name PalletTemplateTransactionPaymentCall (289) */
3688>>>>>>> chore:  regenerate types4343>>>>>>> chore:  regenerate types
3689  type PalletTemplateTransactionPaymentCall = Null;4344  type PalletTemplateTransactionPaymentCall = Null;
3695  /** @name PalletRmrkCoreCall (290) */4350  /** @name PalletRmrkCoreCall (290) */
3696=======4351=======
3697  /** @name PalletRmrkCoreCall (291) */4352  /** @name PalletRmrkCoreCall (291) */
4353<<<<<<< HEAD
3698=======4354=======
3699  /** @name PalletTemplateTransactionPaymentCall (290) */4355  /** @name PalletTemplateTransactionPaymentCall (290) */
3700  type PalletTemplateTransactionPaymentCall = Null;4356  type PalletTemplateTransactionPaymentCall = Null;
3705  /** @name PalletRmrkCoreCall (292) */4361  /** @name PalletRmrkCoreCall (292) */
3706>>>>>>> chore:  regenerate types4362>>>>>>> chore:  regenerate types
3707>>>>>>> chore:  regenerate types4363>>>>>>> chore:  regenerate types
4364=======
4365>>>>>>> fix: regenerate types after rebase
3708  interface PalletRmrkCoreCall extends Enum {4366  interface PalletRmrkCoreCall extends Enum {
3709    readonly isCreateCollection: boolean;4367    readonly isCreateCollection: boolean;
3710    readonly asCreateCollection: {4368    readonly asCreateCollection: {
3811  }4469  }
38124470
3813<<<<<<< HEAD4471<<<<<<< HEAD
4472<<<<<<< HEAD
3814  /** @name RmrkTraitsResourceResourceTypes (296) */4473  /** @name RmrkTraitsResourceResourceTypes (296) */
3815=======4474=======
3816<<<<<<< HEAD4475<<<<<<< HEAD
3819  /** @name RmrkTraitsResourceResourceTypes (298) */4478  /** @name RmrkTraitsResourceResourceTypes (298) */
3820>>>>>>> chore:  regenerate types4479>>>>>>> chore:  regenerate types
3821>>>>>>> chore:  regenerate types4480>>>>>>> chore:  regenerate types
4481=======
4482  /** @name RmrkTraitsResourceResourceTypes (297) */
4483>>>>>>> fix: regenerate types after rebase
3822  interface RmrkTraitsResourceResourceTypes extends Enum {4484  interface RmrkTraitsResourceResourceTypes extends Enum {
3823    readonly isBasic: boolean;4485    readonly isBasic: boolean;
3824    readonly asBasic: RmrkTraitsResourceBasicResource;4486    readonly asBasic: RmrkTraitsResourceBasicResource;
3830  }4492  }
38314493
3832<<<<<<< HEAD4494<<<<<<< HEAD
4495<<<<<<< HEAD
3833  /** @name RmrkTraitsResourceBasicResource (298) */4496  /** @name RmrkTraitsResourceBasicResource (298) */
3834=======4497=======
3835<<<<<<< HEAD4498<<<<<<< HEAD
3838  /** @name RmrkTraitsResourceBasicResource (300) */4501  /** @name RmrkTraitsResourceBasicResource (300) */
3839>>>>>>> chore:  regenerate types4502>>>>>>> chore:  regenerate types
3840>>>>>>> chore:  regenerate types4503>>>>>>> chore:  regenerate types
4504=======
4505  /** @name RmrkTraitsResourceBasicResource (299) */
4506>>>>>>> fix: regenerate types after rebase
3841  interface RmrkTraitsResourceBasicResource extends Struct {4507  interface RmrkTraitsResourceBasicResource extends Struct {
3842    readonly src: Option<Bytes>;4508    readonly src: Option<Bytes>;
3843    readonly metadata: Option<Bytes>;4509    readonly metadata: Option<Bytes>;
3846  }4512  }
38474513
3848<<<<<<< HEAD4514<<<<<<< HEAD
4515<<<<<<< HEAD
3849  /** @name RmrkTraitsResourceComposableResource (300) */4516  /** @name RmrkTraitsResourceComposableResource (300) */
3850=======4517=======
3851<<<<<<< HEAD4518<<<<<<< HEAD
3854  /** @name RmrkTraitsResourceComposableResource (302) */4521  /** @name RmrkTraitsResourceComposableResource (302) */
3855>>>>>>> chore:  regenerate types4522>>>>>>> chore:  regenerate types
3856>>>>>>> chore:  regenerate types4523>>>>>>> chore:  regenerate types
4524=======
4525  /** @name RmrkTraitsResourceComposableResource (301) */
4526>>>>>>> fix: regenerate types after rebase
3857  interface RmrkTraitsResourceComposableResource extends Struct {4527  interface RmrkTraitsResourceComposableResource extends Struct {
3858    readonly parts: Vec<u32>;4528    readonly parts: Vec<u32>;
3859    readonly base: u32;4529    readonly base: u32;
3864  }4534  }
38654535
3866<<<<<<< HEAD4536<<<<<<< HEAD
4537<<<<<<< HEAD
3867  /** @name RmrkTraitsResourceSlotResource (301) */4538  /** @name RmrkTraitsResourceSlotResource (301) */
3868=======4539=======
3869<<<<<<< HEAD4540<<<<<<< HEAD
3872  /** @name RmrkTraitsResourceSlotResource (303) */4543  /** @name RmrkTraitsResourceSlotResource (303) */
3873>>>>>>> chore:  regenerate types4544>>>>>>> chore:  regenerate types
3874>>>>>>> chore:  regenerate types4545>>>>>>> chore:  regenerate types
4546=======
4547  /** @name RmrkTraitsResourceSlotResource (302) */
4548>>>>>>> fix: regenerate types after rebase
3875  interface RmrkTraitsResourceSlotResource extends Struct {4549  interface RmrkTraitsResourceSlotResource extends Struct {
3876    readonly base: u32;4550    readonly base: u32;
3877    readonly src: Option<Bytes>;4551    readonly src: Option<Bytes>;
3882  }4556  }
38834557
3884<<<<<<< HEAD4558<<<<<<< HEAD
4559<<<<<<< HEAD
3885  /** @name PalletRmrkEquipCall (304) */4560  /** @name PalletRmrkEquipCall (304) */
3886=======4561=======
3887<<<<<<< HEAD4562<<<<<<< HEAD
3890  /** @name PalletRmrkEquipCall (306) */4565  /** @name PalletRmrkEquipCall (306) */
3891>>>>>>> chore:  regenerate types4566>>>>>>> chore:  regenerate types
3892>>>>>>> chore:  regenerate types4567>>>>>>> chore:  regenerate types
4568=======
4569  /** @name PalletRmrkEquipCall (305) */
4570>>>>>>> fix: regenerate types after rebase
3893  interface PalletRmrkEquipCall extends Enum {4571  interface PalletRmrkEquipCall extends Enum {
3894    readonly isCreateBase: boolean;4572    readonly isCreateBase: boolean;
3895    readonly asCreateBase: {4573    readonly asCreateBase: {
3912  }4590  }
39134591
3914<<<<<<< HEAD4592<<<<<<< HEAD
4593<<<<<<< HEAD
3915  /** @name RmrkTraitsPartPartType (307) */4594  /** @name RmrkTraitsPartPartType (307) */
3916=======4595=======
3917<<<<<<< HEAD4596<<<<<<< HEAD
3920  /** @name RmrkTraitsPartPartType (309) */4599  /** @name RmrkTraitsPartPartType (309) */
3921>>>>>>> chore:  regenerate types4600>>>>>>> chore:  regenerate types
3922>>>>>>> chore:  regenerate types4601>>>>>>> chore:  regenerate types
4602=======
4603  /** @name RmrkTraitsPartPartType (308) */
4604>>>>>>> fix: regenerate types after rebase
3923  interface RmrkTraitsPartPartType extends Enum {4605  interface RmrkTraitsPartPartType extends Enum {
3924    readonly isFixedPart: boolean;4606    readonly isFixedPart: boolean;
3925    readonly asFixedPart: RmrkTraitsPartFixedPart;4607    readonly asFixedPart: RmrkTraitsPartFixedPart;
3929  }4611  }
39304612
3931<<<<<<< HEAD4613<<<<<<< HEAD
4614<<<<<<< HEAD
3932  /** @name RmrkTraitsPartFixedPart (309) */4615  /** @name RmrkTraitsPartFixedPart (309) */
3933=======4616=======
3934<<<<<<< HEAD4617<<<<<<< HEAD
3937  /** @name RmrkTraitsPartFixedPart (311) */4620  /** @name RmrkTraitsPartFixedPart (311) */
3938>>>>>>> chore:  regenerate types4621>>>>>>> chore:  regenerate types
3939>>>>>>> chore:  regenerate types4622>>>>>>> chore:  regenerate types
4623=======
4624  /** @name RmrkTraitsPartFixedPart (310) */
4625>>>>>>> fix: regenerate types after rebase
3940  interface RmrkTraitsPartFixedPart extends Struct {4626  interface RmrkTraitsPartFixedPart extends Struct {
3941    readonly id: u32;4627    readonly id: u32;
3942    readonly z: u32;4628    readonly z: u32;
3943    readonly src: Bytes;4629    readonly src: Bytes;
3944  }4630  }
39454631
3946<<<<<<< HEAD4632<<<<<<< HEAD
4633<<<<<<< HEAD
3947  /** @name RmrkTraitsPartSlotPart (310) */4634  /** @name RmrkTraitsPartSlotPart (310) */
3948=======4635=======
3949<<<<<<< HEAD4636<<<<<<< HEAD
3952  /** @name RmrkTraitsPartSlotPart (312) */4639  /** @name RmrkTraitsPartSlotPart (312) */
3953>>>>>>> chore:  regenerate types4640>>>>>>> chore:  regenerate types
3954>>>>>>> chore:  regenerate types4641>>>>>>> chore:  regenerate types
4642=======
4643  /** @name RmrkTraitsPartSlotPart (311) */
4644>>>>>>> fix: regenerate types after rebase
3955  interface RmrkTraitsPartSlotPart extends Struct {4645  interface RmrkTraitsPartSlotPart extends Struct {
3956    readonly id: u32;4646    readonly id: u32;
3957    readonly equippable: RmrkTraitsPartEquippableList;4647    readonly equippable: RmrkTraitsPartEquippableList;
3960  }4650  }
39614651
3962<<<<<<< HEAD4652<<<<<<< HEAD
4653<<<<<<< HEAD
3963  /** @name RmrkTraitsPartEquippableList (311) */4654  /** @name RmrkTraitsPartEquippableList (311) */
3964=======4655=======
3965<<<<<<< HEAD4656<<<<<<< HEAD
3968  /** @name RmrkTraitsPartEquippableList (313) */4659  /** @name RmrkTraitsPartEquippableList (313) */
3969>>>>>>> chore:  regenerate types4660>>>>>>> chore:  regenerate types
3970>>>>>>> chore:  regenerate types4661>>>>>>> chore:  regenerate types
4662=======
4663  /** @name RmrkTraitsPartEquippableList (312) */
4664>>>>>>> fix: regenerate types after rebase
3971  interface RmrkTraitsPartEquippableList extends Enum {4665  interface RmrkTraitsPartEquippableList extends Enum {
3972    readonly isAll: boolean;4666    readonly isAll: boolean;
3973    readonly isEmpty: boolean;4667    readonly isEmpty: boolean;
3977  }4671  }
39784672
3979<<<<<<< HEAD4673<<<<<<< HEAD
4674<<<<<<< HEAD
3980  /** @name RmrkTraitsTheme (313) */4675  /** @name RmrkTraitsTheme (313) */
3981=======4676=======
3982<<<<<<< HEAD4677<<<<<<< HEAD
3985  /** @name RmrkTraitsTheme (315) */4680  /** @name RmrkTraitsTheme (315) */
3986>>>>>>> chore:  regenerate types4681>>>>>>> chore:  regenerate types
3987>>>>>>> chore:  regenerate types4682>>>>>>> chore:  regenerate types
4683=======
4684  /** @name RmrkTraitsTheme (314) */
4685>>>>>>> fix: regenerate types after rebase
3988  interface RmrkTraitsTheme extends Struct {4686  interface RmrkTraitsTheme extends Struct {
3989    readonly name: Bytes;4687    readonly name: Bytes;
3990    readonly properties: Vec<RmrkTraitsThemeThemeProperty>;4688    readonly properties: Vec<RmrkTraitsThemeThemeProperty>;
3991    readonly inherit: bool;4689    readonly inherit: bool;
3992  }4690  }
39934691
3994<<<<<<< HEAD4692<<<<<<< HEAD
4693<<<<<<< HEAD
3995  /** @name RmrkTraitsThemeThemeProperty (315) */4694  /** @name RmrkTraitsThemeThemeProperty (315) */
3996=======4695=======
3997<<<<<<< HEAD4696<<<<<<< HEAD
4000  /** @name RmrkTraitsThemeThemeProperty (317) */4699  /** @name RmrkTraitsThemeThemeProperty (317) */
4001>>>>>>> chore:  regenerate types4700>>>>>>> chore:  regenerate types
4002>>>>>>> chore:  regenerate types4701>>>>>>> chore:  regenerate types
4702=======
4703  /** @name RmrkTraitsThemeThemeProperty (316) */
4704>>>>>>> fix: regenerate types after rebase
4003  interface RmrkTraitsThemeThemeProperty extends Struct {4705  interface RmrkTraitsThemeThemeProperty extends Struct {
4004    readonly key: Bytes;4706    readonly key: Bytes;
4005    readonly value: Bytes;4707    readonly value: Bytes;
4006  }4708  }
40074709
4008<<<<<<< HEAD4710<<<<<<< HEAD
4711<<<<<<< HEAD
4009  /** @name PalletAppPromotionCall (317) */4712  /** @name PalletAppPromotionCall (317) */
4010=======4713=======
4011<<<<<<< HEAD4714<<<<<<< HEAD
4014  /** @name PalletAppPromotionCall (319) */4717  /** @name PalletAppPromotionCall (319) */
4015>>>>>>> chore:  regenerate types4718>>>>>>> chore:  regenerate types
4016>>>>>>> chore:  regenerate types4719>>>>>>> chore:  regenerate types
4720=======
4721  /** @name PalletAppPromotionCall (318) */
4722>>>>>>> fix: regenerate types after rebase
4017  interface PalletAppPromotionCall extends Enum {4723  interface PalletAppPromotionCall extends Enum {
4018    readonly isSetAdminAddress: boolean;4724    readonly isSetAdminAddress: boolean;
4019    readonly asSetAdminAddress: {4725    readonly asSetAdminAddress: {
4048  }4754  }
40494755
4050<<<<<<< HEAD4756<<<<<<< HEAD
4757<<<<<<< HEAD
4051  /** @name PalletForeignAssetsModuleCall (318) */4758  /** @name PalletForeignAssetsModuleCall (318) */
4052=======4759=======
4053<<<<<<< HEAD4760<<<<<<< HEAD
4056  /** @name PalletForeignAssetsModuleCall (320) */4763  /** @name PalletForeignAssetsModuleCall (320) */
4057>>>>>>> chore:  regenerate types4764>>>>>>> chore:  regenerate types
4058>>>>>>> chore:  regenerate types4765>>>>>>> chore:  regenerate types
4766=======
4767  /** @name PalletForeignAssetsModuleCall (319) */
4768>>>>>>> fix: regenerate types after rebase
4059  interface PalletForeignAssetsModuleCall extends Enum {4769  interface PalletForeignAssetsModuleCall extends Enum {
4060    readonly isRegisterForeignAsset: boolean;4770    readonly isRegisterForeignAsset: boolean;
4061    readonly asRegisterForeignAsset: {4771    readonly asRegisterForeignAsset: {
4073  }4783  }
40744784
4075<<<<<<< HEAD4785<<<<<<< HEAD
4786<<<<<<< HEAD
4076  /** @name PalletEvmCall (319) */4787  /** @name PalletEvmCall (319) */
4077=======4788=======
4078<<<<<<< HEAD4789<<<<<<< HEAD
4081  /** @name PalletEvmCall (321) */4792  /** @name PalletEvmCall (321) */
4082>>>>>>> chore:  regenerate types4793>>>>>>> chore:  regenerate types
4083>>>>>>> chore:  regenerate types4794>>>>>>> chore:  regenerate types
4795=======
4796  /** @name PalletEvmCall (320) */
4797>>>>>>> fix: regenerate types after rebase
4084  interface PalletEvmCall extends Enum {4798  interface PalletEvmCall extends Enum {
4085    readonly isWithdraw: boolean;4799    readonly isWithdraw: boolean;
4086    readonly asWithdraw: {4800    readonly asWithdraw: {
4126  }4840  }
41274841
4128<<<<<<< HEAD4842<<<<<<< HEAD
4843<<<<<<< HEAD
4129  /** @name PalletEthereumCall (325) */4844  /** @name PalletEthereumCall (325) */
4130=======4845=======
4131<<<<<<< HEAD4846<<<<<<< HEAD
4134  /** @name PalletEthereumCall (325) */4849  /** @name PalletEthereumCall (325) */
4135>>>>>>> chore:  regenerate types4850>>>>>>> chore:  regenerate types
4136>>>>>>> chore:  regenerate types4851>>>>>>> chore:  regenerate types
4852=======
4853  /** @name PalletEthereumCall (326) */
4854>>>>>>> fix: regenerate types after rebase
4137  interface PalletEthereumCall extends Enum {4855  interface PalletEthereumCall extends Enum {
4138    readonly isTransact: boolean;4856    readonly isTransact: boolean;
4139    readonly asTransact: {4857    readonly asTransact: {
4143  }4861  }
41444862
4145<<<<<<< HEAD4863<<<<<<< HEAD
4864<<<<<<< HEAD
4146  /** @name EthereumTransactionTransactionV2 (326) */4865  /** @name EthereumTransactionTransactionV2 (326) */
4147=======4866=======
4148<<<<<<< HEAD4867<<<<<<< HEAD
4151  /** @name EthereumTransactionTransactionV2 (326) */4870  /** @name EthereumTransactionTransactionV2 (326) */
4152>>>>>>> chore:  regenerate types4871>>>>>>> chore:  regenerate types
4153>>>>>>> chore:  regenerate types4872>>>>>>> chore:  regenerate types
4873=======
4874  /** @name EthereumTransactionTransactionV2 (327) */
4875>>>>>>> fix: regenerate types after rebase
4154  interface EthereumTransactionTransactionV2 extends Enum {4876  interface EthereumTransactionTransactionV2 extends Enum {
4155    readonly isLegacy: boolean;4877    readonly isLegacy: boolean;
4156    readonly asLegacy: EthereumTransactionLegacyTransaction;4878    readonly asLegacy: EthereumTransactionLegacyTransaction;
4162  }4884  }
41634885
4164<<<<<<< HEAD4886<<<<<<< HEAD
4887<<<<<<< HEAD
4165  /** @name EthereumTransactionLegacyTransaction (327) */4888  /** @name EthereumTransactionLegacyTransaction (327) */
4166=======4889=======
4167<<<<<<< HEAD4890<<<<<<< HEAD
4170  /** @name EthereumTransactionLegacyTransaction (327) */4893  /** @name EthereumTransactionLegacyTransaction (327) */
4171>>>>>>> chore:  regenerate types4894>>>>>>> chore:  regenerate types
4172>>>>>>> chore:  regenerate types4895>>>>>>> chore:  regenerate types
4896=======
4897  /** @name EthereumTransactionLegacyTransaction (328) */
4898>>>>>>> fix: regenerate types after rebase
4173  interface EthereumTransactionLegacyTransaction extends Struct {4899  interface EthereumTransactionLegacyTransaction extends Struct {
4174    readonly nonce: U256;4900    readonly nonce: U256;
4175    readonly gasPrice: U256;4901    readonly gasPrice: U256;
4181  }4907  }
41824908
4183<<<<<<< HEAD4909<<<<<<< HEAD
4910<<<<<<< HEAD
4184  /** @name EthereumTransactionTransactionAction (328) */4911  /** @name EthereumTransactionTransactionAction (328) */
4185=======4912=======
4186<<<<<<< HEAD4913<<<<<<< HEAD
4189  /** @name EthereumTransactionTransactionAction (328) */4916  /** @name EthereumTransactionTransactionAction (328) */
4190>>>>>>> chore:  regenerate types4917>>>>>>> chore:  regenerate types
4191>>>>>>> chore:  regenerate types4918>>>>>>> chore:  regenerate types
4919=======
4920  /** @name EthereumTransactionTransactionAction (329) */
4921>>>>>>> fix: regenerate types after rebase
4192  interface EthereumTransactionTransactionAction extends Enum {4922  interface EthereumTransactionTransactionAction extends Enum {
4193    readonly isCall: boolean;4923    readonly isCall: boolean;
4194    readonly asCall: H160;4924    readonly asCall: H160;
4197  }4927  }
41984928
4199<<<<<<< HEAD4929<<<<<<< HEAD
4930<<<<<<< HEAD
4200  /** @name EthereumTransactionTransactionSignature (329) */4931  /** @name EthereumTransactionTransactionSignature (329) */
4201=======4932=======
4202<<<<<<< HEAD4933<<<<<<< HEAD
4205  /** @name EthereumTransactionTransactionSignature (329) */4936  /** @name EthereumTransactionTransactionSignature (329) */
4206>>>>>>> chore:  regenerate types4937>>>>>>> chore:  regenerate types
4207>>>>>>> chore:  regenerate types4938>>>>>>> chore:  regenerate types
4939=======
4940  /** @name EthereumTransactionTransactionSignature (330) */
4941>>>>>>> fix: regenerate types after rebase
4208  interface EthereumTransactionTransactionSignature extends Struct {4942  interface EthereumTransactionTransactionSignature extends Struct {
4209    readonly v: u64;4943    readonly v: u64;
4210    readonly r: H256;4944    readonly r: H256;
4211    readonly s: H256;4945    readonly s: H256;
4212  }4946  }
42134947
4214<<<<<<< HEAD4948<<<<<<< HEAD
4949<<<<<<< HEAD
4215  /** @name EthereumTransactionEip2930Transaction (331) */4950  /** @name EthereumTransactionEip2930Transaction (331) */
4216=======4951=======
4217<<<<<<< HEAD4952<<<<<<< HEAD
4220  /** @name EthereumTransactionEip2930Transaction (331) */4955  /** @name EthereumTransactionEip2930Transaction (331) */
4221>>>>>>> chore:  regenerate types4956>>>>>>> chore:  regenerate types
4222>>>>>>> chore:  regenerate types4957>>>>>>> chore:  regenerate types
4958=======
4959  /** @name EthereumTransactionEip2930Transaction (332) */
4960>>>>>>> fix: regenerate types after rebase
4223  interface EthereumTransactionEip2930Transaction extends Struct {4961  interface EthereumTransactionEip2930Transaction extends Struct {
4224    readonly chainId: u64;4962    readonly chainId: u64;
4225    readonly nonce: U256;4963    readonly nonce: U256;
4235  }4973  }
42364974
4237<<<<<<< HEAD4975<<<<<<< HEAD
4976<<<<<<< HEAD
4238  /** @name EthereumTransactionAccessListItem (333) */4977  /** @name EthereumTransactionAccessListItem (333) */
4239=======4978=======
4240<<<<<<< HEAD4979<<<<<<< HEAD
4243  /** @name EthereumTransactionAccessListItem (333) */4982  /** @name EthereumTransactionAccessListItem (333) */
4244>>>>>>> chore:  regenerate types4983>>>>>>> chore:  regenerate types
4245>>>>>>> chore:  regenerate types4984>>>>>>> chore:  regenerate types
4985=======
4986  /** @name EthereumTransactionAccessListItem (334) */
4987>>>>>>> fix: regenerate types after rebase
4246  interface EthereumTransactionAccessListItem extends Struct {4988  interface EthereumTransactionAccessListItem extends Struct {
4247    readonly address: H160;4989    readonly address: H160;
4248    readonly storageKeys: Vec<H256>;4990    readonly storageKeys: Vec<H256>;
4249  }4991  }
42504992
4251<<<<<<< HEAD4993<<<<<<< HEAD
4994<<<<<<< HEAD
4252  /** @name EthereumTransactionEip1559Transaction (334) */4995  /** @name EthereumTransactionEip1559Transaction (334) */
4253=======4996=======
4254<<<<<<< HEAD4997<<<<<<< HEAD
4257  /** @name EthereumTransactionEip1559Transaction (334) */5000  /** @name EthereumTransactionEip1559Transaction (334) */
4258>>>>>>> chore:  regenerate types5001>>>>>>> chore:  regenerate types
4259>>>>>>> chore:  regenerate types5002>>>>>>> chore:  regenerate types
5003=======
5004  /** @name EthereumTransactionEip1559Transaction (335) */
5005>>>>>>> fix: regenerate types after rebase
4260  interface EthereumTransactionEip1559Transaction extends Struct {5006  interface EthereumTransactionEip1559Transaction extends Struct {
4261    readonly chainId: u64;5007    readonly chainId: u64;
4262    readonly nonce: U256;5008    readonly nonce: U256;
4273  }5019  }
42745020
4275<<<<<<< HEAD5021<<<<<<< HEAD
5022<<<<<<< HEAD
4276  /** @name PalletEvmMigrationCall (335) */5023  /** @name PalletEvmMigrationCall (335) */
4277=======5024=======
4278<<<<<<< HEAD5025<<<<<<< HEAD
4281  /** @name PalletEvmMigrationCall (335) */5028  /** @name PalletEvmMigrationCall (335) */
4282>>>>>>> chore:  regenerate types5029>>>>>>> chore:  regenerate types
4283>>>>>>> chore:  regenerate types5030>>>>>>> chore:  regenerate types
5031=======
5032  /** @name PalletEvmMigrationCall (336) */
5033>>>>>>> fix: regenerate types after rebase
4284  interface PalletEvmMigrationCall extends Enum {5034  interface PalletEvmMigrationCall extends Enum {
4285    readonly isBegin: boolean;5035    readonly isBegin: boolean;
4286    readonly asBegin: {5036    readonly asBegin: {
4308  }5058  }
43095059
4310<<<<<<< HEAD5060<<<<<<< HEAD
5061<<<<<<< HEAD
4311  /** @name PalletMaintenanceCall (339) */5062  /** @name PalletMaintenanceCall (339) */
4312=======5063=======
4313  /** @name PalletMaintenanceCall (338) */5064  /** @name PalletMaintenanceCall (338) */
4314>>>>>>> chore:  regenerate types5065>>>>>>> chore:  regenerate types
5066=======
5067  /** @name PalletMaintenanceCall (340) */
5068>>>>>>> fix: regenerate types after rebase
4315  interface PalletMaintenanceCall extends Enum {5069  interface PalletMaintenanceCall extends Enum {
4316    readonly isEnable: boolean;5070    readonly isEnable: boolean;
4317    readonly isDisable: boolean;5071    readonly isDisable: boolean;
4318    readonly type: 'Enable' | 'Disable';5072    readonly type: 'Enable' | 'Disable';
4319  }5073  }
43205074
4321<<<<<<< HEAD5075<<<<<<< HEAD
5076<<<<<<< HEAD
4322  /** @name PalletTestUtilsCall (340) */5077  /** @name PalletTestUtilsCall (340) */
4323=======5078=======
4324  /** @name PalletTestUtilsCall (339) */5079  /** @name PalletTestUtilsCall (339) */
4325>>>>>>> chore:  regenerate types5080>>>>>>> chore:  regenerate types
5081=======
5082  /** @name PalletTestUtilsCall (341) */
5083>>>>>>> fix: regenerate types after rebase
4326  interface PalletTestUtilsCall extends Enum {5084  interface PalletTestUtilsCall extends Enum {
4327    readonly isEnable: boolean;5085    readonly isEnable: boolean;
4328    readonly isSetTestValue: boolean;5086    readonly isSetTestValue: boolean;
4343  }5101  }
43445102
4345<<<<<<< HEAD5103<<<<<<< HEAD
5104<<<<<<< HEAD
4346  /** @name PalletSudoError (342) */5105  /** @name PalletSudoError (342) */
4347=======5106=======
4348<<<<<<< HEAD5107<<<<<<< HEAD
4351  /** @name PalletSudoError (341) */5110  /** @name PalletSudoError (341) */
4352>>>>>>> chore:  regenerate types5111>>>>>>> chore:  regenerate types
4353>>>>>>> chore:  regenerate types5112>>>>>>> chore:  regenerate types
5113=======
5114  /** @name PalletSudoError (343) */
5115>>>>>>> fix: regenerate types after rebase
4354  interface PalletSudoError extends Enum {5116  interface PalletSudoError extends Enum {
4355    readonly isRequireSudo: boolean;5117    readonly isRequireSudo: boolean;
4356    readonly type: 'RequireSudo';5118    readonly type: 'RequireSudo';
4357  }5119  }
43585120
4359<<<<<<< HEAD5121<<<<<<< HEAD
5122<<<<<<< HEAD
4360  /** @name OrmlVestingModuleError (344) */5123  /** @name OrmlVestingModuleError (344) */
4361=======5124=======
4362<<<<<<< HEAD5125<<<<<<< HEAD
4365  /** @name OrmlVestingModuleError (343) */5128  /** @name OrmlVestingModuleError (343) */
4366>>>>>>> chore:  regenerate types5129>>>>>>> chore:  regenerate types
4367>>>>>>> chore:  regenerate types5130>>>>>>> chore:  regenerate types
5131=======
5132  /** @name OrmlVestingModuleError (345) */
5133>>>>>>> fix: regenerate types after rebase
4368  interface OrmlVestingModuleError extends Enum {5134  interface OrmlVestingModuleError extends Enum {
4369    readonly isZeroVestingPeriod: boolean;5135    readonly isZeroVestingPeriod: boolean;
4370    readonly isZeroVestingPeriodCount: boolean;5136    readonly isZeroVestingPeriodCount: boolean;
4376  }5142  }
43775143
4378<<<<<<< HEAD5144<<<<<<< HEAD
5145<<<<<<< HEAD
4379  /** @name OrmlXtokensModuleError (345) */5146  /** @name OrmlXtokensModuleError (345) */
4380=======5147=======
4381<<<<<<< HEAD5148<<<<<<< HEAD
4384  /** @name OrmlXtokensModuleError (344) */5151  /** @name OrmlXtokensModuleError (344) */
4385>>>>>>> chore:  regenerate types5152>>>>>>> chore:  regenerate types
4386>>>>>>> chore:  regenerate types5153>>>>>>> chore:  regenerate types
5154=======
5155  /** @name OrmlXtokensModuleError (346) */
5156>>>>>>> fix: regenerate types after rebase
4387  interface OrmlXtokensModuleError extends Enum {5157  interface OrmlXtokensModuleError extends Enum {
4388    readonly isAssetHasNoReserve: boolean;5158    readonly isAssetHasNoReserve: boolean;
4389    readonly isNotCrossChainTransfer: boolean;5159    readonly isNotCrossChainTransfer: boolean;
4408  }5178  }
44095179
4410<<<<<<< HEAD5180<<<<<<< HEAD
5181<<<<<<< HEAD
4411  /** @name OrmlTokensBalanceLock (348) */5182  /** @name OrmlTokensBalanceLock (348) */
4412=======5183=======
4413<<<<<<< HEAD5184<<<<<<< HEAD
4416  /** @name OrmlTokensBalanceLock (347) */5187  /** @name OrmlTokensBalanceLock (347) */
4417>>>>>>> chore:  regenerate types5188>>>>>>> chore:  regenerate types
4418>>>>>>> chore:  regenerate types5189>>>>>>> chore:  regenerate types
5190=======
5191  /** @name OrmlTokensBalanceLock (349) */
5192>>>>>>> fix: regenerate types after rebase
4419  interface OrmlTokensBalanceLock extends Struct {5193  interface OrmlTokensBalanceLock extends Struct {
4420    readonly id: U8aFixed;5194    readonly id: U8aFixed;
4421    readonly amount: u128;5195    readonly amount: u128;
4422  }5196  }
44235197
4424<<<<<<< HEAD5198<<<<<<< HEAD
5199<<<<<<< HEAD
4425  /** @name OrmlTokensAccountData (350) */5200  /** @name OrmlTokensAccountData (350) */
4426=======5201=======
4427<<<<<<< HEAD5202<<<<<<< HEAD
4430  /** @name OrmlTokensAccountData (349) */5205  /** @name OrmlTokensAccountData (349) */
4431>>>>>>> chore:  regenerate types5206>>>>>>> chore:  regenerate types
4432>>>>>>> chore:  regenerate types5207>>>>>>> chore:  regenerate types
5208=======
5209  /** @name OrmlTokensAccountData (351) */
5210>>>>>>> fix: regenerate types after rebase
4433  interface OrmlTokensAccountData extends Struct {5211  interface OrmlTokensAccountData extends Struct {
4434    readonly free: u128;5212    readonly free: u128;
4435    readonly reserved: u128;5213    readonly reserved: u128;
4436    readonly frozen: u128;5214    readonly frozen: u128;
4437  }5215  }
44385216
4439<<<<<<< HEAD5217<<<<<<< HEAD
5218<<<<<<< HEAD
4440  /** @name OrmlTokensReserveData (352) */5219  /** @name OrmlTokensReserveData (352) */
4441=======5220=======
4442<<<<<<< HEAD5221<<<<<<< HEAD
4445  /** @name OrmlTokensReserveData (351) */5224  /** @name OrmlTokensReserveData (351) */
4446>>>>>>> chore:  regenerate types5225>>>>>>> chore:  regenerate types
4447>>>>>>> chore:  regenerate types5226>>>>>>> chore:  regenerate types
5227=======
5228  /** @name OrmlTokensReserveData (353) */
5229>>>>>>> fix: regenerate types after rebase
4448  interface OrmlTokensReserveData extends Struct {5230  interface OrmlTokensReserveData extends Struct {
4449    readonly id: Null;5231    readonly id: Null;
4450    readonly amount: u128;5232    readonly amount: u128;
4451  }5233  }
44525234
4453<<<<<<< HEAD5235<<<<<<< HEAD
5236<<<<<<< HEAD
4454  /** @name OrmlTokensModuleError (354) */5237  /** @name OrmlTokensModuleError (354) */
4455=======5238=======
4456<<<<<<< HEAD5239<<<<<<< HEAD
4459  /** @name OrmlTokensModuleError (353) */5242  /** @name OrmlTokensModuleError (353) */
4460>>>>>>> chore:  regenerate types5243>>>>>>> chore:  regenerate types
4461>>>>>>> chore:  regenerate types5244>>>>>>> chore:  regenerate types
5245=======
5246  /** @name OrmlTokensModuleError (355) */
5247>>>>>>> fix: regenerate types after rebase
4462  interface OrmlTokensModuleError extends Enum {5248  interface OrmlTokensModuleError extends Enum {
4463    readonly isBalanceTooLow: boolean;5249    readonly isBalanceTooLow: boolean;
4464    readonly isAmountIntoBalanceFailed: boolean;5250    readonly isAmountIntoBalanceFailed: boolean;
4472  }5258  }
44735259
4474<<<<<<< HEAD5260<<<<<<< HEAD
5261<<<<<<< HEAD
4475  /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */5262  /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */
4476=======5263=======
4477<<<<<<< HEAD5264<<<<<<< HEAD
4480  /** @name CumulusPalletXcmpQueueInboundChannelDetails (355) */5267  /** @name CumulusPalletXcmpQueueInboundChannelDetails (355) */
4481>>>>>>> chore:  regenerate types5268>>>>>>> chore:  regenerate types
4482>>>>>>> chore:  regenerate types5269>>>>>>> chore:  regenerate types
5270=======
5271  /** @name CumulusPalletXcmpQueueInboundChannelDetails (357) */
5272>>>>>>> fix: regenerate types after rebase
4483  interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct {5273  interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct {
4484    readonly sender: u32;5274    readonly sender: u32;
4485    readonly state: CumulusPalletXcmpQueueInboundState;5275    readonly state: CumulusPalletXcmpQueueInboundState;
4486    readonly messageMetadata: Vec<ITuple<[u32, PolkadotParachainPrimitivesXcmpMessageFormat]>>;5276    readonly messageMetadata: Vec<ITuple<[u32, PolkadotParachainPrimitivesXcmpMessageFormat]>>;
4487  }5277  }
44885278
4489<<<<<<< HEAD5279<<<<<<< HEAD
5280<<<<<<< HEAD
4490  /** @name CumulusPalletXcmpQueueInboundState (357) */5281  /** @name CumulusPalletXcmpQueueInboundState (357) */
4491=======5282=======
4492<<<<<<< HEAD5283<<<<<<< HEAD
4495  /** @name CumulusPalletXcmpQueueInboundState (356) */5286  /** @name CumulusPalletXcmpQueueInboundState (356) */
4496>>>>>>> chore:  regenerate types5287>>>>>>> chore:  regenerate types
4497>>>>>>> chore:  regenerate types5288>>>>>>> chore:  regenerate types
5289=======
5290  /** @name CumulusPalletXcmpQueueInboundState (358) */
5291>>>>>>> fix: regenerate types after rebase
4498  interface CumulusPalletXcmpQueueInboundState extends Enum {5292  interface CumulusPalletXcmpQueueInboundState extends Enum {
4499    readonly isOk: boolean;5293    readonly isOk: boolean;
4500    readonly isSuspended: boolean;5294    readonly isSuspended: boolean;
4501    readonly type: 'Ok' | 'Suspended';5295    readonly type: 'Ok' | 'Suspended';
4502  }5296  }
45035297
4504<<<<<<< HEAD5298<<<<<<< HEAD
5299<<<<<<< HEAD
4505  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */5300  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */
4506=======5301=======
4507<<<<<<< HEAD5302<<<<<<< HEAD
4510  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (359) */5305  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (359) */
4511>>>>>>> chore:  regenerate types5306>>>>>>> chore:  regenerate types
4512>>>>>>> chore:  regenerate types5307>>>>>>> chore:  regenerate types
5308=======
5309  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (361) */
5310>>>>>>> fix: regenerate types after rebase
4513  interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum {5311  interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum {
4514    readonly isConcatenatedVersionedXcm: boolean;5312    readonly isConcatenatedVersionedXcm: boolean;
4515    readonly isConcatenatedEncodedBlob: boolean;5313    readonly isConcatenatedEncodedBlob: boolean;
4518  }5316  }
45195317
4520<<<<<<< HEAD5318<<<<<<< HEAD
5319<<<<<<< HEAD
4521  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */5320  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */
4522=======5321=======
4523<<<<<<< HEAD5322<<<<<<< HEAD
4526  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (362) */5325  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (362) */
4527>>>>>>> chore:  regenerate types5326>>>>>>> chore:  regenerate types
4528>>>>>>> chore:  regenerate types5327>>>>>>> chore:  regenerate types
5328=======
5329  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (364) */
5330>>>>>>> fix: regenerate types after rebase
4529  interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct {5331  interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct {
4530    readonly recipient: u32;5332    readonly recipient: u32;
4531    readonly state: CumulusPalletXcmpQueueOutboundState;5333    readonly state: CumulusPalletXcmpQueueOutboundState;
4535  }5337  }
45365338
4537<<<<<<< HEAD5339<<<<<<< HEAD
5340<<<<<<< HEAD
4538  /** @name CumulusPalletXcmpQueueOutboundState (364) */5341  /** @name CumulusPalletXcmpQueueOutboundState (364) */
4539=======5342=======
4540<<<<<<< HEAD5343<<<<<<< HEAD
4543  /** @name CumulusPalletXcmpQueueOutboundState (363) */5346  /** @name CumulusPalletXcmpQueueOutboundState (363) */
4544>>>>>>> chore:  regenerate types5347>>>>>>> chore:  regenerate types
4545>>>>>>> chore:  regenerate types5348>>>>>>> chore:  regenerate types
5349=======
5350  /** @name CumulusPalletXcmpQueueOutboundState (365) */
5351>>>>>>> fix: regenerate types after rebase
4546  interface CumulusPalletXcmpQueueOutboundState extends Enum {5352  interface CumulusPalletXcmpQueueOutboundState extends Enum {
4547    readonly isOk: boolean;5353    readonly isOk: boolean;
4548    readonly isSuspended: boolean;5354    readonly isSuspended: boolean;
4549    readonly type: 'Ok' | 'Suspended';5355    readonly type: 'Ok' | 'Suspended';
4550  }5356  }
45515357
4552<<<<<<< HEAD5358<<<<<<< HEAD
5359<<<<<<< HEAD
4553  /** @name CumulusPalletXcmpQueueQueueConfigData (366) */5360  /** @name CumulusPalletXcmpQueueQueueConfigData (366) */
4554=======5361=======
4555<<<<<<< HEAD5362<<<<<<< HEAD
4558  /** @name CumulusPalletXcmpQueueQueueConfigData (365) */5365  /** @name CumulusPalletXcmpQueueQueueConfigData (365) */
4559>>>>>>> chore:  regenerate types5366>>>>>>> chore:  regenerate types
4560>>>>>>> chore:  regenerate types5367>>>>>>> chore:  regenerate types
5368=======
5369  /** @name CumulusPalletXcmpQueueQueueConfigData (367) */
5370>>>>>>> fix: regenerate types after rebase
4561  interface CumulusPalletXcmpQueueQueueConfigData extends Struct {5371  interface CumulusPalletXcmpQueueQueueConfigData extends Struct {
4562    readonly suspendThreshold: u32;5372    readonly suspendThreshold: u32;
4563    readonly dropThreshold: u32;5373    readonly dropThreshold: u32;
4568  }5378  }
45695379
4570<<<<<<< HEAD5380<<<<<<< HEAD
5381<<<<<<< HEAD
4571  /** @name CumulusPalletXcmpQueueError (368) */5382  /** @name CumulusPalletXcmpQueueError (368) */
4572=======5383=======
4573<<<<<<< HEAD5384<<<<<<< HEAD
4576  /** @name CumulusPalletXcmpQueueError (367) */5387  /** @name CumulusPalletXcmpQueueError (367) */
4577>>>>>>> chore:  regenerate types5388>>>>>>> chore:  regenerate types
4578>>>>>>> chore:  regenerate types5389>>>>>>> chore:  regenerate types
5390=======
5391  /** @name CumulusPalletXcmpQueueError (369) */
5392>>>>>>> fix: regenerate types after rebase
4579  interface CumulusPalletXcmpQueueError extends Enum {5393  interface CumulusPalletXcmpQueueError extends Enum {
4580    readonly isFailedToSend: boolean;5394    readonly isFailedToSend: boolean;
4581    readonly isBadXcmOrigin: boolean;5395    readonly isBadXcmOrigin: boolean;
4586  }5400  }
45875401
4588<<<<<<< HEAD5402<<<<<<< HEAD
5403<<<<<<< HEAD
4589  /** @name PalletXcmError (369) */5404  /** @name PalletXcmError (369) */
4590=======5405=======
4591<<<<<<< HEAD5406<<<<<<< HEAD
4594  /** @name PalletXcmError (368) */5409  /** @name PalletXcmError (368) */
4595>>>>>>> chore:  regenerate types5410>>>>>>> chore:  regenerate types
4596>>>>>>> chore:  regenerate types5411>>>>>>> chore:  regenerate types
5412=======
5413  /** @name PalletXcmError (370) */
5414>>>>>>> fix: regenerate types after rebase
4597  interface PalletXcmError extends Enum {5415  interface PalletXcmError extends Enum {
4598    readonly isUnreachable: boolean;5416    readonly isUnreachable: boolean;
4599    readonly isSendFailure: boolean;5417    readonly isSendFailure: boolean;
4612  }5430  }
46135431
4614<<<<<<< HEAD5432<<<<<<< HEAD
5433<<<<<<< HEAD
4615  /** @name CumulusPalletXcmError (370) */5434  /** @name CumulusPalletXcmError (370) */
4616  type CumulusPalletXcmError = Null;5435  type CumulusPalletXcmError = Null;
46175436
4618  /** @name CumulusPalletDmpQueueConfigData (371) */5437  /** @name CumulusPalletDmpQueueConfigData (371) */
4619=======5438=======
4620<<<<<<< HEAD5439<<<<<<< HEAD
5440=======
5441>>>>>>> fix: regenerate types after rebase
4621  /** @name CumulusPalletXcmError (371) */5442  /** @name CumulusPalletXcmError (371) */
4622  type CumulusPalletXcmError = Null;5443  type CumulusPalletXcmError = Null;
46235444
4624  /** @name CumulusPalletDmpQueueConfigData (372) */5445  /** @name CumulusPalletDmpQueueConfigData (372) */
5446<<<<<<< HEAD
4625=======5447=======
4626  /** @name CumulusPalletXcmError (369) */5448  /** @name CumulusPalletXcmError (369) */
4627  type CumulusPalletXcmError = Null;5449  type CumulusPalletXcmError = Null;
46285450
4629  /** @name CumulusPalletDmpQueueConfigData (370) */5451  /** @name CumulusPalletDmpQueueConfigData (370) */
4630>>>>>>> chore:  regenerate types5452>>>>>>> chore:  regenerate types
4631>>>>>>> chore:  regenerate types5453>>>>>>> chore:  regenerate types
5454=======
5455>>>>>>> fix: regenerate types after rebase
4632  interface CumulusPalletDmpQueueConfigData extends Struct {5456  interface CumulusPalletDmpQueueConfigData extends Struct {
4633    readonly maxIndividual: SpWeightsWeightV2Weight;5457    readonly maxIndividual: SpWeightsWeightV2Weight;
4634  }5458  }
46355459
4636<<<<<<< HEAD5460<<<<<<< HEAD
5461<<<<<<< HEAD
4637  /** @name CumulusPalletDmpQueuePageIndexData (372) */5462  /** @name CumulusPalletDmpQueuePageIndexData (372) */
4638=======5463=======
4639<<<<<<< HEAD5464<<<<<<< HEAD
4642  /** @name CumulusPalletDmpQueuePageIndexData (371) */5467  /** @name CumulusPalletDmpQueuePageIndexData (371) */
4643>>>>>>> chore:  regenerate types5468>>>>>>> chore:  regenerate types
4644>>>>>>> chore:  regenerate types5469>>>>>>> chore:  regenerate types
5470=======
5471  /** @name CumulusPalletDmpQueuePageIndexData (373) */
5472>>>>>>> fix: regenerate types after rebase
4645  interface CumulusPalletDmpQueuePageIndexData extends Struct {5473  interface CumulusPalletDmpQueuePageIndexData extends Struct {
4646    readonly beginUsed: u32;5474    readonly beginUsed: u32;
4647    readonly endUsed: u32;5475    readonly endUsed: u32;
4648    readonly overweightCount: u64;5476    readonly overweightCount: u64;
4649  }5477  }
46505478
4651<<<<<<< HEAD5479<<<<<<< HEAD
5480<<<<<<< HEAD
4652  /** @name CumulusPalletDmpQueueError (375) */5481  /** @name CumulusPalletDmpQueueError (375) */
4653=======5482=======
4654<<<<<<< HEAD5483<<<<<<< HEAD
4657  /** @name CumulusPalletDmpQueueError (374) */5486  /** @name CumulusPalletDmpQueueError (374) */
4658>>>>>>> chore:  regenerate types5487>>>>>>> chore:  regenerate types
4659>>>>>>> chore:  regenerate types5488>>>>>>> chore:  regenerate types
5489=======
5490  /** @name CumulusPalletDmpQueueError (376) */
5491>>>>>>> fix: regenerate types after rebase
4660  interface CumulusPalletDmpQueueError extends Enum {5492  interface CumulusPalletDmpQueueError extends Enum {
4661    readonly isUnknown: boolean;5493    readonly isUnknown: boolean;
4662    readonly isOverLimit: boolean;5494    readonly isOverLimit: boolean;
4663    readonly type: 'Unknown' | 'OverLimit';5495    readonly type: 'Unknown' | 'OverLimit';
4664  }5496  }
46655497
4666<<<<<<< HEAD5498<<<<<<< HEAD
5499<<<<<<< HEAD
4667  /** @name PalletUniqueError (379) */5500  /** @name PalletUniqueError (379) */
4668=======5501=======
4669<<<<<<< HEAD5502<<<<<<< HEAD
4672  /** @name PalletUniqueError (378) */5505  /** @name PalletUniqueError (378) */
4673>>>>>>> chore:  regenerate types5506>>>>>>> chore:  regenerate types
4674>>>>>>> chore:  regenerate types5507>>>>>>> chore:  regenerate types
5508=======
5509  /** @name PalletUniqueError (380) */
5510>>>>>>> fix: regenerate types after rebase
4675  interface PalletUniqueError extends Enum {5511  interface PalletUniqueError extends Enum {
4676    readonly isCollectionDecimalPointLimitExceeded: boolean;5512    readonly isCollectionDecimalPointLimitExceeded: boolean;
4677    readonly isEmptyArgument: boolean;5513    readonly isEmptyArgument: boolean;
4694    readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection';5530    readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection';
4695  }5531  }
46965532
4697<<<<<<< HEAD
4698  /** @name PalletUniqueSchedulerV2BlockAgenda (381) */5533  /** @name PalletUniqueSchedulerV2BlockAgenda (381) */
4699=======
4700  /** @name PalletUniqueSchedulerV2BlockAgenda (379) */
4701>>>>>>> chore:  regenerate types
4702  interface PalletUniqueSchedulerV2BlockAgenda extends Struct {5534  interface PalletUniqueSchedulerV2BlockAgenda extends Struct {
4703    readonly agenda: Vec<Option<PalletUniqueSchedulerV2Scheduled>>;5535    readonly agenda: Vec<Option<PalletUniqueSchedulerV2Scheduled>>;
4704    readonly freePlaces: u32;5536    readonly freePlaces: u32;
4705  }5537  }
47065538
4707<<<<<<< HEAD
4708  /** @name PalletUniqueSchedulerV2Scheduled (384) */5539  /** @name PalletUniqueSchedulerV2Scheduled (384) */
4709=======
4710  /** @name PalletUniqueSchedulerV2Scheduled (382) */
4711>>>>>>> chore:  regenerate types
4712  interface PalletUniqueSchedulerV2Scheduled extends Struct {5540  interface PalletUniqueSchedulerV2Scheduled extends Struct {
4713    readonly maybeId: Option<U8aFixed>;5541    readonly maybeId: Option<U8aFixed>;
4714    readonly priority: u8;5542    readonly priority: u8;
4717    readonly origin: OpalRuntimeOriginCaller;5545    readonly origin: OpalRuntimeOriginCaller;
4718  }5546  }
47195547
4720<<<<<<< HEAD
4721  /** @name PalletUniqueSchedulerV2ScheduledCall (385) */5548  /** @name PalletUniqueSchedulerV2ScheduledCall (385) */
4722=======
4723  /** @name PalletUniqueSchedulerV2ScheduledCall (383) */
4724>>>>>>> chore:  regenerate types
4725  interface PalletUniqueSchedulerV2ScheduledCall extends Enum {5549  interface PalletUniqueSchedulerV2ScheduledCall extends Enum {
4726    readonly isInline: boolean;5550    readonly isInline: boolean;
4727    readonly asInline: Bytes;5551    readonly asInline: Bytes;
4733    readonly type: 'Inline' | 'PreimageLookup';5557    readonly type: 'Inline' | 'PreimageLookup';
4734  }5558  }
47355559
4736<<<<<<< HEAD
4737  /** @name OpalRuntimeOriginCaller (387) */5560  /** @name OpalRuntimeOriginCaller (387) */
4738=======
4739  /** @name OpalRuntimeOriginCaller (385) */
4740>>>>>>> chore:  regenerate types
4741  interface OpalRuntimeOriginCaller extends Enum {5561  interface OpalRuntimeOriginCaller extends Enum {
4742    readonly isSystem: boolean;5562    readonly isSystem: boolean;
4743    readonly asSystem: FrameSupportDispatchRawOrigin;5563    readonly asSystem: FrameSupportDispatchRawOrigin;
4751    readonly type: 'System' | 'Void' | 'PolkadotXcm' | 'CumulusXcm' | 'Ethereum';5571    readonly type: 'System' | 'Void' | 'PolkadotXcm' | 'CumulusXcm' | 'Ethereum';
4752  }5572  }
47535573
4754<<<<<<< HEAD
4755  /** @name FrameSupportDispatchRawOrigin (388) */5574  /** @name FrameSupportDispatchRawOrigin (388) */
4756=======
4757  /** @name FrameSupportDispatchRawOrigin (386) */
4758>>>>>>> chore:  regenerate types
4759  interface FrameSupportDispatchRawOrigin extends Enum {5575  interface FrameSupportDispatchRawOrigin extends Enum {
4760    readonly isRoot: boolean;5576    readonly isRoot: boolean;
4761    readonly isSigned: boolean;5577    readonly isSigned: boolean;
4764    readonly type: 'Root' | 'Signed' | 'None';5580    readonly type: 'Root' | 'Signed' | 'None';
4765  }5581  }
47665582
4767<<<<<<< HEAD
4768  /** @name PalletXcmOrigin (389) */5583  /** @name PalletXcmOrigin (389) */
4769=======
4770  /** @name PalletXcmOrigin (387) */
4771>>>>>>> chore:  regenerate types
4772  interface PalletXcmOrigin extends Enum {5584  interface PalletXcmOrigin extends Enum {
4773    readonly isXcm: boolean;5585    readonly isXcm: boolean;
4774    readonly asXcm: XcmV1MultiLocation;5586    readonly asXcm: XcmV1MultiLocation;
4777    readonly type: 'Xcm' | 'Response';5589    readonly type: 'Xcm' | 'Response';
4778  }5590  }
47795591
4780<<<<<<< HEAD
4781  /** @name CumulusPalletXcmOrigin (390) */5592  /** @name CumulusPalletXcmOrigin (390) */
4782=======
4783  /** @name CumulusPalletXcmOrigin (388) */
4784>>>>>>> chore:  regenerate types
4785  interface CumulusPalletXcmOrigin extends Enum {5593  interface CumulusPalletXcmOrigin extends Enum {
4786    readonly isRelay: boolean;5594    readonly isRelay: boolean;
4787    readonly isSiblingParachain: boolean;5595    readonly isSiblingParachain: boolean;
4788    readonly asSiblingParachain: u32;5596    readonly asSiblingParachain: u32;
4789    readonly type: 'Relay' | 'SiblingParachain';5597    readonly type: 'Relay' | 'SiblingParachain';
4790  }5598  }
47915599
4792<<<<<<< HEAD
4793  /** @name PalletEthereumRawOrigin (391) */5600  /** @name PalletEthereumRawOrigin (391) */
4794=======
4795  /** @name PalletEthereumRawOrigin (389) */
4796>>>>>>> chore:  regenerate types
4797  interface PalletEthereumRawOrigin extends Enum {5601  interface PalletEthereumRawOrigin extends Enum {
4798    readonly isEthereumTransaction: boolean;5602    readonly isEthereumTransaction: boolean;
4799    readonly asEthereumTransaction: H160;5603    readonly asEthereumTransaction: H160;
4800    readonly type: 'EthereumTransaction';5604    readonly type: 'EthereumTransaction';
4801  }5605  }
48025606
4803<<<<<<< HEAD
4804  /** @name SpCoreVoid (392) */5607  /** @name SpCoreVoid (392) */
4805  type SpCoreVoid = Null;5608  type SpCoreVoid = Null;
48065609
4807  /** @name PalletUniqueSchedulerV2Error (394) */5610  /** @name PalletUniqueSchedulerV2Error (394) */
4808=======
4809  /** @name SpCoreVoid (390) */
4810  type SpCoreVoid = Null;
4811
4812  /** @name PalletUniqueSchedulerV2Error (392) */
4813>>>>>>> chore:  regenerate types
4814  interface PalletUniqueSchedulerV2Error extends Enum {5611  interface PalletUniqueSchedulerV2Error extends Enum {
4815    readonly isFailedToSchedule: boolean;5612    readonly isFailedToSchedule: boolean;
4816    readonly isAgendaIsExhausted: boolean;5613    readonly isAgendaIsExhausted: boolean;
4823    readonly type: 'FailedToSchedule' | 'AgendaIsExhausted' | 'ScheduledCallCorrupted' | 'PreimageNotFound' | 'TooBigScheduledCall' | 'NotFound' | 'TargetBlockNumberInPast' | 'Named';5620    readonly type: 'FailedToSchedule' | 'AgendaIsExhausted' | 'ScheduledCallCorrupted' | 'PreimageNotFound' | 'TooBigScheduledCall' | 'NotFound' | 'TargetBlockNumberInPast' | 'Named';
4824  }5621  }
48255622
5623  /** @name UpDataStructsCollection (395) */
4826<<<<<<< HEAD5624<<<<<<< HEAD
4827  /** @name UpDataStructsCollection (395) */
4828=======5625=======
4829  /** @name UpDataStructsCollection (393) */5626  /** @name UpDataStructsCollection (393) */
4830>>>>>>> chore:  regenerate types5627>>>>>>> chore:  regenerate types
4831>>>>>>> chore:  regenerate types5628>>>>>>> chore:  regenerate types
5629<<<<<<< HEAD
4832>>>>>>> chore:  regenerate types5630>>>>>>> chore:  regenerate types
5631=======
5632=======
5633>>>>>>> fix: regenerate types after rebase
5634>>>>>>> fix: regenerate types after rebase
4833  interface UpDataStructsCollection extends Struct {5635  interface UpDataStructsCollection extends Struct {
4834    readonly owner: AccountId32;5636    readonly owner: AccountId32;
4835    readonly mode: UpDataStructsCollectionMode;5637    readonly mode: UpDataStructsCollectionMode;
4843  }5645  }
48445646
4845<<<<<<< HEAD5647<<<<<<< HEAD
5648<<<<<<< HEAD
4846  /** @name UpDataStructsSponsorshipStateAccountId32 (382) */5649  /** @name UpDataStructsSponsorshipStateAccountId32 (382) */
4847=======5650=======
5651=======
5652>>>>>>> fix: regenerate types after rebase
4848<<<<<<< HEAD5653<<<<<<< HEAD
4849  /** @name UpDataStructsSponsorshipStateAccountId32 (383) */5654  /** @name UpDataStructsSponsorshipStateAccountId32 (383) */
4850=======5655=======
4854  /** @name UpDataStructsSponsorshipStateAccountId32 (394) */5659  /** @name UpDataStructsSponsorshipStateAccountId32 (394) */
4855>>>>>>> chore:  regenerate types5660>>>>>>> chore:  regenerate types
4856>>>>>>> chore:  regenerate types5661>>>>>>> chore:  regenerate types
5662<<<<<<< HEAD
4857>>>>>>> chore:  regenerate types5663>>>>>>> chore:  regenerate types
5664=======
5665=======
5666  /** @name UpDataStructsSponsorshipStateAccountId32 (396) */
5667>>>>>>> fix: regenerate types after rebase
5668>>>>>>> fix: regenerate types after rebase
4858  interface UpDataStructsSponsorshipStateAccountId32 extends Enum {5669  interface UpDataStructsSponsorshipStateAccountId32 extends Enum {
4859    readonly isDisabled: boolean;5670    readonly isDisabled: boolean;
4860    readonly isUnconfirmed: boolean;5671    readonly isUnconfirmed: boolean;
4865  }5676  }
48665677
4867<<<<<<< HEAD5678<<<<<<< HEAD
5679<<<<<<< HEAD
4868  /** @name UpDataStructsProperties (384) */5680  /** @name UpDataStructsProperties (384) */
4869=======5681=======
5682=======
5683>>>>>>> fix: regenerate types after rebase
4870<<<<<<< HEAD5684<<<<<<< HEAD
4871  /** @name UpDataStructsProperties (385) */5685  /** @name UpDataStructsProperties (385) */
4872=======5686=======
4876  /** @name UpDataStructsProperties (396) */5690  /** @name UpDataStructsProperties (396) */
4877>>>>>>> chore:  regenerate types5691>>>>>>> chore:  regenerate types
4878>>>>>>> chore:  regenerate types5692>>>>>>> chore:  regenerate types
5693<<<<<<< HEAD
4879>>>>>>> chore:  regenerate types5694>>>>>>> chore:  regenerate types
5695=======
5696=======
5697  /** @name UpDataStructsProperties (398) */
5698>>>>>>> fix: regenerate types after rebase
5699>>>>>>> fix: regenerate types after rebase
4880  interface UpDataStructsProperties extends Struct {5700  interface UpDataStructsProperties extends Struct {
4881    readonly map: UpDataStructsPropertiesMapBoundedVec;5701    readonly map: UpDataStructsPropertiesMapBoundedVec;
4882    readonly consumedSpace: u32;5702    readonly consumedSpace: u32;
4883    readonly spaceLimit: u32;5703    readonly spaceLimit: u32;
4884  }5704  }
48855705
4886<<<<<<< HEAD5706<<<<<<< HEAD
5707<<<<<<< HEAD
4887  /** @name UpDataStructsPropertiesMapBoundedVec (385) */5708  /** @name UpDataStructsPropertiesMapBoundedVec (385) */
4888=======5709=======
5710=======
5711>>>>>>> fix: regenerate types after rebase
4889<<<<<<< HEAD5712<<<<<<< HEAD
4890  /** @name UpDataStructsPropertiesMapBoundedVec (386) */5713  /** @name UpDataStructsPropertiesMapBoundedVec (386) */
4891=======5714=======
4892<<<<<<< HEAD5715<<<<<<< HEAD
5716=======
5717>>>>>>> fix: regenerate types after rebase
4893  /** @name UpDataStructsPropertiesMapBoundedVec (399) */5718  /** @name UpDataStructsPropertiesMapBoundedVec (399) */
4894>>>>>>> chore:  regenerate types5719>>>>>>> chore:  regenerate types
4895>>>>>>> chore:  regenerate types5720>>>>>>> chore:  regenerate types
4905  /** @name UpDataStructsCollectionStats (398) */5730  /** @name UpDataStructsCollectionStats (398) */
4906=======5731=======
4907  /** @name UpDataStructsCollectionStats (411) */5732  /** @name UpDataStructsCollectionStats (411) */
5733<<<<<<< HEAD
4908=======5734=======
4909  /** @name UpDataStructsPropertiesMapBoundedVec (397) */5735  /** @name UpDataStructsPropertiesMapBoundedVec (397) */
4910  interface UpDataStructsPropertiesMapBoundedVec extends BTreeMap<Bytes, Bytes> {}5736  interface UpDataStructsPropertiesMapBoundedVec extends BTreeMap<Bytes, Bytes> {}
4915  /** @name UpDataStructsCollectionStats (409) */5741  /** @name UpDataStructsCollectionStats (409) */
4916>>>>>>> chore:  regenerate types5742>>>>>>> chore:  regenerate types
4917>>>>>>> chore:  regenerate types5743>>>>>>> chore:  regenerate types
5744<<<<<<< HEAD
4918>>>>>>> chore:  regenerate types5745>>>>>>> chore:  regenerate types
5746=======
5747=======
5748>>>>>>> fix: regenerate types after rebase
5749>>>>>>> fix: regenerate types after rebase
4919  interface UpDataStructsCollectionStats extends Struct {5750  interface UpDataStructsCollectionStats extends Struct {
4920    readonly created: u32;5751    readonly created: u32;
4921    readonly destroyed: u32;5752    readonly destroyed: u32;
4922    readonly alive: u32;5753    readonly alive: u32;
4923  }5754  }
49245755
4925<<<<<<< HEAD5756<<<<<<< HEAD
5757<<<<<<< HEAD
4926  /** @name UpDataStructsTokenChild (398) */5758  /** @name UpDataStructsTokenChild (398) */
4927=======5759=======
5760=======
5761>>>>>>> fix: regenerate types after rebase
4928<<<<<<< HEAD5762<<<<<<< HEAD
4929  /** @name UpDataStructsTokenChild (399) */5763  /** @name UpDataStructsTokenChild (399) */
4930=======5764=======
4934  /** @name UpDataStructsTokenChild (410) */5768  /** @name UpDataStructsTokenChild (410) */
4935>>>>>>> chore:  regenerate types5769>>>>>>> chore:  regenerate types
4936>>>>>>> chore:  regenerate types5770>>>>>>> chore:  regenerate types
5771<<<<<<< HEAD
4937>>>>>>> chore:  regenerate types5772>>>>>>> chore:  regenerate types
5773=======
5774=======
5775  /** @name UpDataStructsTokenChild (412) */
5776>>>>>>> fix: regenerate types after rebase
5777>>>>>>> fix: regenerate types after rebase
4938  interface UpDataStructsTokenChild extends Struct {5778  interface UpDataStructsTokenChild extends Struct {
4939    readonly token: u32;5779    readonly token: u32;
4940    readonly collection: u32;5780    readonly collection: u32;
4941  }5781  }
49425782
4943<<<<<<< HEAD5783<<<<<<< HEAD
4944<<<<<<< HEAD5784<<<<<<< HEAD
5785<<<<<<< HEAD
4945  /** @name PhantomTypeUpDataStructs (399) */5786  /** @name PhantomTypeUpDataStructs (399) */
4946=======5787=======
4947=======5788=======
4948>>>>>>> chore:  regenerate types5789>>>>>>> chore:  regenerate types
5790=======
5791>>>>>>> fix: regenerate types after rebase
4949<<<<<<< HEAD5792<<<<<<< HEAD
4950  /** @name PhantomTypeUpDataStructs (400) */5793  /** @name PhantomTypeUpDataStructs (400) */
4951=======5794=======
4961=======5804=======
4962  /** @name PhantomTypeUpDataStructs (411) */5805  /** @name PhantomTypeUpDataStructs (411) */
4963>>>>>>> chore:  regenerate types5806>>>>>>> chore:  regenerate types
5807=======
5808  /** @name PhantomTypeUpDataStructs (413) */
5809>>>>>>> fix: regenerate types after rebase
4964  interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftNftInfo, RmrkTraitsResourceResourceInfo, RmrkTraitsPropertyPropertyInfo, RmrkTraitsBaseBaseInfo, RmrkTraitsPartPartType, RmrkTraitsTheme, RmrkTraitsNftNftChild, UpPovEstimateRpcPovInfo]>> {}5810  interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftNftInfo, RmrkTraitsResourceResourceInfo, RmrkTraitsPropertyPropertyInfo, RmrkTraitsBaseBaseInfo, RmrkTraitsPartPartType, RmrkTraitsTheme, RmrkTraitsNftNftChild, UpPovEstimateRpcPovInfo]>> {}
4965>>>>>>> fix: update polkadot types and definitions
49665811
4967<<<<<<< HEAD5812<<<<<<< HEAD
5813<<<<<<< HEAD
4968  /** @name UpDataStructsTokenData (401) */5814  /** @name UpDataStructsTokenData (401) */
4969=======5815=======
5816=======
5817>>>>>>> fix: regenerate types after rebase
4970<<<<<<< HEAD5818<<<<<<< HEAD
4971  /** @name UpDataStructsTokenData (402) */5819  /** @name UpDataStructsTokenData (402) */
4972=======5820=======
4976  /** @name UpDataStructsTokenData (413) */5824  /** @name UpDataStructsTokenData (413) */
4977>>>>>>> chore:  regenerate types5825>>>>>>> chore:  regenerate types
4978>>>>>>> chore:  regenerate types5826>>>>>>> chore:  regenerate types
5827<<<<<<< HEAD
4979>>>>>>> chore:  regenerate types5828>>>>>>> chore:  regenerate types
5829=======
5830=======
5831  /** @name UpDataStructsTokenData (415) */
5832>>>>>>> fix: regenerate types after rebase
5833>>>>>>> fix: regenerate types after rebase
4980  interface UpDataStructsTokenData extends Struct {5834  interface UpDataStructsTokenData extends Struct {
4981    readonly properties: Vec<UpDataStructsProperty>;5835    readonly properties: Vec<UpDataStructsProperty>;
4982    readonly owner: Option<PalletEvmAccountBasicCrossAccountIdRepr>;5836    readonly owner: Option<PalletEvmAccountBasicCrossAccountIdRepr>;
4983    readonly pieces: u128;5837    readonly pieces: u128;
4984  }5838  }
49855839
4986<<<<<<< HEAD5840<<<<<<< HEAD
5841<<<<<<< HEAD
4987  /** @name UpDataStructsRpcCollection (403) */5842  /** @name UpDataStructsRpcCollection (403) */
4988=======5843=======
5844=======
5845>>>>>>> fix: regenerate types after rebase
4989<<<<<<< HEAD5846<<<<<<< HEAD
4990  /** @name UpDataStructsRpcCollection (404) */5847  /** @name UpDataStructsRpcCollection (404) */
4991=======5848=======
4995  /** @name UpDataStructsRpcCollection (415) */5852  /** @name UpDataStructsRpcCollection (415) */
4996>>>>>>> chore:  regenerate types5853>>>>>>> chore:  regenerate types
4997>>>>>>> chore:  regenerate types5854>>>>>>> chore:  regenerate types
5855<<<<<<< HEAD
4998>>>>>>> chore:  regenerate types5856>>>>>>> chore:  regenerate types
5857=======
5858=======
5859  /** @name UpDataStructsRpcCollection (417) */
5860>>>>>>> fix: regenerate types after rebase
5861>>>>>>> fix: regenerate types after rebase
4999  interface UpDataStructsRpcCollection extends Struct {5862  interface UpDataStructsRpcCollection extends Struct {
5000    readonly owner: AccountId32;5863    readonly owner: AccountId32;
5001    readonly mode: UpDataStructsCollectionMode;5864    readonly mode: UpDataStructsCollectionMode;
5012  }5875  }
50135876
5014<<<<<<< HEAD5877<<<<<<< HEAD
5878<<<<<<< HEAD
5015  /** @name UpDataStructsRpcCollectionFlags (404) */5879  /** @name UpDataStructsRpcCollectionFlags (404) */
5016=======5880=======
5881=======
5882>>>>>>> fix: regenerate types after rebase
5017<<<<<<< HEAD5883<<<<<<< HEAD
5018  /** @name UpDataStructsRpcCollectionFlags (405) */5884  /** @name UpDataStructsRpcCollectionFlags (405) */
5019=======5885=======
5023  /** @name UpDataStructsRpcCollectionFlags (416) */5889  /** @name UpDataStructsRpcCollectionFlags (416) */
5024>>>>>>> chore:  regenerate types5890>>>>>>> chore:  regenerate types
5025>>>>>>> chore:  regenerate types5891>>>>>>> chore:  regenerate types
5892<<<<<<< HEAD
5026>>>>>>> chore:  regenerate types5893>>>>>>> chore:  regenerate types
5894=======
5895=======
5896  /** @name UpDataStructsRpcCollectionFlags (418) */
5897>>>>>>> fix: regenerate types after rebase
5898>>>>>>> fix: regenerate types after rebase
5027  interface UpDataStructsRpcCollectionFlags extends Struct {5899  interface UpDataStructsRpcCollectionFlags extends Struct {
5028    readonly foreign: bool;5900    readonly foreign: bool;
5029    readonly erc721metadata: bool;5901    readonly erc721metadata: bool;
5030  }5902  }
50315903
5032<<<<<<< HEAD5904<<<<<<< HEAD
5905<<<<<<< HEAD
5033  /** @name RmrkTraitsCollectionCollectionInfo (405) */5906  /** @name RmrkTraitsCollectionCollectionInfo (405) */
5034=======5907=======
5908=======
5909>>>>>>> fix: regenerate types after rebase
5035<<<<<<< HEAD5910<<<<<<< HEAD
5036  /** @name RmrkTraitsCollectionCollectionInfo (406) */5911  /** @name RmrkTraitsCollectionCollectionInfo (406) */
5037=======5912=======
5041  /** @name RmrkTraitsCollectionCollectionInfo (417) */5916  /** @name RmrkTraitsCollectionCollectionInfo (417) */
5042>>>>>>> chore:  regenerate types5917>>>>>>> chore:  regenerate types
5043>>>>>>> chore:  regenerate types5918>>>>>>> chore:  regenerate types
5919<<<<<<< HEAD
5044>>>>>>> chore:  regenerate types5920>>>>>>> chore:  regenerate types
5921=======
5922=======
5923  /** @name RmrkTraitsCollectionCollectionInfo (419) */
5924>>>>>>> fix: regenerate types after rebase
5925>>>>>>> fix: regenerate types after rebase
5045  interface RmrkTraitsCollectionCollectionInfo extends Struct {5926  interface RmrkTraitsCollectionCollectionInfo extends Struct {
5046    readonly issuer: AccountId32;5927    readonly issuer: AccountId32;
5047    readonly metadata: Bytes;5928    readonly metadata: Bytes;
5051  }5932  }
50525933
5053<<<<<<< HEAD5934<<<<<<< HEAD
5935<<<<<<< HEAD
5054  /** @name RmrkTraitsNftNftInfo (406) */5936  /** @name RmrkTraitsNftNftInfo (406) */
5055=======5937=======
5938=======
5939>>>>>>> fix: regenerate types after rebase
5056<<<<<<< HEAD5940<<<<<<< HEAD
5057  /** @name RmrkTraitsNftNftInfo (407) */5941  /** @name RmrkTraitsNftNftInfo (407) */
5058=======5942=======
5062  /** @name RmrkTraitsNftNftInfo (418) */5946  /** @name RmrkTraitsNftNftInfo (418) */
5063>>>>>>> chore:  regenerate types5947>>>>>>> chore:  regenerate types
5064>>>>>>> chore:  regenerate types5948>>>>>>> chore:  regenerate types
5949<<<<<<< HEAD
5065>>>>>>> chore:  regenerate types5950>>>>>>> chore:  regenerate types
5951=======
5952=======
5953  /** @name RmrkTraitsNftNftInfo (420) */
5954>>>>>>> fix: regenerate types after rebase
5955>>>>>>> fix: regenerate types after rebase
5066  interface RmrkTraitsNftNftInfo extends Struct {5956  interface RmrkTraitsNftNftInfo extends Struct {
5067    readonly owner: RmrkTraitsNftAccountIdOrCollectionNftTuple;5957    readonly owner: RmrkTraitsNftAccountIdOrCollectionNftTuple;
5068    readonly royalty: Option<RmrkTraitsNftRoyaltyInfo>;5958    readonly royalty: Option<RmrkTraitsNftRoyaltyInfo>;
5072  }5962  }
50735963
5074<<<<<<< HEAD5964<<<<<<< HEAD
5965<<<<<<< HEAD
5075  /** @name RmrkTraitsNftRoyaltyInfo (408) */5966  /** @name RmrkTraitsNftRoyaltyInfo (408) */
5076=======5967=======
5968=======
5969>>>>>>> fix: regenerate types after rebase
5077<<<<<<< HEAD5970<<<<<<< HEAD
5078  /** @name RmrkTraitsNftRoyaltyInfo (409) */5971  /** @name RmrkTraitsNftRoyaltyInfo (409) */
5079=======5972=======
5083  /** @name RmrkTraitsNftRoyaltyInfo (420) */5976  /** @name RmrkTraitsNftRoyaltyInfo (420) */
5084>>>>>>> chore:  regenerate types5977>>>>>>> chore:  regenerate types
5085>>>>>>> chore:  regenerate types5978>>>>>>> chore:  regenerate types
5979<<<<<<< HEAD
5086>>>>>>> chore:  regenerate types5980>>>>>>> chore:  regenerate types
5981=======
5982=======
5983  /** @name RmrkTraitsNftRoyaltyInfo (422) */
5984>>>>>>> fix: regenerate types after rebase
5985>>>>>>> fix: regenerate types after rebase
5087  interface RmrkTraitsNftRoyaltyInfo extends Struct {5986  interface RmrkTraitsNftRoyaltyInfo extends Struct {
5088    readonly recipient: AccountId32;5987    readonly recipient: AccountId32;
5089    readonly amount: Permill;5988    readonly amount: Permill;
5090  }5989  }
50915990
5092<<<<<<< HEAD5991<<<<<<< HEAD
5992<<<<<<< HEAD
5093  /** @name RmrkTraitsResourceResourceInfo (409) */5993  /** @name RmrkTraitsResourceResourceInfo (409) */
5094=======5994=======
5995=======
5996>>>>>>> fix: regenerate types after rebase
5095<<<<<<< HEAD5997<<<<<<< HEAD
5096  /** @name RmrkTraitsResourceResourceInfo (410) */5998  /** @name RmrkTraitsResourceResourceInfo (410) */
5097=======5999=======
5101  /** @name RmrkTraitsResourceResourceInfo (421) */6003  /** @name RmrkTraitsResourceResourceInfo (421) */
5102>>>>>>> chore:  regenerate types6004>>>>>>> chore:  regenerate types
5103>>>>>>> chore:  regenerate types6005>>>>>>> chore:  regenerate types
6006<<<<<<< HEAD
5104>>>>>>> chore:  regenerate types6007>>>>>>> chore:  regenerate types
6008=======
6009=======
6010  /** @name RmrkTraitsResourceResourceInfo (423) */
6011>>>>>>> fix: regenerate types after rebase
6012>>>>>>> fix: regenerate types after rebase
5105  interface RmrkTraitsResourceResourceInfo extends Struct {6013  interface RmrkTraitsResourceResourceInfo extends Struct {
5106    readonly id: u32;6014    readonly id: u32;
5107    readonly resource: RmrkTraitsResourceResourceTypes;6015    readonly resource: RmrkTraitsResourceResourceTypes;
5110  }6018  }
51116019
5112<<<<<<< HEAD6020<<<<<<< HEAD
6021<<<<<<< HEAD
5113  /** @name RmrkTraitsPropertyPropertyInfo (410) */6022  /** @name RmrkTraitsPropertyPropertyInfo (410) */
5114=======6023=======
6024=======
6025>>>>>>> fix: regenerate types after rebase
5115<<<<<<< HEAD6026<<<<<<< HEAD
5116  /** @name RmrkTraitsPropertyPropertyInfo (411) */6027  /** @name RmrkTraitsPropertyPropertyInfo (411) */
5117=======6028=======
5121  /** @name RmrkTraitsPropertyPropertyInfo (422) */6032  /** @name RmrkTraitsPropertyPropertyInfo (422) */
5122>>>>>>> chore:  regenerate types6033>>>>>>> chore:  regenerate types
5123>>>>>>> chore:  regenerate types6034>>>>>>> chore:  regenerate types
6035<<<<<<< HEAD
5124>>>>>>> chore:  regenerate types6036>>>>>>> chore:  regenerate types
6037=======
6038=======
6039  /** @name RmrkTraitsPropertyPropertyInfo (424) */
6040>>>>>>> fix: regenerate types after rebase
6041>>>>>>> fix: regenerate types after rebase
5125  interface RmrkTraitsPropertyPropertyInfo extends Struct {6042  interface RmrkTraitsPropertyPropertyInfo extends Struct {
5126    readonly key: Bytes;6043    readonly key: Bytes;
5127    readonly value: Bytes;6044    readonly value: Bytes;
5128  }6045  }
51296046
5130<<<<<<< HEAD6047<<<<<<< HEAD
6048<<<<<<< HEAD
5131  /** @name RmrkTraitsBaseBaseInfo (411) */6049  /** @name RmrkTraitsBaseBaseInfo (411) */
5132=======6050=======
6051=======
6052>>>>>>> fix: regenerate types after rebase
5133<<<<<<< HEAD6053<<<<<<< HEAD
5134  /** @name RmrkTraitsBaseBaseInfo (412) */6054  /** @name RmrkTraitsBaseBaseInfo (412) */
5135=======6055=======
5139  /** @name RmrkTraitsBaseBaseInfo (423) */6059  /** @name RmrkTraitsBaseBaseInfo (423) */
5140>>>>>>> chore:  regenerate types6060>>>>>>> chore:  regenerate types
5141>>>>>>> chore:  regenerate types6061>>>>>>> chore:  regenerate types
6062<<<<<<< HEAD
5142>>>>>>> chore:  regenerate types6063>>>>>>> chore:  regenerate types
6064=======
6065=======
6066  /** @name RmrkTraitsBaseBaseInfo (425) */
6067>>>>>>> fix: regenerate types after rebase
6068>>>>>>> fix: regenerate types after rebase
5143  interface RmrkTraitsBaseBaseInfo extends Struct {6069  interface RmrkTraitsBaseBaseInfo extends Struct {
5144    readonly issuer: AccountId32;6070    readonly issuer: AccountId32;
5145    readonly baseType: Bytes;6071    readonly baseType: Bytes;
5146    readonly symbol: Bytes;6072    readonly symbol: Bytes;
5147  }6073  }
51486074
5149<<<<<<< HEAD6075<<<<<<< HEAD
6076<<<<<<< HEAD
5150  /** @name RmrkTraitsNftNftChild (412) */6077  /** @name RmrkTraitsNftNftChild (412) */
5151=======6078=======
6079=======
6080>>>>>>> fix: regenerate types after rebase
5152<<<<<<< HEAD6081<<<<<<< HEAD
5153  /** @name RmrkTraitsNftNftChild (413) */6082  /** @name RmrkTraitsNftNftChild (413) */
5154=======6083=======
5158  /** @name RmrkTraitsNftNftChild (424) */6087  /** @name RmrkTraitsNftNftChild (424) */
5159>>>>>>> chore:  regenerate types6088>>>>>>> chore:  regenerate types
5160>>>>>>> chore:  regenerate types6089>>>>>>> chore:  regenerate types
6090<<<<<<< HEAD
5161>>>>>>> chore:  regenerate types6091>>>>>>> chore:  regenerate types
6092=======
6093=======
6094  /** @name RmrkTraitsNftNftChild (426) */
6095>>>>>>> fix: regenerate types after rebase
6096>>>>>>> fix: regenerate types after rebase
5162  interface RmrkTraitsNftNftChild extends Struct {6097  interface RmrkTraitsNftNftChild extends Struct {
5163    readonly collectionId: u32;6098    readonly collectionId: u32;
5164    readonly nftId: u32;6099    readonly nftId: u32;
5165  }6100  }
51666101
5167<<<<<<< HEAD6102<<<<<<< HEAD
5168<<<<<<< HEAD6103<<<<<<< HEAD
6104<<<<<<< HEAD
5169  /** @name PalletCommonError (414) */6105  /** @name PalletCommonError (414) */
5170=======6106=======
5171=======6107=======
5172>>>>>>> chore:  regenerate types6108>>>>>>> chore:  regenerate types
6109=======
6110>>>>>>> fix: regenerate types after rebase
5173<<<<<<< HEAD6111<<<<<<< HEAD
5174  /** @name PalletCommonError (415) */6112  /** @name PalletCommonError (415) */
5175=======6113=======
5182=======6120=======
5183  /** @name UpPovEstimateRpcPovInfo (425) */6121  /** @name UpPovEstimateRpcPovInfo (425) */
5184>>>>>>> chore:  regenerate types6122>>>>>>> chore:  regenerate types
6123=======
6124  /** @name UpPovEstimateRpcPovInfo (427) */
6125>>>>>>> fix: regenerate types after rebase
5185  interface UpPovEstimateRpcPovInfo extends Struct {6126  interface UpPovEstimateRpcPovInfo extends Struct {
5186    readonly proofSize: u64;6127    readonly proofSize: u64;
5187    readonly compactProofSize: u64;6128    readonly compactProofSize: u64;
51926133
5193<<<<<<< HEAD6134<<<<<<< HEAD
5194<<<<<<< HEAD6135<<<<<<< HEAD
6136<<<<<<< HEAD
5195  /** @name PalletCommonError (424) */6137  /** @name PalletCommonError (424) */
5196>>>>>>> fix: update polkadot types and definitions6138>>>>>>> fix: update polkadot types and definitions
5197<<<<<<< HEAD6139<<<<<<< HEAD
5205=======6147=======
5206  /** @name SpRuntimeTransactionValidityTransactionValidityError (428) */6148  /** @name SpRuntimeTransactionValidityTransactionValidityError (428) */
5207>>>>>>> chore:  regenerate types6149>>>>>>> chore:  regenerate types
6150=======
6151  /** @name SpRuntimeTransactionValidityTransactionValidityError (430) */
6152>>>>>>> fix: regenerate types after rebase
5208  interface SpRuntimeTransactionValidityTransactionValidityError extends Enum {6153  interface SpRuntimeTransactionValidityTransactionValidityError extends Enum {
5209    readonly isInvalid: boolean;6154    readonly isInvalid: boolean;
5210    readonly asInvalid: SpRuntimeTransactionValidityInvalidTransaction;6155    readonly asInvalid: SpRuntimeTransactionValidityInvalidTransaction;
5213    readonly type: 'Invalid' | 'Unknown';6158    readonly type: 'Invalid' | 'Unknown';
5214  }6159  }
52156160
5216  /** @name SpRuntimeTransactionValidityInvalidTransaction (429) */6161  /** @name SpRuntimeTransactionValidityInvalidTransaction (431) */
5217  interface SpRuntimeTransactionValidityInvalidTransaction extends Enum {6162  interface SpRuntimeTransactionValidityInvalidTransaction extends Enum {
5218    readonly isCall: boolean;6163    readonly isCall: boolean;
5219    readonly isPayment: boolean;6164    readonly isPayment: boolean;
5230    readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryDispatch' | 'BadSigner';6175    readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryDispatch' | 'BadSigner';
5231  }6176  }
52326177
5233  /** @name SpRuntimeTransactionValidityUnknownTransaction (430) */6178  /** @name SpRuntimeTransactionValidityUnknownTransaction (432) */
5234  interface SpRuntimeTransactionValidityUnknownTransaction extends Enum {6179  interface SpRuntimeTransactionValidityUnknownTransaction extends Enum {
5235    readonly isCannotLookup: boolean;6180    readonly isCannotLookup: boolean;
5236    readonly isNoUnsignedValidator: boolean;6181    readonly isNoUnsignedValidator: boolean;
5240  }6185  }
52416186
5242<<<<<<< HEAD6187<<<<<<< HEAD
6188<<<<<<< HEAD
5243  /** @name PalletCommonError (428) */6189  /** @name PalletCommonError (428) */
5244>>>>>>> chore: regenerate types6190>>>>>>> chore: regenerate types
5245<<<<<<< HEAD6191<<<<<<< HEAD
5250=======6196=======
5251=======6197=======
5252  /** @name UpPovEstimateRpcTrieKeyValue (432) */6198  /** @name UpPovEstimateRpcTrieKeyValue (432) */
6199=======
6200  /** @name UpPovEstimateRpcTrieKeyValue (434) */
6201>>>>>>> fix: regenerate types after rebase
5253  interface UpPovEstimateRpcTrieKeyValue extends Struct {6202  interface UpPovEstimateRpcTrieKeyValue extends Struct {
5254    readonly key: Bytes;6203    readonly key: Bytes;
5255    readonly value: Bytes;6204    readonly value: Bytes;
5256  }6205  }
52576206
6207<<<<<<< HEAD
5258  /** @name PalletCommonError (434) */6208  /** @name PalletCommonError (434) */
5259>>>>>>> chore:  regenerate types6209>>>>>>> chore:  regenerate types
5260>>>>>>> chore:  regenerate types6210>>>>>>> chore:  regenerate types
6211<<<<<<< HEAD
5261>>>>>>> chore:  regenerate types6212>>>>>>> chore:  regenerate types
6213=======
6214=======
6215  /** @name PalletCommonError (436) */
6216>>>>>>> fix: regenerate types after rebase
6217>>>>>>> fix: regenerate types after rebase
5262  interface PalletCommonError extends Enum {6218  interface PalletCommonError extends Enum {
5263    readonly isCollectionNotFound: boolean;6219    readonly isCollectionNotFound: boolean;
5264    readonly isMustBeTokenOwner: boolean;6220    readonly isMustBeTokenOwner: boolean;
5302<<<<<<< HEAD6258<<<<<<< HEAD
5303<<<<<<< HEAD6259<<<<<<< HEAD
5304<<<<<<< HEAD6260<<<<<<< HEAD
6261<<<<<<< HEAD
5305  /** @name PalletFungibleError (416) */6262  /** @name PalletFungibleError (416) */
5306=======6263=======
5307=======6264=======
5308>>>>>>> chore: regenerate types6265>>>>>>> chore: regenerate types
5309=======6266=======
5310>>>>>>> chore:  regenerate types6267>>>>>>> chore:  regenerate types
6268=======
6269>>>>>>> fix: regenerate types after rebase
5311<<<<<<< HEAD6270<<<<<<< HEAD
5312  /** @name PalletFungibleError (417) */6271  /** @name PalletFungibleError (417) */
5313=======6272=======
5339  /** @name PalletFungibleError (436) */6298  /** @name PalletFungibleError (436) */
5340>>>>>>> chore:  regenerate types6299>>>>>>> chore:  regenerate types
5341>>>>>>> chore:  regenerate types6300>>>>>>> chore:  regenerate types
6301<<<<<<< HEAD
5342>>>>>>> chore:  regenerate types6302>>>>>>> chore:  regenerate types
6303=======
6304=======
6305  /** @name PalletFungibleError (438) */
6306>>>>>>> fix: regenerate types after rebase
6307>>>>>>> fix: regenerate types after rebase
5343  interface PalletFungibleError extends Enum {6308  interface PalletFungibleError extends Enum {
5344    readonly isNotFungibleDataUsedToMintFungibleCollectionToken: boolean;6309    readonly isNotFungibleDataUsedToMintFungibleCollectionToken: boolean;
5345    readonly isFungibleItemsHaveNoId: boolean;6310    readonly isFungibleItemsHaveNoId: boolean;
5354<<<<<<< HEAD6319<<<<<<< HEAD
5355<<<<<<< HEAD6320<<<<<<< HEAD
5356<<<<<<< HEAD6321<<<<<<< HEAD
6322<<<<<<< HEAD
5357  /** @name PalletRefungibleError (420) */6323  /** @name PalletRefungibleError (420) */
5358=======6324=======
5359=======6325=======
5360>>>>>>> chore: regenerate types6326>>>>>>> chore: regenerate types
5361=======6327=======
5362>>>>>>> chore:  regenerate types6328>>>>>>> chore:  regenerate types
6329=======
6330>>>>>>> fix: regenerate types after rebase
5363<<<<<<< HEAD6331<<<<<<< HEAD
5364  /** @name PalletRefungibleItemData (417) */6332  /** @name PalletRefungibleItemData (417) */
5365=======6333=======
5366=======6334=======
5367>>>>>>> chore: regenerate types6335>>>>>>> chore: regenerate types
5368=======6336=======
5369>>>>>>> chore:  regenerate types6337>>>>>>> chore:  regenerate types
6338=======
6339>>>>>>> fix: regenerate types after rebase
5370<<<<<<< HEAD6340<<<<<<< HEAD
5371  /** @name PalletRefungibleItemData (418) */6341  /** @name PalletRefungibleItemData (418) */
5372=======6342=======
5398  /** @name PalletRefungibleItemData (437) */6368  /** @name PalletRefungibleItemData (437) */
5399>>>>>>> chore:  regenerate types6369>>>>>>> chore:  regenerate types
5400>>>>>>> chore:  regenerate types6370>>>>>>> chore:  regenerate types
6371<<<<<<< HEAD
5401>>>>>>> chore:  regenerate types6372>>>>>>> chore:  regenerate types
6373=======
6374=======
6375  /** @name PalletRefungibleItemData (439) */
6376>>>>>>> fix: regenerate types after rebase
6377>>>>>>> fix: regenerate types after rebase
5402  interface PalletRefungibleItemData extends Struct {6378  interface PalletRefungibleItemData extends Struct {
5403    readonly constData: Bytes;6379    readonly constData: Bytes;
5404  }6380  }
54056381
5406<<<<<<< HEAD6382<<<<<<< HEAD
5407<<<<<<< HEAD6383<<<<<<< HEAD
5408<<<<<<< HEAD6384<<<<<<< HEAD
6385<<<<<<< HEAD
5409  /** @name PalletRefungibleError (422) */6386  /** @name PalletRefungibleError (422) */
5410=======6387=======
5411=======6388=======
5412>>>>>>> chore: regenerate types6389>>>>>>> chore: regenerate types
5413=======6390=======
5414>>>>>>> chore:  regenerate types6391>>>>>>> chore:  regenerate types
6392=======
6393>>>>>>> fix: regenerate types after rebase
5415<<<<<<< HEAD6394<<<<<<< HEAD
5416  /** @name PalletRefungibleError (423) */6395  /** @name PalletRefungibleError (423) */
5417=======6396=======
5449  /** @name PalletRefungibleError (442) */6428  /** @name PalletRefungibleError (442) */
5450>>>>>>> chore:  regenerate types6429>>>>>>> chore:  regenerate types
5451>>>>>>> chore:  regenerate types6430>>>>>>> chore:  regenerate types
6431<<<<<<< HEAD
5452>>>>>>> chore:  regenerate types6432>>>>>>> chore:  regenerate types
6433<<<<<<< HEAD
5453>>>>>>> chore:  regenerate types6434>>>>>>> chore:  regenerate types
6435=======
6436=======
6437=======
6438  /** @name PalletRefungibleError (444) */
6439>>>>>>> fix: regenerate types after rebase
6440>>>>>>> fix: regenerate types after rebase
6441>>>>>>> fix: regenerate types after rebase
5454  interface PalletRefungibleError extends Enum {6442  interface PalletRefungibleError extends Enum {
5455    readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean;6443    readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean;
5456    readonly isWrongRefungiblePieces: boolean;6444    readonly isWrongRefungiblePieces: boolean;
5463<<<<<<< HEAD6451<<<<<<< HEAD
5464<<<<<<< HEAD6452<<<<<<< HEAD
5465<<<<<<< HEAD6453<<<<<<< HEAD
6454<<<<<<< HEAD
5466  /** @name PalletNonfungibleItemData (421) */6455  /** @name PalletNonfungibleItemData (421) */
5467=======6456=======
5468=======6457=======
5469>>>>>>> chore: regenerate types6458>>>>>>> chore: regenerate types
5470=======6459=======
5471>>>>>>> chore:  regenerate types6460>>>>>>> chore:  regenerate types
6461=======
6462>>>>>>> fix: regenerate types after rebase
5472<<<<<<< HEAD6463<<<<<<< HEAD
5473  /** @name PalletNonfungibleItemData (423) */6464  /** @name PalletNonfungibleItemData (423) */
5474=======6465=======
5475=======6466=======
5476>>>>>>> chore: regenerate types6467>>>>>>> chore: regenerate types
5477=======6468=======
5478>>>>>>> chore:  regenerate types6469>>>>>>> chore:  regenerate types
6470=======
6471>>>>>>> fix: regenerate types after rebase
5479<<<<<<< HEAD6472<<<<<<< HEAD
5480  /** @name PalletNonfungibleItemData (424) */6473  /** @name PalletNonfungibleItemData (424) */
5481=======6474=======
5513  /** @name PalletNonfungibleItemData (443) */6506  /** @name PalletNonfungibleItemData (443) */
5514>>>>>>> chore:  regenerate types6507>>>>>>> chore:  regenerate types
5515>>>>>>> chore:  regenerate types6508>>>>>>> chore:  regenerate types
6509<<<<<<< HEAD
5516>>>>>>> chore:  regenerate types6510>>>>>>> chore:  regenerate types
6511<<<<<<< HEAD
5517>>>>>>> chore:  regenerate types6512>>>>>>> chore:  regenerate types
6513=======
6514=======
6515=======
6516  /** @name PalletNonfungibleItemData (445) */
6517>>>>>>> fix: regenerate types after rebase
6518>>>>>>> fix: regenerate types after rebase
6519>>>>>>> fix: regenerate types after rebase
5518  interface PalletNonfungibleItemData extends Struct {6520  interface PalletNonfungibleItemData extends Struct {
5519    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;6521    readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
5520  }6522  }
55216523
5522<<<<<<< HEAD6524<<<<<<< HEAD
5523<<<<<<< HEAD6525<<<<<<< HEAD
5524<<<<<<< HEAD6526<<<<<<< HEAD
6527<<<<<<< HEAD
5525  /** @name UpDataStructsPropertyScope (423) */6528  /** @name UpDataStructsPropertyScope (423) */
5526=======6529=======
5527=======6530=======
5528>>>>>>> chore: regenerate types6531>>>>>>> chore: regenerate types
5529=======6532=======
5530>>>>>>> chore:  regenerate types6533>>>>>>> chore:  regenerate types
6534=======
6535>>>>>>> fix: regenerate types after rebase
5531<<<<<<< HEAD6536<<<<<<< HEAD
5532  /** @name UpDataStructsPropertyScope (425) */6537  /** @name UpDataStructsPropertyScope (425) */
5533=======6538=======
5534=======6539=======
5535>>>>>>> chore: regenerate types6540>>>>>>> chore: regenerate types
5536=======6541=======
5537>>>>>>> chore:  regenerate types6542>>>>>>> chore:  regenerate types
6543=======
6544>>>>>>> fix: regenerate types after rebase
5538<<<<<<< HEAD6545<<<<<<< HEAD
5539  /** @name UpDataStructsPropertyScope (426) */6546  /** @name UpDataStructsPropertyScope (426) */
5540=======6547=======
5572  /** @name UpDataStructsPropertyScope (445) */6579  /** @name UpDataStructsPropertyScope (445) */
5573>>>>>>> chore:  regenerate types6580>>>>>>> chore:  regenerate types
5574>>>>>>> chore:  regenerate types6581>>>>>>> chore:  regenerate types
6582<<<<<<< HEAD
5575>>>>>>> chore:  regenerate types6583>>>>>>> chore:  regenerate types
6584<<<<<<< HEAD
5576>>>>>>> chore:  regenerate types6585>>>>>>> chore:  regenerate types
6586=======
6587=======
6588=======
6589  /** @name UpDataStructsPropertyScope (447) */
6590>>>>>>> fix: regenerate types after rebase
6591>>>>>>> fix: regenerate types after rebase
6592>>>>>>> fix: regenerate types after rebase
5577  interface UpDataStructsPropertyScope extends Enum {6593  interface UpDataStructsPropertyScope extends Enum {
5578    readonly isNone: boolean;6594    readonly isNone: boolean;
5579    readonly isRmrk: boolean;6595    readonly isRmrk: boolean;
5583<<<<<<< HEAD6599<<<<<<< HEAD
5584<<<<<<< HEAD6600<<<<<<< HEAD
5585<<<<<<< HEAD6601<<<<<<< HEAD
6602<<<<<<< HEAD
5586  /** @name PalletNonfungibleError (426) */6603  /** @name PalletNonfungibleError (426) */
5587=======6604=======
5588=======6605=======
5589>>>>>>> chore: regenerate types6606>>>>>>> chore: regenerate types
5590=======6607=======
5591>>>>>>> chore:  regenerate types6608>>>>>>> chore:  regenerate types
6609=======
6610>>>>>>> fix: regenerate types after rebase
5592<<<<<<< HEAD6611<<<<<<< HEAD
5593  /** @name PalletNonfungibleError (427) */6612  /** @name PalletNonfungibleError (427) */
5594=======6613=======
5595=======6614=======
5596>>>>>>> chore: regenerate types6615>>>>>>> chore: regenerate types
5597=======6616=======
5598>>>>>>> chore:  regenerate types6617>>>>>>> chore:  regenerate types
6618=======
6619>>>>>>> fix: regenerate types after rebase
5599<<<<<<< HEAD6620<<<<<<< HEAD
5600  /** @name PalletNonfungibleError (428) */6621  /** @name PalletNonfungibleError (428) */
5601=======6622=======
5633  /** @name PalletNonfungibleError (447) */6654  /** @name PalletNonfungibleError (447) */
5634>>>>>>> chore:  regenerate types6655>>>>>>> chore:  regenerate types
5635>>>>>>> chore:  regenerate types6656>>>>>>> chore:  regenerate types
6657<<<<<<< HEAD
5636>>>>>>> chore:  regenerate types6658>>>>>>> chore:  regenerate types
6659<<<<<<< HEAD
5637>>>>>>> chore:  regenerate types6660>>>>>>> chore:  regenerate types
6661=======
6662=======
6663=======
6664  /** @name PalletNonfungibleError (449) */
6665>>>>>>> fix: regenerate types after rebase
6666>>>>>>> fix: regenerate types after rebase
6667>>>>>>> fix: regenerate types after rebase
5638  interface PalletNonfungibleError extends Enum {6668  interface PalletNonfungibleError extends Enum {
5639    readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean;6669    readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean;
5640    readonly isNonfungibleItemsHaveNoAmount: boolean;6670    readonly isNonfungibleItemsHaveNoAmount: boolean;
5645<<<<<<< HEAD6675<<<<<<< HEAD
5646<<<<<<< HEAD6676<<<<<<< HEAD
5647<<<<<<< HEAD6677<<<<<<< HEAD
6678<<<<<<< HEAD
5648  /** @name PalletStructureError (427) */6679  /** @name PalletStructureError (427) */
5649=======6680=======
5650=======6681=======
5651>>>>>>> chore: regenerate types6682>>>>>>> chore: regenerate types
5652=======6683=======
5653>>>>>>> chore:  regenerate types6684>>>>>>> chore:  regenerate types
6685=======
6686>>>>>>> fix: regenerate types after rebase
5654<<<<<<< HEAD6687<<<<<<< HEAD
5655  /** @name PalletStructureError (428) */6688  /** @name PalletStructureError (428) */
5656=======6689=======
5657=======6690=======
5658>>>>>>> chore: regenerate types6691>>>>>>> chore: regenerate types
5659=======6692=======
5660>>>>>>> chore:  regenerate types6693>>>>>>> chore:  regenerate types
6694=======
6695>>>>>>> fix: regenerate types after rebase
5661<<<<<<< HEAD6696<<<<<<< HEAD
5662  /** @name PalletStructureError (429) */6697  /** @name PalletStructureError (429) */
5663=======6698=======
5695  /** @name PalletStructureError (448) */6730  /** @name PalletStructureError (448) */
5696>>>>>>> chore:  regenerate types6731>>>>>>> chore:  regenerate types
5697>>>>>>> chore:  regenerate types6732>>>>>>> chore:  regenerate types
6733<<<<<<< HEAD
5698>>>>>>> chore:  regenerate types6734>>>>>>> chore:  regenerate types
6735<<<<<<< HEAD
5699>>>>>>> chore:  regenerate types6736>>>>>>> chore:  regenerate types
6737=======
6738=======
6739=======
6740  /** @name PalletStructureError (450) */
6741>>>>>>> fix: regenerate types after rebase
6742>>>>>>> fix: regenerate types after rebase
6743>>>>>>> fix: regenerate types after rebase
5700  interface PalletStructureError extends Enum {6744  interface PalletStructureError extends Enum {
5701    readonly isOuroborosDetected: boolean;6745    readonly isOuroborosDetected: boolean;
5702    readonly isDepthLimit: boolean;6746    readonly isDepthLimit: boolean;
5708<<<<<<< HEAD6752<<<<<<< HEAD
5709<<<<<<< HEAD6753<<<<<<< HEAD
5710<<<<<<< HEAD6754<<<<<<< HEAD
6755<<<<<<< HEAD
5711  /** @name PalletRmrkCoreError (428) */6756  /** @name PalletRmrkCoreError (428) */
5712=======6757=======
5713=======6758=======
5714>>>>>>> chore: regenerate types6759>>>>>>> chore: regenerate types
5715=======6760=======
5716>>>>>>> chore:  regenerate types6761>>>>>>> chore:  regenerate types
6762=======
6763>>>>>>> fix: regenerate types after rebase
5717<<<<<<< HEAD6764<<<<<<< HEAD
5718  /** @name PalletRmrkCoreError (429) */6765  /** @name PalletRmrkCoreError (429) */
5719=======6766=======
5720=======6767=======
5721>>>>>>> chore: regenerate types6768>>>>>>> chore: regenerate types
5722=======6769=======
5723>>>>>>> chore:  regenerate types6770>>>>>>> chore:  regenerate types
6771=======
6772>>>>>>> fix: regenerate types after rebase
5724<<<<<<< HEAD6773<<<<<<< HEAD
5725  /** @name PalletRmrkCoreError (430) */6774  /** @name PalletRmrkCoreError (430) */
5726=======6775=======
5758  /** @name PalletRmrkCoreError (449) */6807  /** @name PalletRmrkCoreError (449) */
5759>>>>>>> chore:  regenerate types6808>>>>>>> chore:  regenerate types
5760>>>>>>> chore:  regenerate types6809>>>>>>> chore:  regenerate types
6810<<<<<<< HEAD
5761>>>>>>> chore:  regenerate types6811>>>>>>> chore:  regenerate types
6812<<<<<<< HEAD
5762>>>>>>> chore:  regenerate types6813>>>>>>> chore:  regenerate types
6814=======
6815=======
6816=======
6817  /** @name PalletRmrkCoreError (451) */
6818>>>>>>> fix: regenerate types after rebase
6819>>>>>>> fix: regenerate types after rebase
6820>>>>>>> fix: regenerate types after rebase
5763  interface PalletRmrkCoreError extends Enum {6821  interface PalletRmrkCoreError extends Enum {
5764    readonly isCorruptedCollectionType: boolean;6822    readonly isCorruptedCollectionType: boolean;
5765    readonly isRmrkPropertyKeyIsTooLong: boolean;6823    readonly isRmrkPropertyKeyIsTooLong: boolean;
5786<<<<<<< HEAD6844<<<<<<< HEAD
5787<<<<<<< HEAD6845<<<<<<< HEAD
5788<<<<<<< HEAD6846<<<<<<< HEAD
6847<<<<<<< HEAD
5789  /** @name PalletRmrkEquipError (430) */6848  /** @name PalletRmrkEquipError (430) */
5790=======6849=======
5791=======6850=======
5792>>>>>>> chore: regenerate types6851>>>>>>> chore: regenerate types
5793=======6852=======
5794>>>>>>> chore:  regenerate types6853>>>>>>> chore:  regenerate types
6854=======
6855>>>>>>> fix: regenerate types after rebase
5795<<<<<<< HEAD6856<<<<<<< HEAD
5796  /** @name PalletRmrkEquipError (431) */6857  /** @name PalletRmrkEquipError (431) */
5797=======6858=======
5798=======6859=======
5799>>>>>>> chore: regenerate types6860>>>>>>> chore: regenerate types
5800=======6861=======
5801>>>>>>> chore:  regenerate types6862>>>>>>> chore:  regenerate types
6863=======
6864>>>>>>> fix: regenerate types after rebase
5802<<<<<<< HEAD6865<<<<<<< HEAD
5803  /** @name PalletRmrkEquipError (432) */6866  /** @name PalletRmrkEquipError (432) */
5804=======6867=======
5836  /** @name PalletRmrkEquipError (451) */6899  /** @name PalletRmrkEquipError (451) */
5837>>>>>>> chore:  regenerate types6900>>>>>>> chore:  regenerate types
5838>>>>>>> chore:  regenerate types6901>>>>>>> chore:  regenerate types
6902<<<<<<< HEAD
5839>>>>>>> chore:  regenerate types6903>>>>>>> chore:  regenerate types
6904<<<<<<< HEAD
5840>>>>>>> chore:  regenerate types6905>>>>>>> chore:  regenerate types
6906=======
6907=======
6908=======
6909  /** @name PalletRmrkEquipError (453) */
6910>>>>>>> fix: regenerate types after rebase
6911>>>>>>> fix: regenerate types after rebase
6912>>>>>>> fix: regenerate types after rebase
5841  interface PalletRmrkEquipError extends Enum {6913  interface PalletRmrkEquipError extends Enum {
5842    readonly isPermissionError: boolean;6914    readonly isPermissionError: boolean;
5843    readonly isNoAvailableBaseId: boolean;6915    readonly isNoAvailableBaseId: boolean;
5852<<<<<<< HEAD6924<<<<<<< HEAD
5853<<<<<<< HEAD6925<<<<<<< HEAD
5854<<<<<<< HEAD6926<<<<<<< HEAD
6927<<<<<<< HEAD
5855  /** @name PalletAppPromotionError (436) */6928  /** @name PalletAppPromotionError (436) */
5856=======6929=======
5857=======6930=======
5858>>>>>>> chore: regenerate types6931>>>>>>> chore: regenerate types
5859=======6932=======
5860>>>>>>> chore:  regenerate types6933>>>>>>> chore:  regenerate types
6934=======
6935>>>>>>> fix: regenerate types after rebase
5861<<<<<<< HEAD6936<<<<<<< HEAD
5862  /** @name PalletAppPromotionError (437) */6937  /** @name PalletAppPromotionError (437) */
5863=======6938=======
5864=======6939=======
5865>>>>>>> chore: regenerate types6940>>>>>>> chore: regenerate types
5866=======6941=======
5867>>>>>>> chore:  regenerate types6942>>>>>>> chore:  regenerate types
6943=======
6944>>>>>>> fix: regenerate types after rebase
5868<<<<<<< HEAD6945<<<<<<< HEAD
5869  /** @name PalletAppPromotionError (438) */6946  /** @name PalletAppPromotionError (438) */
5870=======6947=======
5902  /** @name PalletAppPromotionError (457) */6979  /** @name PalletAppPromotionError (457) */
5903>>>>>>> chore:  regenerate types6980>>>>>>> chore:  regenerate types
5904>>>>>>> chore:  regenerate types6981>>>>>>> chore:  regenerate types
6982<<<<<<< HEAD
5905>>>>>>> chore:  regenerate types6983>>>>>>> chore:  regenerate types
6984<<<<<<< HEAD
5906>>>>>>> chore:  regenerate types6985>>>>>>> chore:  regenerate types
6986=======
6987=======
6988=======
6989  /** @name PalletAppPromotionError (459) */
6990>>>>>>> fix: regenerate types after rebase
6991>>>>>>> fix: regenerate types after rebase
6992>>>>>>> fix: regenerate types after rebase
5907  interface PalletAppPromotionError extends Enum {6993  interface PalletAppPromotionError extends Enum {
5908    readonly isAdminNotSet: boolean;6994    readonly isAdminNotSet: boolean;
5909    readonly isNoPermission: boolean;6995    readonly isNoPermission: boolean;
5917<<<<<<< HEAD7003<<<<<<< HEAD
5918<<<<<<< HEAD7004<<<<<<< HEAD
5919<<<<<<< HEAD7005<<<<<<< HEAD
7006<<<<<<< HEAD
5920  /** @name PalletForeignAssetsModuleError (437) */7007  /** @name PalletForeignAssetsModuleError (437) */
5921=======7008=======
5922=======7009=======
5923>>>>>>> chore: regenerate types7010>>>>>>> chore: regenerate types
5924=======7011=======
5925>>>>>>> chore:  regenerate types7012>>>>>>> chore:  regenerate types
7013=======
7014>>>>>>> fix: regenerate types after rebase
5926<<<<<<< HEAD7015<<<<<<< HEAD
5927  /** @name PalletForeignAssetsModuleError (438) */7016  /** @name PalletForeignAssetsModuleError (438) */
5928=======7017=======
5929=======7018=======
5930>>>>>>> chore: regenerate types7019>>>>>>> chore: regenerate types
5931=======7020=======
5932>>>>>>> chore:  regenerate types7021>>>>>>> chore:  regenerate types
7022=======
7023>>>>>>> fix: regenerate types after rebase
5933<<<<<<< HEAD7024<<<<<<< HEAD
5934  /** @name PalletForeignAssetsModuleError (439) */7025  /** @name PalletForeignAssetsModuleError (439) */
5935=======7026=======
5967  /** @name PalletForeignAssetsModuleError (458) */7058  /** @name PalletForeignAssetsModuleError (458) */
5968>>>>>>> chore:  regenerate types7059>>>>>>> chore:  regenerate types
5969>>>>>>> chore:  regenerate types7060>>>>>>> chore:  regenerate types
7061<<<<<<< HEAD
5970>>>>>>> chore:  regenerate types7062>>>>>>> chore:  regenerate types
7063<<<<<<< HEAD
5971>>>>>>> chore:  regenerate types7064>>>>>>> chore:  regenerate types
7065=======
7066=======
7067=======
7068  /** @name PalletForeignAssetsModuleError (460) */
7069>>>>>>> fix: regenerate types after rebase
7070>>>>>>> fix: regenerate types after rebase
7071>>>>>>> fix: regenerate types after rebase
5972  interface PalletForeignAssetsModuleError extends Enum {7072  interface PalletForeignAssetsModuleError extends Enum {
5973    readonly isBadLocation: boolean;7073    readonly isBadLocation: boolean;
5974    readonly isMultiLocationExisted: boolean;7074    readonly isMultiLocationExisted: boolean;
5980<<<<<<< HEAD7080<<<<<<< HEAD
5981<<<<<<< HEAD7081<<<<<<< HEAD
5982<<<<<<< HEAD7082<<<<<<< HEAD
7083<<<<<<< HEAD
5983  /** @name PalletEvmError (439) */7084  /** @name PalletEvmError (439) */
5984=======7085=======
5985=======7086=======
5986>>>>>>> chore: regenerate types7087>>>>>>> chore: regenerate types
5987=======7088=======
5988>>>>>>> chore:  regenerate types7089>>>>>>> chore:  regenerate types
7090=======
7091>>>>>>> fix: regenerate types after rebase
5989<<<<<<< HEAD7092<<<<<<< HEAD
5990  /** @name PalletEvmError (440) */7093  /** @name PalletEvmError (440) */
5991=======7094=======
5992=======7095=======
5993>>>>>>> chore: regenerate types7096>>>>>>> chore: regenerate types
5994=======7097=======
5995>>>>>>> chore:  regenerate types7098>>>>>>> chore:  regenerate types
7099=======
7100>>>>>>> fix: regenerate types after rebase
5996<<<<<<< HEAD7101<<<<<<< HEAD
5997  /** @name PalletEvmError (441) */7102  /** @name PalletEvmError (441) */
5998=======7103=======
6030  /** @name PalletEvmError (461) */7135  /** @name PalletEvmError (461) */
6031>>>>>>> chore:  regenerate types7136>>>>>>> chore:  regenerate types
6032>>>>>>> chore:  regenerate types7137>>>>>>> chore:  regenerate types
7138<<<<<<< HEAD
6033>>>>>>> chore:  regenerate types7139>>>>>>> chore:  regenerate types
7140<<<<<<< HEAD
6034>>>>>>> chore:  regenerate types7141>>>>>>> chore:  regenerate types
7142=======
7143=======
7144=======
7145  /** @name PalletEvmError (462) */
7146>>>>>>> fix: regenerate types after rebase
7147>>>>>>> fix: regenerate types after rebase
7148>>>>>>> fix: regenerate types after rebase
6035  interface PalletEvmError extends Enum {7149  interface PalletEvmError extends Enum {
6036    readonly isBalanceLow: boolean;7150    readonly isBalanceLow: boolean;
6037    readonly isFeeOverflow: boolean;7151    readonly isFeeOverflow: boolean;
6050<<<<<<< HEAD7164<<<<<<< HEAD
6051<<<<<<< HEAD7165<<<<<<< HEAD
6052<<<<<<< HEAD7166<<<<<<< HEAD
7167<<<<<<< HEAD
6053  /** @name FpRpcTransactionStatus (442) */7168  /** @name FpRpcTransactionStatus (442) */
6054=======7169=======
6055=======7170=======
6056>>>>>>> chore: regenerate types7171>>>>>>> chore: regenerate types
6057=======7172=======
6058>>>>>>> chore:  regenerate types7173>>>>>>> chore:  regenerate types
7174=======
7175>>>>>>> fix: regenerate types after rebase
6059<<<<<<< HEAD7176<<<<<<< HEAD
6060  /** @name FpRpcTransactionStatus (443) */7177  /** @name FpRpcTransactionStatus (443) */
6061=======7178=======
6062=======7179=======
6063>>>>>>> chore: regenerate types7180>>>>>>> chore: regenerate types
6064=======7181=======
6065>>>>>>> chore:  regenerate types7182>>>>>>> chore:  regenerate types
7183=======
7184>>>>>>> fix: regenerate types after rebase
6066<<<<<<< HEAD7185<<<<<<< HEAD
6067  /** @name FpRpcTransactionStatus (444) */7186  /** @name FpRpcTransactionStatus (444) */
6068=======7187=======
6100  /** @name FpRpcTransactionStatus (464) */7219  /** @name FpRpcTransactionStatus (464) */
6101>>>>>>> chore:  regenerate types7220>>>>>>> chore:  regenerate types
6102>>>>>>> chore:  regenerate types7221>>>>>>> chore:  regenerate types
7222<<<<<<< HEAD
6103>>>>>>> chore:  regenerate types7223>>>>>>> chore:  regenerate types
7224<<<<<<< HEAD
6104>>>>>>> chore:  regenerate types7225>>>>>>> chore:  regenerate types
7226=======
7227=======
7228=======
7229  /** @name FpRpcTransactionStatus (465) */
7230>>>>>>> fix: regenerate types after rebase
7231>>>>>>> fix: regenerate types after rebase
7232>>>>>>> fix: regenerate types after rebase
6105  interface FpRpcTransactionStatus extends Struct {7233  interface FpRpcTransactionStatus extends Struct {
6106    readonly transactionHash: H256;7234    readonly transactionHash: H256;
6107    readonly transactionIndex: u32;7235    readonly transactionIndex: u32;
6115<<<<<<< HEAD7243<<<<<<< HEAD
6116<<<<<<< HEAD7244<<<<<<< HEAD
6117<<<<<<< HEAD7245<<<<<<< HEAD
7246<<<<<<< HEAD
6118  /** @name EthbloomBloom (444) */7247  /** @name EthbloomBloom (444) */
6119  interface EthbloomBloom extends U8aFixed {}7248  interface EthbloomBloom extends U8aFixed {}
61207249
6124>>>>>>> chore: regenerate types7253>>>>>>> chore: regenerate types
6125=======7254=======
6126>>>>>>> chore:  regenerate types7255>>>>>>> chore:  regenerate types
7256=======
7257>>>>>>> fix: regenerate types after rebase
6127<<<<<<< HEAD7258<<<<<<< HEAD
6128  /** @name EthbloomBloom (445) */7259  /** @name EthbloomBloom (445) */
6129  interface EthbloomBloom extends U8aFixed {}7260  interface EthbloomBloom extends U8aFixed {}
6134>>>>>>> chore: regenerate types7265>>>>>>> chore: regenerate types
6135=======7266=======
6136>>>>>>> chore:  regenerate types7267>>>>>>> chore:  regenerate types
7268=======
7269>>>>>>> fix: regenerate types after rebase
6137<<<<<<< HEAD7270<<<<<<< HEAD
6138  /** @name EthbloomBloom (446) */7271  /** @name EthbloomBloom (446) */
6139  interface EthbloomBloom extends U8aFixed {}7272  interface EthbloomBloom extends U8aFixed {}
6186  /** @name EthereumReceiptReceiptV3 (468) */7319  /** @name EthereumReceiptReceiptV3 (468) */
6187>>>>>>> chore:  regenerate types7320>>>>>>> chore:  regenerate types
6188>>>>>>> chore:  regenerate types7321>>>>>>> chore:  regenerate types
7322<<<<<<< HEAD
6189>>>>>>> chore:  regenerate types7323>>>>>>> chore:  regenerate types
7324<<<<<<< HEAD
6190>>>>>>> chore:  regenerate types7325>>>>>>> chore:  regenerate types
7326=======
7327=======
7328=======
7329  /** @name EthbloomBloom (467) */
7330  interface EthbloomBloom extends U8aFixed {}
7331
7332  /** @name EthereumReceiptReceiptV3 (469) */
7333>>>>>>> fix: regenerate types after rebase
7334>>>>>>> fix: regenerate types after rebase
7335>>>>>>> fix: regenerate types after rebase
6191  interface EthereumReceiptReceiptV3 extends Enum {7336  interface EthereumReceiptReceiptV3 extends Enum {
6192    readonly isLegacy: boolean;7337    readonly isLegacy: boolean;
6193    readonly asLegacy: EthereumReceiptEip658ReceiptData;7338    readonly asLegacy: EthereumReceiptEip658ReceiptData;
6201<<<<<<< HEAD7346<<<<<<< HEAD
6202<<<<<<< HEAD7347<<<<<<< HEAD
6203<<<<<<< HEAD7348<<<<<<< HEAD
7349<<<<<<< HEAD
6204  /** @name EthereumReceiptEip658ReceiptData (447) */7350  /** @name EthereumReceiptEip658ReceiptData (447) */
6205=======7351=======
6206=======7352=======
6207>>>>>>> chore: regenerate types7353>>>>>>> chore: regenerate types
6208=======7354=======
6209>>>>>>> chore:  regenerate types7355>>>>>>> chore:  regenerate types
7356=======
7357>>>>>>> fix: regenerate types after rebase
6210<<<<<<< HEAD7358<<<<<<< HEAD
6211  /** @name EthereumReceiptEip658ReceiptData (448) */7359  /** @name EthereumReceiptEip658ReceiptData (448) */
6212=======7360=======
6213=======7361=======
6214>>>>>>> chore: regenerate types7362>>>>>>> chore: regenerate types
6215=======7363=======
6216>>>>>>> chore:  regenerate types7364>>>>>>> chore:  regenerate types
7365=======
7366>>>>>>> fix: regenerate types after rebase
6217<<<<<<< HEAD7367<<<<<<< HEAD
6218  /** @name EthereumReceiptEip658ReceiptData (449) */7368  /** @name EthereumReceiptEip658ReceiptData (449) */
6219=======7369=======
6251  /** @name EthereumReceiptEip658ReceiptData (469) */7401  /** @name EthereumReceiptEip658ReceiptData (469) */
6252>>>>>>> chore:  regenerate types7402>>>>>>> chore:  regenerate types
6253>>>>>>> chore:  regenerate types7403>>>>>>> chore:  regenerate types
7404<<<<<<< HEAD
6254>>>>>>> chore:  regenerate types7405>>>>>>> chore:  regenerate types
7406<<<<<<< HEAD
6255>>>>>>> chore:  regenerate types7407>>>>>>> chore:  regenerate types
7408=======
7409=======
7410=======
7411  /** @name EthereumReceiptEip658ReceiptData (470) */
7412>>>>>>> fix: regenerate types after rebase
7413>>>>>>> fix: regenerate types after rebase
7414>>>>>>> fix: regenerate types after rebase
6256  interface EthereumReceiptEip658ReceiptData extends Struct {7415  interface EthereumReceiptEip658ReceiptData extends Struct {
6257    readonly statusCode: u8;7416    readonly statusCode: u8;
6258    readonly usedGas: U256;7417    readonly usedGas: U256;
6263<<<<<<< HEAD7422<<<<<<< HEAD
6264<<<<<<< HEAD7423<<<<<<< HEAD
6265<<<<<<< HEAD7424<<<<<<< HEAD
7425<<<<<<< HEAD
6266  /** @name EthereumBlock (448) */7426  /** @name EthereumBlock (448) */
6267=======7427=======
6268=======7428=======
6269>>>>>>> chore: regenerate types7429>>>>>>> chore: regenerate types
6270=======7430=======
6271>>>>>>> chore:  regenerate types7431>>>>>>> chore:  regenerate types
7432=======
7433>>>>>>> fix: regenerate types after rebase
6272<<<<<<< HEAD7434<<<<<<< HEAD
6273  /** @name EthereumBlock (449) */7435  /** @name EthereumBlock (449) */
6274=======7436=======
6275=======7437=======
6276>>>>>>> chore: regenerate types7438>>>>>>> chore: regenerate types
6277=======7439=======
6278>>>>>>> chore:  regenerate types7440>>>>>>> chore:  regenerate types
7441=======
7442>>>>>>> fix: regenerate types after rebase
6279<<<<<<< HEAD7443<<<<<<< HEAD
6280  /** @name EthereumBlock (450) */7444  /** @name EthereumBlock (450) */
6281=======7445=======
6313  /** @name EthereumBlock (470) */7477  /** @name EthereumBlock (470) */
6314>>>>>>> chore:  regenerate types7478>>>>>>> chore:  regenerate types
6315>>>>>>> chore:  regenerate types7479>>>>>>> chore:  regenerate types
7480<<<<<<< HEAD
6316>>>>>>> chore:  regenerate types7481>>>>>>> chore:  regenerate types
7482<<<<<<< HEAD
6317>>>>>>> chore:  regenerate types7483>>>>>>> chore:  regenerate types
7484=======
7485=======
7486=======
7487  /** @name EthereumBlock (471) */
7488>>>>>>> fix: regenerate types after rebase
7489>>>>>>> fix: regenerate types after rebase
7490>>>>>>> fix: regenerate types after rebase
6318  interface EthereumBlock extends Struct {7491  interface EthereumBlock extends Struct {
6319    readonly header: EthereumHeader;7492    readonly header: EthereumHeader;
6320    readonly transactions: Vec<EthereumTransactionTransactionV2>;7493    readonly transactions: Vec<EthereumTransactionTransactionV2>;
6324<<<<<<< HEAD7497<<<<<<< HEAD
6325<<<<<<< HEAD7498<<<<<<< HEAD
6326<<<<<<< HEAD7499<<<<<<< HEAD
7500<<<<<<< HEAD
6327  /** @name EthereumHeader (449) */7501  /** @name EthereumHeader (449) */
6328=======7502=======
6329=======7503=======
6330>>>>>>> chore: regenerate types7504>>>>>>> chore: regenerate types
6331=======7505=======
6332>>>>>>> chore:  regenerate types7506>>>>>>> chore:  regenerate types
7507=======
7508>>>>>>> fix: regenerate types after rebase
6333<<<<<<< HEAD7509<<<<<<< HEAD
6334  /** @name EthereumHeader (450) */7510  /** @name EthereumHeader (450) */
6335=======7511=======
6336=======7512=======
6337>>>>>>> chore: regenerate types7513>>>>>>> chore: regenerate types
6338=======7514=======
6339>>>>>>> chore:  regenerate types7515>>>>>>> chore:  regenerate types
7516=======
7517>>>>>>> fix: regenerate types after rebase
6340<<<<<<< HEAD7518<<<<<<< HEAD
6341  /** @name EthereumHeader (451) */7519  /** @name EthereumHeader (451) */
6342=======7520=======
6374  /** @name EthereumHeader (471) */7552  /** @name EthereumHeader (471) */
6375>>>>>>> chore:  regenerate types7553>>>>>>> chore:  regenerate types
6376>>>>>>> chore:  regenerate types7554>>>>>>> chore:  regenerate types
7555<<<<<<< HEAD
6377>>>>>>> chore:  regenerate types7556>>>>>>> chore:  regenerate types
7557<<<<<<< HEAD
6378>>>>>>> chore:  regenerate types7558>>>>>>> chore:  regenerate types
7559=======
7560=======
7561=======
7562  /** @name EthereumHeader (472) */
7563>>>>>>> fix: regenerate types after rebase
7564>>>>>>> fix: regenerate types after rebase
7565>>>>>>> fix: regenerate types after rebase
6379  interface EthereumHeader extends Struct {7566  interface EthereumHeader extends Struct {
6380    readonly parentHash: H256;7567    readonly parentHash: H256;
6381    readonly ommersHash: H256;7568    readonly ommersHash: H256;
6397<<<<<<< HEAD7584<<<<<<< HEAD
6398<<<<<<< HEAD7585<<<<<<< HEAD
6399<<<<<<< HEAD7586<<<<<<< HEAD
7587<<<<<<< HEAD
6400  /** @name EthereumTypesHashH64 (450) */7588  /** @name EthereumTypesHashH64 (450) */
6401  interface EthereumTypesHashH64 extends U8aFixed {}7589  interface EthereumTypesHashH64 extends U8aFixed {}
64027590
6406>>>>>>> chore: regenerate types7594>>>>>>> chore: regenerate types
6407=======7595=======
6408>>>>>>> chore:  regenerate types7596>>>>>>> chore:  regenerate types
7597=======
7598>>>>>>> fix: regenerate types after rebase
6409<<<<<<< HEAD7599<<<<<<< HEAD
6410  /** @name EthereumTypesHashH64 (451) */7600  /** @name EthereumTypesHashH64 (451) */
6411  interface EthereumTypesHashH64 extends U8aFixed {}7601  interface EthereumTypesHashH64 extends U8aFixed {}
6416>>>>>>> chore: regenerate types7606>>>>>>> chore: regenerate types
6417=======7607=======
6418>>>>>>> chore:  regenerate types7608>>>>>>> chore:  regenerate types
7609=======
7610>>>>>>> fix: regenerate types after rebase
6419<<<<<<< HEAD7611<<<<<<< HEAD
6420  /** @name EthereumTypesHashH64 (452) */7612  /** @name EthereumTypesHashH64 (452) */
6421  interface EthereumTypesHashH64 extends U8aFixed {}7613  interface EthereumTypesHashH64 extends U8aFixed {}
6468  /** @name PalletEthereumError (477) */7660  /** @name PalletEthereumError (477) */
6469>>>>>>> chore:  regenerate types7661>>>>>>> chore:  regenerate types
6470>>>>>>> chore:  regenerate types7662>>>>>>> chore:  regenerate types
7663<<<<<<< HEAD
6471>>>>>>> chore:  regenerate types7664>>>>>>> chore:  regenerate types
7665<<<<<<< HEAD
6472>>>>>>> chore:  regenerate types7666>>>>>>> chore:  regenerate types
7667=======
7668=======
7669=======
7670  /** @name EthereumTypesHashH64 (473) */
7671  interface EthereumTypesHashH64 extends U8aFixed {}
7672
7673  /** @name PalletEthereumError (478) */
7674>>>>>>> fix: regenerate types after rebase
7675>>>>>>> fix: regenerate types after rebase
7676>>>>>>> fix: regenerate types after rebase
6473  interface PalletEthereumError extends Enum {7677  interface PalletEthereumError extends Enum {
6474    readonly isInvalidSignature: boolean;7678    readonly isInvalidSignature: boolean;
6475    readonly isPreLogExists: boolean;7679    readonly isPreLogExists: boolean;
6479<<<<<<< HEAD7683<<<<<<< HEAD
6480<<<<<<< HEAD7684<<<<<<< HEAD
6481<<<<<<< HEAD7685<<<<<<< HEAD
7686<<<<<<< HEAD
6482  /** @name PalletEvmCoderSubstrateError (456) */7687  /** @name PalletEvmCoderSubstrateError (456) */
6483=======7688=======
6484=======7689=======
6485>>>>>>> chore: regenerate types7690>>>>>>> chore: regenerate types
6486=======7691=======
6487>>>>>>> chore:  regenerate types7692>>>>>>> chore:  regenerate types
7693=======
7694>>>>>>> fix: regenerate types after rebase
6488<<<<<<< HEAD7695<<<<<<< HEAD
6489  /** @name PalletEvmCoderSubstrateError (457) */7696  /** @name PalletEvmCoderSubstrateError (457) */
6490=======7697=======
6491=======7698=======
6492>>>>>>> chore: regenerate types7699>>>>>>> chore: regenerate types
6493=======7700=======
6494>>>>>>> chore:  regenerate types7701>>>>>>> chore:  regenerate types
7702=======
7703>>>>>>> fix: regenerate types after rebase
6495<<<<<<< HEAD7704<<<<<<< HEAD
6496  /** @name PalletEvmCoderSubstrateError (458) */7705  /** @name PalletEvmCoderSubstrateError (458) */
6497=======7706=======
6529  /** @name PalletEvmCoderSubstrateError (478) */7738  /** @name PalletEvmCoderSubstrateError (478) */
6530>>>>>>> chore:  regenerate types7739>>>>>>> chore:  regenerate types
6531>>>>>>> chore:  regenerate types7740>>>>>>> chore:  regenerate types
7741<<<<<<< HEAD
6532>>>>>>> chore:  regenerate types7742>>>>>>> chore:  regenerate types
7743<<<<<<< HEAD
6533>>>>>>> chore:  regenerate types7744>>>>>>> chore:  regenerate types
7745=======
7746=======
7747=======
7748  /** @name PalletEvmCoderSubstrateError (479) */
7749>>>>>>> fix: regenerate types after rebase
7750>>>>>>> fix: regenerate types after rebase
7751>>>>>>> fix: regenerate types after rebase
6534  interface PalletEvmCoderSubstrateError extends Enum {7752  interface PalletEvmCoderSubstrateError extends Enum {
6535    readonly isOutOfGas: boolean;7753    readonly isOutOfGas: boolean;
6536    readonly isOutOfFund: boolean;7754    readonly isOutOfFund: boolean;
6540<<<<<<< HEAD7758<<<<<<< HEAD
6541<<<<<<< HEAD7759<<<<<<< HEAD
6542<<<<<<< HEAD7760<<<<<<< HEAD
7761<<<<<<< HEAD
6543  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (457) */7762  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (457) */
6544=======7763=======
6545=======7764=======
6546>>>>>>> chore: regenerate types7765>>>>>>> chore: regenerate types
6547=======7766=======
6548>>>>>>> chore:  regenerate types7767>>>>>>> chore:  regenerate types
7768=======
7769>>>>>>> fix: regenerate types after rebase
6549<<<<<<< HEAD7770<<<<<<< HEAD
6550  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (458) */7771  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (458) */
6551=======7772=======
6552=======7773=======
6553>>>>>>> chore: regenerate types7774>>>>>>> chore: regenerate types
6554=======7775=======
6555>>>>>>> chore:  regenerate types7776>>>>>>> chore:  regenerate types
7777=======
7778>>>>>>> fix: regenerate types after rebase
6556<<<<<<< HEAD7779<<<<<<< HEAD
6557  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (459) */7780  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (459) */
6558=======7781=======
6590  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (479) */7813  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (479) */
6591>>>>>>> chore:  regenerate types7814>>>>>>> chore:  regenerate types
6592>>>>>>> chore:  regenerate types7815>>>>>>> chore:  regenerate types
7816<<<<<<< HEAD
6593>>>>>>> chore:  regenerate types7817>>>>>>> chore:  regenerate types
7818<<<<<<< HEAD
6594>>>>>>> chore:  regenerate types7819>>>>>>> chore:  regenerate types
7820=======
7821=======
7822=======
7823  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (480) */
7824>>>>>>> fix: regenerate types after rebase
7825>>>>>>> fix: regenerate types after rebase
7826>>>>>>> fix: regenerate types after rebase
6595  interface UpDataStructsSponsorshipStateBasicCrossAccountIdRepr extends Enum {7827  interface UpDataStructsSponsorshipStateBasicCrossAccountIdRepr extends Enum {
6596    readonly isDisabled: boolean;7828    readonly isDisabled: boolean;
6597    readonly isUnconfirmed: boolean;7829    readonly isUnconfirmed: boolean;
6604<<<<<<< HEAD7836<<<<<<< HEAD
6605<<<<<<< HEAD7837<<<<<<< HEAD
6606<<<<<<< HEAD7838<<<<<<< HEAD
7839<<<<<<< HEAD
6607  /** @name PalletEvmContractHelpersSponsoringModeT (458) */7840  /** @name PalletEvmContractHelpersSponsoringModeT (458) */
6608=======7841=======
6609=======7842=======
6610>>>>>>> chore: regenerate types7843>>>>>>> chore: regenerate types
6611=======7844=======
6612>>>>>>> chore:  regenerate types7845>>>>>>> chore:  regenerate types
7846=======
7847>>>>>>> fix: regenerate types after rebase
6613<<<<<<< HEAD7848<<<<<<< HEAD
6614  /** @name PalletEvmContractHelpersSponsoringModeT (459) */7849  /** @name PalletEvmContractHelpersSponsoringModeT (459) */
6615=======7850=======
6616=======7851=======
6617>>>>>>> chore: regenerate types7852>>>>>>> chore: regenerate types
6618=======7853=======
6619>>>>>>> chore:  regenerate types7854>>>>>>> chore:  regenerate types
7855=======
7856>>>>>>> fix: regenerate types after rebase
6620<<<<<<< HEAD7857<<<<<<< HEAD
6621  /** @name PalletEvmContractHelpersSponsoringModeT (460) */7858  /** @name PalletEvmContractHelpersSponsoringModeT (460) */
6622=======7859=======
6654  /** @name PalletEvmContractHelpersSponsoringModeT (480) */7891  /** @name PalletEvmContractHelpersSponsoringModeT (480) */
6655>>>>>>> chore:  regenerate types7892>>>>>>> chore:  regenerate types
6656>>>>>>> chore:  regenerate types7893>>>>>>> chore:  regenerate types
7894<<<<<<< HEAD
6657>>>>>>> chore:  regenerate types7895>>>>>>> chore:  regenerate types
7896<<<<<<< HEAD
6658>>>>>>> chore:  regenerate types7897>>>>>>> chore:  regenerate types
7898=======
7899=======
7900=======
7901  /** @name PalletEvmContractHelpersSponsoringModeT (481) */
7902>>>>>>> fix: regenerate types after rebase
7903>>>>>>> fix: regenerate types after rebase
7904>>>>>>> fix: regenerate types after rebase
6659  interface PalletEvmContractHelpersSponsoringModeT extends Enum {7905  interface PalletEvmContractHelpersSponsoringModeT extends Enum {
6660    readonly isDisabled: boolean;7906    readonly isDisabled: boolean;
6661    readonly isAllowlisted: boolean;7907    readonly isAllowlisted: boolean;
6666<<<<<<< HEAD7912<<<<<<< HEAD
6667<<<<<<< HEAD7913<<<<<<< HEAD
6668<<<<<<< HEAD7914<<<<<<< HEAD
7915<<<<<<< HEAD
6669  /** @name PalletEvmContractHelpersError (464) */7916  /** @name PalletEvmContractHelpersError (464) */
6670=======7917=======
6671=======7918=======
6672>>>>>>> chore: regenerate types7919>>>>>>> chore: regenerate types
6673=======7920=======
6674>>>>>>> chore:  regenerate types7921>>>>>>> chore:  regenerate types
7922=======
7923>>>>>>> fix: regenerate types after rebase
6675<<<<<<< HEAD7924<<<<<<< HEAD
6676  /** @name PalletEvmContractHelpersError (465) */7925  /** @name PalletEvmContractHelpersError (465) */
6677=======7926=======
6678=======7927=======
6679>>>>>>> chore: regenerate types7928>>>>>>> chore: regenerate types
6680=======7929=======
6681>>>>>>> chore:  regenerate types7930>>>>>>> chore:  regenerate types
7931=======
7932>>>>>>> fix: regenerate types after rebase
6682<<<<<<< HEAD7933<<<<<<< HEAD
6683  /** @name PalletEvmContractHelpersError (466) */7934  /** @name PalletEvmContractHelpersError (466) */
6684=======7935=======
6716  /** @name PalletEvmContractHelpersError (486) */7967  /** @name PalletEvmContractHelpersError (486) */
6717>>>>>>> chore:  regenerate types7968>>>>>>> chore:  regenerate types
6718>>>>>>> chore:  regenerate types7969>>>>>>> chore:  regenerate types
7970<<<<<<< HEAD
6719>>>>>>> chore:  regenerate types7971>>>>>>> chore:  regenerate types
7972<<<<<<< HEAD
6720>>>>>>> chore:  regenerate types7973>>>>>>> chore:  regenerate types
7974=======
7975=======
7976=======
7977  /** @name PalletEvmContractHelpersError (487) */
7978>>>>>>> fix: regenerate types after rebase
7979>>>>>>> fix: regenerate types after rebase
7980>>>>>>> fix: regenerate types after rebase
6721  interface PalletEvmContractHelpersError extends Enum {7981  interface PalletEvmContractHelpersError extends Enum {
6722    readonly isNoPermission: boolean;7982    readonly isNoPermission: boolean;
6723    readonly isNoPendingSponsor: boolean;7983    readonly isNoPendingSponsor: boolean;
6728<<<<<<< HEAD7988<<<<<<< HEAD
6729<<<<<<< HEAD7989<<<<<<< HEAD
6730<<<<<<< HEAD7990<<<<<<< HEAD
7991<<<<<<< HEAD
6731  /** @name PalletEvmMigrationError (465) */7992  /** @name PalletEvmMigrationError (465) */
6732=======7993=======
6733=======7994=======
6734>>>>>>> chore: regenerate types7995>>>>>>> chore: regenerate types
6735=======7996=======
6736>>>>>>> chore:  regenerate types7997>>>>>>> chore:  regenerate types
7998=======
7999>>>>>>> fix: regenerate types after rebase
6737<<<<<<< HEAD8000<<<<<<< HEAD
6738  /** @name PalletEvmMigrationError (466) */8001  /** @name PalletEvmMigrationError (466) */
6739=======8002=======
6740=======8003=======
6741>>>>>>> chore: regenerate types8004>>>>>>> chore: regenerate types
6742=======8005=======
6743>>>>>>> chore:  regenerate types8006>>>>>>> chore:  regenerate types
8007=======
8008>>>>>>> fix: regenerate types after rebase
6744<<<<<<< HEAD8009<<<<<<< HEAD
6745  /** @name PalletEvmMigrationError (467) */8010  /** @name PalletEvmMigrationError (467) */
6746=======8011=======
6778  /** @name PalletEvmMigrationError (487) */8043  /** @name PalletEvmMigrationError (487) */
6779>>>>>>> chore:  regenerate types8044>>>>>>> chore:  regenerate types
6780>>>>>>> chore:  regenerate types8045>>>>>>> chore:  regenerate types
8046<<<<<<< HEAD
6781>>>>>>> chore:  regenerate types8047>>>>>>> chore:  regenerate types
8048<<<<<<< HEAD
6782>>>>>>> chore:  regenerate types8049>>>>>>> chore:  regenerate types
8050=======
8051=======
8052=======
8053  /** @name PalletEvmMigrationError (488) */
8054>>>>>>> fix: regenerate types after rebase
8055>>>>>>> fix: regenerate types after rebase
8056>>>>>>> fix: regenerate types after rebase
6783  interface PalletEvmMigrationError extends Enum {8057  interface PalletEvmMigrationError extends Enum {
6784    readonly isAccountNotEmpty: boolean;8058    readonly isAccountNotEmpty: boolean;
6785    readonly isAccountIsNotMigrating: boolean;8059    readonly isAccountIsNotMigrating: boolean;
6790<<<<<<< HEAD8064<<<<<<< HEAD
6791<<<<<<< HEAD8065<<<<<<< HEAD
6792<<<<<<< HEAD8066<<<<<<< HEAD
8067<<<<<<< HEAD
6793  /** @name PalletMaintenanceError (466) */8068  /** @name PalletMaintenanceError (466) */
6794  type PalletMaintenanceError = Null;8069  type PalletMaintenanceError = Null;
67958070
6799>>>>>>> chore: regenerate types8074>>>>>>> chore: regenerate types
6800=======8075=======
6801>>>>>>> chore:  regenerate types8076>>>>>>> chore:  regenerate types
8077=======
8078>>>>>>> fix: regenerate types after rebase
6802<<<<<<< HEAD8079<<<<<<< HEAD
6803  /** @name PalletMaintenanceError (467) */8080  /** @name PalletMaintenanceError (467) */
6804  type PalletMaintenanceError = Null;8081  type PalletMaintenanceError = Null;
6809>>>>>>> chore: regenerate types8086>>>>>>> chore: regenerate types
6810=======8087=======
6811>>>>>>> chore:  regenerate types8088>>>>>>> chore:  regenerate types
8089=======
8090>>>>>>> fix: regenerate types after rebase
6812<<<<<<< HEAD8091<<<<<<< HEAD
6813  /** @name PalletMaintenanceError (468) */8092  /** @name PalletMaintenanceError (468) */
6814  type PalletMaintenanceError = Null;8093  type PalletMaintenanceError = Null;
6861  /** @name PalletTestUtilsError (489) */8140  /** @name PalletTestUtilsError (489) */
6862>>>>>>> chore:  regenerate types8141>>>>>>> chore:  regenerate types
6863>>>>>>> chore:  regenerate types8142>>>>>>> chore:  regenerate types
8143<<<<<<< HEAD
6864>>>>>>> chore:  regenerate types8144>>>>>>> chore:  regenerate types
8145<<<<<<< HEAD
6865>>>>>>> chore:  regenerate types8146>>>>>>> chore:  regenerate types
8147=======
8148=======
8149=======
8150  /** @name PalletMaintenanceError (489) */
8151  type PalletMaintenanceError = Null;
8152
8153  /** @name PalletTestUtilsError (490) */
8154>>>>>>> fix: regenerate types after rebase
8155>>>>>>> fix: regenerate types after rebase
8156>>>>>>> fix: regenerate types after rebase
6866  interface PalletTestUtilsError extends Enum {8157  interface PalletTestUtilsError extends Enum {
6867    readonly isTestPalletDisabled: boolean;8158    readonly isTestPalletDisabled: boolean;
6868    readonly isTriggerRollback: boolean;8159    readonly isTriggerRollback: boolean;
6872<<<<<<< HEAD8163<<<<<<< HEAD
6873<<<<<<< HEAD8164<<<<<<< HEAD
6874<<<<<<< HEAD8165<<<<<<< HEAD
8166<<<<<<< HEAD
6875  /** @name SpRuntimeMultiSignature (469) */8167  /** @name SpRuntimeMultiSignature (469) */
6876=======8168=======
6877=======8169=======
6878>>>>>>> chore: regenerate types8170>>>>>>> chore: regenerate types
6879=======8171=======
6880>>>>>>> chore:  regenerate types8172>>>>>>> chore:  regenerate types
8173=======
8174>>>>>>> fix: regenerate types after rebase
6881<<<<<<< HEAD8175<<<<<<< HEAD
6882  /** @name SpRuntimeMultiSignature (470) */8176  /** @name SpRuntimeMultiSignature (470) */
6883=======8177=======
6884=======8178=======
6885>>>>>>> chore: regenerate types8179>>>>>>> chore: regenerate types
6886=======8180=======
6887>>>>>>> chore:  regenerate types8181>>>>>>> chore:  regenerate types
8182=======
8183>>>>>>> fix: regenerate types after rebase
6888<<<<<<< HEAD8184<<<<<<< HEAD
6889  /** @name SpRuntimeMultiSignature (471) */8185  /** @name SpRuntimeMultiSignature (471) */
6890=======8186=======
6922  /** @name SpRuntimeMultiSignature (491) */8218  /** @name SpRuntimeMultiSignature (491) */
6923>>>>>>> chore:  regenerate types8219>>>>>>> chore:  regenerate types
6924>>>>>>> chore:  regenerate types8220>>>>>>> chore:  regenerate types
8221<<<<<<< HEAD
6925>>>>>>> chore:  regenerate types8222>>>>>>> chore:  regenerate types
8223<<<<<<< HEAD
6926>>>>>>> chore:  regenerate types8224>>>>>>> chore:  regenerate types
8225=======
8226=======
8227=======
8228  /** @name SpRuntimeMultiSignature (492) */
8229>>>>>>> fix: regenerate types after rebase
8230>>>>>>> fix: regenerate types after rebase
8231>>>>>>> fix: regenerate types after rebase
6927  interface SpRuntimeMultiSignature extends Enum {8232  interface SpRuntimeMultiSignature extends Enum {
6928    readonly isEd25519: boolean;8233    readonly isEd25519: boolean;
6929    readonly asEd25519: SpCoreEd25519Signature;8234    readonly asEd25519: SpCoreEd25519Signature;
6937<<<<<<< HEAD8242<<<<<<< HEAD
6938<<<<<<< HEAD8243<<<<<<< HEAD
6939<<<<<<< HEAD8244<<<<<<< HEAD
8245<<<<<<< HEAD
6940  /** @name SpCoreEd25519Signature (470) */8246  /** @name SpCoreEd25519Signature (470) */
6941=======8247=======
6942=======8248=======
6943>>>>>>> chore: regenerate types8249>>>>>>> chore: regenerate types
6944=======8250=======
6945>>>>>>> chore:  regenerate types8251>>>>>>> chore:  regenerate types
8252=======
8253>>>>>>> fix: regenerate types after rebase
6946<<<<<<< HEAD8254<<<<<<< HEAD
6947  /** @name SpCoreEd25519Signature (471) */8255  /** @name SpCoreEd25519Signature (471) */
6948=======8256=======
6949=======8257=======
6950>>>>>>> chore: regenerate types8258>>>>>>> chore: regenerate types
6951=======8259=======
6952>>>>>>> chore:  regenerate types8260>>>>>>> chore:  regenerate types
8261=======
8262>>>>>>> fix: regenerate types after rebase
6953<<<<<<< HEAD8263<<<<<<< HEAD
6954  /** @name SpCoreEd25519Signature (472) */8264  /** @name SpCoreEd25519Signature (472) */
6955=======8265=======
7012=======8322=======
7013  /** @name SpCoreEd25519Signature (492) */8323  /** @name SpCoreEd25519Signature (492) */
7014>>>>>>> chore:  regenerate types8324>>>>>>> chore:  regenerate types
8325=======
8326  /** @name SpCoreEd25519Signature (493) */
8327>>>>>>> fix: regenerate types after rebase
7015  interface SpCoreEd25519Signature extends U8aFixed {}8328  interface SpCoreEd25519Signature extends U8aFixed {}
70168329
7017  /** @name SpCoreSr25519Signature (494) */8330  /** @name SpCoreSr25519Signature (495) */
7018  interface SpCoreSr25519Signature extends U8aFixed {}8331  interface SpCoreSr25519Signature extends U8aFixed {}
70198332
7020  /** @name SpCoreEcdsaSignature (495) */8333  /** @name SpCoreEcdsaSignature (496) */
7021  interface SpCoreEcdsaSignature extends U8aFixed {}8334  interface SpCoreEcdsaSignature extends U8aFixed {}
70228335
7023  /** @name FrameSystemExtensionsCheckSpecVersion (498) */8336  /** @name FrameSystemExtensionsCheckSpecVersion (499) */
7024  type FrameSystemExtensionsCheckSpecVersion = Null;8337  type FrameSystemExtensionsCheckSpecVersion = Null;
70258338
7026  /** @name FrameSystemExtensionsCheckTxVersion (499) */8339  /** @name FrameSystemExtensionsCheckTxVersion (500) */
7027  type FrameSystemExtensionsCheckTxVersion = Null;8340  type FrameSystemExtensionsCheckTxVersion = Null;
70288341
7029  /** @name FrameSystemExtensionsCheckGenesis (500) */8342  /** @name FrameSystemExtensionsCheckGenesis (501) */
7030  type FrameSystemExtensionsCheckGenesis = Null;8343  type FrameSystemExtensionsCheckGenesis = Null;
70318344
7032  /** @name FrameSystemExtensionsCheckNonce (503) */8345  /** @name FrameSystemExtensionsCheckNonce (504) */
7033  interface FrameSystemExtensionsCheckNonce extends Compact<u32> {}8346  interface FrameSystemExtensionsCheckNonce extends Compact<u32> {}
70348347
7035  /** @name FrameSystemExtensionsCheckWeight (504) */8348  /** @name FrameSystemExtensionsCheckWeight (505) */
7036  type FrameSystemExtensionsCheckWeight = Null;8349  type FrameSystemExtensionsCheckWeight = Null;
70378350
7038  /** @name OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance (505) */8351  /** @name OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance (506) */
7039  type OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance = Null;8352  type OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance = Null;
70408353
7041  /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (506) */8354  /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (507) */
7042  interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact<u128> {}8355  interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact<u128> {}
70438356
7044  /** @name OpalRuntimeRuntime (507) */8357  /** @name OpalRuntimeRuntime (508) */
7045  type OpalRuntimeRuntime = Null;8358  type OpalRuntimeRuntime = Null;
70468359
7047<<<<<<< HEAD8360<<<<<<< HEAD
7048<<<<<<< HEAD8361<<<<<<< HEAD
8362<<<<<<< HEAD
7049  /** @name PalletEthereumFakeTransactionFinalizer (498) */8363  /** @name PalletEthereumFakeTransactionFinalizer (498) */
7050>>>>>>> fix: update polkadot types and definitions8364>>>>>>> fix: update polkadot types and definitions
7051<<<<<<< HEAD8365<<<<<<< HEAD
7073  /** @name PalletEthereumFakeTransactionFinalizer (508) */8387  /** @name PalletEthereumFakeTransactionFinalizer (508) */
7074>>>>>>> chore:  regenerate types8388>>>>>>> chore:  regenerate types
7075>>>>>>> chore:  regenerate types8389>>>>>>> chore:  regenerate types
8390<<<<<<< HEAD
7076>>>>>>> chore:  regenerate types8391>>>>>>> chore:  regenerate types
8392<<<<<<< HEAD
7077>>>>>>> chore:  regenerate types8393>>>>>>> chore:  regenerate types
8394=======
8395=======
8396=======
8397  /** @name PalletEthereumFakeTransactionFinalizer (509) */
8398>>>>>>> fix: regenerate types after rebase
8399>>>>>>> fix: regenerate types after rebase
8400>>>>>>> fix: regenerate types after rebase
7078  type PalletEthereumFakeTransactionFinalizer = Null;8401  type PalletEthereumFakeTransactionFinalizer = Null;
70798402
7080} // declare module8403} // declare module