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
before · tests/src/interfaces/registry.ts
1// Auto-generated via `yarn polkadot-types-from-defs`, do not edit2/* eslint-disable */34// import type lookup before we augment - in some environments5// this is required to allow for ambient/previous definitions6import '@polkadot/types/types/registry';78<<<<<<< HEAD9<<<<<<< HEAD10<<<<<<< HEAD11import 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';12=======13=======14>>>>>>> chore: regenerate types15=======16>>>>>>> chore:  regenerate types17<<<<<<< HEAD18import 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';19=======20=======21>>>>>>> chore: regenerate types22=======23>>>>>>> chore:  regenerate types24<<<<<<< HEAD25import 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';26=======27=======28>>>>>>> chore: regenerate types29=======30>>>>>>> chore:  regenerate types31<<<<<<< HEAD32import 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, 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, 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';33=======34import 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, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, 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, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, 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, 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, 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';35>>>>>>> fix: update polkadot types and definitions36<<<<<<< HEAD37>>>>>>> fix: update polkadot types and definitions38<<<<<<< HEAD39>>>>>>> fix: update polkadot types and definitions40<<<<<<< HEAD41>>>>>>> fix: update polkadot types and definitions42=======43=======44=======45=======46import 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, FrameSupportScheduleLookupError, FrameSupportScheduleMaybeHashed, 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, PalletUniqueSchedulerCall, PalletUniqueSchedulerError, PalletUniqueSchedulerEvent, PalletUniqueSchedulerScheduledV3, 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, 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';47>>>>>>> chore: regenerate types48<<<<<<< HEAD49>>>>>>> chore: regenerate types50<<<<<<< HEAD51>>>>>>> chore: regenerate types52<<<<<<< HEAD53>>>>>>> chore: regenerate types54=======55=======56=======57=======58import 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';59>>>>>>> chore:  regenerate types60>>>>>>> chore:  regenerate types61>>>>>>> chore:  regenerate types62>>>>>>> chore:  regenerate types6364declare module '@polkadot/types/types/registry' {65  interface InterfaceTypes {66    CumulusPalletDmpQueueCall: CumulusPalletDmpQueueCall;67    CumulusPalletDmpQueueConfigData: CumulusPalletDmpQueueConfigData;68    CumulusPalletDmpQueueError: CumulusPalletDmpQueueError;69    CumulusPalletDmpQueueEvent: CumulusPalletDmpQueueEvent;70    CumulusPalletDmpQueuePageIndexData: CumulusPalletDmpQueuePageIndexData;71    CumulusPalletParachainSystemCall: CumulusPalletParachainSystemCall;72    CumulusPalletParachainSystemError: CumulusPalletParachainSystemError;73    CumulusPalletParachainSystemEvent: CumulusPalletParachainSystemEvent;74    CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot;75    CumulusPalletXcmCall: CumulusPalletXcmCall;76    CumulusPalletXcmError: CumulusPalletXcmError;77    CumulusPalletXcmEvent: CumulusPalletXcmEvent;78    CumulusPalletXcmpQueueCall: CumulusPalletXcmpQueueCall;79    CumulusPalletXcmpQueueError: CumulusPalletXcmpQueueError;80    CumulusPalletXcmpQueueEvent: CumulusPalletXcmpQueueEvent;81    CumulusPalletXcmpQueueInboundChannelDetails: CumulusPalletXcmpQueueInboundChannelDetails;82    CumulusPalletXcmpQueueInboundState: CumulusPalletXcmpQueueInboundState;83    CumulusPalletXcmpQueueOutboundChannelDetails: CumulusPalletXcmpQueueOutboundChannelDetails;84    CumulusPalletXcmpQueueOutboundState: CumulusPalletXcmpQueueOutboundState;85    CumulusPalletXcmpQueueQueueConfigData: CumulusPalletXcmpQueueQueueConfigData;86    CumulusPrimitivesParachainInherentParachainInherentData: CumulusPrimitivesParachainInherentParachainInherentData;87    EthbloomBloom: EthbloomBloom;88    EthereumBlock: EthereumBlock;89    EthereumHeader: EthereumHeader;90    EthereumLog: EthereumLog;91    EthereumReceiptEip658ReceiptData: EthereumReceiptEip658ReceiptData;92    EthereumReceiptReceiptV3: EthereumReceiptReceiptV3;93    EthereumTransactionAccessListItem: EthereumTransactionAccessListItem;94    EthereumTransactionEip1559Transaction: EthereumTransactionEip1559Transaction;95    EthereumTransactionEip2930Transaction: EthereumTransactionEip2930Transaction;96    EthereumTransactionLegacyTransaction: EthereumTransactionLegacyTransaction;97    EthereumTransactionTransactionAction: EthereumTransactionTransactionAction;98    EthereumTransactionTransactionSignature: EthereumTransactionTransactionSignature;99    EthereumTransactionTransactionV2: EthereumTransactionTransactionV2;100    EthereumTypesHashH64: EthereumTypesHashH64;101    EvmCoreErrorExitError: EvmCoreErrorExitError;102    EvmCoreErrorExitFatal: EvmCoreErrorExitFatal;103    EvmCoreErrorExitReason: EvmCoreErrorExitReason;104    EvmCoreErrorExitRevert: EvmCoreErrorExitRevert;105    EvmCoreErrorExitSucceed: EvmCoreErrorExitSucceed;106    FpRpcTransactionStatus: FpRpcTransactionStatus;107    FrameSupportDispatchDispatchClass: FrameSupportDispatchDispatchClass;108    FrameSupportDispatchDispatchInfo: FrameSupportDispatchDispatchInfo;109    FrameSupportDispatchPays: FrameSupportDispatchPays;110    FrameSupportDispatchPerDispatchClassU32: FrameSupportDispatchPerDispatchClassU32;111    FrameSupportDispatchPerDispatchClassWeight: FrameSupportDispatchPerDispatchClassWeight;112    FrameSupportDispatchPerDispatchClassWeightsPerClass: FrameSupportDispatchPerDispatchClassWeightsPerClass;113    FrameSupportPalletId: FrameSupportPalletId;114    FrameSupportTokensMiscBalanceStatus: FrameSupportTokensMiscBalanceStatus;115    FrameSystemAccountInfo: FrameSystemAccountInfo;116    FrameSystemCall: FrameSystemCall;117    FrameSystemError: FrameSystemError;118    FrameSystemEvent: FrameSystemEvent;119    FrameSystemEventRecord: FrameSystemEventRecord;120    FrameSystemExtensionsCheckGenesis: FrameSystemExtensionsCheckGenesis;121    FrameSystemExtensionsCheckNonce: FrameSystemExtensionsCheckNonce;122    FrameSystemExtensionsCheckSpecVersion: FrameSystemExtensionsCheckSpecVersion;123    FrameSystemExtensionsCheckTxVersion: FrameSystemExtensionsCheckTxVersion;124    FrameSystemExtensionsCheckWeight: FrameSystemExtensionsCheckWeight;125    FrameSystemLastRuntimeUpgradeInfo: FrameSystemLastRuntimeUpgradeInfo;126    FrameSystemLimitsBlockLength: FrameSystemLimitsBlockLength;127    FrameSystemLimitsBlockWeights: FrameSystemLimitsBlockWeights;128    FrameSystemLimitsWeightsPerClass: FrameSystemLimitsWeightsPerClass;129    FrameSystemPhase: FrameSystemPhase;130    OpalRuntimeRuntime: OpalRuntimeRuntime;131    OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance: OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance;132    OrmlTokensAccountData: OrmlTokensAccountData;133    OrmlTokensBalanceLock: OrmlTokensBalanceLock;134    OrmlTokensModuleCall: OrmlTokensModuleCall;135    OrmlTokensModuleError: OrmlTokensModuleError;136    OrmlTokensModuleEvent: OrmlTokensModuleEvent;137    OrmlTokensReserveData: OrmlTokensReserveData;138    OrmlVestingModuleCall: OrmlVestingModuleCall;139    OrmlVestingModuleError: OrmlVestingModuleError;140    OrmlVestingModuleEvent: OrmlVestingModuleEvent;141    OrmlVestingVestingSchedule: OrmlVestingVestingSchedule;142    OrmlXtokensModuleCall: OrmlXtokensModuleCall;143    OrmlXtokensModuleError: OrmlXtokensModuleError;144    OrmlXtokensModuleEvent: OrmlXtokensModuleEvent;145    PalletAppPromotionCall: PalletAppPromotionCall;146    PalletAppPromotionError: PalletAppPromotionError;147    PalletAppPromotionEvent: PalletAppPromotionEvent;148    PalletBalancesAccountData: PalletBalancesAccountData;149    PalletBalancesBalanceLock: PalletBalancesBalanceLock;150    PalletBalancesCall: PalletBalancesCall;151    PalletBalancesError: PalletBalancesError;152    PalletBalancesEvent: PalletBalancesEvent;153    PalletBalancesReasons: PalletBalancesReasons;154    PalletBalancesReserveData: PalletBalancesReserveData;155    PalletCommonError: PalletCommonError;156    PalletCommonEvent: PalletCommonEvent;157    PalletConfigurationAppPromotionConfiguration: PalletConfigurationAppPromotionConfiguration;158    PalletConfigurationCall: PalletConfigurationCall;159    PalletConfigurationError: PalletConfigurationError;160    PalletEthereumCall: PalletEthereumCall;161    PalletEthereumError: PalletEthereumError;162    PalletEthereumEvent: PalletEthereumEvent;163    PalletEthereumFakeTransactionFinalizer: PalletEthereumFakeTransactionFinalizer;164    PalletEvmAccountBasicCrossAccountIdRepr: PalletEvmAccountBasicCrossAccountIdRepr;165    PalletEvmCall: PalletEvmCall;166    PalletEvmCoderSubstrateError: PalletEvmCoderSubstrateError;167    PalletEvmContractHelpersError: PalletEvmContractHelpersError;168    PalletEvmContractHelpersEvent: PalletEvmContractHelpersEvent;169    PalletEvmContractHelpersSponsoringModeT: PalletEvmContractHelpersSponsoringModeT;170    PalletEvmError: PalletEvmError;171    PalletEvmEvent: PalletEvmEvent;172    PalletEvmMigrationCall: PalletEvmMigrationCall;173    PalletEvmMigrationError: PalletEvmMigrationError;174    PalletEvmMigrationEvent: PalletEvmMigrationEvent;175    PalletForeignAssetsAssetIds: PalletForeignAssetsAssetIds;176    PalletForeignAssetsModuleAssetMetadata: PalletForeignAssetsModuleAssetMetadata;177    PalletForeignAssetsModuleCall: PalletForeignAssetsModuleCall;178    PalletForeignAssetsModuleError: PalletForeignAssetsModuleError;179    PalletForeignAssetsModuleEvent: PalletForeignAssetsModuleEvent;180    PalletForeignAssetsNativeCurrency: PalletForeignAssetsNativeCurrency;181    PalletFungibleError: PalletFungibleError;182    PalletInflationCall: PalletInflationCall;183    PalletMaintenanceCall: PalletMaintenanceCall;184    PalletMaintenanceError: PalletMaintenanceError;185    PalletMaintenanceEvent: PalletMaintenanceEvent;186    PalletNonfungibleError: PalletNonfungibleError;187    PalletNonfungibleItemData: PalletNonfungibleItemData;188    PalletRefungibleError: PalletRefungibleError;189    PalletRmrkCoreCall: PalletRmrkCoreCall;190    PalletRmrkCoreError: PalletRmrkCoreError;191    PalletRmrkCoreEvent: PalletRmrkCoreEvent;192    PalletRmrkEquipCall: PalletRmrkEquipCall;193    PalletRmrkEquipError: PalletRmrkEquipError;194    PalletRmrkEquipEvent: PalletRmrkEquipEvent;195    PalletStructureCall: PalletStructureCall;196    PalletStructureError: PalletStructureError;197    PalletStructureEvent: PalletStructureEvent;198    PalletSudoCall: PalletSudoCall;199    PalletSudoError: PalletSudoError;200    PalletSudoEvent: PalletSudoEvent;201    PalletTemplateTransactionPaymentCall: PalletTemplateTransactionPaymentCall;202    PalletTemplateTransactionPaymentChargeTransactionPayment: PalletTemplateTransactionPaymentChargeTransactionPayment;203    PalletTestUtilsCall: PalletTestUtilsCall;204    PalletTestUtilsError: PalletTestUtilsError;205    PalletTestUtilsEvent: PalletTestUtilsEvent;206    PalletTimestampCall: PalletTimestampCall;207    PalletTransactionPaymentEvent: PalletTransactionPaymentEvent;208    PalletTransactionPaymentReleases: PalletTransactionPaymentReleases;209    PalletTreasuryCall: PalletTreasuryCall;210    PalletTreasuryError: PalletTreasuryError;211    PalletTreasuryEvent: PalletTreasuryEvent;212    PalletTreasuryProposal: PalletTreasuryProposal;213    PalletUniqueCall: PalletUniqueCall;214    PalletUniqueError: PalletUniqueError;215    PalletXcmCall: PalletXcmCall;216    PalletXcmError: PalletXcmError;217    PalletXcmEvent: PalletXcmEvent;218    PhantomTypeUpDataStructs: PhantomTypeUpDataStructs;219    PolkadotCorePrimitivesInboundDownwardMessage: PolkadotCorePrimitivesInboundDownwardMessage;220    PolkadotCorePrimitivesInboundHrmpMessage: PolkadotCorePrimitivesInboundHrmpMessage;221    PolkadotCorePrimitivesOutboundHrmpMessage: PolkadotCorePrimitivesOutboundHrmpMessage;222    PolkadotParachainPrimitivesXcmpMessageFormat: PolkadotParachainPrimitivesXcmpMessageFormat;223    PolkadotPrimitivesV2AbridgedHostConfiguration: PolkadotPrimitivesV2AbridgedHostConfiguration;224    PolkadotPrimitivesV2AbridgedHrmpChannel: PolkadotPrimitivesV2AbridgedHrmpChannel;225    PolkadotPrimitivesV2PersistedValidationData: PolkadotPrimitivesV2PersistedValidationData;226    PolkadotPrimitivesV2UpgradeRestriction: PolkadotPrimitivesV2UpgradeRestriction;227    RmrkTraitsBaseBaseInfo: RmrkTraitsBaseBaseInfo;228    RmrkTraitsCollectionCollectionInfo: RmrkTraitsCollectionCollectionInfo;229    RmrkTraitsNftAccountIdOrCollectionNftTuple: RmrkTraitsNftAccountIdOrCollectionNftTuple;230    RmrkTraitsNftNftChild: RmrkTraitsNftNftChild;231    RmrkTraitsNftNftInfo: RmrkTraitsNftNftInfo;232    RmrkTraitsNftRoyaltyInfo: RmrkTraitsNftRoyaltyInfo;233    RmrkTraitsPartEquippableList: RmrkTraitsPartEquippableList;234    RmrkTraitsPartFixedPart: RmrkTraitsPartFixedPart;235    RmrkTraitsPartPartType: RmrkTraitsPartPartType;236    RmrkTraitsPartSlotPart: RmrkTraitsPartSlotPart;237    RmrkTraitsPropertyPropertyInfo: RmrkTraitsPropertyPropertyInfo;238    RmrkTraitsResourceBasicResource: RmrkTraitsResourceBasicResource;239    RmrkTraitsResourceComposableResource: RmrkTraitsResourceComposableResource;240    RmrkTraitsResourceResourceInfo: RmrkTraitsResourceResourceInfo;241    RmrkTraitsResourceResourceTypes: RmrkTraitsResourceResourceTypes;242    RmrkTraitsResourceSlotResource: RmrkTraitsResourceSlotResource;243    RmrkTraitsTheme: RmrkTraitsTheme;244    RmrkTraitsThemeThemeProperty: RmrkTraitsThemeThemeProperty;245    SpCoreEcdsaSignature: SpCoreEcdsaSignature;246    SpCoreEd25519Signature: SpCoreEd25519Signature;247    SpCoreSr25519Signature: SpCoreSr25519Signature;248    SpRuntimeArithmeticError: SpRuntimeArithmeticError;249    SpRuntimeDigest: SpRuntimeDigest;250    SpRuntimeDigestDigestItem: SpRuntimeDigestDigestItem;251    SpRuntimeDispatchError: SpRuntimeDispatchError;252    SpRuntimeModuleError: SpRuntimeModuleError;253    SpRuntimeMultiSignature: SpRuntimeMultiSignature;254    SpRuntimeTokenError: SpRuntimeTokenError;255    SpRuntimeTransactionValidityInvalidTransaction: SpRuntimeTransactionValidityInvalidTransaction;256    SpRuntimeTransactionValidityTransactionValidityError: SpRuntimeTransactionValidityTransactionValidityError;257    SpRuntimeTransactionValidityUnknownTransaction: SpRuntimeTransactionValidityUnknownTransaction;258    SpRuntimeTransactionalError: SpRuntimeTransactionalError;259    SpTrieStorageProof: SpTrieStorageProof;260    SpVersionRuntimeVersion: SpVersionRuntimeVersion;261    SpWeightsRuntimeDbWeight: SpWeightsRuntimeDbWeight;262    SpWeightsWeightV2Weight: SpWeightsWeightV2Weight;263    UpDataStructsAccessMode: UpDataStructsAccessMode;264    UpDataStructsCollection: UpDataStructsCollection;265    UpDataStructsCollectionLimits: UpDataStructsCollectionLimits;266    UpDataStructsCollectionMode: UpDataStructsCollectionMode;267    UpDataStructsCollectionPermissions: UpDataStructsCollectionPermissions;268    UpDataStructsCollectionStats: UpDataStructsCollectionStats;269    UpDataStructsCreateCollectionData: UpDataStructsCreateCollectionData;270    UpDataStructsCreateFungibleData: UpDataStructsCreateFungibleData;271    UpDataStructsCreateItemData: UpDataStructsCreateItemData;272    UpDataStructsCreateItemExData: UpDataStructsCreateItemExData;273    UpDataStructsCreateNftData: UpDataStructsCreateNftData;274    UpDataStructsCreateNftExData: UpDataStructsCreateNftExData;275    UpDataStructsCreateReFungibleData: UpDataStructsCreateReFungibleData;276    UpDataStructsCreateRefungibleExMultipleOwners: UpDataStructsCreateRefungibleExMultipleOwners;277    UpDataStructsCreateRefungibleExSingleOwner: UpDataStructsCreateRefungibleExSingleOwner;278    UpDataStructsNestingPermissions: UpDataStructsNestingPermissions;279    UpDataStructsOwnerRestrictedSet: UpDataStructsOwnerRestrictedSet;280    UpDataStructsProperties: UpDataStructsProperties;281    UpDataStructsPropertiesMapBoundedVec: UpDataStructsPropertiesMapBoundedVec;282    UpDataStructsPropertiesMapPropertyPermission: UpDataStructsPropertiesMapPropertyPermission;283    UpDataStructsProperty: UpDataStructsProperty;284    UpDataStructsPropertyKeyPermission: UpDataStructsPropertyKeyPermission;285    UpDataStructsPropertyPermission: UpDataStructsPropertyPermission;286    UpDataStructsPropertyScope: UpDataStructsPropertyScope;287    UpDataStructsRpcCollection: UpDataStructsRpcCollection;288    UpDataStructsRpcCollectionFlags: UpDataStructsRpcCollectionFlags;289    UpDataStructsSponsoringRateLimit: UpDataStructsSponsoringRateLimit;290    UpDataStructsSponsorshipStateAccountId32: UpDataStructsSponsorshipStateAccountId32;291    UpDataStructsSponsorshipStateBasicCrossAccountIdRepr: UpDataStructsSponsorshipStateBasicCrossAccountIdRepr;292    UpDataStructsTokenChild: UpDataStructsTokenChild;293    UpDataStructsTokenData: UpDataStructsTokenData;294    UpPovEstimateRpcPovInfo: UpPovEstimateRpcPovInfo;295    UpPovEstimateRpcTrieKeyValue: UpPovEstimateRpcTrieKeyValue;296    XcmDoubleEncoded: XcmDoubleEncoded;297    XcmV0Junction: XcmV0Junction;298    XcmV0JunctionBodyId: XcmV0JunctionBodyId;299    XcmV0JunctionBodyPart: XcmV0JunctionBodyPart;300    XcmV0JunctionNetworkId: XcmV0JunctionNetworkId;301    XcmV0MultiAsset: XcmV0MultiAsset;302    XcmV0MultiLocation: XcmV0MultiLocation;303    XcmV0Order: XcmV0Order;304    XcmV0OriginKind: XcmV0OriginKind;305    XcmV0Response: XcmV0Response;306    XcmV0Xcm: XcmV0Xcm;307    XcmV1Junction: XcmV1Junction;308    XcmV1MultiAsset: XcmV1MultiAsset;309    XcmV1MultiLocation: XcmV1MultiLocation;310    XcmV1MultiassetAssetId: XcmV1MultiassetAssetId;311    XcmV1MultiassetAssetInstance: XcmV1MultiassetAssetInstance;312    XcmV1MultiassetFungibility: XcmV1MultiassetFungibility;313    XcmV1MultiassetMultiAssetFilter: XcmV1MultiassetMultiAssetFilter;314    XcmV1MultiassetMultiAssets: XcmV1MultiassetMultiAssets;315    XcmV1MultiassetWildFungibility: XcmV1MultiassetWildFungibility;316    XcmV1MultiassetWildMultiAsset: XcmV1MultiassetWildMultiAsset;317    XcmV1MultilocationJunctions: XcmV1MultilocationJunctions;318    XcmV1Order: XcmV1Order;319    XcmV1Response: XcmV1Response;320    XcmV1Xcm: XcmV1Xcm;321    XcmV2Instruction: XcmV2Instruction;322    XcmV2Response: XcmV2Response;323    XcmV2TraitsError: XcmV2TraitsError;324    XcmV2TraitsOutcome: XcmV2TraitsOutcome;325    XcmV2WeightLimit: XcmV2WeightLimit;326    XcmV2Xcm: XcmV2Xcm;327    XcmVersionedMultiAsset: XcmVersionedMultiAsset;328    XcmVersionedMultiAssets: XcmVersionedMultiAssets;329    XcmVersionedMultiLocation: XcmVersionedMultiLocation;330    XcmVersionedXcm: XcmVersionedXcm;331  } // InterfaceTypes332} // declare module
modifiedtests/src/interfaces/types-lookup.tsdiffbeforeafterboth
--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -1369,6 +1369,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEthereumEvent (109) */
 =======
 <<<<<<< HEAD
@@ -1377,6 +1378,9 @@
   /** @name PalletEthereumEvent (115) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletEthereumEvent (113) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletEthereumEvent extends Enum {
     readonly isExecuted: boolean;
     readonly asExecuted: {
@@ -1389,6 +1393,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EvmCoreErrorExitReason (110) */
 =======
 <<<<<<< HEAD
@@ -1397,6 +1402,9 @@
   /** @name EvmCoreErrorExitReason (116) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EvmCoreErrorExitReason (114) */
+>>>>>>> fix: regenerate types after rebase
   interface EvmCoreErrorExitReason extends Enum {
     readonly isSucceed: boolean;
     readonly asSucceed: EvmCoreErrorExitSucceed;
@@ -1410,6 +1418,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EvmCoreErrorExitSucceed (111) */
 =======
 <<<<<<< HEAD
@@ -1418,6 +1427,9 @@
   /** @name EvmCoreErrorExitSucceed (117) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EvmCoreErrorExitSucceed (115) */
+>>>>>>> fix: regenerate types after rebase
   interface EvmCoreErrorExitSucceed extends Enum {
     readonly isStopped: boolean;
     readonly isReturned: boolean;
@@ -1426,6 +1438,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EvmCoreErrorExitError (112) */
 =======
 <<<<<<< HEAD
@@ -1434,6 +1447,9 @@
   /** @name EvmCoreErrorExitError (118) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EvmCoreErrorExitError (116) */
+>>>>>>> fix: regenerate types after rebase
   interface EvmCoreErrorExitError extends Enum {
     readonly isStackUnderflow: boolean;
     readonly isStackOverflow: boolean;
@@ -1455,6 +1471,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EvmCoreErrorExitRevert (115) */
 =======
 <<<<<<< HEAD
@@ -1463,12 +1480,16 @@
   /** @name EvmCoreErrorExitRevert (121) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EvmCoreErrorExitRevert (119) */
+>>>>>>> fix: regenerate types after rebase
   interface EvmCoreErrorExitRevert extends Enum {
     readonly isReverted: boolean;
     readonly type: 'Reverted';
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EvmCoreErrorExitFatal (116) */
 =======
 <<<<<<< HEAD
@@ -1477,6 +1498,9 @@
   /** @name EvmCoreErrorExitFatal (122) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EvmCoreErrorExitFatal (120) */
+>>>>>>> fix: regenerate types after rebase
   interface EvmCoreErrorExitFatal extends Enum {
     readonly isNotSupported: boolean;
     readonly isUnhandledInterrupt: boolean;
@@ -1488,6 +1512,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmContractHelpersEvent (117) */
 =======
 <<<<<<< HEAD
@@ -1496,6 +1521,9 @@
   /** @name PalletEvmContractHelpersEvent (123) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletEvmContractHelpersEvent (121) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmContractHelpersEvent extends Enum {
     readonly isContractSponsorSet: boolean;
     readonly asContractSponsorSet: ITuple<[H160, AccountId32]>;
@@ -1507,9 +1535,12 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmMigrationEvent (118) */
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
   /** @name PalletEvmMigrationEvent (122) */
 >>>>>>> chore:  regenerate types
   interface PalletEvmMigrationEvent extends Enum {
@@ -1521,10 +1552,13 @@
   /** @name PalletMaintenanceEvent (119) */
 =======
   /** @name PalletMaintenanceEvent (123) */
+<<<<<<< HEAD
 =======
   /** @name PalletMaintenanceEvent (124) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
   interface PalletMaintenanceEvent extends Enum {
     readonly isMaintenanceEnabled: boolean;
     readonly isMaintenanceDisabled: boolean;
@@ -1532,6 +1566,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletTestUtilsEvent (120) */
 =======
 <<<<<<< HEAD
@@ -1540,6 +1575,9 @@
   /** @name PalletTestUtilsEvent (125) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletTestUtilsEvent (124) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletTestUtilsEvent extends Enum {
     readonly isValueIsSet: boolean;
     readonly isShouldRollback: boolean;
@@ -1548,6 +1586,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSystemPhase (121) */
 =======
 <<<<<<< HEAD
@@ -1556,6 +1595,9 @@
   /** @name FrameSystemPhase (126) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name FrameSystemPhase (125) */
+>>>>>>> fix: regenerate types after rebase
   interface FrameSystemPhase extends Enum {
     readonly isApplyExtrinsic: boolean;
     readonly asApplyExtrinsic: u32;
@@ -1565,6 +1607,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSystemLastRuntimeUpgradeInfo (124) */
 =======
 <<<<<<< HEAD
@@ -1573,12 +1616,16 @@
   /** @name FrameSystemLastRuntimeUpgradeInfo (128) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name FrameSystemLastRuntimeUpgradeInfo (127) */
+>>>>>>> fix: regenerate types after rebase
   interface FrameSystemLastRuntimeUpgradeInfo extends Struct {
     readonly specVersion: Compact<u32>;
     readonly specName: Text;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSystemCall (125) */
 =======
 <<<<<<< HEAD
@@ -1587,6 +1634,9 @@
   /** @name FrameSystemCall (129) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name FrameSystemCall (128) */
+>>>>>>> fix: regenerate types after rebase
   interface FrameSystemCall extends Enum {
     readonly isRemark: boolean;
     readonly asRemark: {
@@ -1625,8 +1675,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSystemLimitsBlockWeights (129) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FrameSystemLimitsBlockWeights (130) */
 =======
@@ -1636,7 +1689,13 @@
   /** @name FrameSystemLimitsBlockWeights (134) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name FrameSystemLimitsBlockWeights (133) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface FrameSystemLimitsBlockWeights extends Struct {
     readonly baseBlock: SpWeightsWeightV2Weight;
     readonly maxBlock: SpWeightsWeightV2Weight;
@@ -1644,8 +1703,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (130) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (131) */
 =======
@@ -1655,7 +1717,13 @@
   /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (135) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (134) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct {
     readonly normal: FrameSystemLimitsWeightsPerClass;
     readonly operational: FrameSystemLimitsWeightsPerClass;
@@ -1663,8 +1731,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSystemLimitsWeightsPerClass (131) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FrameSystemLimitsWeightsPerClass (132) */
 =======
@@ -1674,7 +1745,13 @@
   /** @name FrameSystemLimitsWeightsPerClass (136) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name FrameSystemLimitsWeightsPerClass (135) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface FrameSystemLimitsWeightsPerClass extends Struct {
     readonly baseExtrinsic: SpWeightsWeightV2Weight;
     readonly maxExtrinsic: Option<SpWeightsWeightV2Weight>;
@@ -1683,8 +1760,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSystemLimitsBlockLength (133) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FrameSystemLimitsBlockLength (134) */
 =======
@@ -1694,14 +1774,23 @@
   /** @name FrameSystemLimitsBlockLength (138) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name FrameSystemLimitsBlockLength (137) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface FrameSystemLimitsBlockLength extends Struct {
     readonly max: FrameSupportDispatchPerDispatchClassU32;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSupportDispatchPerDispatchClassU32 (134) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FrameSupportDispatchPerDispatchClassU32 (135) */
 =======
@@ -1711,7 +1800,13 @@
   /** @name FrameSupportDispatchPerDispatchClassU32 (139) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name FrameSupportDispatchPerDispatchClassU32 (138) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface FrameSupportDispatchPerDispatchClassU32 extends Struct {
     readonly normal: u32;
     readonly operational: u32;
@@ -1719,8 +1814,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name SpWeightsRuntimeDbWeight (135) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name SpWeightsRuntimeDbWeight (136) */
 =======
@@ -1730,15 +1828,24 @@
   /** @name SpWeightsRuntimeDbWeight (140) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name SpWeightsRuntimeDbWeight (139) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface SpWeightsRuntimeDbWeight extends Struct {
     readonly read: u64;
     readonly write: u64;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name SpVersionRuntimeVersion (136) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name SpVersionRuntimeVersion (137) */
 =======
@@ -1748,7 +1855,13 @@
   /** @name SpVersionRuntimeVersion (141) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name SpVersionRuntimeVersion (140) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface SpVersionRuntimeVersion extends Struct {
     readonly specName: Text;
     readonly implName: Text;
@@ -1761,8 +1874,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSystemError (141) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FrameSystemError (142) */
 =======
@@ -1772,7 +1888,13 @@
   /** @name FrameSystemError (146) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name FrameSystemError (145) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface FrameSystemError extends Enum {
     readonly isInvalidSpecName: boolean;
     readonly isSpecVersionNeedsToIncrease: boolean;
@@ -1784,8 +1906,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotPrimitivesV2PersistedValidationData (142) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PolkadotPrimitivesV2PersistedValidationData (143) */
 =======
@@ -1795,7 +1920,13 @@
   /** @name PolkadotPrimitivesV2PersistedValidationData (147) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PolkadotPrimitivesV2PersistedValidationData (146) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotPrimitivesV2PersistedValidationData extends Struct {
     readonly parentHead: Bytes;
     readonly relayParentNumber: u32;
@@ -1804,8 +1935,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotPrimitivesV2UpgradeRestriction (145) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PolkadotPrimitivesV2UpgradeRestriction (146) */
 =======
@@ -1815,15 +1949,24 @@
   /** @name PolkadotPrimitivesV2UpgradeRestriction (150) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PolkadotPrimitivesV2UpgradeRestriction (149) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotPrimitivesV2UpgradeRestriction extends Enum {
     readonly isPresent: boolean;
     readonly type: 'Present';
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name SpTrieStorageProof (146) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name SpTrieStorageProof (147) */
 =======
@@ -1833,14 +1976,23 @@
   /** @name SpTrieStorageProof (151) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name SpTrieStorageProof (150) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface SpTrieStorageProof extends Struct {
     readonly trieNodes: BTreeSet<Bytes>;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (148) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (149) */
 =======
@@ -1850,7 +2002,13 @@
   /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (153) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (152) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct {
     readonly dmqMqcHead: H256;
     readonly relayDispatchQueueSize: ITuple<[u32, u32]>;
@@ -1859,8 +2017,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (151) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (152) */
 =======
@@ -1870,7 +2031,13 @@
   /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (156) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (155) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct {
     readonly maxCapacity: u32;
     readonly maxTotalSize: u32;
@@ -1881,8 +2048,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (152) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (153) */
 =======
@@ -1892,7 +2062,13 @@
   /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (157) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (156) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct {
     readonly maxCodeSize: u32;
     readonly maxHeadDataSize: u32;
@@ -1906,8 +2082,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotCorePrimitivesOutboundHrmpMessage (158) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PolkadotCorePrimitivesOutboundHrmpMessage (159) */
 =======
@@ -1917,15 +2096,24 @@
   /** @name PolkadotCorePrimitivesOutboundHrmpMessage (163) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PolkadotCorePrimitivesOutboundHrmpMessage (162) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct {
     readonly recipient: u32;
     readonly data: Bytes;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletParachainSystemCall (159) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name CumulusPalletParachainSystemCall (160) */
 =======
@@ -1935,7 +2123,13 @@
   /** @name CumulusPalletParachainSystemCall (164) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name CumulusPalletParachainSystemCall (163) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletParachainSystemCall extends Enum {
     readonly isSetValidationData: boolean;
     readonly asSetValidationData: {
@@ -1957,8 +2151,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPrimitivesParachainInherentParachainInherentData (160) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name CumulusPrimitivesParachainInherentParachainInherentData (161) */
 =======
@@ -1968,7 +2165,13 @@
   /** @name CumulusPrimitivesParachainInherentParachainInherentData (165) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name CumulusPrimitivesParachainInherentParachainInherentData (164) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct {
     readonly validationData: PolkadotPrimitivesV2PersistedValidationData;
     readonly relayChainState: SpTrieStorageProof;
@@ -1977,8 +2180,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotCorePrimitivesInboundDownwardMessage (162) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PolkadotCorePrimitivesInboundDownwardMessage (163) */
 =======
@@ -1988,15 +2194,24 @@
   /** @name PolkadotCorePrimitivesInboundDownwardMessage (167) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PolkadotCorePrimitivesInboundDownwardMessage (166) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct {
     readonly sentAt: u32;
     readonly msg: Bytes;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotCorePrimitivesInboundHrmpMessage (165) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PolkadotCorePrimitivesInboundHrmpMessage (166) */
 =======
@@ -2006,15 +2221,24 @@
   /** @name PolkadotCorePrimitivesInboundHrmpMessage (170) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PolkadotCorePrimitivesInboundHrmpMessage (169) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct {
     readonly sentAt: u32;
     readonly data: Bytes;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletParachainSystemError (168) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name CumulusPalletParachainSystemError (169) */
 =======
@@ -2024,7 +2248,13 @@
   /** @name CumulusPalletParachainSystemError (173) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name CumulusPalletParachainSystemError (172) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletParachainSystemError extends Enum {
     readonly isOverlappingUpgrades: boolean;
     readonly isProhibitedByPolkadot: boolean;
@@ -2038,8 +2268,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletBalancesBalanceLock (170) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletBalancesBalanceLock (171) */
 =======
@@ -2049,7 +2282,13 @@
   /** @name PalletBalancesBalanceLock (175) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletBalancesBalanceLock (174) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletBalancesBalanceLock extends Struct {
     readonly id: U8aFixed;
     readonly amount: u128;
@@ -2057,8 +2296,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletBalancesReasons (171) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletBalancesReasons (172) */
 =======
@@ -2068,7 +2310,13 @@
   /** @name PalletBalancesReasons (176) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletBalancesReasons (175) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletBalancesReasons extends Enum {
     readonly isFee: boolean;
     readonly isMisc: boolean;
@@ -2077,8 +2325,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletBalancesReserveData (174) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletBalancesReserveData (175) */
 =======
@@ -2088,15 +2339,24 @@
   /** @name PalletBalancesReserveData (179) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletBalancesReserveData (178) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletBalancesReserveData extends Struct {
     readonly id: U8aFixed;
     readonly amount: u128;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletBalancesCall (176) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletBalancesReleases (177) */
 =======
@@ -2106,6 +2366,9 @@
   /** @name PalletBalancesReleases (181) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletBalancesReleases (180) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletBalancesReleases extends Enum {
     readonly isV100: boolean;
     readonly isV200: boolean;
@@ -2113,6 +2376,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletBalancesCall (178) */
 =======
 <<<<<<< HEAD
@@ -2121,7 +2385,13 @@
   /** @name PalletBalancesCall (182) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletBalancesCall (181) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletBalancesCall extends Enum {
     readonly isTransfer: boolean;
     readonly asTransfer: {
@@ -2159,8 +2429,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletBalancesError (179) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletBalancesError (181) */
 =======
@@ -2170,7 +2443,13 @@
   /** @name PalletBalancesError (185) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletBalancesError (184) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletBalancesError extends Enum {
     readonly isVestingBalance: boolean;
     readonly isLiquidityRestrictions: boolean;
@@ -2184,8 +2463,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletTimestampCall (181) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletTimestampCall (183) */
 =======
@@ -2195,7 +2477,13 @@
   /** @name PalletTimestampCall (187) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletTimestampCall (186) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletTimestampCall extends Enum {
     readonly isSet: boolean;
     readonly asSet: {
@@ -2205,8 +2493,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletTransactionPaymentReleases (183) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletTransactionPaymentReleases (185) */
 =======
@@ -2216,7 +2507,13 @@
   /** @name PalletTransactionPaymentReleases (189) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletTransactionPaymentReleases (188) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletTransactionPaymentReleases extends Enum {
     readonly isV1Ancient: boolean;
     readonly isV2: boolean;
@@ -2224,8 +2521,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletTreasuryProposal (184) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletTreasuryProposal (186) */
 =======
@@ -2235,7 +2535,13 @@
   /** @name PalletTreasuryProposal (190) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletTreasuryProposal (189) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletTreasuryProposal extends Struct {
     readonly proposer: AccountId32;
     readonly value: u128;
@@ -2244,8 +2550,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletTreasuryCall (187) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletTreasuryCall (189) */
 =======
@@ -2255,7 +2564,13 @@
   /** @name PalletTreasuryCall (193) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletTreasuryCall (192) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletTreasuryCall extends Enum {
     readonly isProposeSpend: boolean;
     readonly asProposeSpend: {
@@ -2283,11 +2598,14 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FrameSupportPalletId (190) */
   interface FrameSupportPalletId extends U8aFixed {}
 
   /** @name PalletTreasuryError (191) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FrameSupportPalletId (192) */
   interface FrameSupportPalletId extends U8aFixed {}
@@ -2295,10 +2613,13 @@
   /** @name PalletTreasuryError (193) */
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
   /** @name FrameSupportPalletId (195) */
   interface FrameSupportPalletId extends U8aFixed {}
 
   /** @name PalletTreasuryError (196) */
+<<<<<<< HEAD
 =======
   /** @name FrameSupportPalletId (196) */
   interface FrameSupportPalletId extends U8aFixed {}
@@ -2306,7 +2627,12 @@
   /** @name PalletTreasuryError (197) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletTreasuryError extends Enum {
     readonly isInsufficientProposersBalance: boolean;
     readonly isInvalidIndex: boolean;
@@ -2317,8 +2643,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletSudoCall (192) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletSudoCall (194) */
 =======
@@ -2328,7 +2657,13 @@
   /** @name PalletSudoCall (198) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletSudoCall (197) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletSudoCall extends Enum {
     readonly isSudo: boolean;
     readonly asSudo: {
@@ -2352,8 +2687,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlVestingModuleCall (194) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name OrmlVestingModuleCall (196) */
 =======
@@ -2363,7 +2701,13 @@
   /** @name OrmlVestingModuleCall (200) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name OrmlVestingModuleCall (199) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface OrmlVestingModuleCall extends Enum {
     readonly isClaim: boolean;
     readonly isVestedTransfer: boolean;
@@ -2384,8 +2728,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlXtokensModuleCall (196) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name OrmlXtokensModuleCall (198) */
 =======
@@ -2395,7 +2742,13 @@
   /** @name OrmlXtokensModuleCall (202) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name OrmlXtokensModuleCall (201) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface OrmlXtokensModuleCall extends Enum {
     readonly isTransfer: boolean;
     readonly asTransfer: {
@@ -2443,8 +2796,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmVersionedMultiAsset (197) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmVersionedMultiAsset (199) */
 =======
@@ -2454,7 +2810,13 @@
   /** @name XcmVersionedMultiAsset (203) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmVersionedMultiAsset (202) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmVersionedMultiAsset extends Enum {
     readonly isV0: boolean;
     readonly asV0: XcmV0MultiAsset;
@@ -2464,8 +2826,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlTokensModuleCall (200) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name OrmlTokensModuleCall (202) */
 =======
@@ -2475,7 +2840,13 @@
   /** @name OrmlTokensModuleCall (206) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name OrmlTokensModuleCall (205) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface OrmlTokensModuleCall extends Enum {
     readonly isTransfer: boolean;
     readonly asTransfer: {
@@ -2513,8 +2884,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueCall (201) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueCall (203) */
 =======
@@ -2524,7 +2898,13 @@
   /** @name CumulusPalletXcmpQueueCall (207) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name CumulusPalletXcmpQueueCall (206) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletXcmpQueueCall extends Enum {
     readonly isServiceOverweight: boolean;
     readonly asServiceOverweight: {
@@ -2561,8 +2941,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletXcmCall (202) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletXcmCall (204) */
 =======
@@ -2572,7 +2955,13 @@
   /** @name PalletXcmCall (208) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletXcmCall (207) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletXcmCall extends Enum {
     readonly isSend: boolean;
     readonly asSend: {
@@ -2635,8 +3024,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmVersionedXcm (203) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmVersionedXcm (205) */
 =======
@@ -2646,7 +3038,13 @@
   /** @name XcmVersionedXcm (209) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmVersionedXcm (208) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmVersionedXcm extends Enum {
     readonly isV0: boolean;
     readonly asV0: XcmV0Xcm;
@@ -2658,8 +3056,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmV0Xcm (204) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmV0Xcm (206) */
 =======
@@ -2669,7 +3070,13 @@
   /** @name XcmV0Xcm (210) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmV0Xcm (209) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmV0Xcm extends Enum {
     readonly isWithdrawAsset: boolean;
     readonly asWithdrawAsset: {
@@ -2733,8 +3140,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmV0Order (206) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmV0Order (208) */
 =======
@@ -2744,7 +3154,13 @@
   /** @name XcmV0Order (212) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmV0Order (211) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmV0Order extends Enum {
     readonly isNull: boolean;
     readonly isDepositAsset: boolean;
@@ -2793,8 +3209,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmV0Response (208) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmV0Response (210) */
 =======
@@ -2804,7 +3223,13 @@
   /** @name XcmV0Response (214) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmV0Response (213) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmV0Response extends Enum {
     readonly isAssets: boolean;
     readonly asAssets: Vec<XcmV0MultiAsset>;
@@ -2812,8 +3237,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmV1Xcm (209) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmV1Xcm (211) */
 =======
@@ -2823,7 +3251,13 @@
   /** @name XcmV1Xcm (215) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmV1Xcm (214) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmV1Xcm extends Enum {
     readonly isWithdrawAsset: boolean;
     readonly asWithdrawAsset: {
@@ -2893,8 +3327,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmV1Order (211) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmV1Order (213) */
 =======
@@ -2904,7 +3341,13 @@
   /** @name XcmV1Order (217) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmV1Order (216) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmV1Order extends Enum {
     readonly isNoop: boolean;
     readonly isDepositAsset: boolean;
@@ -2955,8 +3398,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name XcmV1Response (213) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name XcmV1Response (215) */
 =======
@@ -2966,7 +3412,13 @@
   /** @name XcmV1Response (219) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name XcmV1Response (218) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface XcmV1Response extends Enum {
     readonly isAssets: boolean;
     readonly asAssets: XcmV1MultiassetMultiAssets;
@@ -2976,11 +3428,14 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmCall (227) */
   type CumulusPalletXcmCall = Null;
 
   /** @name CumulusPalletDmpQueueCall (228) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name CumulusPalletXcmCall (229) */
   type CumulusPalletXcmCall = Null;
@@ -2988,10 +3443,13 @@
   /** @name CumulusPalletDmpQueueCall (230) */
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
   /** @name CumulusPalletXcmCall (232) */
   type CumulusPalletXcmCall = Null;
 
   /** @name CumulusPalletDmpQueueCall (233) */
+<<<<<<< HEAD
 =======
   /** @name CumulusPalletXcmCall (233) */
   type CumulusPalletXcmCall = Null;
@@ -2999,7 +3457,12 @@
   /** @name CumulusPalletDmpQueueCall (234) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletDmpQueueCall extends Enum {
     readonly isServiceOverweight: boolean;
     readonly asServiceOverweight: {
@@ -3010,8 +3473,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletInflationCall (229) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletInflationCall (231) */
 =======
@@ -3021,7 +3487,13 @@
   /** @name PalletInflationCall (235) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletInflationCall (234) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletInflationCall extends Enum {
     readonly isStartInflation: boolean;
     readonly asStartInflation: {
@@ -3031,8 +3503,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletUniqueCall (230) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletUniqueCall (232) */
 =======
@@ -3042,7 +3517,13 @@
   /** @name PalletUniqueCall (236) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletUniqueCall (235) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletUniqueCall extends Enum {
     readonly isCreateCollection: boolean;
     readonly asCreateCollection: {
@@ -3216,8 +3697,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCollectionMode (235) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCollectionMode (237) */
 =======
@@ -3227,7 +3711,13 @@
   /** @name UpDataStructsCollectionMode (241) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCollectionMode (240) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCollectionMode extends Enum {
     readonly isNft: boolean;
     readonly isFungible: boolean;
@@ -3237,8 +3727,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateCollectionData (236) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateCollectionData (238) */
 =======
@@ -3248,7 +3741,13 @@
   /** @name UpDataStructsCreateCollectionData (242) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateCollectionData (241) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateCollectionData extends Struct {
     readonly mode: UpDataStructsCollectionMode;
     readonly access: Option<UpDataStructsAccessMode>;
@@ -3263,8 +3762,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsAccessMode (238) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsAccessMode (240) */
 =======
@@ -3274,7 +3776,13 @@
   /** @name UpDataStructsAccessMode (244) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsAccessMode (243) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsAccessMode extends Enum {
     readonly isNormal: boolean;
     readonly isAllowList: boolean;
@@ -3282,8 +3790,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCollectionLimits (240) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCollectionLimits (242) */
 =======
@@ -3293,7 +3804,13 @@
   /** @name UpDataStructsCollectionLimits (246) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCollectionLimits (245) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCollectionLimits extends Struct {
     readonly accountTokenOwnershipLimit: Option<u32>;
     readonly sponsoredDataSize: Option<u32>;
@@ -3307,8 +3824,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsSponsoringRateLimit (242) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsSponsoringRateLimit (244) */
 =======
@@ -3318,7 +3838,13 @@
   /** @name UpDataStructsSponsoringRateLimit (248) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsSponsoringRateLimit (247) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsSponsoringRateLimit extends Enum {
     readonly isSponsoringDisabled: boolean;
     readonly isBlocks: boolean;
@@ -3327,8 +3853,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCollectionPermissions (245) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCollectionPermissions (247) */
 =======
@@ -3338,7 +3867,13 @@
   /** @name UpDataStructsCollectionPermissions (251) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCollectionPermissions (250) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCollectionPermissions extends Struct {
     readonly access: Option<UpDataStructsAccessMode>;
     readonly mintMode: Option<bool>;
@@ -3346,8 +3881,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsNestingPermissions (247) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsNestingPermissions (249) */
 =======
@@ -3357,7 +3895,13 @@
   /** @name UpDataStructsNestingPermissions (253) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsNestingPermissions (252) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsNestingPermissions extends Struct {
     readonly tokenOwner: bool;
     readonly collectionAdmin: bool;
@@ -3365,11 +3909,14 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsOwnerRestrictedSet (249) */
   interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
 
   /** @name UpDataStructsPropertyKeyPermission (254) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsOwnerRestrictedSet (251) */
   interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
@@ -3377,10 +3924,13 @@
   /** @name UpDataStructsPropertyKeyPermission (256) */
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
   /** @name UpDataStructsOwnerRestrictedSet (254) */
   interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
 
   /** @name UpDataStructsPropertyKeyPermission (259) */
+<<<<<<< HEAD
 =======
   /** @name UpDataStructsOwnerRestrictedSet (255) */
   interface UpDataStructsOwnerRestrictedSet extends BTreeSet<u32> {}
@@ -3388,15 +3938,23 @@
   /** @name UpDataStructsPropertyKeyPermission (260) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsPropertyKeyPermission extends Struct {
     readonly key: Bytes;
     readonly permission: UpDataStructsPropertyPermission;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsPropertyPermission (255) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsPropertyPermission (257) */
 =======
@@ -3406,7 +3964,13 @@
   /** @name UpDataStructsPropertyPermission (261) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsPropertyPermission (260) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsPropertyPermission extends Struct {
     readonly mutable: bool;
     readonly collectionAdmin: bool;
@@ -3414,8 +3978,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsProperty (258) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsProperty (260) */
 =======
@@ -3425,15 +3992,24 @@
   /** @name UpDataStructsProperty (264) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsProperty (263) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsProperty extends Struct {
     readonly key: Bytes;
     readonly value: Bytes;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateItemData (261) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateItemData (263) */
 =======
@@ -3443,7 +4019,13 @@
   /** @name UpDataStructsCreateItemData (267) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateItemData (266) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateItemData extends Enum {
     readonly isNft: boolean;
     readonly asNft: UpDataStructsCreateNftData;
@@ -3455,8 +4037,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateNftData (262) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateNftData (264) */
 =======
@@ -3466,14 +4051,23 @@
   /** @name UpDataStructsCreateNftData (268) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateNftData (267) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateNftData extends Struct {
     readonly properties: Vec<UpDataStructsProperty>;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateFungibleData (263) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateFungibleData (265) */
 =======
@@ -3483,14 +4077,23 @@
   /** @name UpDataStructsCreateFungibleData (269) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateFungibleData (268) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateFungibleData extends Struct {
     readonly value: u128;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateReFungibleData (264) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateReFungibleData (266) */
 =======
@@ -3500,15 +4103,24 @@
   /** @name UpDataStructsCreateReFungibleData (270) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateReFungibleData (269) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateReFungibleData extends Struct {
     readonly pieces: u128;
     readonly properties: Vec<UpDataStructsProperty>;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateItemExData (267) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateItemExData (269) */
 =======
@@ -3518,7 +4130,13 @@
   /** @name UpDataStructsCreateItemExData (273) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateItemExData (272) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateItemExData extends Enum {
     readonly isNft: boolean;
     readonly asNft: Vec<UpDataStructsCreateNftExData>;
@@ -3532,8 +4150,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateNftExData (269) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateNftExData (271) */
 =======
@@ -3543,15 +4164,24 @@
   /** @name UpDataStructsCreateNftExData (275) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateNftExData (274) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateNftExData extends Struct {
     readonly properties: Vec<UpDataStructsProperty>;
     readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateRefungibleExSingleOwner (276) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateRefungibleExSingleOwner (278) */
 =======
@@ -3561,7 +4191,13 @@
   /** @name UpDataStructsCreateRefungibleExSingleOwner (282) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateRefungibleExSingleOwner (281) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateRefungibleExSingleOwner extends Struct {
     readonly user: PalletEvmAccountBasicCrossAccountIdRepr;
     readonly pieces: u128;
@@ -3569,8 +4205,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsCreateRefungibleExMultipleOwners (278) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsCreateRefungibleExMultipleOwners (280) */
 =======
@@ -3580,23 +4219,31 @@
   /** @name UpDataStructsCreateRefungibleExMultipleOwners (284) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsCreateRefungibleExMultipleOwners (283) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCreateRefungibleExMultipleOwners extends Struct {
     readonly users: BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>;
     readonly properties: Vec<UpDataStructsProperty>;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletConfigurationCall (279) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletConfigurationCall (281) */
 =======
 <<<<<<< HEAD
-  /** @name PalletUniqueSchedulerV2Call (284) */
 =======
-  /** @name PalletUniqueSchedulerV2Call (285) */
->>>>>>> chore:  regenerate types
+>>>>>>> fix: regenerate types after rebase
+  /** @name PalletUniqueSchedulerV2Call (284) */
   interface PalletUniqueSchedulerV2Call extends Enum {
     readonly isSchedule: boolean;
     readonly asSchedule: {
@@ -3645,13 +4292,18 @@
     readonly type: 'Schedule' | 'Cancel' | 'ScheduleNamed' | 'CancelNamed' | 'ScheduleAfter' | 'ScheduleNamedAfter' | 'ChangeNamedPriority';
   }
 
+  /** @name PalletConfigurationCall (287) */
 <<<<<<< HEAD
-  /** @name PalletConfigurationCall (287) */
 =======
   /** @name PalletConfigurationCall (288) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletConfigurationCall extends Enum {
     readonly isSetWeightToFeeCoefficientOverride: boolean;
     readonly asSetWeightToFeeCoefficientOverride: {
@@ -3681,9 +4333,12 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletTemplateTransactionPaymentCall (288) */
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
   /** @name PalletTemplateTransactionPaymentCall (289) */
 >>>>>>> chore:  regenerate types
   type PalletTemplateTransactionPaymentCall = Null;
@@ -3695,6 +4350,7 @@
   /** @name PalletRmrkCoreCall (290) */
 =======
   /** @name PalletRmrkCoreCall (291) */
+<<<<<<< HEAD
 =======
   /** @name PalletTemplateTransactionPaymentCall (290) */
   type PalletTemplateTransactionPaymentCall = Null;
@@ -3705,6 +4361,8 @@
   /** @name PalletRmrkCoreCall (292) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
   interface PalletRmrkCoreCall extends Enum {
     readonly isCreateCollection: boolean;
     readonly asCreateCollection: {
@@ -3811,6 +4469,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsResourceResourceTypes (296) */
 =======
 <<<<<<< HEAD
@@ -3819,6 +4478,9 @@
   /** @name RmrkTraitsResourceResourceTypes (298) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsResourceResourceTypes (297) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsResourceResourceTypes extends Enum {
     readonly isBasic: boolean;
     readonly asBasic: RmrkTraitsResourceBasicResource;
@@ -3830,6 +4492,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsResourceBasicResource (298) */
 =======
 <<<<<<< HEAD
@@ -3838,6 +4501,9 @@
   /** @name RmrkTraitsResourceBasicResource (300) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsResourceBasicResource (299) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsResourceBasicResource extends Struct {
     readonly src: Option<Bytes>;
     readonly metadata: Option<Bytes>;
@@ -3846,6 +4512,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsResourceComposableResource (300) */
 =======
 <<<<<<< HEAD
@@ -3854,6 +4521,9 @@
   /** @name RmrkTraitsResourceComposableResource (302) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsResourceComposableResource (301) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsResourceComposableResource extends Struct {
     readonly parts: Vec<u32>;
     readonly base: u32;
@@ -3864,6 +4534,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsResourceSlotResource (301) */
 =======
 <<<<<<< HEAD
@@ -3872,6 +4543,9 @@
   /** @name RmrkTraitsResourceSlotResource (303) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsResourceSlotResource (302) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsResourceSlotResource extends Struct {
     readonly base: u32;
     readonly src: Option<Bytes>;
@@ -3882,6 +4556,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletRmrkEquipCall (304) */
 =======
 <<<<<<< HEAD
@@ -3890,6 +4565,9 @@
   /** @name PalletRmrkEquipCall (306) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletRmrkEquipCall (305) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletRmrkEquipCall extends Enum {
     readonly isCreateBase: boolean;
     readonly asCreateBase: {
@@ -3912,6 +4590,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsPartPartType (307) */
 =======
 <<<<<<< HEAD
@@ -3920,6 +4599,9 @@
   /** @name RmrkTraitsPartPartType (309) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsPartPartType (308) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsPartPartType extends Enum {
     readonly isFixedPart: boolean;
     readonly asFixedPart: RmrkTraitsPartFixedPart;
@@ -3929,6 +4611,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsPartFixedPart (309) */
 =======
 <<<<<<< HEAD
@@ -3937,6 +4620,9 @@
   /** @name RmrkTraitsPartFixedPart (311) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsPartFixedPart (310) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsPartFixedPart extends Struct {
     readonly id: u32;
     readonly z: u32;
@@ -3944,6 +4630,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsPartSlotPart (310) */
 =======
 <<<<<<< HEAD
@@ -3952,6 +4639,9 @@
   /** @name RmrkTraitsPartSlotPart (312) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsPartSlotPart (311) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsPartSlotPart extends Struct {
     readonly id: u32;
     readonly equippable: RmrkTraitsPartEquippableList;
@@ -3960,6 +4650,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsPartEquippableList (311) */
 =======
 <<<<<<< HEAD
@@ -3968,6 +4659,9 @@
   /** @name RmrkTraitsPartEquippableList (313) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsPartEquippableList (312) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsPartEquippableList extends Enum {
     readonly isAll: boolean;
     readonly isEmpty: boolean;
@@ -3977,6 +4671,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsTheme (313) */
 =======
 <<<<<<< HEAD
@@ -3985,6 +4680,9 @@
   /** @name RmrkTraitsTheme (315) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsTheme (314) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsTheme extends Struct {
     readonly name: Bytes;
     readonly properties: Vec<RmrkTraitsThemeThemeProperty>;
@@ -3992,6 +4690,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsThemeThemeProperty (315) */
 =======
 <<<<<<< HEAD
@@ -4000,12 +4699,16 @@
   /** @name RmrkTraitsThemeThemeProperty (317) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name RmrkTraitsThemeThemeProperty (316) */
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsThemeThemeProperty extends Struct {
     readonly key: Bytes;
     readonly value: Bytes;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletAppPromotionCall (317) */
 =======
 <<<<<<< HEAD
@@ -4014,6 +4717,9 @@
   /** @name PalletAppPromotionCall (319) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletAppPromotionCall (318) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletAppPromotionCall extends Enum {
     readonly isSetAdminAddress: boolean;
     readonly asSetAdminAddress: {
@@ -4048,6 +4754,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletForeignAssetsModuleCall (318) */
 =======
 <<<<<<< HEAD
@@ -4056,6 +4763,9 @@
   /** @name PalletForeignAssetsModuleCall (320) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletForeignAssetsModuleCall (319) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletForeignAssetsModuleCall extends Enum {
     readonly isRegisterForeignAsset: boolean;
     readonly asRegisterForeignAsset: {
@@ -4073,6 +4783,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmCall (319) */
 =======
 <<<<<<< HEAD
@@ -4081,6 +4792,9 @@
   /** @name PalletEvmCall (321) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletEvmCall (320) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmCall extends Enum {
     readonly isWithdraw: boolean;
     readonly asWithdraw: {
@@ -4126,6 +4840,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEthereumCall (325) */
 =======
 <<<<<<< HEAD
@@ -4134,6 +4849,9 @@
   /** @name PalletEthereumCall (325) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletEthereumCall (326) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletEthereumCall extends Enum {
     readonly isTransact: boolean;
     readonly asTransact: {
@@ -4143,6 +4861,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTransactionTransactionV2 (326) */
 =======
 <<<<<<< HEAD
@@ -4151,6 +4870,9 @@
   /** @name EthereumTransactionTransactionV2 (326) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EthereumTransactionTransactionV2 (327) */
+>>>>>>> fix: regenerate types after rebase
   interface EthereumTransactionTransactionV2 extends Enum {
     readonly isLegacy: boolean;
     readonly asLegacy: EthereumTransactionLegacyTransaction;
@@ -4162,6 +4884,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTransactionLegacyTransaction (327) */
 =======
 <<<<<<< HEAD
@@ -4170,6 +4893,9 @@
   /** @name EthereumTransactionLegacyTransaction (327) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EthereumTransactionLegacyTransaction (328) */
+>>>>>>> fix: regenerate types after rebase
   interface EthereumTransactionLegacyTransaction extends Struct {
     readonly nonce: U256;
     readonly gasPrice: U256;
@@ -4181,6 +4907,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTransactionTransactionAction (328) */
 =======
 <<<<<<< HEAD
@@ -4189,6 +4916,9 @@
   /** @name EthereumTransactionTransactionAction (328) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EthereumTransactionTransactionAction (329) */
+>>>>>>> fix: regenerate types after rebase
   interface EthereumTransactionTransactionAction extends Enum {
     readonly isCall: boolean;
     readonly asCall: H160;
@@ -4197,6 +4927,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTransactionTransactionSignature (329) */
 =======
 <<<<<<< HEAD
@@ -4205,6 +4936,9 @@
   /** @name EthereumTransactionTransactionSignature (329) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EthereumTransactionTransactionSignature (330) */
+>>>>>>> fix: regenerate types after rebase
   interface EthereumTransactionTransactionSignature extends Struct {
     readonly v: u64;
     readonly r: H256;
@@ -4212,6 +4946,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTransactionEip2930Transaction (331) */
 =======
 <<<<<<< HEAD
@@ -4220,6 +4955,9 @@
   /** @name EthereumTransactionEip2930Transaction (331) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EthereumTransactionEip2930Transaction (332) */
+>>>>>>> fix: regenerate types after rebase
   interface EthereumTransactionEip2930Transaction extends Struct {
     readonly chainId: u64;
     readonly nonce: U256;
@@ -4235,6 +4973,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTransactionAccessListItem (333) */
 =======
 <<<<<<< HEAD
@@ -4243,12 +4982,16 @@
   /** @name EthereumTransactionAccessListItem (333) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EthereumTransactionAccessListItem (334) */
+>>>>>>> fix: regenerate types after rebase
   interface EthereumTransactionAccessListItem extends Struct {
     readonly address: H160;
     readonly storageKeys: Vec<H256>;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTransactionEip1559Transaction (334) */
 =======
 <<<<<<< HEAD
@@ -4257,6 +5000,9 @@
   /** @name EthereumTransactionEip1559Transaction (334) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name EthereumTransactionEip1559Transaction (335) */
+>>>>>>> fix: regenerate types after rebase
   interface EthereumTransactionEip1559Transaction extends Struct {
     readonly chainId: u64;
     readonly nonce: U256;
@@ -4273,6 +5019,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmMigrationCall (335) */
 =======
 <<<<<<< HEAD
@@ -4281,6 +5028,9 @@
   /** @name PalletEvmMigrationCall (335) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletEvmMigrationCall (336) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmMigrationCall extends Enum {
     readonly isBegin: boolean;
     readonly asBegin: {
@@ -4308,10 +5058,14 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletMaintenanceCall (339) */
 =======
   /** @name PalletMaintenanceCall (338) */
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletMaintenanceCall (340) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletMaintenanceCall extends Enum {
     readonly isEnable: boolean;
     readonly isDisable: boolean;
@@ -4319,10 +5073,14 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletTestUtilsCall (340) */
 =======
   /** @name PalletTestUtilsCall (339) */
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletTestUtilsCall (341) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletTestUtilsCall extends Enum {
     readonly isEnable: boolean;
     readonly isSetTestValue: boolean;
@@ -4343,6 +5101,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletSudoError (342) */
 =======
 <<<<<<< HEAD
@@ -4351,12 +5110,16 @@
   /** @name PalletSudoError (341) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletSudoError (343) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletSudoError extends Enum {
     readonly isRequireSudo: boolean;
     readonly type: 'RequireSudo';
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlVestingModuleError (344) */
 =======
 <<<<<<< HEAD
@@ -4365,6 +5128,9 @@
   /** @name OrmlVestingModuleError (343) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name OrmlVestingModuleError (345) */
+>>>>>>> fix: regenerate types after rebase
   interface OrmlVestingModuleError extends Enum {
     readonly isZeroVestingPeriod: boolean;
     readonly isZeroVestingPeriodCount: boolean;
@@ -4376,6 +5142,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlXtokensModuleError (345) */
 =======
 <<<<<<< HEAD
@@ -4384,6 +5151,9 @@
   /** @name OrmlXtokensModuleError (344) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name OrmlXtokensModuleError (346) */
+>>>>>>> fix: regenerate types after rebase
   interface OrmlXtokensModuleError extends Enum {
     readonly isAssetHasNoReserve: boolean;
     readonly isNotCrossChainTransfer: boolean;
@@ -4408,6 +5178,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlTokensBalanceLock (348) */
 =======
 <<<<<<< HEAD
@@ -4416,12 +5187,16 @@
   /** @name OrmlTokensBalanceLock (347) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name OrmlTokensBalanceLock (349) */
+>>>>>>> fix: regenerate types after rebase
   interface OrmlTokensBalanceLock extends Struct {
     readonly id: U8aFixed;
     readonly amount: u128;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlTokensAccountData (350) */
 =======
 <<<<<<< HEAD
@@ -4430,6 +5205,9 @@
   /** @name OrmlTokensAccountData (349) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name OrmlTokensAccountData (351) */
+>>>>>>> fix: regenerate types after rebase
   interface OrmlTokensAccountData extends Struct {
     readonly free: u128;
     readonly reserved: u128;
@@ -4437,6 +5215,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlTokensReserveData (352) */
 =======
 <<<<<<< HEAD
@@ -4445,12 +5224,16 @@
   /** @name OrmlTokensReserveData (351) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name OrmlTokensReserveData (353) */
+>>>>>>> fix: regenerate types after rebase
   interface OrmlTokensReserveData extends Struct {
     readonly id: Null;
     readonly amount: u128;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name OrmlTokensModuleError (354) */
 =======
 <<<<<<< HEAD
@@ -4459,6 +5242,9 @@
   /** @name OrmlTokensModuleError (353) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name OrmlTokensModuleError (355) */
+>>>>>>> fix: regenerate types after rebase
   interface OrmlTokensModuleError extends Enum {
     readonly isBalanceTooLow: boolean;
     readonly isAmountIntoBalanceFailed: boolean;
@@ -4472,6 +5258,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueInboundChannelDetails (356) */
 =======
 <<<<<<< HEAD
@@ -4480,6 +5267,9 @@
   /** @name CumulusPalletXcmpQueueInboundChannelDetails (355) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletXcmpQueueInboundChannelDetails (357) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct {
     readonly sender: u32;
     readonly state: CumulusPalletXcmpQueueInboundState;
@@ -4487,6 +5277,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueInboundState (357) */
 =======
 <<<<<<< HEAD
@@ -4495,6 +5286,9 @@
   /** @name CumulusPalletXcmpQueueInboundState (356) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletXcmpQueueInboundState (358) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletXcmpQueueInboundState extends Enum {
     readonly isOk: boolean;
     readonly isSuspended: boolean;
@@ -4502,6 +5296,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PolkadotParachainPrimitivesXcmpMessageFormat (360) */
 =======
 <<<<<<< HEAD
@@ -4510,6 +5305,9 @@
   /** @name PolkadotParachainPrimitivesXcmpMessageFormat (359) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PolkadotParachainPrimitivesXcmpMessageFormat (361) */
+>>>>>>> fix: regenerate types after rebase
   interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum {
     readonly isConcatenatedVersionedXcm: boolean;
     readonly isConcatenatedEncodedBlob: boolean;
@@ -4518,6 +5316,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueOutboundChannelDetails (363) */
 =======
 <<<<<<< HEAD
@@ -4526,6 +5325,9 @@
   /** @name CumulusPalletXcmpQueueOutboundChannelDetails (362) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletXcmpQueueOutboundChannelDetails (364) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct {
     readonly recipient: u32;
     readonly state: CumulusPalletXcmpQueueOutboundState;
@@ -4535,6 +5337,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueOutboundState (364) */
 =======
 <<<<<<< HEAD
@@ -4543,6 +5346,9 @@
   /** @name CumulusPalletXcmpQueueOutboundState (363) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletXcmpQueueOutboundState (365) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletXcmpQueueOutboundState extends Enum {
     readonly isOk: boolean;
     readonly isSuspended: boolean;
@@ -4550,6 +5356,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueQueueConfigData (366) */
 =======
 <<<<<<< HEAD
@@ -4558,6 +5365,9 @@
   /** @name CumulusPalletXcmpQueueQueueConfigData (365) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletXcmpQueueQueueConfigData (367) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletXcmpQueueQueueConfigData extends Struct {
     readonly suspendThreshold: u32;
     readonly dropThreshold: u32;
@@ -4568,6 +5378,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmpQueueError (368) */
 =======
 <<<<<<< HEAD
@@ -4576,6 +5387,9 @@
   /** @name CumulusPalletXcmpQueueError (367) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletXcmpQueueError (369) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletXcmpQueueError extends Enum {
     readonly isFailedToSend: boolean;
     readonly isBadXcmOrigin: boolean;
@@ -4586,6 +5400,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletXcmError (369) */
 =======
 <<<<<<< HEAD
@@ -4594,6 +5409,9 @@
   /** @name PalletXcmError (368) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletXcmError (370) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletXcmError extends Enum {
     readonly isUnreachable: boolean;
     readonly isSendFailure: boolean;
@@ -4612,16 +5430,20 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletXcmError (370) */
   type CumulusPalletXcmError = Null;
 
   /** @name CumulusPalletDmpQueueConfigData (371) */
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
   /** @name CumulusPalletXcmError (371) */
   type CumulusPalletXcmError = Null;
 
   /** @name CumulusPalletDmpQueueConfigData (372) */
+<<<<<<< HEAD
 =======
   /** @name CumulusPalletXcmError (369) */
   type CumulusPalletXcmError = Null;
@@ -4629,11 +5451,14 @@
   /** @name CumulusPalletDmpQueueConfigData (370) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletDmpQueueConfigData extends Struct {
     readonly maxIndividual: SpWeightsWeightV2Weight;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletDmpQueuePageIndexData (372) */
 =======
 <<<<<<< HEAD
@@ -4642,6 +5467,9 @@
   /** @name CumulusPalletDmpQueuePageIndexData (371) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletDmpQueuePageIndexData (373) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletDmpQueuePageIndexData extends Struct {
     readonly beginUsed: u32;
     readonly endUsed: u32;
@@ -4649,6 +5477,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name CumulusPalletDmpQueueError (375) */
 =======
 <<<<<<< HEAD
@@ -4657,6 +5486,9 @@
   /** @name CumulusPalletDmpQueueError (374) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name CumulusPalletDmpQueueError (376) */
+>>>>>>> fix: regenerate types after rebase
   interface CumulusPalletDmpQueueError extends Enum {
     readonly isUnknown: boolean;
     readonly isOverLimit: boolean;
@@ -4664,6 +5496,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletUniqueError (379) */
 =======
 <<<<<<< HEAD
@@ -4672,6 +5505,9 @@
   /** @name PalletUniqueError (378) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PalletUniqueError (380) */
+>>>>>>> fix: regenerate types after rebase
   interface PalletUniqueError extends Enum {
     readonly isCollectionDecimalPointLimitExceeded: boolean;
     readonly isEmptyArgument: boolean;
@@ -4694,21 +5530,13 @@
     readonly type: 'CollectionDecimalPointLimitExceeded' | 'ConfirmUnsetSponsorFail' | 'EmptyArgument' | 'RepartitionCalledOnNonRefungibleCollection';
   }
 
-<<<<<<< HEAD
   /** @name PalletUniqueSchedulerV2BlockAgenda (381) */
-=======
-  /** @name PalletUniqueSchedulerV2BlockAgenda (379) */
->>>>>>> chore:  regenerate types
   interface PalletUniqueSchedulerV2BlockAgenda extends Struct {
     readonly agenda: Vec<Option<PalletUniqueSchedulerV2Scheduled>>;
     readonly freePlaces: u32;
   }
 
-<<<<<<< HEAD
   /** @name PalletUniqueSchedulerV2Scheduled (384) */
-=======
-  /** @name PalletUniqueSchedulerV2Scheduled (382) */
->>>>>>> chore:  regenerate types
   interface PalletUniqueSchedulerV2Scheduled extends Struct {
     readonly maybeId: Option<U8aFixed>;
     readonly priority: u8;
@@ -4717,11 +5545,7 @@
     readonly origin: OpalRuntimeOriginCaller;
   }
 
-<<<<<<< HEAD
   /** @name PalletUniqueSchedulerV2ScheduledCall (385) */
-=======
-  /** @name PalletUniqueSchedulerV2ScheduledCall (383) */
->>>>>>> chore:  regenerate types
   interface PalletUniqueSchedulerV2ScheduledCall extends Enum {
     readonly isInline: boolean;
     readonly asInline: Bytes;
@@ -4733,11 +5557,7 @@
     readonly type: 'Inline' | 'PreimageLookup';
   }
 
-<<<<<<< HEAD
   /** @name OpalRuntimeOriginCaller (387) */
-=======
-  /** @name OpalRuntimeOriginCaller (385) */
->>>>>>> chore:  regenerate types
   interface OpalRuntimeOriginCaller extends Enum {
     readonly isSystem: boolean;
     readonly asSystem: FrameSupportDispatchRawOrigin;
@@ -4751,11 +5571,7 @@
     readonly type: 'System' | 'Void' | 'PolkadotXcm' | 'CumulusXcm' | 'Ethereum';
   }
 
-<<<<<<< HEAD
   /** @name FrameSupportDispatchRawOrigin (388) */
-=======
-  /** @name FrameSupportDispatchRawOrigin (386) */
->>>>>>> chore:  regenerate types
   interface FrameSupportDispatchRawOrigin extends Enum {
     readonly isRoot: boolean;
     readonly isSigned: boolean;
@@ -4764,11 +5580,7 @@
     readonly type: 'Root' | 'Signed' | 'None';
   }
 
-<<<<<<< HEAD
   /** @name PalletXcmOrigin (389) */
-=======
-  /** @name PalletXcmOrigin (387) */
->>>>>>> chore:  regenerate types
   interface PalletXcmOrigin extends Enum {
     readonly isXcm: boolean;
     readonly asXcm: XcmV1MultiLocation;
@@ -4777,11 +5589,7 @@
     readonly type: 'Xcm' | 'Response';
   }
 
-<<<<<<< HEAD
   /** @name CumulusPalletXcmOrigin (390) */
-=======
-  /** @name CumulusPalletXcmOrigin (388) */
->>>>>>> chore:  regenerate types
   interface CumulusPalletXcmOrigin extends Enum {
     readonly isRelay: boolean;
     readonly isSiblingParachain: boolean;
@@ -4789,28 +5597,17 @@
     readonly type: 'Relay' | 'SiblingParachain';
   }
 
-<<<<<<< HEAD
   /** @name PalletEthereumRawOrigin (391) */
-=======
-  /** @name PalletEthereumRawOrigin (389) */
->>>>>>> chore:  regenerate types
   interface PalletEthereumRawOrigin extends Enum {
     readonly isEthereumTransaction: boolean;
     readonly asEthereumTransaction: H160;
     readonly type: 'EthereumTransaction';
   }
 
-<<<<<<< HEAD
   /** @name SpCoreVoid (392) */
   type SpCoreVoid = Null;
 
   /** @name PalletUniqueSchedulerV2Error (394) */
-=======
-  /** @name SpCoreVoid (390) */
-  type SpCoreVoid = Null;
-
-  /** @name PalletUniqueSchedulerV2Error (392) */
->>>>>>> chore:  regenerate types
   interface PalletUniqueSchedulerV2Error extends Enum {
     readonly isFailedToSchedule: boolean;
     readonly isAgendaIsExhausted: boolean;
@@ -4823,13 +5620,18 @@
     readonly type: 'FailedToSchedule' | 'AgendaIsExhausted' | 'ScheduledCallCorrupted' | 'PreimageNotFound' | 'TooBigScheduledCall' | 'NotFound' | 'TargetBlockNumberInPast' | 'Named';
   }
 
+  /** @name UpDataStructsCollection (395) */
 <<<<<<< HEAD
-  /** @name UpDataStructsCollection (395) */
 =======
   /** @name UpDataStructsCollection (393) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCollection extends Struct {
     readonly owner: AccountId32;
     readonly mode: UpDataStructsCollectionMode;
@@ -4843,8 +5645,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsSponsorshipStateAccountId32 (382) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsSponsorshipStateAccountId32 (383) */
 =======
@@ -4854,7 +5659,13 @@
   /** @name UpDataStructsSponsorshipStateAccountId32 (394) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsSponsorshipStateAccountId32 (396) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsSponsorshipStateAccountId32 extends Enum {
     readonly isDisabled: boolean;
     readonly isUnconfirmed: boolean;
@@ -4865,8 +5676,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsProperties (384) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsProperties (385) */
 =======
@@ -4876,7 +5690,13 @@
   /** @name UpDataStructsProperties (396) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsProperties (398) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsProperties extends Struct {
     readonly map: UpDataStructsPropertiesMapBoundedVec;
     readonly consumedSpace: u32;
@@ -4884,12 +5704,17 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsPropertiesMapBoundedVec (385) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsPropertiesMapBoundedVec (386) */
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> fix: regenerate types after rebase
   /** @name UpDataStructsPropertiesMapBoundedVec (399) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
@@ -4905,6 +5730,7 @@
   /** @name UpDataStructsCollectionStats (398) */
 =======
   /** @name UpDataStructsCollectionStats (411) */
+<<<<<<< HEAD
 =======
   /** @name UpDataStructsPropertiesMapBoundedVec (397) */
   interface UpDataStructsPropertiesMapBoundedVec extends BTreeMap<Bytes, Bytes> {}
@@ -4915,7 +5741,12 @@
   /** @name UpDataStructsCollectionStats (409) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsCollectionStats extends Struct {
     readonly created: u32;
     readonly destroyed: u32;
@@ -4923,8 +5754,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsTokenChild (398) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsTokenChild (399) */
 =======
@@ -4934,7 +5768,13 @@
   /** @name UpDataStructsTokenChild (410) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsTokenChild (412) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsTokenChild extends Struct {
     readonly token: u32;
     readonly collection: u32;
@@ -4942,10 +5782,13 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PhantomTypeUpDataStructs (399) */
 =======
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PhantomTypeUpDataStructs (400) */
 =======
@@ -4961,12 +5804,17 @@
 =======
   /** @name PhantomTypeUpDataStructs (411) */
 >>>>>>> chore:  regenerate types
+=======
+  /** @name PhantomTypeUpDataStructs (413) */
+>>>>>>> fix: regenerate types after rebase
   interface PhantomTypeUpDataStructs extends Vec<ITuple<[UpDataStructsTokenData, UpDataStructsRpcCollection, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftNftInfo, RmrkTraitsResourceResourceInfo, RmrkTraitsPropertyPropertyInfo, RmrkTraitsBaseBaseInfo, RmrkTraitsPartPartType, RmrkTraitsTheme, RmrkTraitsNftNftChild, UpPovEstimateRpcPovInfo]>> {}
->>>>>>> fix: update polkadot types and definitions
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsTokenData (401) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsTokenData (402) */
 =======
@@ -4976,7 +5824,13 @@
   /** @name UpDataStructsTokenData (413) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsTokenData (415) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsTokenData extends Struct {
     readonly properties: Vec<UpDataStructsProperty>;
     readonly owner: Option<PalletEvmAccountBasicCrossAccountIdRepr>;
@@ -4984,8 +5838,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsRpcCollection (403) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsRpcCollection (404) */
 =======
@@ -4995,7 +5852,13 @@
   /** @name UpDataStructsRpcCollection (415) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsRpcCollection (417) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsRpcCollection extends Struct {
     readonly owner: AccountId32;
     readonly mode: UpDataStructsCollectionMode;
@@ -5012,8 +5875,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsRpcCollectionFlags (404) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsRpcCollectionFlags (405) */
 =======
@@ -5023,15 +5889,24 @@
   /** @name UpDataStructsRpcCollectionFlags (416) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name UpDataStructsRpcCollectionFlags (418) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsRpcCollectionFlags extends Struct {
     readonly foreign: bool;
     readonly erc721metadata: bool;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsCollectionCollectionInfo (405) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name RmrkTraitsCollectionCollectionInfo (406) */
 =======
@@ -5041,7 +5916,13 @@
   /** @name RmrkTraitsCollectionCollectionInfo (417) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name RmrkTraitsCollectionCollectionInfo (419) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsCollectionCollectionInfo extends Struct {
     readonly issuer: AccountId32;
     readonly metadata: Bytes;
@@ -5051,8 +5932,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsNftNftInfo (406) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name RmrkTraitsNftNftInfo (407) */
 =======
@@ -5062,7 +5946,13 @@
   /** @name RmrkTraitsNftNftInfo (418) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name RmrkTraitsNftNftInfo (420) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsNftNftInfo extends Struct {
     readonly owner: RmrkTraitsNftAccountIdOrCollectionNftTuple;
     readonly royalty: Option<RmrkTraitsNftRoyaltyInfo>;
@@ -5072,8 +5962,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsNftRoyaltyInfo (408) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name RmrkTraitsNftRoyaltyInfo (409) */
 =======
@@ -5083,15 +5976,24 @@
   /** @name RmrkTraitsNftRoyaltyInfo (420) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name RmrkTraitsNftRoyaltyInfo (422) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsNftRoyaltyInfo extends Struct {
     readonly recipient: AccountId32;
     readonly amount: Permill;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsResourceResourceInfo (409) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name RmrkTraitsResourceResourceInfo (410) */
 =======
@@ -5101,7 +6003,13 @@
   /** @name RmrkTraitsResourceResourceInfo (421) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name RmrkTraitsResourceResourceInfo (423) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsResourceResourceInfo extends Struct {
     readonly id: u32;
     readonly resource: RmrkTraitsResourceResourceTypes;
@@ -5110,8 +6018,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsPropertyPropertyInfo (410) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name RmrkTraitsPropertyPropertyInfo (411) */
 =======
@@ -5121,15 +6032,24 @@
   /** @name RmrkTraitsPropertyPropertyInfo (422) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name RmrkTraitsPropertyPropertyInfo (424) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsPropertyPropertyInfo extends Struct {
     readonly key: Bytes;
     readonly value: Bytes;
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsBaseBaseInfo (411) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name RmrkTraitsBaseBaseInfo (412) */
 =======
@@ -5139,7 +6059,13 @@
   /** @name RmrkTraitsBaseBaseInfo (423) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name RmrkTraitsBaseBaseInfo (425) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsBaseBaseInfo extends Struct {
     readonly issuer: AccountId32;
     readonly baseType: Bytes;
@@ -5147,8 +6073,11 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name RmrkTraitsNftNftChild (412) */
 =======
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name RmrkTraitsNftNftChild (413) */
 =======
@@ -5158,7 +6087,13 @@
   /** @name RmrkTraitsNftNftChild (424) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name RmrkTraitsNftNftChild (426) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface RmrkTraitsNftNftChild extends Struct {
     readonly collectionId: u32;
     readonly nftId: u32;
@@ -5166,10 +6101,13 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletCommonError (414) */
 =======
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletCommonError (415) */
 =======
@@ -5182,6 +6120,9 @@
 =======
   /** @name UpPovEstimateRpcPovInfo (425) */
 >>>>>>> chore:  regenerate types
+=======
+  /** @name UpPovEstimateRpcPovInfo (427) */
+>>>>>>> fix: regenerate types after rebase
   interface UpPovEstimateRpcPovInfo extends Struct {
     readonly proofSize: u64;
     readonly compactProofSize: u64;
@@ -5192,6 +6133,7 @@
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletCommonError (424) */
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -5205,6 +6147,9 @@
 =======
   /** @name SpRuntimeTransactionValidityTransactionValidityError (428) */
 >>>>>>> chore:  regenerate types
+=======
+  /** @name SpRuntimeTransactionValidityTransactionValidityError (430) */
+>>>>>>> fix: regenerate types after rebase
   interface SpRuntimeTransactionValidityTransactionValidityError extends Enum {
     readonly isInvalid: boolean;
     readonly asInvalid: SpRuntimeTransactionValidityInvalidTransaction;
@@ -5213,7 +6158,7 @@
     readonly type: 'Invalid' | 'Unknown';
   }
 
-  /** @name SpRuntimeTransactionValidityInvalidTransaction (429) */
+  /** @name SpRuntimeTransactionValidityInvalidTransaction (431) */
   interface SpRuntimeTransactionValidityInvalidTransaction extends Enum {
     readonly isCall: boolean;
     readonly isPayment: boolean;
@@ -5230,7 +6175,7 @@
     readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryDispatch' | 'BadSigner';
   }
 
-  /** @name SpRuntimeTransactionValidityUnknownTransaction (430) */
+  /** @name SpRuntimeTransactionValidityUnknownTransaction (432) */
   interface SpRuntimeTransactionValidityUnknownTransaction extends Enum {
     readonly isCannotLookup: boolean;
     readonly isNoUnsignedValidator: boolean;
@@ -5240,6 +6185,7 @@
   }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletCommonError (428) */
 >>>>>>> chore: regenerate types
 <<<<<<< HEAD
@@ -5250,15 +6196,25 @@
 =======
 =======
   /** @name UpPovEstimateRpcTrieKeyValue (432) */
+=======
+  /** @name UpPovEstimateRpcTrieKeyValue (434) */
+>>>>>>> fix: regenerate types after rebase
   interface UpPovEstimateRpcTrieKeyValue extends Struct {
     readonly key: Bytes;
     readonly value: Bytes;
   }
 
+<<<<<<< HEAD
   /** @name PalletCommonError (434) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletCommonError (436) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletCommonError extends Enum {
     readonly isCollectionNotFound: boolean;
     readonly isMustBeTokenOwner: boolean;
@@ -5302,12 +6258,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletFungibleError (416) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletFungibleError (417) */
 =======
@@ -5339,7 +6298,13 @@
   /** @name PalletFungibleError (436) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletFungibleError (438) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletFungibleError extends Enum {
     readonly isNotFungibleDataUsedToMintFungibleCollectionToken: boolean;
     readonly isFungibleItemsHaveNoId: boolean;
@@ -5354,12 +6319,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletRefungibleError (420) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletRefungibleItemData (417) */
 =======
@@ -5367,6 +6335,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletRefungibleItemData (418) */
 =======
@@ -5398,7 +6368,13 @@
   /** @name PalletRefungibleItemData (437) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+  /** @name PalletRefungibleItemData (439) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletRefungibleItemData extends Struct {
     readonly constData: Bytes;
   }
@@ -5406,12 +6382,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletRefungibleError (422) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletRefungibleError (423) */
 =======
@@ -5449,8 +6428,17 @@
   /** @name PalletRefungibleError (442) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletRefungibleError (444) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletRefungibleError extends Enum {
     readonly isNotRefungibleDataUsedToMintFungibleCollectionToken: boolean;
     readonly isWrongRefungiblePieces: boolean;
@@ -5463,12 +6451,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletNonfungibleItemData (421) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletNonfungibleItemData (423) */
 =======
@@ -5476,6 +6467,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletNonfungibleItemData (424) */
 =======
@@ -5513,8 +6506,17 @@
   /** @name PalletNonfungibleItemData (443) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletNonfungibleItemData (445) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletNonfungibleItemData extends Struct {
     readonly owner: PalletEvmAccountBasicCrossAccountIdRepr;
   }
@@ -5522,12 +6524,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsPropertyScope (423) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsPropertyScope (425) */
 =======
@@ -5535,6 +6540,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsPropertyScope (426) */
 =======
@@ -5572,8 +6579,17 @@
   /** @name UpDataStructsPropertyScope (445) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name UpDataStructsPropertyScope (447) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsPropertyScope extends Enum {
     readonly isNone: boolean;
     readonly isRmrk: boolean;
@@ -5583,12 +6599,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletNonfungibleError (426) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletNonfungibleError (427) */
 =======
@@ -5596,6 +6615,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletNonfungibleError (428) */
 =======
@@ -5633,8 +6654,17 @@
   /** @name PalletNonfungibleError (447) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletNonfungibleError (449) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletNonfungibleError extends Enum {
     readonly isNotNonfungibleDataUsedToMintFungibleCollectionToken: boolean;
     readonly isNonfungibleItemsHaveNoAmount: boolean;
@@ -5645,12 +6675,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletStructureError (427) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletStructureError (428) */
 =======
@@ -5658,6 +6691,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletStructureError (429) */
 =======
@@ -5695,8 +6730,17 @@
   /** @name PalletStructureError (448) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletStructureError (450) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletStructureError extends Enum {
     readonly isOuroborosDetected: boolean;
     readonly isDepthLimit: boolean;
@@ -5708,12 +6752,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletRmrkCoreError (428) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletRmrkCoreError (429) */
 =======
@@ -5721,6 +6768,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletRmrkCoreError (430) */
 =======
@@ -5758,8 +6807,17 @@
   /** @name PalletRmrkCoreError (449) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletRmrkCoreError (451) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletRmrkCoreError extends Enum {
     readonly isCorruptedCollectionType: boolean;
     readonly isRmrkPropertyKeyIsTooLong: boolean;
@@ -5786,12 +6844,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletRmrkEquipError (430) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletRmrkEquipError (431) */
 =======
@@ -5799,6 +6860,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletRmrkEquipError (432) */
 =======
@@ -5836,8 +6899,17 @@
   /** @name PalletRmrkEquipError (451) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletRmrkEquipError (453) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletRmrkEquipError extends Enum {
     readonly isPermissionError: boolean;
     readonly isNoAvailableBaseId: boolean;
@@ -5852,12 +6924,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletAppPromotionError (436) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletAppPromotionError (437) */
 =======
@@ -5865,6 +6940,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletAppPromotionError (438) */
 =======
@@ -5902,8 +6979,17 @@
   /** @name PalletAppPromotionError (457) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletAppPromotionError (459) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletAppPromotionError extends Enum {
     readonly isAdminNotSet: boolean;
     readonly isNoPermission: boolean;
@@ -5917,12 +7003,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletForeignAssetsModuleError (437) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletForeignAssetsModuleError (438) */
 =======
@@ -5930,6 +7019,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletForeignAssetsModuleError (439) */
 =======
@@ -5967,8 +7058,17 @@
   /** @name PalletForeignAssetsModuleError (458) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletForeignAssetsModuleError (460) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletForeignAssetsModuleError extends Enum {
     readonly isBadLocation: boolean;
     readonly isMultiLocationExisted: boolean;
@@ -5980,12 +7080,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmError (439) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmError (440) */
 =======
@@ -5993,6 +7096,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmError (441) */
 =======
@@ -6030,8 +7135,17 @@
   /** @name PalletEvmError (461) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletEvmError (462) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmError extends Enum {
     readonly isBalanceLow: boolean;
     readonly isFeeOverflow: boolean;
@@ -6050,12 +7164,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name FpRpcTransactionStatus (442) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FpRpcTransactionStatus (443) */
 =======
@@ -6063,6 +7180,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name FpRpcTransactionStatus (444) */
 =======
@@ -6100,8 +7219,17 @@
   /** @name FpRpcTransactionStatus (464) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name FpRpcTransactionStatus (465) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface FpRpcTransactionStatus extends Struct {
     readonly transactionHash: H256;
     readonly transactionIndex: u32;
@@ -6115,6 +7243,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthbloomBloom (444) */
   interface EthbloomBloom extends U8aFixed {}
 
@@ -6124,6 +7253,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthbloomBloom (445) */
   interface EthbloomBloom extends U8aFixed {}
@@ -6134,6 +7265,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthbloomBloom (446) */
   interface EthbloomBloom extends U8aFixed {}
@@ -6186,8 +7319,20 @@
   /** @name EthereumReceiptReceiptV3 (468) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name EthbloomBloom (467) */
+  interface EthbloomBloom extends U8aFixed {}
+
+  /** @name EthereumReceiptReceiptV3 (469) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface EthereumReceiptReceiptV3 extends Enum {
     readonly isLegacy: boolean;
     readonly asLegacy: EthereumReceiptEip658ReceiptData;
@@ -6201,12 +7346,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumReceiptEip658ReceiptData (447) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumReceiptEip658ReceiptData (448) */
 =======
@@ -6214,6 +7362,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumReceiptEip658ReceiptData (449) */
 =======
@@ -6251,8 +7401,17 @@
   /** @name EthereumReceiptEip658ReceiptData (469) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name EthereumReceiptEip658ReceiptData (470) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface EthereumReceiptEip658ReceiptData extends Struct {
     readonly statusCode: u8;
     readonly usedGas: U256;
@@ -6263,12 +7422,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumBlock (448) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumBlock (449) */
 =======
@@ -6276,6 +7438,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumBlock (450) */
 =======
@@ -6313,8 +7477,17 @@
   /** @name EthereumBlock (470) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name EthereumBlock (471) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface EthereumBlock extends Struct {
     readonly header: EthereumHeader;
     readonly transactions: Vec<EthereumTransactionTransactionV2>;
@@ -6324,12 +7497,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumHeader (449) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumHeader (450) */
 =======
@@ -6337,6 +7513,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumHeader (451) */
 =======
@@ -6374,8 +7552,17 @@
   /** @name EthereumHeader (471) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name EthereumHeader (472) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface EthereumHeader extends Struct {
     readonly parentHash: H256;
     readonly ommersHash: H256;
@@ -6397,6 +7584,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name EthereumTypesHashH64 (450) */
   interface EthereumTypesHashH64 extends U8aFixed {}
 
@@ -6406,6 +7594,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumTypesHashH64 (451) */
   interface EthereumTypesHashH64 extends U8aFixed {}
@@ -6416,6 +7606,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name EthereumTypesHashH64 (452) */
   interface EthereumTypesHashH64 extends U8aFixed {}
@@ -6468,8 +7660,20 @@
   /** @name PalletEthereumError (477) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name EthereumTypesHashH64 (473) */
+  interface EthereumTypesHashH64 extends U8aFixed {}
+
+  /** @name PalletEthereumError (478) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletEthereumError extends Enum {
     readonly isInvalidSignature: boolean;
     readonly isPreLogExists: boolean;
@@ -6479,12 +7683,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmCoderSubstrateError (456) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmCoderSubstrateError (457) */
 =======
@@ -6492,6 +7699,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmCoderSubstrateError (458) */
 =======
@@ -6529,8 +7738,17 @@
   /** @name PalletEvmCoderSubstrateError (478) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletEvmCoderSubstrateError (479) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmCoderSubstrateError extends Enum {
     readonly isOutOfGas: boolean;
     readonly isOutOfFund: boolean;
@@ -6540,12 +7758,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (457) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (458) */
 =======
@@ -6553,6 +7774,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (459) */
 =======
@@ -6590,8 +7813,17 @@
   /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (479) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name UpDataStructsSponsorshipStateBasicCrossAccountIdRepr (480) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface UpDataStructsSponsorshipStateBasicCrossAccountIdRepr extends Enum {
     readonly isDisabled: boolean;
     readonly isUnconfirmed: boolean;
@@ -6604,12 +7836,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmContractHelpersSponsoringModeT (458) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmContractHelpersSponsoringModeT (459) */
 =======
@@ -6617,6 +7852,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmContractHelpersSponsoringModeT (460) */
 =======
@@ -6654,8 +7891,17 @@
   /** @name PalletEvmContractHelpersSponsoringModeT (480) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletEvmContractHelpersSponsoringModeT (481) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmContractHelpersSponsoringModeT extends Enum {
     readonly isDisabled: boolean;
     readonly isAllowlisted: boolean;
@@ -6666,12 +7912,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmContractHelpersError (464) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmContractHelpersError (465) */
 =======
@@ -6679,6 +7928,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmContractHelpersError (466) */
 =======
@@ -6716,8 +7967,17 @@
   /** @name PalletEvmContractHelpersError (486) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletEvmContractHelpersError (487) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmContractHelpersError extends Enum {
     readonly isNoPermission: boolean;
     readonly isNoPendingSponsor: boolean;
@@ -6728,12 +7988,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEvmMigrationError (465) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmMigrationError (466) */
 =======
@@ -6741,6 +8004,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletEvmMigrationError (467) */
 =======
@@ -6778,8 +8043,17 @@
   /** @name PalletEvmMigrationError (487) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletEvmMigrationError (488) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletEvmMigrationError extends Enum {
     readonly isAccountNotEmpty: boolean;
     readonly isAccountIsNotMigrating: boolean;
@@ -6790,6 +8064,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletMaintenanceError (466) */
   type PalletMaintenanceError = Null;
 
@@ -6799,6 +8074,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletMaintenanceError (467) */
   type PalletMaintenanceError = Null;
@@ -6809,6 +8086,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name PalletMaintenanceError (468) */
   type PalletMaintenanceError = Null;
@@ -6861,8 +8140,20 @@
   /** @name PalletTestUtilsError (489) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletMaintenanceError (489) */
+  type PalletMaintenanceError = Null;
+
+  /** @name PalletTestUtilsError (490) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface PalletTestUtilsError extends Enum {
     readonly isTestPalletDisabled: boolean;
     readonly isTriggerRollback: boolean;
@@ -6872,12 +8163,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name SpRuntimeMultiSignature (469) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name SpRuntimeMultiSignature (470) */
 =======
@@ -6885,6 +8179,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name SpRuntimeMultiSignature (471) */
 =======
@@ -6922,8 +8218,17 @@
   /** @name SpRuntimeMultiSignature (491) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name SpRuntimeMultiSignature (492) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   interface SpRuntimeMultiSignature extends Enum {
     readonly isEd25519: boolean;
     readonly asEd25519: SpCoreEd25519Signature;
@@ -6937,12 +8242,15 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name SpCoreEd25519Signature (470) */
 =======
 =======
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name SpCoreEd25519Signature (471) */
 =======
@@ -6950,6 +8258,8 @@
 >>>>>>> chore: regenerate types
 =======
 >>>>>>> chore:  regenerate types
+=======
+>>>>>>> fix: regenerate types after rebase
 <<<<<<< HEAD
   /** @name SpCoreEd25519Signature (472) */
 =======
@@ -7012,40 +8322,44 @@
 =======
   /** @name SpCoreEd25519Signature (492) */
 >>>>>>> chore:  regenerate types
+=======
+  /** @name SpCoreEd25519Signature (493) */
+>>>>>>> fix: regenerate types after rebase
   interface SpCoreEd25519Signature extends U8aFixed {}
 
-  /** @name SpCoreSr25519Signature (494) */
+  /** @name SpCoreSr25519Signature (495) */
   interface SpCoreSr25519Signature extends U8aFixed {}
 
-  /** @name SpCoreEcdsaSignature (495) */
+  /** @name SpCoreEcdsaSignature (496) */
   interface SpCoreEcdsaSignature extends U8aFixed {}
 
-  /** @name FrameSystemExtensionsCheckSpecVersion (498) */
+  /** @name FrameSystemExtensionsCheckSpecVersion (499) */
   type FrameSystemExtensionsCheckSpecVersion = Null;
 
-  /** @name FrameSystemExtensionsCheckTxVersion (499) */
+  /** @name FrameSystemExtensionsCheckTxVersion (500) */
   type FrameSystemExtensionsCheckTxVersion = Null;
 
-  /** @name FrameSystemExtensionsCheckGenesis (500) */
+  /** @name FrameSystemExtensionsCheckGenesis (501) */
   type FrameSystemExtensionsCheckGenesis = Null;
 
-  /** @name FrameSystemExtensionsCheckNonce (503) */
+  /** @name FrameSystemExtensionsCheckNonce (504) */
   interface FrameSystemExtensionsCheckNonce extends Compact<u32> {}
 
-  /** @name FrameSystemExtensionsCheckWeight (504) */
+  /** @name FrameSystemExtensionsCheckWeight (505) */
   type FrameSystemExtensionsCheckWeight = Null;
 
-  /** @name OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance (505) */
+  /** @name OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance (506) */
   type OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance = Null;
 
-  /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (506) */
+  /** @name PalletTemplateTransactionPaymentChargeTransactionPayment (507) */
   interface PalletTemplateTransactionPaymentChargeTransactionPayment extends Compact<u128> {}
 
-  /** @name OpalRuntimeRuntime (507) */
+  /** @name OpalRuntimeRuntime (508) */
   type OpalRuntimeRuntime = Null;
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
   /** @name PalletEthereumFakeTransactionFinalizer (498) */
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -7073,8 +8387,17 @@
   /** @name PalletEthereumFakeTransactionFinalizer (508) */
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+<<<<<<< HEAD
 >>>>>>> chore:  regenerate types
+=======
+=======
+=======
+  /** @name PalletEthereumFakeTransactionFinalizer (509) */
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
+>>>>>>> fix: regenerate types after rebase
   type PalletEthereumFakeTransactionFinalizer = Null;
 
 } // declare module