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

--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -9,22 +9,16 @@
 import type { Bytes, Compact, Option, U256, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AnyNumber, IMethod, ITuple } from '@polkadot/types-codec/types';
 <<<<<<< HEAD
+<<<<<<< HEAD
 import type { AccountId32, Call, H160, H256, MultiAddress, Permill } from '@polkadot/types/interfaces/runtime';
 =======
 <<<<<<< HEAD
 import type { AccountId32, Call, H160, H256, MultiAddress, Perbill, Permill } from '@polkadot/types/interfaces/runtime';
 >>>>>>> chore:  regenerate types
-import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumLog, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletConfigurationAppPromotionConfiguration, PalletEvmAccountBasicCrossAccountIdRepr, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, SpWeightsWeightV2Weight, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
 =======
-import type { AccountId32, Call, H160, H256, MultiAddress, Perbill, Permill, Weight } from '@polkadot/types/interfaces/runtime';
-import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumLog, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
-<<<<<<< HEAD
-=======
-import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletEvmAccountBasicCrossAccountIdRepr, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
+import type { AccountId32, Call, H160, H256, MultiAddress, Permill } from '@polkadot/types/interfaces/runtime';
+>>>>>>> chore: regenerate types
+import type { CumulusPrimitivesParachainInherentParachainInherentData, EthereumLog, EthereumTransactionTransactionV2, OrmlVestingVestingSchedule, PalletConfigurationAppPromotionConfiguration, PalletEvmAccountBasicCrossAccountIdRepr, PalletForeignAssetsAssetIds, PalletForeignAssetsModuleAssetMetadata, RmrkTraitsNftAccountIdOrCollectionNftTuple, RmrkTraitsPartEquippableList, RmrkTraitsPartPartType, RmrkTraitsResourceBasicResource, RmrkTraitsResourceComposableResource, RmrkTraitsResourceResourceTypes, RmrkTraitsResourceSlotResource, RmrkTraitsTheme, SpWeightsWeightV2Weight, UpDataStructsCollectionLimits, UpDataStructsCollectionMode, UpDataStructsCollectionPermissions, UpDataStructsCreateCollectionData, UpDataStructsCreateItemData, UpDataStructsCreateItemExData, UpDataStructsProperty, UpDataStructsPropertyKeyPermission, XcmV1MultiLocation, XcmV2WeightLimit, XcmVersionedMultiAsset, XcmVersionedMultiAssets, XcmVersionedMultiLocation, XcmVersionedXcm } from '@polkadot/types/lookup';
 
 export type __AugmentedSubmittable = AugmentedSubmittable<() => unknown>;
 export type __SubmittableExtrinsic<ApiType extends ApiTypes> = SubmittableExtrinsic<ApiType>;

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

--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -2760,9 +2760,9 @@
   readonly isCustom: boolean;
   readonly asCustom: u8;
   readonly isBadMandatory: boolean;
-  readonly isMandatoryDispatch: boolean;
+  readonly isMandatoryValidation: boolean;
   readonly isBadSigner: boolean;
-  readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryDispatch' | 'BadSigner';
+  readonly type: 'Call' | 'Payment' | 'Future' | 'Stale' | 'BadProof' | 'AncientBirthBlock' | 'ExhaustsResources' | 'Custom' | 'BadMandatory' | 'MandatoryValidation' | 'BadSigner';
 }
 
 /** @name SpRuntimeTransactionValidityTransactionValidityError */

--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -1211,19 +1211,7 @@
     data: 'Bytes'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup109: pallet_ethereum::pallet::Event
-=======
-<<<<<<< HEAD
-   * Lookup113: pallet_ethereum::pallet::Event
-=======
-   * Lookup115: pallet_ethereum::pallet::Event
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup113: pallet_ethereum::pallet::Event
->>>>>>> fix: regenerate types after rebase
    **/
   PalletEthereumEvent: {
     _enum: {
@@ -1236,19 +1224,7 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup110: evm_core::error::ExitReason
-=======
-<<<<<<< HEAD
-   * Lookup114: evm_core::error::ExitReason
-=======
-   * Lookup116: evm_core::error::ExitReason
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup114: evm_core::error::ExitReason
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitReason: {
     _enum: {
@@ -1259,37 +1235,13 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup111: evm_core::error::ExitSucceed
-=======
-<<<<<<< HEAD
-   * Lookup115: evm_core::error::ExitSucceed
-=======
-   * Lookup117: evm_core::error::ExitSucceed
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup115: evm_core::error::ExitSucceed
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitSucceed: {
     _enum: ['Stopped', 'Returned', 'Suicided']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup112: evm_core::error::ExitError
-=======
-<<<<<<< HEAD
-   * Lookup116: evm_core::error::ExitError
-=======
-   * Lookup118: evm_core::error::ExitError
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup116: evm_core::error::ExitError
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitError: {
     _enum: {
@@ -1311,37 +1263,13 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup115: evm_core::error::ExitRevert
-=======
-<<<<<<< HEAD
-   * Lookup119: evm_core::error::ExitRevert
-=======
-   * Lookup121: evm_core::error::ExitRevert
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup119: evm_core::error::ExitRevert
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitRevert: {
     _enum: ['Reverted']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup116: evm_core::error::ExitFatal
-=======
-<<<<<<< HEAD
-   * Lookup120: evm_core::error::ExitFatal
-=======
-   * Lookup122: evm_core::error::ExitFatal
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup120: evm_core::error::ExitFatal
->>>>>>> fix: regenerate types after rebase
    **/
   EvmCoreErrorExitFatal: {
     _enum: {
@@ -1352,19 +1280,7 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup117: pallet_evm_contract_helpers::pallet::Event<T>
-=======
-<<<<<<< HEAD
-   * Lookup121: pallet_evm_contract_helpers::pallet::Event<T>
-=======
-   * Lookup123: pallet_evm_contract_helpers::pallet::Event<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup121: pallet_evm_contract_helpers::pallet::Event<T>
->>>>>>> fix: regenerate types after rebase
    **/
   PalletEvmContractHelpersEvent: {
     _enum: {
@@ -1374,67 +1290,25 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup118: pallet_evm_migration::pallet::Event<T>
-=======
-<<<<<<< HEAD
-=======
->>>>>>> fix: regenerate types after rebase
-   * Lookup122: pallet_evm_migration::pallet::Event<T>
->>>>>>> chore:  regenerate types
    **/
   PalletEvmMigrationEvent: {
     _enum: ['TestEvent']
   },
   /**
-<<<<<<< HEAD
    * Lookup119: pallet_maintenance::pallet::Event<T>
-=======
-   * Lookup123: pallet_maintenance::pallet::Event<T>
-<<<<<<< HEAD
-=======
-   * Lookup124: pallet_maintenance::pallet::Event<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
->>>>>>> fix: regenerate types after rebase
    **/
   PalletMaintenanceEvent: {
     _enum: ['MaintenanceEnabled', 'MaintenanceDisabled']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup120: pallet_test_utils::pallet::Event<T>
-=======
-<<<<<<< HEAD
-   * Lookup124: pallet_test_utils::pallet::Event<T>
-=======
-   * Lookup125: pallet_test_utils::pallet::Event<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup124: pallet_test_utils::pallet::Event<T>
->>>>>>> fix: regenerate types after rebase
    **/
   PalletTestUtilsEvent: {
     _enum: ['ValueIsSet', 'ShouldRollback', 'BatchCompleted']
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup121: frame_system::Phase
-=======
-<<<<<<< HEAD
-   * Lookup125: frame_system::Phase
-=======
-   * Lookup126: frame_system::Phase
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup125: frame_system::Phase
->>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemPhase: {
     _enum: {
@@ -1444,38 +1318,14 @@
     }
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup124: frame_system::LastRuntimeUpgradeInfo
-=======
-<<<<<<< HEAD
-   * Lookup127: frame_system::LastRuntimeUpgradeInfo
-=======
-   * Lookup128: frame_system::LastRuntimeUpgradeInfo
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup127: frame_system::LastRuntimeUpgradeInfo
->>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemLastRuntimeUpgradeInfo: {
     specVersion: 'Compact<u32>',
     specName: 'Text'
   },
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
    * Lookup125: frame_system::pallet::Call<T>
-=======
-<<<<<<< HEAD
-   * Lookup128: frame_system::pallet::Call<T>
-=======
-   * Lookup129: frame_system::pallet::Call<T>
->>>>>>> chore:  regenerate types
->>>>>>> chore:  regenerate types
-=======
-   * Lookup128: frame_system::pallet::Call<T>
->>>>>>> fix: regenerate types after rebase
    **/
   FrameSystemCall: {
     _enum: {
@@ -1512,6 +1362,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup129: frame_system::limits::BlockWeights
 =======
 =======
@@ -1532,6 +1383,9 @@
    * Lookup133: frame_system::limits::BlockWeights
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup129: frame_system::limits::BlockWeights
+>>>>>>> chore: regenerate types
    **/
   FrameSystemLimitsBlockWeights: {
     baseBlock: 'SpWeightsWeightV2Weight',
@@ -1541,6 +1395,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup130: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
 =======
 =======
@@ -1561,6 +1416,9 @@
    * Lookup134: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup130: frame_support::dispatch::PerDispatchClass<frame_system::limits::WeightsPerClass>
+>>>>>>> chore: regenerate types
    **/
   FrameSupportDispatchPerDispatchClassWeightsPerClass: {
     normal: 'FrameSystemLimitsWeightsPerClass',
@@ -1570,6 +1428,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup131: frame_system::limits::WeightsPerClass
 =======
 =======
@@ -1590,6 +1449,9 @@
    * Lookup135: frame_system::limits::WeightsPerClass
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup131: frame_system::limits::WeightsPerClass
+>>>>>>> chore: regenerate types
    **/
   FrameSystemLimitsWeightsPerClass: {
     baseExtrinsic: 'SpWeightsWeightV2Weight',
@@ -1600,6 +1462,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup133: frame_system::limits::BlockLength
 =======
 =======
@@ -1620,6 +1483,9 @@
    * Lookup137: frame_system::limits::BlockLength
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup133: frame_system::limits::BlockLength
+>>>>>>> chore: regenerate types
    **/
   FrameSystemLimitsBlockLength: {
     max: 'FrameSupportDispatchPerDispatchClassU32'
@@ -1627,6 +1493,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup134: frame_support::dispatch::PerDispatchClass<T>
 =======
 =======
@@ -1647,6 +1514,9 @@
    * Lookup138: frame_support::dispatch::PerDispatchClass<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup134: frame_support::dispatch::PerDispatchClass<T>
+>>>>>>> chore: regenerate types
    **/
   FrameSupportDispatchPerDispatchClassU32: {
     normal: 'u32',
@@ -1656,6 +1526,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup135: sp_weights::RuntimeDbWeight
 =======
 =======
@@ -1676,6 +1547,9 @@
    * Lookup139: sp_weights::RuntimeDbWeight
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup135: sp_weights::RuntimeDbWeight
+>>>>>>> chore: regenerate types
    **/
   SpWeightsRuntimeDbWeight: {
     read: 'u64',
@@ -1684,6 +1558,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup136: sp_version::RuntimeVersion
 =======
 =======
@@ -1704,6 +1579,9 @@
    * Lookup140: sp_version::RuntimeVersion
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup136: sp_version::RuntimeVersion
+>>>>>>> chore: regenerate types
    **/
   SpVersionRuntimeVersion: {
     specName: 'Text',
@@ -1718,6 +1596,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup141: frame_system::pallet::Error<T>
 =======
 =======
@@ -1738,6 +1617,9 @@
    * Lookup145: frame_system::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup141: frame_system::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   FrameSystemError: {
     _enum: ['InvalidSpecName', 'SpecVersionNeedsToIncrease', 'FailedToExtractRuntimeVersion', 'NonDefaultComposite', 'NonZeroRefCount', 'CallFiltered']
@@ -1745,6 +1627,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup142: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
 =======
 =======
@@ -1765,6 +1648,9 @@
    * Lookup146: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup142: polkadot_primitives::v2::PersistedValidationData<primitive_types::H256, N>
+>>>>>>> chore: regenerate types
    **/
   PolkadotPrimitivesV2PersistedValidationData: {
     parentHead: 'Bytes',
@@ -1775,6 +1661,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup145: polkadot_primitives::v2::UpgradeRestriction
 =======
 =======
@@ -1795,6 +1682,9 @@
    * Lookup149: polkadot_primitives::v2::UpgradeRestriction
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup145: polkadot_primitives::v2::UpgradeRestriction
+>>>>>>> chore: regenerate types
    **/
   PolkadotPrimitivesV2UpgradeRestriction: {
     _enum: ['Present']
@@ -1802,6 +1692,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup146: sp_trie::storage_proof::StorageProof
 =======
 =======
@@ -1822,6 +1713,9 @@
    * Lookup150: sp_trie::storage_proof::StorageProof
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup146: sp_trie::storage_proof::StorageProof
+>>>>>>> chore: regenerate types
    **/
   SpTrieStorageProof: {
     trieNodes: 'BTreeSet<Bytes>'
@@ -1829,6 +1723,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup148: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
 =======
 =======
@@ -1849,6 +1744,9 @@
    * Lookup152: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup148: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: {
     dmqMqcHead: 'H256',
@@ -1859,6 +1757,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup151: polkadot_primitives::v2::AbridgedHrmpChannel
 =======
 =======
@@ -1879,6 +1778,9 @@
    * Lookup155: polkadot_primitives::v2::AbridgedHrmpChannel
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup151: polkadot_primitives::v2::AbridgedHrmpChannel
+>>>>>>> chore: regenerate types
    **/
   PolkadotPrimitivesV2AbridgedHrmpChannel: {
     maxCapacity: 'u32',
@@ -1891,6 +1793,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup152: polkadot_primitives::v2::AbridgedHostConfiguration
 =======
 =======
@@ -1911,6 +1814,9 @@
    * Lookup156: polkadot_primitives::v2::AbridgedHostConfiguration
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup152: polkadot_primitives::v2::AbridgedHostConfiguration
+>>>>>>> chore: regenerate types
    **/
   PolkadotPrimitivesV2AbridgedHostConfiguration: {
     maxCodeSize: 'u32',
@@ -1926,6 +1832,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup158: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
 =======
 =======
@@ -1946,6 +1853,9 @@
    * Lookup162: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup158: polkadot_core_primitives::OutboundHrmpMessage<polkadot_parachain::primitives::Id>
+>>>>>>> chore: regenerate types
    **/
   PolkadotCorePrimitivesOutboundHrmpMessage: {
     recipient: 'u32',
@@ -1954,6 +1864,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup159: cumulus_pallet_parachain_system::pallet::Call<T>
 =======
 =======
@@ -1974,6 +1885,9 @@
    * Lookup163: cumulus_pallet_parachain_system::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup159: cumulus_pallet_parachain_system::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletParachainSystemCall: {
     _enum: {
@@ -1994,6 +1908,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup160: cumulus_primitives_parachain_inherent::ParachainInherentData
 =======
 =======
@@ -2014,6 +1929,9 @@
    * Lookup164: cumulus_primitives_parachain_inherent::ParachainInherentData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup160: cumulus_primitives_parachain_inherent::ParachainInherentData
+>>>>>>> chore: regenerate types
    **/
   CumulusPrimitivesParachainInherentParachainInherentData: {
     validationData: 'PolkadotPrimitivesV2PersistedValidationData',
@@ -2024,6 +1942,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup162: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
 =======
 =======
@@ -2044,6 +1963,9 @@
    * Lookup166: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup162: polkadot_core_primitives::InboundDownwardMessage<BlockNumber>
+>>>>>>> chore: regenerate types
    **/
   PolkadotCorePrimitivesInboundDownwardMessage: {
     sentAt: 'u32',
@@ -2052,6 +1974,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup165: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
 =======
 =======
@@ -2072,6 +1995,9 @@
    * Lookup169: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup165: polkadot_core_primitives::InboundHrmpMessage<BlockNumber>
+>>>>>>> chore: regenerate types
    **/
   PolkadotCorePrimitivesInboundHrmpMessage: {
     sentAt: 'u32',
@@ -2080,6 +2006,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup168: cumulus_pallet_parachain_system::pallet::Error<T>
 =======
 =======
@@ -2100,6 +2027,9 @@
    * Lookup172: cumulus_pallet_parachain_system::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup168: cumulus_pallet_parachain_system::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletParachainSystemError: {
     _enum: ['OverlappingUpgrades', 'ProhibitedByPolkadot', 'TooBig', 'ValidationDataNotAvailable', 'HostConfigurationNotAvailable', 'NotScheduled', 'NothingAuthorized', 'Unauthorized']
@@ -2107,6 +2037,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup170: pallet_balances::BalanceLock<Balance>
 =======
 =======
@@ -2127,6 +2058,9 @@
    * Lookup174: pallet_balances::BalanceLock<Balance>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup170: pallet_balances::BalanceLock<Balance>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesBalanceLock: {
     id: '[u8;8]',
@@ -2136,6 +2070,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup171: pallet_balances::Reasons
 =======
 =======
@@ -2156,6 +2091,9 @@
    * Lookup175: pallet_balances::Reasons
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup171: pallet_balances::Reasons
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesReasons: {
     _enum: ['Fee', 'Misc', 'All']
@@ -2163,6 +2101,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup174: pallet_balances::ReserveData<ReserveIdentifier, Balance>
 =======
 =======
@@ -2183,6 +2122,9 @@
    * Lookup178: pallet_balances::ReserveData<ReserveIdentifier, Balance>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup174: pallet_balances::ReserveData<ReserveIdentifier, Balance>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesReserveData: {
     id: '[u8;16]',
@@ -2191,6 +2133,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup176: pallet_balances::pallet::Call<T, I>
 =======
 =======
@@ -2229,6 +2172,9 @@
    * Lookup181: pallet_balances::pallet::Call<T, I>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup176: pallet_balances::pallet::Call<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesCall: {
     _enum: {
@@ -2263,6 +2209,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup179: pallet_balances::pallet::Error<T, I>
 =======
 =======
@@ -2283,6 +2230,9 @@
    * Lookup184: pallet_balances::pallet::Error<T, I>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup179: pallet_balances::pallet::Error<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletBalancesError: {
     _enum: ['VestingBalance', 'LiquidityRestrictions', 'InsufficientBalance', 'ExistentialDeposit', 'KeepAlive', 'ExistingVestingSchedule', 'DeadAccount', 'TooManyReserves']
@@ -2290,6 +2240,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup181: pallet_timestamp::pallet::Call<T>
 =======
 =======
@@ -2310,6 +2261,9 @@
    * Lookup186: pallet_timestamp::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup181: pallet_timestamp::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletTimestampCall: {
     _enum: {
@@ -2321,6 +2275,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup183: pallet_transaction_payment::Releases
 =======
 =======
@@ -2341,6 +2296,9 @@
    * Lookup188: pallet_transaction_payment::Releases
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup183: pallet_transaction_payment::Releases
+>>>>>>> chore: regenerate types
    **/
   PalletTransactionPaymentReleases: {
     _enum: ['V1Ancient', 'V2']
@@ -2348,6 +2306,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup184: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
 =======
 =======
@@ -2368,6 +2327,9 @@
    * Lookup189: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup184: pallet_treasury::Proposal<sp_core::crypto::AccountId32, Balance>
+>>>>>>> chore: regenerate types
    **/
   PalletTreasuryProposal: {
     proposer: 'AccountId32',
@@ -2378,6 +2340,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup187: pallet_treasury::pallet::Call<T, I>
 =======
 =======
@@ -2398,6 +2361,9 @@
    * Lookup192: pallet_treasury::pallet::Call<T, I>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup187: pallet_treasury::pallet::Call<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletTreasuryCall: {
     _enum: {
@@ -2423,6 +2389,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup190: frame_support::PalletId
    **/
   FrameSupportPalletId: '[u8;8]',
@@ -2461,6 +2428,13 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup190: frame_support::PalletId
+   **/
+  FrameSupportPalletId: '[u8;8]',
+  /**
+   * Lookup191: pallet_treasury::pallet::Error<T, I>
+>>>>>>> chore: regenerate types
    **/
   PalletTreasuryError: {
     _enum: ['InsufficientProposersBalance', 'InvalidIndex', 'TooManyApprovals', 'InsufficientPermission', 'ProposalNotApproved']
@@ -2468,6 +2442,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup192: pallet_sudo::pallet::Call<T>
 =======
 =======
@@ -2488,6 +2463,9 @@
    * Lookup197: pallet_sudo::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup192: pallet_sudo::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletSudoCall: {
     _enum: {
@@ -2513,6 +2491,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup194: orml_vesting::module::Call<T>
 =======
 =======
@@ -2533,6 +2512,9 @@
    * Lookup199: orml_vesting::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup194: orml_vesting::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlVestingModuleCall: {
     _enum: {
@@ -2553,6 +2535,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup196: orml_xtokens::module::Call<T>
 =======
 =======
@@ -2573,6 +2556,9 @@
    * Lookup201: orml_xtokens::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup196: orml_xtokens::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlXtokensModuleCall: {
     _enum: {
@@ -2617,6 +2603,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup197: xcm::VersionedMultiAsset
 =======
 =======
@@ -2637,6 +2624,9 @@
    * Lookup202: xcm::VersionedMultiAsset
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup197: xcm::VersionedMultiAsset
+>>>>>>> chore: regenerate types
    **/
   XcmVersionedMultiAsset: {
     _enum: {
@@ -2647,6 +2637,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup200: orml_tokens::module::Call<T>
 =======
 =======
@@ -2667,6 +2658,9 @@
    * Lookup205: orml_tokens::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup200: orml_tokens::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensModuleCall: {
     _enum: {
@@ -2702,6 +2696,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup201: cumulus_pallet_xcmp_queue::pallet::Call<T>
 =======
 =======
@@ -2722,6 +2717,9 @@
    * Lookup206: cumulus_pallet_xcmp_queue::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup201: cumulus_pallet_xcmp_queue::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueCall: {
     _enum: {
@@ -2772,6 +2770,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup202: pallet_xcm::pallet::Call<T>
 =======
 =======
@@ -2792,6 +2791,9 @@
    * Lookup207: pallet_xcm::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup202: pallet_xcm::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletXcmCall: {
     _enum: {
@@ -2847,6 +2849,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup203: xcm::VersionedXcm<RuntimeCall>
 =======
 =======
@@ -2867,6 +2870,9 @@
    * Lookup208: xcm::VersionedXcm<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup203: xcm::VersionedXcm<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmVersionedXcm: {
     _enum: {
@@ -2878,6 +2884,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup204: xcm::v0::Xcm<RuntimeCall>
 =======
 =======
@@ -2898,6 +2905,9 @@
    * Lookup209: xcm::v0::Xcm<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup204: xcm::v0::Xcm<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV0Xcm: {
     _enum: {
@@ -2953,6 +2963,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup206: xcm::v0::order::Order<RuntimeCall>
 =======
 =======
@@ -2973,6 +2984,9 @@
    * Lookup211: xcm::v0::order::Order<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup206: xcm::v0::order::Order<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV0Order: {
     _enum: {
@@ -3017,6 +3031,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup208: xcm::v0::Response
 =======
 =======
@@ -3037,6 +3052,9 @@
    * Lookup213: xcm::v0::Response
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup208: xcm::v0::Response
+>>>>>>> chore: regenerate types
    **/
   XcmV0Response: {
     _enum: {
@@ -3046,6 +3064,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup209: xcm::v1::Xcm<RuntimeCall>
 =======
 =======
@@ -3066,6 +3085,9 @@
    * Lookup214: xcm::v1::Xcm<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup209: xcm::v1::Xcm<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV1Xcm: {
     _enum: {
@@ -3126,6 +3148,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup211: xcm::v1::order::Order<RuntimeCall>
 =======
 =======
@@ -3146,6 +3169,9 @@
    * Lookup216: xcm::v1::order::Order<RuntimeCall>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup211: xcm::v1::order::Order<RuntimeCall>
+>>>>>>> chore: regenerate types
    **/
   XcmV1Order: {
     _enum: {
@@ -3192,6 +3218,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup213: xcm::v1::Response
 =======
 =======
@@ -3212,6 +3239,9 @@
    * Lookup218: xcm::v1::Response
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup213: xcm::v1::Response
+>>>>>>> chore: regenerate types
    **/
   XcmV1Response: {
     _enum: {
@@ -3222,6 +3252,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup227: cumulus_pallet_xcm::pallet::Call<T>
    **/
   CumulusPalletXcmCall: 'Null',
@@ -3260,7 +3291,14 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup227: cumulus_pallet_xcm::pallet::Call<T>
    **/
+  CumulusPalletXcmCall: 'Null',
+  /**
+   * Lookup228: cumulus_pallet_dmp_queue::pallet::Call<T>
+>>>>>>> chore: regenerate types
+   **/
   CumulusPalletDmpQueueCall: {
     _enum: {
       service_overweight: {
@@ -3272,6 +3310,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup229: pallet_inflation::pallet::Call<T>
 =======
 =======
@@ -3292,6 +3331,9 @@
    * Lookup234: pallet_inflation::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup229: pallet_inflation::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletInflationCall: {
     _enum: {
@@ -3303,6 +3345,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup230: pallet_unique::Call<T>
 =======
 =======
@@ -3323,6 +3366,9 @@
    * Lookup235: pallet_unique::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup230: pallet_unique::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletUniqueCall: {
     _enum: {
@@ -3468,6 +3514,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup235: up_data_structs::CollectionMode
 =======
 =======
@@ -3488,6 +3535,9 @@
    * Lookup240: up_data_structs::CollectionMode
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup235: up_data_structs::CollectionMode
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCollectionMode: {
     _enum: {
@@ -3499,6 +3549,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup236: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
 =======
 =======
@@ -3519,6 +3570,9 @@
    * Lookup241: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup236: up_data_structs::CreateCollectionData<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateCollectionData: {
     mode: 'UpDataStructsCollectionMode',
@@ -3535,6 +3589,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup238: up_data_structs::AccessMode
 =======
 =======
@@ -3555,6 +3610,9 @@
    * Lookup243: up_data_structs::AccessMode
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup238: up_data_structs::AccessMode
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsAccessMode: {
     _enum: ['Normal', 'AllowList']
@@ -3562,6 +3620,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup240: up_data_structs::CollectionLimits
 =======
 =======
@@ -3582,6 +3641,9 @@
    * Lookup245: up_data_structs::CollectionLimits
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup240: up_data_structs::CollectionLimits
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCollectionLimits: {
     accountTokenOwnershipLimit: 'Option<u32>',
@@ -3597,6 +3659,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup242: up_data_structs::SponsoringRateLimit
 =======
 =======
@@ -3617,6 +3680,9 @@
    * Lookup247: up_data_structs::SponsoringRateLimit
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup242: up_data_structs::SponsoringRateLimit
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsSponsoringRateLimit: {
     _enum: {
@@ -3627,6 +3693,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup245: up_data_structs::CollectionPermissions
 =======
 =======
@@ -3647,6 +3714,9 @@
    * Lookup250: up_data_structs::CollectionPermissions
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup245: up_data_structs::CollectionPermissions
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCollectionPermissions: {
     access: 'Option<UpDataStructsAccessMode>',
@@ -3656,6 +3726,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup247: up_data_structs::NestingPermissions
 =======
 =======
@@ -3676,6 +3747,9 @@
    * Lookup252: up_data_structs::NestingPermissions
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup247: up_data_structs::NestingPermissions
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsNestingPermissions: {
     tokenOwner: 'bool',
@@ -3685,6 +3759,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup249: up_data_structs::OwnerRestrictedSet
    **/
   UpDataStructsOwnerRestrictedSet: 'BTreeSet<u32>',
@@ -3723,7 +3798,14 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup249: up_data_structs::OwnerRestrictedSet
    **/
+  UpDataStructsOwnerRestrictedSet: 'BTreeSet<u32>',
+  /**
+   * Lookup254: up_data_structs::PropertyKeyPermission
+>>>>>>> chore: regenerate types
+   **/
   UpDataStructsPropertyKeyPermission: {
     key: 'Bytes',
     permission: 'UpDataStructsPropertyPermission'
@@ -3731,6 +3813,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup255: up_data_structs::PropertyPermission
 =======
 =======
@@ -3751,6 +3834,9 @@
    * Lookup260: up_data_structs::PropertyPermission
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup255: up_data_structs::PropertyPermission
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsPropertyPermission: {
     mutable: 'bool',
@@ -3760,6 +3846,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup258: up_data_structs::Property
 =======
 =======
@@ -3780,6 +3867,9 @@
    * Lookup263: up_data_structs::Property
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup258: up_data_structs::Property
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsProperty: {
     key: 'Bytes',
@@ -3788,6 +3878,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup261: up_data_structs::CreateItemData
 =======
 =======
@@ -3808,6 +3899,9 @@
    * Lookup266: up_data_structs::CreateItemData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup261: up_data_structs::CreateItemData
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateItemData: {
     _enum: {
@@ -3819,6 +3913,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup262: up_data_structs::CreateNftData
 =======
 =======
@@ -3839,6 +3934,9 @@
    * Lookup267: up_data_structs::CreateNftData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup262: up_data_structs::CreateNftData
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateNftData: {
     properties: 'Vec<UpDataStructsProperty>'
@@ -3846,6 +3944,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup263: up_data_structs::CreateFungibleData
 =======
 =======
@@ -3866,6 +3965,9 @@
    * Lookup268: up_data_structs::CreateFungibleData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup263: up_data_structs::CreateFungibleData
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateFungibleData: {
     value: 'u128'
@@ -3873,6 +3975,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup264: up_data_structs::CreateReFungibleData
 =======
 =======
@@ -3893,6 +3996,9 @@
    * Lookup269: up_data_structs::CreateReFungibleData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup264: up_data_structs::CreateReFungibleData
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateReFungibleData: {
     pieces: 'u128',
@@ -3901,6 +4007,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup267: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -3921,6 +4028,9 @@
    * Lookup272: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup267: up_data_structs::CreateItemExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateItemExData: {
     _enum: {
@@ -3933,6 +4043,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup269: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -3953,6 +4064,9 @@
    * Lookup274: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup269: up_data_structs::CreateNftExData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateNftExData: {
     properties: 'Vec<UpDataStructsProperty>',
@@ -3961,6 +4075,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup276: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -3981,6 +4096,9 @@
    * Lookup281: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup276: up_data_structs::CreateRefungibleExSingleOwner<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateRefungibleExSingleOwner: {
     user: 'PalletEvmAccountBasicCrossAccountIdRepr',
@@ -3990,6 +4108,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup278: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -4010,6 +4129,9 @@
    * Lookup283: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup278: up_data_structs::CreateRefungibleExMultipleOwners<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCreateRefungibleExMultipleOwners: {
     users: 'BTreeMap<PalletEvmAccountBasicCrossAccountIdRepr, u128>',
@@ -4018,6 +4140,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup279: pallet_configuration::pallet::Call<T>
 =======
 =======
@@ -4038,6 +4161,9 @@
    * Lookup284: pallet_unique_scheduler_v2::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup279: pallet_configuration::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletConfigurationCall: {
     _enum: {
@@ -4058,6 +4184,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup284: pallet_configuration::AppPromotionConfiguration<BlockNumber>
 =======
 =======
@@ -4078,6 +4205,9 @@
    * Lookup287: pallet_configuration::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup284: pallet_configuration::AppPromotionConfiguration<BlockNumber>
+>>>>>>> chore: regenerate types
    **/
   PalletConfigurationAppPromotionConfiguration: {
     recalculationInterval: 'Option<u32>',
@@ -4088,6 +4218,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup288: pallet_template_transaction_payment::Call<T>
 =======
 <<<<<<< HEAD
@@ -4095,6 +4226,9 @@
 >>>>>>> fix: regenerate types after rebase
    * Lookup289: pallet_template_transaction_payment::Call<T>
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup288: pallet_template_transaction_payment::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletTemplateTransactionPaymentCall: 'Null',
   /**
@@ -4103,6 +4237,7 @@
   PalletStructureCall: 'Null',
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup290: pallet_rmrk_core::pallet::Call<T>
 =======
    * Lookup291: pallet_rmrk_core::pallet::Call<T>
@@ -4121,6 +4256,9 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup290: pallet_rmrk_core::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkCoreCall: {
     _enum: {
@@ -4213,6 +4351,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup296: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4224,6 +4363,9 @@
 =======
    * Lookup297: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup296: rmrk_traits::resource::ResourceTypes<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceResourceTypes: {
     _enum: {
@@ -4235,6 +4377,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup298: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4246,6 +4389,9 @@
 =======
    * Lookup299: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup298: rmrk_traits::resource::BasicResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceBasicResource: {
     src: 'Option<Bytes>',
@@ -4256,6 +4402,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup300: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4267,6 +4414,9 @@
 =======
    * Lookup301: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup300: rmrk_traits::resource::ComposableResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceComposableResource: {
     parts: 'Vec<u32>',
@@ -4279,6 +4429,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup301: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4290,6 +4441,9 @@
 =======
    * Lookup302: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup301: rmrk_traits::resource::SlotResource<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceSlotResource: {
     base: 'u32',
@@ -4302,6 +4456,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup304: pallet_rmrk_equip::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4313,6 +4468,9 @@
 =======
    * Lookup305: pallet_rmrk_equip::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup304: pallet_rmrk_equip::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkEquipCall: {
     _enum: {
@@ -4335,6 +4493,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup307: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4346,6 +4505,9 @@
 =======
    * Lookup308: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup307: rmrk_traits::part::PartType<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartPartType: {
     _enum: {
@@ -4356,6 +4518,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup309: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4367,6 +4530,9 @@
 =======
    * Lookup310: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup309: rmrk_traits::part::FixedPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartFixedPart: {
     id: 'u32',
@@ -4376,6 +4542,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup310: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4387,6 +4554,9 @@
 =======
    * Lookup311: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup310: rmrk_traits::part::SlotPart<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartSlotPart: {
     id: 'u32',
@@ -4397,6 +4567,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup311: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4408,6 +4579,9 @@
 =======
    * Lookup312: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup311: rmrk_traits::part::EquippableList<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPartEquippableList: {
     _enum: {
@@ -4419,6 +4593,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup313: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
 =======
 <<<<<<< HEAD
@@ -4430,6 +4605,9 @@
 =======
    * Lookup314: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup313: rmrk_traits::theme::Theme<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsTheme: {
     name: 'Bytes',
@@ -4439,6 +4617,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup315: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 <<<<<<< HEAD
@@ -4450,6 +4629,9 @@
 =======
    * Lookup316: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup315: rmrk_traits::theme::ThemeProperty<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsThemeThemeProperty: {
     key: 'Bytes',
@@ -4458,6 +4640,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup317: pallet_app_promotion::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4469,6 +4652,9 @@
 =======
    * Lookup318: pallet_app_promotion::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup317: pallet_app_promotion::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletAppPromotionCall: {
     _enum: {
@@ -4499,6 +4685,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup318: pallet_foreign_assets::module::Call<T>
 =======
 <<<<<<< HEAD
@@ -4510,6 +4697,9 @@
 =======
    * Lookup319: pallet_foreign_assets::module::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup318: pallet_foreign_assets::module::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletForeignAssetsModuleCall: {
     _enum: {
@@ -4528,6 +4718,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup319: pallet_evm::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4539,6 +4730,9 @@
 =======
    * Lookup320: pallet_evm::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup319: pallet_evm::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletEvmCall: {
     _enum: {
@@ -4583,6 +4777,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup325: pallet_ethereum::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4594,6 +4789,9 @@
 =======
    * Lookup326: pallet_ethereum::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup325: pallet_ethereum::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletEthereumCall: {
     _enum: {
@@ -4605,6 +4803,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup326: ethereum::transaction::TransactionV2
 =======
 <<<<<<< HEAD
@@ -4616,6 +4815,9 @@
 =======
    * Lookup327: ethereum::transaction::TransactionV2
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup326: ethereum::transaction::TransactionV2
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionTransactionV2: {
     _enum: {
@@ -4627,6 +4829,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup327: ethereum::transaction::LegacyTransaction
 =======
 <<<<<<< HEAD
@@ -4638,6 +4841,9 @@
 =======
    * Lookup328: ethereum::transaction::LegacyTransaction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup327: ethereum::transaction::LegacyTransaction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionLegacyTransaction: {
     nonce: 'U256',
@@ -4651,6 +4857,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup328: ethereum::transaction::TransactionAction
 =======
 <<<<<<< HEAD
@@ -4662,6 +4869,9 @@
 =======
    * Lookup329: ethereum::transaction::TransactionAction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup328: ethereum::transaction::TransactionAction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionTransactionAction: {
     _enum: {
@@ -4672,6 +4882,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup329: ethereum::transaction::TransactionSignature
 =======
 <<<<<<< HEAD
@@ -4683,6 +4894,9 @@
 =======
    * Lookup330: ethereum::transaction::TransactionSignature
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup329: ethereum::transaction::TransactionSignature
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionTransactionSignature: {
     v: 'u64',
@@ -4692,6 +4906,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup331: ethereum::transaction::EIP2930Transaction
 =======
 <<<<<<< HEAD
@@ -4703,6 +4918,9 @@
 =======
    * Lookup332: ethereum::transaction::EIP2930Transaction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup331: ethereum::transaction::EIP2930Transaction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionEip2930Transaction: {
     chainId: 'u64',
@@ -4720,6 +4938,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup333: ethereum::transaction::AccessListItem
 =======
 <<<<<<< HEAD
@@ -4731,6 +4950,9 @@
 =======
    * Lookup334: ethereum::transaction::AccessListItem
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup333: ethereum::transaction::AccessListItem
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionAccessListItem: {
     address: 'H160',
@@ -4739,6 +4961,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup334: ethereum::transaction::EIP1559Transaction
 =======
 <<<<<<< HEAD
@@ -4750,6 +4973,9 @@
 =======
    * Lookup335: ethereum::transaction::EIP1559Transaction
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup334: ethereum::transaction::EIP1559Transaction
+>>>>>>> chore: regenerate types
    **/
   EthereumTransactionEip1559Transaction: {
     chainId: 'u64',
@@ -4768,6 +4994,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup335: pallet_evm_migration::pallet::Call<T>
 =======
 <<<<<<< HEAD
@@ -4779,6 +5006,9 @@
 =======
    * Lookup336: pallet_evm_migration::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup335: pallet_evm_migration::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletEvmMigrationCall: {
     _enum: {
@@ -4804,6 +5034,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup339: pallet_maintenance::pallet::Call<T>
 =======
    * Lookup338: pallet_maintenance::pallet::Call<T>
@@ -4811,6 +5042,9 @@
 =======
    * Lookup340: pallet_maintenance::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup339: pallet_maintenance::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletMaintenanceCall: {
     _enum: ['enable', 'disable']
@@ -4818,6 +5052,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup340: pallet_test_utils::pallet::Call<T>
 =======
    * Lookup339: pallet_test_utils::pallet::Call<T>
@@ -4825,6 +5060,9 @@
 =======
    * Lookup341: pallet_test_utils::pallet::Call<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup340: pallet_test_utils::pallet::Call<T>
+>>>>>>> chore: regenerate types
    **/
   PalletTestUtilsCall: {
     _enum: {
@@ -4845,6 +5083,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup342: pallet_sudo::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -4856,6 +5095,9 @@
 =======
    * Lookup343: pallet_sudo::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup342: pallet_sudo::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletSudoError: {
     _enum: ['RequireSudo']
@@ -4863,6 +5105,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup344: orml_vesting::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4874,6 +5117,9 @@
 =======
    * Lookup345: orml_vesting::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup344: orml_vesting::module::Error<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlVestingModuleError: {
     _enum: ['ZeroVestingPeriod', 'ZeroVestingPeriodCount', 'InsufficientBalanceToLock', 'TooManyVestingSchedules', 'AmountLow', 'MaxVestingSchedulesExceeded']
@@ -4881,6 +5127,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup345: orml_xtokens::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4892,6 +5139,9 @@
 =======
    * Lookup346: orml_xtokens::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup345: orml_xtokens::module::Error<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlXtokensModuleError: {
     _enum: ['AssetHasNoReserve', 'NotCrossChainTransfer', 'InvalidDest', 'NotCrossChainTransferableCurrency', 'UnweighableMessage', 'XcmExecutionFailed', 'CannotReanchor', 'InvalidAncestry', 'InvalidAsset', 'DestinationNotInvertible', 'BadVersion', 'DistinctReserveForAssetAndFee', 'ZeroFee', 'ZeroAmount', 'TooManyAssetsBeingSent', 'AssetIndexNonExistent', 'FeeNotEnough', 'NotSupportedMultiLocation', 'MinXcmFeeNotDefined']
@@ -4899,6 +5149,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup348: orml_tokens::BalanceLock<Balance>
 =======
 <<<<<<< HEAD
@@ -4910,6 +5161,9 @@
 =======
    * Lookup349: orml_tokens::BalanceLock<Balance>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup348: orml_tokens::BalanceLock<Balance>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensBalanceLock: {
     id: '[u8;8]',
@@ -4918,6 +5172,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup350: orml_tokens::AccountData<Balance>
 =======
 <<<<<<< HEAD
@@ -4929,6 +5184,9 @@
 =======
    * Lookup351: orml_tokens::AccountData<Balance>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup350: orml_tokens::AccountData<Balance>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensAccountData: {
     free: 'u128',
@@ -4938,6 +5196,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup352: orml_tokens::ReserveData<ReserveIdentifier, Balance>
 =======
 <<<<<<< HEAD
@@ -4949,6 +5208,9 @@
 =======
    * Lookup353: orml_tokens::ReserveData<ReserveIdentifier, Balance>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup352: orml_tokens::ReserveData<ReserveIdentifier, Balance>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensReserveData: {
     id: 'Null',
@@ -4957,6 +5219,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup354: orml_tokens::module::Error<T>
 =======
 <<<<<<< HEAD
@@ -4968,6 +5231,9 @@
 =======
    * Lookup355: orml_tokens::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup354: orml_tokens::module::Error<T>
+>>>>>>> chore: regenerate types
    **/
   OrmlTokensModuleError: {
     _enum: ['BalanceTooLow', 'AmountIntoBalanceFailed', 'LiquidityRestrictions', 'MaxLocksExceeded', 'KeepAlive', 'ExistentialDeposit', 'DeadAccount', 'TooManyReserves']
@@ -4975,6 +5241,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup356: cumulus_pallet_xcmp_queue::InboundChannelDetails
 =======
 <<<<<<< HEAD
@@ -4986,6 +5253,9 @@
 =======
    * Lookup357: cumulus_pallet_xcmp_queue::InboundChannelDetails
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup356: cumulus_pallet_xcmp_queue::InboundChannelDetails
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueInboundChannelDetails: {
     sender: 'u32',
@@ -4995,6 +5265,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup357: cumulus_pallet_xcmp_queue::InboundState
 =======
 <<<<<<< HEAD
@@ -5006,6 +5277,9 @@
 =======
    * Lookup358: cumulus_pallet_xcmp_queue::InboundState
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup357: cumulus_pallet_xcmp_queue::InboundState
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueInboundState: {
     _enum: ['Ok', 'Suspended']
@@ -5013,6 +5287,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup360: polkadot_parachain::primitives::XcmpMessageFormat
 =======
 <<<<<<< HEAD
@@ -5024,6 +5299,9 @@
 =======
    * Lookup361: polkadot_parachain::primitives::XcmpMessageFormat
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup360: polkadot_parachain::primitives::XcmpMessageFormat
+>>>>>>> chore: regenerate types
    **/
   PolkadotParachainPrimitivesXcmpMessageFormat: {
     _enum: ['ConcatenatedVersionedXcm', 'ConcatenatedEncodedBlob', 'Signals']
@@ -5031,6 +5309,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup363: cumulus_pallet_xcmp_queue::OutboundChannelDetails
 =======
 <<<<<<< HEAD
@@ -5042,6 +5321,9 @@
 =======
    * Lookup364: cumulus_pallet_xcmp_queue::OutboundChannelDetails
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup363: cumulus_pallet_xcmp_queue::OutboundChannelDetails
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueOutboundChannelDetails: {
     recipient: 'u32',
@@ -5053,6 +5335,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup364: cumulus_pallet_xcmp_queue::OutboundState
 =======
 <<<<<<< HEAD
@@ -5064,6 +5347,9 @@
 =======
    * Lookup365: cumulus_pallet_xcmp_queue::OutboundState
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup364: cumulus_pallet_xcmp_queue::OutboundState
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueOutboundState: {
     _enum: ['Ok', 'Suspended']
@@ -5071,6 +5357,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup366: cumulus_pallet_xcmp_queue::QueueConfigData
 =======
 <<<<<<< HEAD
@@ -5082,6 +5369,9 @@
 =======
    * Lookup367: cumulus_pallet_xcmp_queue::QueueConfigData
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup366: cumulus_pallet_xcmp_queue::QueueConfigData
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueQueueConfigData: {
     suspendThreshold: 'u32',
@@ -5094,6 +5384,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup368: cumulus_pallet_xcmp_queue::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -5105,6 +5396,9 @@
 =======
    * Lookup369: cumulus_pallet_xcmp_queue::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup368: cumulus_pallet_xcmp_queue::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletXcmpQueueError: {
     _enum: ['FailedToSend', 'BadXcmOrigin', 'BadXcm', 'BadOverweightIndex', 'WeightOverLimit']
@@ -5112,6 +5406,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup369: pallet_xcm::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -5123,6 +5418,9 @@
 =======
    * Lookup370: pallet_xcm::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup369: pallet_xcm::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletXcmError: {
     _enum: ['Unreachable', 'SendFailure', 'Filtered', 'UnweighableMessage', 'DestinationNotInvertible', 'Empty', 'CannotReanchor', 'TooManyAssets', 'InvalidOrigin', 'BadVersion', 'BadLocation', 'NoSubscription', 'AlreadySubscribed']
@@ -5130,6 +5428,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup370: cumulus_pallet_xcm::pallet::Error<T>
    **/
   CumulusPalletXcmError: 'Null',
@@ -5155,13 +5454,21 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup370: cumulus_pallet_xcm::pallet::Error<T>
    **/
+  CumulusPalletXcmError: 'Null',
+  /**
+   * Lookup371: cumulus_pallet_dmp_queue::ConfigData
+>>>>>>> chore: regenerate types
+   **/
   CumulusPalletDmpQueueConfigData: {
     maxIndividual: 'SpWeightsWeightV2Weight'
   },
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup372: cumulus_pallet_dmp_queue::PageIndexData
 =======
 <<<<<<< HEAD
@@ -5173,6 +5480,9 @@
 =======
    * Lookup373: cumulus_pallet_dmp_queue::PageIndexData
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup372: cumulus_pallet_dmp_queue::PageIndexData
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletDmpQueuePageIndexData: {
     beginUsed: 'u32',
@@ -5182,6 +5492,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup375: cumulus_pallet_dmp_queue::pallet::Error<T>
 =======
 <<<<<<< HEAD
@@ -5193,6 +5504,9 @@
 =======
    * Lookup376: cumulus_pallet_dmp_queue::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup375: cumulus_pallet_dmp_queue::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   CumulusPalletDmpQueueError: {
     _enum: ['Unknown', 'OverLimit']
@@ -5200,6 +5514,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup379: pallet_unique::Error<T>
 =======
 <<<<<<< HEAD
@@ -5211,6 +5526,9 @@
 =======
    * Lookup380: pallet_unique::Error<T>
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup379: pallet_unique::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletUniqueError: {
     _enum: ['CollectionDecimalPointLimitExceeded', 'EmptyArgument', 'RepartitionCalledOnNonRefungibleCollection']
@@ -5218,6 +5536,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup380: pallet_configuration::pallet::Error<T>
 =======
 =======
@@ -5231,12 +5550,16 @@
    * Lookup381: pallet_unique_scheduler_v2::BlockAgenda<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup380: pallet_configuration::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletConfigurationError: {
     _enum: ['InconsistentConfiguration']
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup381: up_data_structs::Collection<sp_core::crypto::AccountId32>
 =======
 <<<<<<< HEAD
@@ -5434,6 +5757,9 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup381: up_data_structs::Collection<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCollection: {
     owner: 'AccountId32',
@@ -5449,6 +5775,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup382: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
 =======
 =======
@@ -5469,6 +5796,9 @@
    * Lookup396: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup382: up_data_structs::SponsorshipState<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsSponsorshipStateAccountId32: {
     _enum: {
@@ -5480,6 +5810,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup384: up_data_structs::Properties
 =======
 =======
@@ -5500,6 +5831,9 @@
    * Lookup398: up_data_structs::Properties
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup384: up_data_structs::Properties
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsProperties: {
     map: 'UpDataStructsPropertiesMapBoundedVec',
@@ -5509,6 +5843,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup385: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5522,6 +5857,9 @@
    * Lookup399: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
+=======
+   * Lookup385: up_data_structs::PropertiesMap<sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsPropertiesMapBoundedVec: 'BTreeMap<Bytes, Bytes>',
   /**
@@ -5530,6 +5868,7 @@
   UpDataStructsPropertiesMapPropertyPermission: 'BTreeMap<Bytes, UpDataStructsPropertyPermission>',
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup397: up_data_structs::CollectionStats
 =======
 <<<<<<< HEAD
@@ -5555,6 +5894,9 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup397: up_data_structs::CollectionStats
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsCollectionStats: {
     created: 'u32',
@@ -5564,6 +5906,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup398: up_data_structs::TokenChild
 =======
 =======
@@ -5584,6 +5927,9 @@
    * Lookup412: up_data_structs::TokenChild
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup398: up_data_structs::TokenChild
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsTokenChild: {
     token: 'u32',
@@ -5592,6 +5938,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup399: PhantomType::up_data_structs<T>
    **/
   PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]',
@@ -5630,6 +5977,13 @@
 =======
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup399: PhantomType::up_data_structs<T>
+   **/
+  PhantomTypeUpDataStructs: '[(UpDataStructsTokenData,UpDataStructsRpcCollection,RmrkTraitsCollectionCollectionInfo,RmrkTraitsNftNftInfo,RmrkTraitsResourceResourceInfo,RmrkTraitsPropertyPropertyInfo,RmrkTraitsBaseBaseInfo,RmrkTraitsPartPartType,RmrkTraitsTheme,RmrkTraitsNftNftChild,UpPovEstimateRpcPovInfo);0]',
+  /**
+   * Lookup401: up_data_structs::TokenData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsTokenData: {
     properties: 'Vec<UpDataStructsProperty>',
@@ -5639,6 +5993,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup403: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
 =======
 =======
@@ -5659,6 +6014,9 @@
    * Lookup417: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup403: up_data_structs::RpcCollection<sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsRpcCollection: {
     owner: 'AccountId32',
@@ -5677,6 +6035,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup404: up_data_structs::RpcCollectionFlags
 =======
 =======
@@ -5697,6 +6056,9 @@
    * Lookup418: up_data_structs::RpcCollectionFlags
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup404: up_data_structs::RpcCollectionFlags
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsRpcCollectionFlags: {
     foreign: 'bool',
@@ -5705,6 +6067,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup405: rmrk_traits::collection::CollectionInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
 =======
 =======
@@ -5725,6 +6088,9 @@
    * Lookup419: rmrk_traits::collection::CollectionInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup405: rmrk_traits::collection::CollectionInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::crypto::AccountId32>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsCollectionCollectionInfo: {
     issuer: 'AccountId32',
@@ -5736,6 +6102,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup406: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5756,6 +6123,9 @@
    * Lookup420: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup406: rmrk_traits::nft::NftInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsNftNftInfo: {
     owner: 'RmrkTraitsNftAccountIdOrCollectionNftTuple',
@@ -5767,6 +6137,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup408: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
 =======
 =======
@@ -5787,6 +6158,9 @@
    * Lookup422: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup408: rmrk_traits::nft::RoyaltyInfo<sp_core::crypto::AccountId32, sp_arithmetic::per_things::Permill>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsNftRoyaltyInfo: {
     recipient: 'AccountId32',
@@ -5795,6 +6169,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup409: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5815,6 +6190,9 @@
    * Lookup423: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup409: rmrk_traits::resource::ResourceInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsResourceResourceInfo: {
     id: 'u32',
@@ -5825,6 +6203,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup410: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5845,6 +6224,9 @@
    * Lookup424: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup410: rmrk_traits::property::PropertyInfo<sp_core::bounded::bounded_vec::BoundedVec<T, S>, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsPropertyPropertyInfo: {
     key: 'Bytes',
@@ -5853,6 +6235,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup411: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 =======
 =======
@@ -5873,6 +6256,9 @@
    * Lookup425: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup411: rmrk_traits::base::BaseInfo<sp_core::crypto::AccountId32, sp_core::bounded::bounded_vec::BoundedVec<T, S>>
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsBaseBaseInfo: {
     issuer: 'AccountId32',
@@ -5882,6 +6268,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup412: rmrk_traits::nft::NftChild
 =======
 =======
@@ -5902,6 +6289,9 @@
    * Lookup426: rmrk_traits::nft::NftChild
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup412: rmrk_traits::nft::NftChild
+>>>>>>> chore: regenerate types
    **/
   RmrkTraitsNftNftChild: {
     collectionId: 'u32',
@@ -5911,6 +6301,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup414: pallet_common::pallet::Error<T>
 =======
 =======
@@ -5932,6 +6323,9 @@
 =======
    * Lookup427: up_pov_estimate_rpc::PovInfo
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup413: up_pov_estimate_rpc::PovInfo
+>>>>>>> chore: regenerate types
    **/
   UpPovEstimateRpcPovInfo: {
     proofSize: 'u64',
@@ -5944,6 +6338,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup424: pallet_common::pallet::Error<T>
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -5960,6 +6355,9 @@
 =======
    * Lookup430: sp_runtime::transaction_validity::TransactionValidityError
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup416: sp_runtime::transaction_validity::TransactionValidityError
+>>>>>>> chore: regenerate types
    **/
   SpRuntimeTransactionValidityTransactionValidityError: {
     _enum: {
@@ -5968,7 +6366,7 @@
     }
   },
   /**
-   * Lookup431: sp_runtime::transaction_validity::InvalidTransaction
+   * Lookup417: sp_runtime::transaction_validity::InvalidTransaction
    **/
   SpRuntimeTransactionValidityInvalidTransaction: {
     _enum: {
@@ -5981,12 +6379,12 @@
       ExhaustsResources: 'Null',
       Custom: 'u8',
       BadMandatory: 'Null',
-      MandatoryDispatch: 'Null',
+      MandatoryValidation: 'Null',
       BadSigner: 'Null'
     }
   },
   /**
-   * Lookup432: sp_runtime::transaction_validity::UnknownTransaction
+   * Lookup418: sp_runtime::transaction_validity::UnknownTransaction
    **/
   SpRuntimeTransactionValidityUnknownTransaction: {
     _enum: {
@@ -5998,6 +6396,7 @@
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup428: pallet_common::pallet::Error<T>
 >>>>>>> chore: regenerate types
 <<<<<<< HEAD
@@ -6011,6 +6410,9 @@
 =======
    * Lookup434: up_pov_estimate_rpc::TrieKeyValue
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup420: up_pov_estimate_rpc::TrieKeyValue
+>>>>>>> chore: regenerate types
    **/
   UpPovEstimateRpcTrieKeyValue: {
     key: 'Bytes',
@@ -6018,6 +6420,7 @@
   },
   /**
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup434: pallet_common::pallet::Error<T>
 >>>>>>> chore:  regenerate types
 >>>>>>> chore:  regenerate types
@@ -6028,6 +6431,9 @@
    * Lookup436: pallet_common::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup422: pallet_common::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletCommonError: {
     _enum: ['CollectionNotFound', 'MustBeTokenOwner', 'NoPermission', 'CantDestroyNotEmptyCollection', 'PublicMintingNotAllowed', 'AddressNotInAllowlist', 'CollectionNameLimitExceeded', 'CollectionDescriptionLimitExceeded', 'CollectionTokenPrefixLimitExceeded', 'TotalCollectionsLimitExceeded', 'CollectionAdminCountExceeded', 'CollectionLimitBoundsExceeded', 'OwnerPermissionsCantBeReverted', 'TransferNotAllowed', 'AccountTokenLimitExceeded', 'CollectionTokenLimitExceeded', 'MetadataFlagFrozen', 'TokenNotFound', 'TokenValueTooLow', 'ApprovedValueTooLow', 'CantApproveMoreThanOwned', 'AddressIsZero', 'UnsupportedOperation', 'NotSufficientFounds', 'UserIsNotAllowedToNest', 'SourceCollectionIsNotAllowedToNest', 'CollectionFieldSizeExceeded', 'NoSpaceForProperty', 'PropertyLimitReached', 'PropertyKeyIsTooLong', 'InvalidCharacterInPropertyKey', 'EmptyPropertyKey', 'CollectionIsExternal', 'CollectionIsInternal', 'ConfirmSponsorshipFail', 'UserIsNotCollectionAdmin']
@@ -6037,6 +6443,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup416: pallet_fungible::pallet::Error<T>
 =======
 =======
@@ -6083,6 +6490,9 @@
    * Lookup438: pallet_fungible::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup424: pallet_fungible::pallet::Error<T>
+>>>>>>> chore: regenerate types
    **/
   PalletFungibleError: {
     _enum: ['NotFungibleDataUsedToMintFungibleCollectionToken', 'FungibleItemsHaveNoId', 'FungibleItemsDontHaveData', 'FungibleDisallowsNesting', 'SettingPropertiesNotAllowed', 'SettingAllowanceForAllNotAllowed', 'FungibleTokensAreAlwaysValid']
@@ -6092,6 +6502,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup420: pallet_refungible::pallet::Error<T>
 =======
 =======
@@ -6100,6 +6511,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup417: pallet_refungible::ItemData
 =======
@@ -6147,6 +6560,9 @@
    * Lookup439: pallet_refungible::ItemData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup425: pallet_refungible::ItemData
+>>>>>>> chore: regenerate types
    **/
   PalletRefungibleItemData: {
     constData: 'Bytes'
@@ -6156,6 +6572,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup422: pallet_refungible::pallet::Error<T>
 =======
 =======
@@ -6211,7 +6628,13 @@
    * Lookup444: pallet_refungible::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup430: pallet_refungible::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletRefungibleError: {
     _enum: ['NotRefungibleDataUsedToMintFungibleCollectionToken', 'WrongRefungiblePieces', 'RepartitionWhileNotOwningAllPieces', 'RefungibleDisallowsNesting', 'SettingPropertiesNotAllowed']
@@ -6221,6 +6644,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup421: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -6229,6 +6653,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup423: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -6285,7 +6711,13 @@
    * Lookup445: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup431: pallet_nonfungible::ItemData<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletNonfungibleItemData: {
     owner: 'PalletEvmAccountBasicCrossAccountIdRepr'
@@ -6295,6 +6727,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup423: up_data_structs::PropertyScope
 =======
 =======
@@ -6303,6 +6736,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup425: up_data_structs::PropertyScope
 =======
@@ -6359,7 +6794,13 @@
    * Lookup447: up_data_structs::PropertyScope
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup433: up_data_structs::PropertyScope
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsPropertyScope: {
     _enum: ['None', 'Rmrk']
@@ -6369,6 +6810,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup426: pallet_nonfungible::pallet::Error<T>
 =======
 =======
@@ -6377,6 +6819,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup427: pallet_nonfungible::pallet::Error<T>
 =======
@@ -6433,7 +6877,13 @@
    * Lookup449: pallet_nonfungible::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup435: pallet_nonfungible::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletNonfungibleError: {
     _enum: ['NotNonfungibleDataUsedToMintFungibleCollectionToken', 'NonfungibleItemsHaveNoAmount', 'CantBurnNftWithChildren']
@@ -6443,6 +6893,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup427: pallet_structure::pallet::Error<T>
 =======
 =======
@@ -6451,6 +6902,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup428: pallet_structure::pallet::Error<T>
 =======
@@ -6507,7 +6960,13 @@
    * Lookup450: pallet_structure::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup436: pallet_structure::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletStructureError: {
     _enum: ['OuroborosDetected', 'DepthLimit', 'BreadthLimit', 'TokenNotFound']
@@ -6517,6 +6976,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup428: pallet_rmrk_core::pallet::Error<T>
 =======
 =======
@@ -6525,6 +6985,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup429: pallet_rmrk_core::pallet::Error<T>
 =======
@@ -6581,7 +7043,13 @@
    * Lookup451: pallet_rmrk_core::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup437: pallet_rmrk_core::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkCoreError: {
     _enum: ['CorruptedCollectionType', 'RmrkPropertyKeyIsTooLong', 'RmrkPropertyValueIsTooLong', 'RmrkPropertyIsNotFound', 'UnableToDecodeRmrkData', 'CollectionNotEmpty', 'NoAvailableCollectionId', 'NoAvailableNftId', 'CollectionUnknown', 'NoPermission', 'NonTransferable', 'CollectionFullOrLocked', 'ResourceDoesntExist', 'CannotSendToDescendentOrSelf', 'CannotAcceptNonOwnedNft', 'CannotRejectNonOwnedNft', 'CannotRejectNonPendingNft', 'ResourceNotPending', 'NoAvailableResourceId']
@@ -6591,6 +7059,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup430: pallet_rmrk_equip::pallet::Error<T>
 =======
 =======
@@ -6599,6 +7068,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup431: pallet_rmrk_equip::pallet::Error<T>
 =======
@@ -6655,7 +7126,13 @@
    * Lookup453: pallet_rmrk_equip::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup439: pallet_rmrk_equip::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletRmrkEquipError: {
     _enum: ['PermissionError', 'NoAvailableBaseId', 'NoAvailablePartId', 'BaseDoesntExist', 'NeedsDefaultThemeFirst', 'PartDoesntExist', 'NoEquippableOnFixedPart']
@@ -6665,6 +7142,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup436: pallet_app_promotion::pallet::Error<T>
 =======
 =======
@@ -6673,6 +7151,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup437: pallet_app_promotion::pallet::Error<T>
 =======
@@ -6729,7 +7209,13 @@
    * Lookup459: pallet_app_promotion::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup445: pallet_app_promotion::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletAppPromotionError: {
     _enum: ['AdminNotSet', 'NoPermission', 'NotSufficientFunds', 'PendingForBlockOverflow', 'SponsorNotSet', 'IncorrectLockedBalanceOperation']
@@ -6739,6 +7225,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup437: pallet_foreign_assets::module::Error<T>
 =======
 =======
@@ -6747,6 +7234,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup438: pallet_foreign_assets::module::Error<T>
 =======
@@ -6803,7 +7292,13 @@
    * Lookup460: pallet_foreign_assets::module::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup446: pallet_foreign_assets::module::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletForeignAssetsModuleError: {
     _enum: ['BadLocation', 'MultiLocationExisted', 'AssetIdNotExists', 'AssetIdExisted']
@@ -6813,6 +7308,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup439: pallet_evm::pallet::Error<T>
 =======
 =======
@@ -6821,6 +7317,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup440: pallet_evm::pallet::Error<T>
 =======
@@ -6877,7 +7375,13 @@
    * Lookup462: pallet_evm::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup448: pallet_evm::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmError: {
     _enum: ['BalanceLow', 'FeeOverflow', 'PaymentOverflow', 'WithdrawFailed', 'GasPriceTooLow', 'InvalidNonce', 'GasLimitTooLow', 'GasLimitTooHigh', 'Undefined', 'Reentrancy', 'TransactionMustComeFromEOA']
@@ -6887,6 +7391,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup442: fp_rpc::TransactionStatus
 =======
 =======
@@ -6895,6 +7400,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup443: fp_rpc::TransactionStatus
 =======
@@ -6951,7 +7458,13 @@
    * Lookup465: fp_rpc::TransactionStatus
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup451: fp_rpc::TransactionStatus
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   FpRpcTransactionStatus: {
     transactionHash: 'H256',
@@ -6967,6 +7480,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup444: ethbloom::Bloom
    **/
   EthbloomBloom: '[u8;256]',
@@ -6979,6 +7493,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup445: ethbloom::Bloom
    **/
@@ -7063,8 +7579,18 @@
    * Lookup469: ethereum::receipt::ReceiptV3
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup453: ethbloom::Bloom
    **/
+  EthbloomBloom: '[u8;256]',
+  /**
+   * Lookup455: ethereum::receipt::ReceiptV3
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
+   **/
   EthereumReceiptReceiptV3: {
     _enum: {
       Legacy: 'EthereumReceiptEip658ReceiptData',
@@ -7077,6 +7603,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup447: ethereum::receipt::EIP658ReceiptData
 =======
 =======
@@ -7085,6 +7612,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup448: ethereum::receipt::EIP658ReceiptData
 =======
@@ -7141,7 +7670,13 @@
    * Lookup470: ethereum::receipt::EIP658ReceiptData
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup456: ethereum::receipt::EIP658ReceiptData
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   EthereumReceiptEip658ReceiptData: {
     statusCode: 'u8',
@@ -7154,6 +7689,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup448: ethereum::block::Block<ethereum::transaction::TransactionV2>
 =======
 =======
@@ -7162,6 +7698,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup449: ethereum::block::Block<ethereum::transaction::TransactionV2>
 =======
@@ -7218,7 +7756,13 @@
    * Lookup471: ethereum::block::Block<ethereum::transaction::TransactionV2>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup457: ethereum::block::Block<ethereum::transaction::TransactionV2>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   EthereumBlock: {
     header: 'EthereumHeader',
@@ -7230,6 +7774,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup449: ethereum::header::Header
 =======
 =======
@@ -7238,6 +7783,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup450: ethereum::header::Header
 =======
@@ -7294,7 +7841,13 @@
    * Lookup472: ethereum::header::Header
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup458: ethereum::header::Header
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   EthereumHeader: {
     parentHash: 'H256',
@@ -7318,6 +7871,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup450: ethereum_types::hash::H64
    **/
   EthereumTypesHashH64: '[u8;8]',
@@ -7330,6 +7884,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup451: ethereum_types::hash::H64
    **/
@@ -7414,8 +7970,18 @@
    * Lookup478: pallet_ethereum::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup459: ethereum_types::hash::H64
    **/
+  EthereumTypesHashH64: '[u8;8]',
+  /**
+   * Lookup464: pallet_ethereum::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
+   **/
   PalletEthereumError: {
     _enum: ['InvalidSignature', 'PreLogExists']
   },
@@ -7424,6 +7990,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup456: pallet_evm_coder_substrate::pallet::Error<T>
 =======
 =======
@@ -7432,6 +7999,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup457: pallet_evm_coder_substrate::pallet::Error<T>
 =======
@@ -7488,7 +8057,13 @@
    * Lookup479: pallet_evm_coder_substrate::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup465: pallet_evm_coder_substrate::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmCoderSubstrateError: {
     _enum: ['OutOfGas', 'OutOfFund']
@@ -7498,6 +8073,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup457: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
 =======
@@ -7506,6 +8082,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup458: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 =======
@@ -7562,7 +8140,13 @@
    * Lookup480: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup466: up_data_structs::SponsorshipState<pallet_evm::account::BasicCrossAccountIdRepr<sp_core::crypto::AccountId32>>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   UpDataStructsSponsorshipStateBasicCrossAccountIdRepr: {
     _enum: {
@@ -7576,6 +8160,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup458: pallet_evm_contract_helpers::SponsoringModeT
 =======
 =======
@@ -7584,6 +8169,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup459: pallet_evm_contract_helpers::SponsoringModeT
 =======
@@ -7640,7 +8227,13 @@
    * Lookup481: pallet_evm_contract_helpers::SponsoringModeT
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup467: pallet_evm_contract_helpers::SponsoringModeT
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmContractHelpersSponsoringModeT: {
     _enum: ['Disabled', 'Allowlisted', 'Generous']
@@ -7650,6 +8243,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup464: pallet_evm_contract_helpers::pallet::Error<T>
 =======
 =======
@@ -7658,6 +8252,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup465: pallet_evm_contract_helpers::pallet::Error<T>
 =======
@@ -7714,7 +8310,13 @@
    * Lookup487: pallet_evm_contract_helpers::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup473: pallet_evm_contract_helpers::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmContractHelpersError: {
     _enum: ['NoPermission', 'NoPendingSponsor', 'TooManyMethodsHaveSponsoredLimit']
@@ -7724,6 +8326,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup465: pallet_evm_migration::pallet::Error<T>
 =======
 =======
@@ -7732,6 +8335,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup466: pallet_evm_migration::pallet::Error<T>
 =======
@@ -7788,7 +8393,13 @@
    * Lookup488: pallet_evm_migration::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup474: pallet_evm_migration::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEvmMigrationError: {
     _enum: ['AccountNotEmpty', 'AccountIsNotMigrating', 'BadEvent']
@@ -7798,6 +8409,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup466: pallet_maintenance::pallet::Error<T>
    **/
   PalletMaintenanceError: 'Null',
@@ -7810,6 +8422,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup467: pallet_maintenance::pallet::Error<T>
    **/
@@ -7894,7 +8508,17 @@
    * Lookup490: pallet_test_utils::pallet::Error<T>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup475: pallet_maintenance::pallet::Error<T>
+   **/
+  PalletMaintenanceError: 'Null',
+  /**
+   * Lookup476: pallet_test_utils::pallet::Error<T>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletTestUtilsError: {
     _enum: ['TestPalletDisabled', 'TriggerRollback']
@@ -7904,6 +8528,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup469: sp_runtime::MultiSignature
 =======
 =======
@@ -7912,6 +8537,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup470: sp_runtime::MultiSignature
 =======
@@ -7968,7 +8595,13 @@
    * Lookup492: sp_runtime::MultiSignature
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup478: sp_runtime::MultiSignature
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   SpRuntimeMultiSignature: {
     _enum: {
@@ -7982,6 +8615,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup470: sp_core::ed25519::Signature
 =======
 =======
@@ -7990,6 +8624,8 @@
 >>>>>>> chore:  regenerate types
 =======
 >>>>>>> fix: regenerate types after rebase
+=======
+>>>>>>> chore: regenerate types
 <<<<<<< HEAD
    * Lookup471: sp_core::ed25519::Signature
 =======
@@ -8075,52 +8711,56 @@
 =======
    * Lookup493: sp_core::ed25519::Signature
 >>>>>>> fix: regenerate types after rebase
+=======
+   * Lookup479: sp_core::ed25519::Signature
+>>>>>>> chore: regenerate types
    **/
   SpCoreEd25519Signature: '[u8;64]',
   /**
-   * Lookup495: sp_core::sr25519::Signature
+   * Lookup481: sp_core::sr25519::Signature
    **/
   SpCoreSr25519Signature: '[u8;64]',
   /**
-   * Lookup496: sp_core::ecdsa::Signature
+   * Lookup482: sp_core::ecdsa::Signature
    **/
   SpCoreEcdsaSignature: '[u8;65]',
   /**
-   * Lookup499: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
+   * Lookup485: frame_system::extensions::check_spec_version::CheckSpecVersion<T>
    **/
   FrameSystemExtensionsCheckSpecVersion: 'Null',
   /**
-   * Lookup500: frame_system::extensions::check_tx_version::CheckTxVersion<T>
+   * Lookup486: frame_system::extensions::check_tx_version::CheckTxVersion<T>
    **/
   FrameSystemExtensionsCheckTxVersion: 'Null',
   /**
-   * Lookup501: frame_system::extensions::check_genesis::CheckGenesis<T>
+   * Lookup487: frame_system::extensions::check_genesis::CheckGenesis<T>
    **/
   FrameSystemExtensionsCheckGenesis: 'Null',
   /**
-   * Lookup504: frame_system::extensions::check_nonce::CheckNonce<T>
+   * Lookup490: frame_system::extensions::check_nonce::CheckNonce<T>
    **/
   FrameSystemExtensionsCheckNonce: 'Compact<u32>',
   /**
-   * Lookup505: frame_system::extensions::check_weight::CheckWeight<T>
+   * Lookup491: frame_system::extensions::check_weight::CheckWeight<T>
    **/
   FrameSystemExtensionsCheckWeight: 'Null',
   /**
-   * Lookup506: opal_runtime::runtime_common::maintenance::CheckMaintenance
+   * Lookup492: opal_runtime::runtime_common::maintenance::CheckMaintenance
    **/
   OpalRuntimeRuntimeCommonMaintenanceCheckMaintenance: 'Null',
   /**
-   * Lookup507: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
+   * Lookup493: pallet_template_transaction_payment::ChargeTransactionPayment<opal_runtime::Runtime>
    **/
   PalletTemplateTransactionPaymentChargeTransactionPayment: 'Compact<u128>',
   /**
-   * Lookup508: opal_runtime::Runtime
+   * Lookup494: opal_runtime::Runtime
    **/
   OpalRuntimeRuntime: 'Null',
   /**
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
    * Lookup498: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
 >>>>>>> fix: update polkadot types and definitions
 <<<<<<< HEAD
@@ -8158,7 +8798,13 @@
    * Lookup509: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
 >>>>>>> fix: regenerate types after rebase
 >>>>>>> fix: regenerate types after rebase
+<<<<<<< HEAD
 >>>>>>> fix: regenerate types after rebase
+=======
+=======
+   * Lookup495: pallet_ethereum::FakeTransactionFinalizer<opal_runtime::Runtime>
+>>>>>>> chore: regenerate types
+>>>>>>> chore: regenerate types
    **/
   PalletEthereumFakeTransactionFinalizer: 'Null'
 };