git.delta.rocks / unique-network / refs/commits / 41dbcfcf6c8b

--- a/tests/src/interfaces/augment-types.ts
+++ b/tests/src/interfaces/augment-types.ts
@@ -5,88 +5,7 @@
 // this is required to allow for ambient/previous definitions
 import '@polkadot/types/types/registry';
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
-=======
-=======
->>>>>>> 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';
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-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, 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 './default';
-=======
-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, 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 './default';
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-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, 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 './default';
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> 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, 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, UpPovEstimateRpcPovInfo, UpPovEstimateRpcTrieKeyValue, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-import type { CumulusPalletDmpQueueCall, CumulusPalletDmpQueueConfigData, CumulusPalletDmpQueueError, CumulusPalletDmpQueueEvent, CumulusPalletDmpQueuePageIndexData, CumulusPalletParachainSystemCall, CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, CumulusPalletXcmCall, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmpQueueCall, CumulusPalletXcmpQueueError, CumulusPalletXcmpQueueEvent, CumulusPalletXcmpQueueInboundChannelDetails, CumulusPalletXcmpQueueInboundState, CumulusPalletXcmpQueueOutboundChannelDetails, CumulusPalletXcmpQueueOutboundState, CumulusPalletXcmpQueueQueueConfigData, CumulusPrimitivesParachainInherentParachainInherentData, EthbloomBloom, EthereumBlock, EthereumHeader, EthereumLog, EthereumReceiptEip658ReceiptData, EthereumReceiptReceiptV3, EthereumTransactionAccessListItem, EthereumTransactionEip1559Transaction, EthereumTransactionEip2930Transaction, EthereumTransactionLegacyTransaction, EthereumTransactionTransactionAction, EthereumTransactionTransactionSignature, EthereumTransactionTransactionV2, EthereumTypesHashH64, EvmCoreErrorExitError, EvmCoreErrorExitFatal, EvmCoreErrorExitReason, EvmCoreErrorExitRevert, EvmCoreErrorExitSucceed, FpRpcTransactionStatus, FrameSupportDispatchDispatchClass, FrameSupportDispatchDispatchInfo, FrameSupportDispatchPays, FrameSupportDispatchPerDispatchClassU32, FrameSupportDispatchPerDispatchClassWeight, FrameSupportDispatchPerDispatchClassWeightsPerClass, FrameSupportPalletId, FrameSupportTokensMiscBalanceStatus, FrameSystemAccountInfo, FrameSystemCall, FrameSystemError, FrameSystemEvent, FrameSystemEventRecord, FrameSystemExtensionsCheckGenesis, FrameSystemExtensionsCheckNonce, FrameSystemExtensionsCheckSpecVersion, FrameSystemExtensionsCheckTxVersion, FrameSystemExtensionsCheckWeight, FrameSystemLastRuntimeUpgradeInfo, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, FrameSystemLimitsWeightsPerClass, FrameSystemPhase, OpalRuntimeRuntime, OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance, OrmlTokensAccountData, OrmlTokensBalanceLock, OrmlTokensModuleCall, OrmlTokensModuleError, OrmlTokensModuleEvent, OrmlTokensReserveData, OrmlVestingModuleCall, OrmlVestingModuleError, OrmlVestingModuleEvent, OrmlVestingVestingSchedule, OrmlXtokensModuleCall, OrmlXtokensModuleError, OrmlXtokensModuleEvent, PalletAppPromotionCall, PalletAppPromotionError, PalletAppPromotionEvent, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, PalletBalancesReasons, PalletBalancesReserveData, PalletCommonError, PalletCommonEvent, PalletConfigurationAppPromotionConfiguration, PalletConfigurationCall, PalletConfigurationError, PalletEthereumCall, PalletEthereumError, PalletEthereumEvent, PalletEthereumFakeTransactionFinalizer, PalletEvmAccountBasicCrossAccountIdRepr, PalletEvmCall, PalletEvmCoderSubstrateError, PalletEvmContractHelpersError, PalletEvmContractHelpersEvent, PalletEvmContractHelpersSponsoringModeT, PalletEvmError, PalletEvmEvent, PalletEvmMigrationCall, PalletEvmMigrationError, PalletEvmMigrationEvent, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, PalletForeignAssetsModuleCall, PalletForeignAssetsModuleError, PalletForeignAssetsModuleEvent, PalletForeignAssetsNativeCurrency, PalletFungibleError, PalletInflationCall, PalletMaintenanceCall, PalletMaintenanceError, PalletMaintenanceEvent, PalletNonfungibleError, PalletNonfungibleItemData, PalletRefungibleError, PalletRefungibleItemData, PalletRmrkCoreCall, PalletRmrkCoreError, PalletRmrkCoreEvent, PalletRmrkEquipCall, PalletRmrkEquipError, PalletRmrkEquipEvent, PalletStructureCall, PalletStructureError, PalletStructureEvent, PalletSudoCall, PalletSudoError, PalletSudoEvent, PalletTemplateTransactionPaymentCall, PalletTemplateTransactionPaymentChargeTransactionPayment, PalletTestUtilsCall, PalletTestUtilsError, PalletTestUtilsEvent, PalletTimestampCall, PalletTransactionPaymentEvent, PalletTransactionPaymentReleases, PalletTreasuryCall, PalletTreasuryError, PalletTreasuryEvent, PalletTreasuryProposal, PalletUniqueCall, PalletUniqueError, PalletXcmCall, PalletXcmError, PalletXcmEvent, PhantomTypeUpDataStructs, PolkadotCorePrimitivesInboundDownwardMessage, PolkadotCorePrimitivesInboundHrmpMessage, PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesXcmpMessageFormat, PolkadotPrimitivesV2AbridgedHostConfiguration, PolkadotPrimitivesV2AbridgedHrmpChannel, PolkadotPrimitivesV2PersistedValidationData, PolkadotPrimitivesV2UpgradeRestriction, RmrkTraitsBaseBaseInfo, RmrkTraitsCollectionCollectionInfo, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsNftNftChild, RmrkTraitsNftNftInfo, RmrkTraitsNftRoyaltyInfo, RmrkTraitsPartEquippableList, RmrkTraitsPartFixedPart, RmrkTraitsPartPartType, RmrkTraitsPartSlotPart, RmrkTraitsPropertyPropertyInfo, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceInfo, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, RmrkTraitsThemeThemeProperty, SpCoreEcdsaSignature, SpCoreEd25519Signature, SpCoreSr25519Signature, SpRuntimeArithmeticError, SpRuntimeDigest, SpRuntimeDigestDigestItem, SpRuntimeDispatchError, SpRuntimeModuleError, SpRuntimeMultiSignature, SpRuntimeTokenError, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, UpPovEstimateRpcPovInfo, UpPovEstimateRpcTrieKeyValue, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
->>>>>>> chore: regenerate types
+import type { 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, SpRuntimeTransactionValidityInvalidTransaction, SpRuntimeTransactionValidityTransactionValidityError, SpRuntimeTransactionValidityUnknownTransaction, SpRuntimeTransactionalError, SpTrieStorageProof, SpVersionRuntimeVersion, SpWeightsRuntimeDbWeight, SpWeightsWeightV2Weight, UpDataStructsAccessMode, UpDataStructsCollection, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCollectionStats, UpDataStructsCreateCollectionData, UpDataStructsCreateFungibleData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsCreateNftData, UpDataStructsCreateNftExData, UpDataStructsCreateReFungibleData, UpDataStructsCreateRefungibleExMultipleOwners, UpDataStructsCreateRefungibleExSingleOwner, UpDataStructsNestingPermissions, UpDataStructsOwnerRestrictedSet, UpDataStructsProperties, UpDataStructsPropertiesMapBoundedVec, UpDataStructsPropertiesMapPropertyPermission, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, UpDataStructsPropertyPermission, UpDataStructsPropertyScope, UpDataStructsRpcCollection, UpDataStructsRpcCollectionFlags, UpDataStructsSponsoringRateLimit, UpDataStructsSponsorshipStateAccountId32, UpDataStructsSponsorshipStateBasicCrossAccountIdRepr, UpDataStructsTokenChild, UpDataStructsTokenData, UpPovEstimateRpcPovInfo, UpPovEstimateRpcTrieKeyValue, XcmDoubleEncoded, XcmV0Junction, XcmV0JunctionBodyId, XcmV0JunctionBodyPart, XcmV0JunctionNetworkId, XcmV0MultiAsset, XcmV0MultiLocation, XcmV0Order, XcmV0OriginKind, XcmV0Response, XcmV0Xcm, XcmV1Junction, XcmV1MultiAsset, XcmV1MultiLocation, XcmV1MultiassetAssetId, XcmV1MultiassetAssetInstance, XcmV1MultiassetFungibility, XcmV1MultiassetMultiAssetFilter, XcmV1MultiassetMultiAssets, XcmV1MultiassetWildFungibility, XcmV1MultiassetWildMultiAsset, XcmV1MultilocationJunctions, XcmV1Order, XcmV1Response, XcmV1Xcm, XcmV2Instruction, XcmV2Response, XcmV2TraitsError, XcmV2TraitsOutcome, XcmV2WeightLimit, XcmV2Xcm, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from './default';
 import type { Data, StorageKey } from '@polkadot/types';
 import type { BitVec, Bool, Bytes, F32, F64, I128, I16, I256, I32, I64, I8, Json, Null, OptionBool, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, f32, f64, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
 import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';

--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -3264,1019 +3264,67 @@
     _enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed', 'SettingAllowanceForAllNotAllowed', 'FungibleTokensAreAlwaysValid']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup420: pallet_refungible::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup417: pallet_refungible::ItemData
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup418: pallet_refungible::ItemData
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup431: pallet_refungible::ItemData
-=======
-   * Lookup427: pallet_refungible::ItemData
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-   * Lookup431: pallet_refungible::ItemData
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-   * 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
-=======
-=======
->>>>>>> chore: regenerate types
-   * Lookup425: pallet_refungible::ItemData
-   **/
-  PalletRefungibleItemData: {
-    constData: 'Bytes'
-  },
-  /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup436: pallet_refungible::pallet::Error<T>
-=======
-   * Lookup432: pallet_refungible::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup436: pallet_refungible::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup430: pallet_refungible::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup430: pallet_refungible::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup428: pallet_refungible::pallet::Error<T>
    **/
   PalletRefungibleError: {
     _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RepartitionWhileNotOwningAllPieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup423: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup424: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup437: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
-=======
-   * Lookup433: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup437: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup431: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup431: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> chore: regenerate types
+   * Lookup429: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
    **/
   PalletNonfungibleItemData: {
     owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup423: up_data_structs::PropertyScope
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup425: up_data_structs::PropertyScope
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup426: up_data_structs::PropertyScope
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup439: up_data_structs::PropertyScope
-=======
-   * Lookup435: up_data_structs::PropertyScope
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup439: up_data_structs::PropertyScope
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup433: up_data_structs::PropertyScope
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup433: up_data_structs::PropertyScope
->>>>>>> chore: regenerate types
+   * Lookup431: up_data_structs::PropertyScope
    **/
   UpDataStructsPropertyScope: {
     _enum: ['None', 'Rmrk']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup426: pallet_nonfungible::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup427: pallet_nonfungible::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup428: pallet_nonfungible::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup441: pallet_nonfungible::pallet::Error<T>
-=======
-   * Lookup437: pallet_nonfungible::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup441: pallet_nonfungible::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup435: pallet_nonfungible::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup435: pallet_nonfungible::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup434: pallet_nonfungible::pallet::Error<T>
    **/
   PalletNonfungibleError: {
     _enum: ['NotNonfungibleDataUsedToMintFungibleCollectionToken', 'NonfungibleItemsHaveNoAmount', 'CantBurnNftWithChildren']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup427: pallet_structure::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup428: pallet_structure::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup429: pallet_structure::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup442: pallet_structure::pallet::Error<T>
-=======
-   * Lookup438: pallet_structure::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup442: pallet_structure::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup436: pallet_structure::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup436: pallet_structure::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup435: pallet_structure::pallet::Error<T>
    **/
   PalletStructureError: {
     _enum: ['OuroborosDetected', 'DepthLimit', 'BreadthLimit', 'TokenNotFound']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup428: pallet_rmrk_core::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup429: pallet_rmrk_core::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup430: pallet_rmrk_core::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup443: pallet_rmrk_core::pallet::Error<T>
-=======
-   * Lookup439: pallet_rmrk_core::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup443: pallet_rmrk_core::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup437: pallet_rmrk_core::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup437: pallet_rmrk_core::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup436: pallet_rmrk_core::pallet::Error<T>
    **/
   PalletRmrkCoreError: {
     _enum: ['CorruptedCollectionType', 'RmrkPropertyKeyIsTooLong', 'RmrkPropertyValueIsTooLong', 'RmrkPropertyIsNotFound', 'UnableToDecodeRmrkData', 'CollectionNotEmpty', 'NoAvailableCollectionId', 'NoAvailableNftId', 'CollectionUnknown', 'NoPermission', 'NonTransferable', 'CollectionFullOrLocked', 'ResourceDoesntExist', 'CannotSendToDescendentOrSelf', 'CannotAcceptNonOwnedNft', 'CannotRejectNonOwnedNft', 'CannotRejectNonPendingNft', 'ResourceNotPending', 'NoAvailableResourceId']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup430: pallet_rmrk_equip::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup431: pallet_rmrk_equip::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup432: pallet_rmrk_equip::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup445: pallet_rmrk_equip::pallet::Error<T>
-=======
-   * Lookup441: pallet_rmrk_equip::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup445: pallet_rmrk_equip::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup439: pallet_rmrk_equip::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup439: pallet_rmrk_equip::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup438: pallet_rmrk_equip::pallet::Error<T>
    **/
   PalletRmrkEquipError: {
     _enum: ['PermissionError', 'NoAvailableBaseId', 'NoAvailablePartId', 'BaseDoesntExist', 'NeedsDefaultThemeFirst', 'PartDoesntExist', 'NoEquippableOnFixedPart']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup436: pallet_app_promotion::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup437: pallet_app_promotion::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup438: pallet_app_promotion::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup451: pallet_app_promotion::pallet::Error<T>
-=======
-   * Lookup447: pallet_app_promotion::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup451: pallet_app_promotion::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup445: pallet_app_promotion::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup445: pallet_app_promotion::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup444: pallet_app_promotion::pallet::Error<T>
    **/
   PalletAppPromotionError: {
     _enum: ['AdminNotSet', 'NoPermission', 'NotSufficientFunds', 'PendingForBlockOverflow', 'SponsorNotSet', 'IncorrectLockedBalanceOperation']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup437: pallet_foreign_assets::module::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup438: pallet_foreign_assets::module::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup439: pallet_foreign_assets::module::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup452: pallet_foreign_assets::module::Error<T>
-=======
-   * Lookup448: pallet_foreign_assets::module::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup452: pallet_foreign_assets::module::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup446: pallet_foreign_assets::module::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup446: pallet_foreign_assets::module::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup445: pallet_foreign_assets::module::Error<T>
    **/
   PalletForeignAssetsModuleError: {
     _enum: ['BadLocation', 'MultiLocationExisted', 'AssetIdNotExists', 'AssetIdExisted']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup439: pallet_evm::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup440: pallet_evm::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup441: pallet_evm::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup454: pallet_evm::pallet::Error<T>
-=======
-   * Lookup451: pallet_evm::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup455: pallet_evm::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup448: pallet_evm::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup448: pallet_evm::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup447: pallet_evm::pallet::Error<T>
    **/
   PalletEvmError: {
     _enum: ['BalanceLow', 'FeeOverflow', 'PaymentOverflow', 'WithdrawFailed', 'GasPriceTooLow', 'InvalidNonce', 'GasLimitTooLow', 'GasLimitTooHigh', 'Undefined', 'Reentrancy', 'TransactionMustComeFromEOA']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup442: fp_rpc::TransactionStatus
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup443: fp_rpc::TransactionStatus
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup444: fp_rpc::TransactionStatus
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup457: fp_rpc::TransactionStatus
-=======
-   * Lookup454: fp_rpc::TransactionStatus
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup458: fp_rpc::TransactionStatus
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup451: fp_rpc::TransactionStatus
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup451: fp_rpc::TransactionStatus
->>>>>>> chore: regenerate types
+   * Lookup450: fp_rpc::TransactionStatus
    **/
   FpRpcTransactionStatus: {
     transactionHash: 'H256',
@@ -4288,127 +3336,12 @@
     logsBloom: 'EthbloomBloom'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup444: ethbloom::Bloom
+   * Lookup452: ethbloom::Bloom
    **/
   EthbloomBloom: '[u8;256]',
   /**
-   * Lookup446: ethereum::receipt::ReceiptV3
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup445: ethbloom::Bloom
-   **/
-  EthbloomBloom: '[u8;256]',
-  /**
-   * Lookup447: ethereum::receipt::ReceiptV3
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup446: ethbloom::Bloom
-   **/
-  EthbloomBloom: '[u8;256]',
-  /**
-   * Lookup448: ethereum::receipt::ReceiptV3
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup459: ethbloom::Bloom
+   * Lookup454: ethereum::receipt::ReceiptV3
    **/
-  EthbloomBloom: '[u8;256]',
-  /**
-   * Lookup461: ethereum::receipt::ReceiptV3
-=======
-   * Lookup456: ethbloom::Bloom
-   **/
-  EthbloomBloom: '[u8;256]',
-  /**
-   * Lookup458: ethereum::receipt::ReceiptV3
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup460: ethbloom::Bloom
-   **/
-  EthbloomBloom: '[u8;256]',
-  /**
-   * Lookup462: ethereum::receipt::ReceiptV3
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * Lookup466: ethbloom::Bloom
-   **/
-  EthbloomBloom: '[u8;256]',
-  /**
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-=======
->>>>>>> chore: regenerate types
-   * Lookup453: ethbloom::Bloom
-   **/
-  EthbloomBloom: '[u8;256]',
-  /**
-   * Lookup455: ethereum::receipt::ReceiptV3
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore: regenerate types
-   **/
   EthereumReceiptReceiptV3: {
     _enum: {
       Legacy: 'EthereumReceiptEip658ReceiptData',
@@ -4417,88 +3350,7 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup447: ethereum::receipt::EIP658ReceiptData
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup448: ethereum::receipt::EIP658ReceiptData
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup449: ethereum::receipt::EIP658ReceiptData
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup462: ethereum::receipt::EIP658ReceiptData
-=======
-   * Lookup459: ethereum::receipt::EIP658ReceiptData
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup463: ethereum::receipt::EIP658ReceiptData
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup456: ethereum::receipt::EIP658ReceiptData
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup456: ethereum::receipt::EIP658ReceiptData
->>>>>>> chore: regenerate types
+   * Lookup455: ethereum::receipt::EIP658ReceiptData
    **/
   EthereumReceiptEip658ReceiptData: {
     statusCode: 'u8',
@@ -4507,88 +3359,7 @@
     logs: 'Vec<EthereumLog>'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup448: ethereum::block::Block<ethereum::transaction::TransactionV2>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup449: ethereum::block::Block<ethereum::transaction::TransactionV2>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup450: ethereum::block::Block<ethereum::transaction::TransactionV2>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup463: ethereum::block::Block<ethereum::transaction::TransactionV2>
-=======
-   * Lookup460: ethereum::block::Block<ethereum::transaction::TransactionV2>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup464: ethereum::block::Block<ethereum::transaction::TransactionV2>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup457: ethereum::block::Block<ethereum::transaction::TransactionV2>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup457: ethereum::block::Block<ethereum::transaction::TransactionV2>
->>>>>>> chore: regenerate types
+   * Lookup456: ethereum::block::Block<ethereum::transaction::TransactionV2>
    **/
   EthereumBlock: {
     header: 'EthereumHeader',
@@ -4596,88 +3367,7 @@
     ommers: 'Vec<EthereumHeader>'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup449: ethereum::header::Header
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup450: ethereum::header::Header
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup451: ethereum::header::Header
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup464: ethereum::header::Header
-=======
-   * Lookup461: ethereum::header::Header
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup465: ethereum::header::Header
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup458: ethereum::header::Header
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup458: ethereum::header::Header
->>>>>>> chore: regenerate types
+   * Lookup457: ethereum::header::Header
    **/
   EthereumHeader: {
     parentHash: 'H256',
@@ -4696,301 +3386,24 @@
     mixHash: 'H256',
     nonce: 'EthereumTypesHashH64'
   },
-  /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup450: ethereum_types::hash::H64
-   **/
-  EthereumTypesHashH64: '[u8;8]',
   /**
-   * Lookup455: pallet_ethereum::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup451: ethereum_types::hash::H64
+   * Lookup458: ethereum_types::hash::H64
    **/
   EthereumTypesHashH64: '[u8;8]',
   /**
-   * Lookup456: pallet_ethereum::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup452: ethereum_types::hash::H64
-   **/
-  EthereumTypesHashH64: '[u8;8]',
-  /**
-   * Lookup457: pallet_ethereum::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup465: ethereum_types::hash::H64
-   **/
-  EthereumTypesHashH64: '[u8;8]',
-  /**
-   * Lookup470: pallet_ethereum::pallet::Error<T>
-=======
-   * Lookup462: ethereum_types::hash::H64
-   **/
-  EthereumTypesHashH64: '[u8;8]',
-  /**
-   * Lookup467: pallet_ethereum::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup466: ethereum_types::hash::H64
-   **/
-  EthereumTypesHashH64: '[u8;8]',
-  /**
-   * Lookup471: pallet_ethereum::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * Lookup472: ethereum_types::hash::H64
-   **/
-  EthereumTypesHashH64: '[u8;8]',
-  /**
-   * 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
+   * Lookup463: pallet_ethereum::pallet::Error<T>
    **/
-  EthereumTypesHashH64: '[u8;8]',
-  /**
-   * Lookup478: pallet_ethereum::pallet::Error<T>
->>>>>>> fix: regenerate types after rebase
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-=======
->>>>>>> chore: regenerate types
-   * Lookup459: ethereum_types::hash::H64
-   **/
-  EthereumTypesHashH64: '[u8;8]',
-  /**
-   * Lookup464: pallet_ethereum::pallet::Error<T>
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore: regenerate types
-   **/
   PalletEthereumError: {
     _enum: ['InvalidSignature', 'PreLogExists']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup456: pallet_evm_coder_substrate::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup457: pallet_evm_coder_substrate::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup458: pallet_evm_coder_substrate::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup471: pallet_evm_coder_substrate::pallet::Error<T>
-=======
-   * Lookup468: pallet_evm_coder_substrate::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup472: pallet_evm_coder_substrate::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup465: pallet_evm_coder_substrate::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup465: pallet_evm_coder_substrate::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup464: pallet_evm_coder_substrate::pallet::Error<T>
    **/
   PalletEvmCoderSubstrateError: {
     _enum: ['OutOfGas', 'OutOfFund']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup458: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
-=======
-=======
->>>>>>> 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>>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup472: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
-=======
-   * Lookup469: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup473: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup466: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup466: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
->>>>>>> chore: regenerate types
+   * Lookup465: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
    **/
   UpDataStructsSponsorshipStateBasicCrossAccountIdRepr: {
     _enum: {
@@ -5000,474 +3413,35 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup458: pallet_evm_contract_helpers::SponsoringModeT
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup459: pallet_evm_contract_helpers::SponsoringModeT
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup460: pallet_evm_contract_helpers::SponsoringModeT
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup473: pallet_evm_contract_helpers::SponsoringModeT
-=======
-   * Lookup470: pallet_evm_contract_helpers::SponsoringModeT
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup474: pallet_evm_contract_helpers::SponsoringModeT
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup467: pallet_evm_contract_helpers::SponsoringModeT
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup467: pallet_evm_contract_helpers::SponsoringModeT
->>>>>>> chore: regenerate types
+   * Lookup466: pallet_evm_contract_helpers::SponsoringModeT
    **/
   PalletEvmContractHelpersSponsoringModeT: {
     _enum: ['Disabled', 'Allowlisted', 'Generous']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup464: pallet_evm_contract_helpers::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup465: pallet_evm_contract_helpers::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup466: pallet_evm_contract_helpers::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup479: pallet_evm_contract_helpers::pallet::Error<T>
-=======
-   * Lookup476: pallet_evm_contract_helpers::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup480: pallet_evm_contract_helpers::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup473: pallet_evm_contract_helpers::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup473: pallet_evm_contract_helpers::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup472: pallet_evm_contract_helpers::pallet::Error<T>
    **/
   PalletEvmContractHelpersError: {
     _enum: ['NoPermission', 'NoPendingSponsor', 'TooManyMethodsHaveSponsoredLimit']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup465: pallet_evm_migration::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup466: pallet_evm_migration::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup467: pallet_evm_migration::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup480: pallet_evm_migration::pallet::Error<T>
-=======
-   * Lookup477: pallet_evm_migration::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup481: pallet_evm_migration::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup474: pallet_evm_migration::pallet::Error<T>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup474: pallet_evm_migration::pallet::Error<T>
->>>>>>> chore: regenerate types
+   * Lookup473: pallet_evm_migration::pallet::Error<T>
    **/
   PalletEvmMigrationError: {
     _enum: ['AccountNotEmpty', 'AccountIsNotMigrating', 'BadEvent']
   },
-  /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup466: pallet_maintenance::pallet::Error<T>
-   **/
-  PalletMaintenanceError: 'Null',
   /**
-   * Lookup467: pallet_test_utils::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup467: pallet_maintenance::pallet::Error<T>
-   **/
-  PalletMaintenanceError: 'Null',
-  /**
-   * Lookup468: pallet_test_utils::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup468: pallet_maintenance::pallet::Error<T>
-   **/
-  PalletMaintenanceError: 'Null',
-  /**
-   * Lookup469: pallet_test_utils::pallet::Error<T>
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup481: pallet_maintenance::pallet::Error<T>
-   **/
-  PalletMaintenanceError: 'Null',
-  /**
-   * Lookup482: pallet_test_utils::pallet::Error<T>
-=======
-   * Lookup478: pallet_maintenance::pallet::Error<T>
+   * Lookup474: pallet_maintenance::pallet::Error<T>
    **/
   PalletMaintenanceError: 'Null',
   /**
-   * Lookup479: pallet_test_utils::pallet::Error<T>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup482: pallet_maintenance::pallet::Error<T>
-   **/
-  PalletMaintenanceError: 'Null',
-  /**
-   * Lookup483: pallet_test_utils::pallet::Error<T>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * Lookup488: pallet_maintenance::pallet::Error<T>
-   **/
-  PalletMaintenanceError: 'Null',
-  /**
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-=======
->>>>>>> chore: regenerate types
-   * Lookup475: pallet_maintenance::pallet::Error<T>
-   **/
-  PalletMaintenanceError: 'Null',
-  /**
-   * Lookup476: pallet_test_utils::pallet::Error<T>
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore: regenerate types
+   * Lookup475: pallet_test_utils::pallet::Error<T>
    **/
   PalletTestUtilsError: {
     _enum: ['TestPalletDisabled', 'TriggerRollback']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup469: sp_runtime::MultiSignature
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup470: sp_runtime::MultiSignature
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup471: sp_runtime::MultiSignature
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup484: sp_runtime::MultiSignature
-=======
-   * Lookup481: sp_runtime::MultiSignature
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup485: sp_runtime::MultiSignature
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup478: sp_runtime::MultiSignature
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup478: sp_runtime::MultiSignature
->>>>>>> chore: regenerate types
+   * Lookup477: sp_runtime::MultiSignature
    **/
   SpRuntimeMultiSignature: {
     _enum: {
@@ -5477,206 +3451,51 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup470: sp_core::ed25519::Signature
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-=======
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
-   * Lookup471: sp_core::ed25519::Signature
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
-<<<<<<< HEAD
-   * Lookup472: sp_core::ed25519::Signature
-=======
-=======
->>>>>>> chore: regenerate types
-=======
->>>>>>> chore:  regenerate types
-<<<<<<< HEAD
-   * Lookup485: sp_core::ed25519::Signature
->>>>>>> fix: update polkadot types and definitions
->>>>>>> fix: update polkadot types and definitions
->>>>>>> fix: update polkadot types and definitions
+   * Lookup478: sp_core::ed25519::Signature
    **/
   SpCoreEd25519Signature: '[u8;64]',
   /**
-   * Lookup472: sp_core::sr25519::Signature
-   **/
-  SpCoreSr25519Signature: '[u8;64]',
-  /**
-   * Lookup473: sp_core::ecdsa::Signature
-   **/
-  SpCoreEcdsaSignature: '[u8;65]',
-  /**
-   * Lookup476: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
-   **/
-  FrameSystemExtensionsCheckSpecVersion: 'Null',
-  /**
-   * Lookup477: frame_system::extensions::check_tx_version::CheckTxVersion<T>
-   **/
-  FrameSystemExtensionsCheckTxVersion: 'Null',
-  /**
-   * Lookup478: frame_system::extensions::check_genesis::CheckGenesis<T>
-   **/
-  FrameSystemExtensionsCheckGenesis: 'Null',
-  /**
-   * Lookup481: frame_system::extensions::check_nonce::CheckNonce<T>
-   **/
-  FrameSystemExtensionsCheckNonce: 'Compact<u32>',
-  /**
-   * Lookup482: frame_system::extensions::check_weight::CheckWeight<T>
-   **/
-  FrameSystemExtensionsCheckWeight: 'Null',
-  /**
-   * Lookup483: opal_runtime::runtime_common::maintenance::CheckMaintenance
-   **/
-  OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance: 'Null',
-  /**
-   * Lookup484: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
-   **/
-  PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
-  /**
-   * Lookup485: opal_runtime::Runtime
-   **/
-  OpalRuntimeRuntime: 'Null',
-  /**
-<<<<<<< HEAD
-   * Lookup486: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
-=======
-<<<<<<< HEAD
-   * Lookup487: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
-=======
-<<<<<<< HEAD
-   * Lookup488: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
-=======
-   * Lookup501: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
-=======
-   * Lookup482: sp_core::ed25519::Signature
-=======
-   * Lookup486: sp_core::ed25519::Signature
->>>>>>> chore: regenerate types
-=======
-   * Lookup492: sp_core::ed25519::Signature
->>>>>>> chore:  regenerate types
-=======
-   * Lookup493: sp_core::ed25519::Signature
->>>>>>> fix: regenerate types after rebase
-=======
-=======
->>>>>>> chore: regenerate types
-   * Lookup479: sp_core::ed25519::Signature
-   **/
-  SpCoreEd25519Signature: '[u8;64]',
-  /**
-   * Lookup481: sp_core::sr25519::Signature
+   * Lookup480: sp_core::sr25519::Signature
    **/
   SpCoreSr25519Signature: '[u8;64]',
   /**
-   * Lookup482: sp_core::ecdsa::Signature
+   * Lookup481: sp_core::ecdsa::Signature
    **/
   SpCoreEcdsaSignature: '[u8;65]',
   /**
-   * Lookup485: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
+   * Lookup484: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
    **/
   FrameSystemExtensionsCheckSpecVersion: 'Null',
   /**
-   * Lookup486: frame_system::extensions::check_tx_version::CheckTxVersion<T>
+   * Lookup485: frame_system::extensions::check_tx_version::CheckTxVersion<T>
    **/
   FrameSystemExtensionsCheckTxVersion: 'Null',
   /**
-   * Lookup487: frame_system::extensions::check_genesis::CheckGenesis<T>
+   * Lookup486: frame_system::extensions::check_genesis::CheckGenesis<T>
    **/
   FrameSystemExtensionsCheckGenesis: 'Null',
   /**
-   * Lookup490: frame_system::extensions::check_nonce::CheckNonce<T>
+   * Lookup489: frame_system::extensions::check_nonce::CheckNonce<T>
    **/
   FrameSystemExtensionsCheckNonce: 'Compact<u32>',
   /**
-   * Lookup491: frame_system::extensions::check_weight::CheckWeight<T>
+   * Lookup490: frame_system::extensions::check_weight::CheckWeight<T>
    **/
   FrameSystemExtensionsCheckWeight: 'Null',
   /**
-   * Lookup492: opal_runtime::runtime_common::maintenance::CheckMaintenance
+   * Lookup491: opal_runtime::runtime_common::maintenance::CheckMaintenance
    **/
   OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance: 'Null',
   /**
-   * Lookup493: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
+   * Lookup492: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
    **/
   PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
   /**
-   * Lookup494: opal_runtime::Runtime
+   * Lookup493: opal_runtime::Runtime
    **/
   OpalRuntimeRuntime: 'Null',
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * Lookup498: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-<<<<<<< HEAD
->>>>>>> fix: update polkadot types and definitions
-=======
-=======
-=======
-=======
-   * Lookup502: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-<<<<<<< HEAD
->>>>>>> chore: regenerate types
-=======
-=======
-=======
-=======
-   * 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
-<<<<<<< HEAD
->>>>>>> fix: regenerate types after rebase
-=======
-=======
-   * Lookup495: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
->>>>>>> chore: regenerate types
->>>>>>> chore: regenerate types
-=======
-   * Lookup495: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
->>>>>>> chore: regenerate types
+   * Lookup494: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
    **/
   PalletEthereumFakeTransactionFinalizer: 'Null'
 };