diff --git a/package.json b/package.json
index ddc52c4dfc..5bafa91418 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "commonjs",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "workspaces": [
     "packages/*"
   ],
diff --git a/packages/api-augment/package.json b/packages/api-augment/package.json
index 6985e2ee8f..abbb23880a 100644
--- a/packages/api-augment/package.json
+++ b/packages/api-augment/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/api-base": "6.12.2-14",
-    "@polkadot/rpc-core": "6.12.2-14",
-    "@polkadot/types": "6.12.2-14"
+    "@polkadot/api-base": "6.12.2-15",
+    "@polkadot/rpc-core": "6.12.2-15",
+    "@polkadot/types": "6.12.2-15"
   }
 }
diff --git a/packages/api-augment/src/augment/consts.ts b/packages/api-augment/src/augment/consts.ts
index a9cbe1f33d..d204ca38f4 100644
--- a/packages/api-augment/src/augment/consts.ts
+++ b/packages/api-augment/src/augment/consts.ts
@@ -3,10 +3,10 @@
 
 declare module '@polkadot/api-augment/consts' {
   import type { ApiTypes, AugmentedConst, QueryableModuleConsts } from '@polkadot/api-base/types';
-  import type { U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types';
+  import type { U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { Codec } from '@polkadot/types-codec/types';
   import type { Perbill, Percent, Permill } from '@polkadot/types/interfaces/runtime';
   import type { FrameSupportPalletId, FrameSupportWeightsRuntimeDbWeight, FrameSupportWeightsWeightToFeeCoefficient, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, PalletContractsSchedule, SpVersionRuntimeVersion } from '@polkadot/types/lookup';
-  import type { Codec } from '@polkadot/types/types';
 
   export interface AugmentedConsts<ApiType  extends ApiTypes> {
     assets: {
diff --git a/packages/api-augment/src/augment/events.ts b/packages/api-augment/src/augment/events.ts
index 9032a26ee1..cf109c231f 100644
--- a/packages/api-augment/src/augment/events.ts
+++ b/packages/api-augment/src/augment/events.ts
@@ -3,10 +3,10 @@
 
 declare module '@polkadot/api-augment/events' {
   import type { ApiTypes, AugmentedEvent, ModuleEvents } from '@polkadot/api-base/types';
-  import type { Bytes, Null, Option, Result, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types';
+  import type { Bytes, Null, Option, Result, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { ITuple } from '@polkadot/types-codec/types';
   import type { AccountId32, H256 } from '@polkadot/types/interfaces/runtime';
   import type { FrameSupportTokensMiscBalanceStatus, FrameSupportWeightsDispatchInfo, NodeRuntimeProxyType, PalletDemocracyVoteAccountVote, PalletDemocracyVoteThreshold, PalletElectionProviderMultiPhaseElectionCompute, PalletImOnlineSr25519AppSr25519Public, PalletMultisigTimepoint, PalletStakingExposure, SpFinalityGrandpaAppPublic, SpRuntimeDispatchError } from '@polkadot/types/lookup';
-  import type { ITuple } from '@polkadot/types/types';
 
   export interface AugmentedEvents<ApiType extends ApiTypes> {
     assets: {
diff --git a/packages/api-augment/src/augment/query.ts b/packages/api-augment/src/augment/query.ts
index ed5e9a17cd..61cd9b6f3e 100644
--- a/packages/api-augment/src/augment/query.ts
+++ b/packages/api-augment/src/augment/query.ts
@@ -3,10 +3,12 @@
 
 declare module '@polkadot/api-augment/query' {
   import type { ApiTypes, AugmentedQuery, QueryableModuleStorage, QueryableModuleStorageAt, QueryableStorageEntry } from '@polkadot/api-base/types';
-  import type { BTreeMap, Bytes, Data, Null, Option, U8aFixed, Vec, WrapperOpaque, bool, u128, u32, u64, u8 } from '@polkadot/types';
+  import type { Data } from '@polkadot/types';
+  import type { BTreeMap, Bytes, Null, Option, U8aFixed, Vec, WrapperOpaque, bool, u128, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
   import type { AccountId32, Call, H256, Perbill, Percent } from '@polkadot/types/interfaces/runtime';
   import type { FrameSupportWeightsPerDispatchClassU64, FrameSystemAccountInfo, FrameSystemEventRecord, FrameSystemLastRuntimeUpgradeInfo, FrameSystemPhase, NodeRuntimeSessionKeys, PalletAssetsApproval, PalletAssetsAssetBalance, PalletAssetsAssetDetails, PalletAssetsAssetMetadata, PalletAuthorshipUncleEntryItem, PalletBagsListListBag, PalletBagsListListNode, PalletBalancesAccountData, PalletBalancesBalanceLock, PalletBalancesReleases, PalletBalancesReserveData, PalletBountiesBounty, PalletChildBountiesChildBounty, PalletCollectiveVotes, PalletContractsStorageDeletedContract, PalletContractsStorageRawContractInfo, PalletContractsWasmOwnerInfo, PalletContractsWasmPrefabWasmModule, PalletDemocracyPreimageStatus, PalletDemocracyReferendumInfo, PalletDemocracyReleases, PalletDemocracyVoteThreshold, PalletDemocracyVoteVoting, PalletElectionProviderMultiPhasePhase, PalletElectionProviderMultiPhaseReadySolution, PalletElectionProviderMultiPhaseRoundSnapshot, PalletElectionProviderMultiPhaseSignedSignedSubmission, PalletElectionProviderMultiPhaseSolutionOrSnapshotSize, PalletElectionsPhragmenSeatHolder, PalletElectionsPhragmenVoter, PalletGiltActiveGilt, PalletGiltActiveGiltsTotal, PalletGiltGiltBid, PalletGrandpaStoredPendingChange, PalletGrandpaStoredState, PalletIdentityRegistrarInfo, PalletIdentityRegistration, PalletImOnlineBoundedOpaqueNetworkState, PalletImOnlineSr25519AppSr25519Public, PalletLotteryLotteryConfig, PalletMultisigMultisig, PalletProxyAnnouncement, PalletProxyProxyDefinition, PalletRecoveryActiveRecovery, PalletRecoveryRecoveryConfig, PalletSchedulerReleases, PalletSchedulerScheduledV2, PalletSocietyBid, PalletSocietyBidKind, PalletSocietyVote, PalletSocietyVouchingStatus, PalletStakingActiveEraInfo, PalletStakingEraRewardPoints, PalletStakingExposure, PalletStakingForcing, PalletStakingNominations, PalletStakingReleases, PalletStakingRewardDestination, PalletStakingSlashingSlashingSpans, PalletStakingSlashingSpanRecord, PalletStakingStakingLedger, PalletStakingUnappliedSlash, PalletStakingValidatorPrefs, PalletTipsOpenTip, PalletTransactionPaymentReleases, PalletTransactionStorageTransactionInfo, PalletTreasuryProposal, PalletUniquesClassDetails, PalletUniquesClassMetadata, PalletUniquesInstanceDetails, PalletUniquesInstanceMetadata, PalletVestingReleases, PalletVestingVestingInfo, SpAuthorityDiscoveryAppPublic, SpConsensusBabeAppPublic, SpConsensusBabeBabeEpochConfiguration, SpConsensusBabeDigestsNextConfigDescriptor, SpCoreCryptoKeyTypeId, SpRuntimeDigest, SpStakingOffenceOffenceDetails } from '@polkadot/types/lookup';
-  import type { AnyNumber, ITuple, Observable } from '@polkadot/types/types';
+  import type { Observable } from '@polkadot/types/types';
 
   export interface AugmentedQueries<ApiType extends ApiTypes> {
     assets: {
diff --git a/packages/api-augment/src/augment/tx.ts b/packages/api-augment/src/augment/tx.ts
index bbf594579f..b7e0f1b886 100644
--- a/packages/api-augment/src/augment/tx.ts
+++ b/packages/api-augment/src/augment/tx.ts
@@ -3,11 +3,12 @@
 
 declare module '@polkadot/api-augment/tx' {
   import type { ApiTypes, AugmentedSubmittable, SubmittableExtrinsic, SubmittableExtrinsicFunction, SubmittableModuleExtrinsics } from '@polkadot/api-base/types';
-  import type { Bytes, Compact, Data, Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types';
+  import type { Data } from '@polkadot/types';
+  import type { Bytes, Compact, Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';
   import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';
   import type { AccountId32, Call, H256, MultiAddress, Perbill, Percent, Perquintill } from '@polkadot/types/interfaces/runtime';
   import type { NodeRuntimeOriginCaller, NodeRuntimeProxyType, NodeRuntimeSessionKeys, PalletAssetsDestroyWitness, PalletDemocracyConviction, PalletDemocracyVoteAccountVote, PalletElectionProviderMultiPhaseRawSolution, PalletElectionProviderMultiPhaseSolutionOrSnapshotSize, PalletElectionsPhragmenRenouncing, PalletIdentityBitFlags, PalletIdentityIdentityInfo, PalletIdentityJudgement, PalletImOnlineHeartbeat, PalletImOnlineSr25519AppSr25519Signature, PalletMultisigTimepoint, PalletSocietyJudgement, PalletStakingRewardDestination, PalletStakingValidatorPrefs, PalletUniquesDestroyWitness, PalletVestingVestingInfo, SpConsensusBabeDigestsNextConfigDescriptor, SpConsensusSlotsEquivocationProof, SpFinalityGrandpaEquivocationProof, SpNposElectionsSupport, SpRuntimeHeader, SpSessionMembershipProof, SpTransactionStorageProofTransactionStorageProof } from '@polkadot/types/lookup';
-  import type { AnyNumber, ITuple } from '@polkadot/types/types';
 
   export interface AugmentedSubmittables<ApiType extends ApiTypes> {
     assets: {
diff --git a/packages/api-augment/src/packageInfo.ts b/packages/api-augment/src/packageInfo.ts
index e08c577793..02816570aa 100644
--- a/packages/api-augment/src/packageInfo.ts
+++ b/packages/api-augment/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-augment', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/api-augment', version: '6.12.2-15' };
diff --git a/packages/api-base/package.json b/packages/api-base/package.json
index 6db0fdd51f..4b70412a1b 100644
--- a/packages/api-base/package.json
+++ b/packages/api-base/package.json
@@ -20,11 +20,11 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/types": "6.12.2-14",
+    "@polkadot/types": "6.12.2-15",
     "@polkadot/util": "^8.1.2",
     "rxjs": "^7.4.0"
   }
diff --git a/packages/api-base/src/packageInfo.ts b/packages/api-base/src/packageInfo.ts
index 513b9bdef1..b71b591151 100644
--- a/packages/api-base/src/packageInfo.ts
+++ b/packages/api-base/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-base', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/api-base', version: '6.12.2-15' };
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index 6413eb302b..cd1218b624 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/api": "6.12.2-14",
-    "@polkadot/types": "6.12.2-14",
+    "@polkadot/api": "6.12.2-15",
+    "@polkadot/types": "6.12.2-15",
     "@polkadot/util": "^8.1.2",
     "rxjs": "^7.4.0"
   }
diff --git a/packages/api-contract/src/packageInfo.ts b/packages/api-contract/src/packageInfo.ts
index 8f0b37b35a..2cad56a279 100644
--- a/packages/api-contract/src/packageInfo.ts
+++ b/packages/api-contract/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-contract', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/api-contract', version: '6.12.2-15' };
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index bc5fb9b37c..538e2fb2df 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/api-augment": "6.12.2-14",
-    "@polkadot/api-base": "6.12.2-14",
-    "@polkadot/rpc-augment": "6.12.2-14",
-    "@polkadot/rpc-core": "6.12.2-14",
-    "@polkadot/types": "6.12.2-14",
-    "@polkadot/types-codec": "6.12.2-14"
+    "@polkadot/api-augment": "6.12.2-15",
+    "@polkadot/api-base": "6.12.2-15",
+    "@polkadot/rpc-augment": "6.12.2-15",
+    "@polkadot/rpc-core": "6.12.2-15",
+    "@polkadot/types": "6.12.2-15",
+    "@polkadot/types-codec": "6.12.2-15"
   },
   "devDependencies": {
-    "@polkadot/api": "6.12.2-14"
+    "@polkadot/api": "6.12.2-15"
   }
 }
diff --git a/packages/api-derive/src/packageInfo.ts b/packages/api-derive/src/packageInfo.ts
index fa34d6ba4d..0e4f2b22a2 100644
--- a/packages/api-derive/src/packageInfo.ts
+++ b/packages/api-derive/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-derive', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/api-derive', version: '6.12.2-15' };
diff --git a/packages/api/package.json b/packages/api/package.json
index b19d9113bc..3b677a8321 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/api-augment": "6.12.2-14",
-    "@polkadot/api-base": "6.12.2-14",
-    "@polkadot/api-derive": "6.12.2-14",
+    "@polkadot/api-augment": "6.12.2-15",
+    "@polkadot/api-base": "6.12.2-15",
+    "@polkadot/api-derive": "6.12.2-15",
     "@polkadot/keyring": "^8.1.2",
-    "@polkadot/rpc-core": "6.12.2-14",
-    "@polkadot/rpc-provider": "6.12.2-14",
-    "@polkadot/types": "6.12.2-14",
-    "@polkadot/types-codec": "6.12.2-14",
-    "@polkadot/types-create": "6.12.2-14",
-    "@polkadot/types-known": "6.12.2-14",
+    "@polkadot/rpc-core": "6.12.2-15",
+    "@polkadot/rpc-provider": "6.12.2-15",
+    "@polkadot/types": "6.12.2-15",
+    "@polkadot/types-codec": "6.12.2-15",
+    "@polkadot/types-create": "6.12.2-15",
+    "@polkadot/types-known": "6.12.2-15",
     "@polkadot/util": "^8.1.2",
     "@polkadot/util-crypto": "^8.1.2",
     "eventemitter3": "^4.0.7",
diff --git a/packages/api/src/packageInfo.ts b/packages/api/src/packageInfo.ts
index bc00c99b09..7d4170c680 100644
--- a/packages/api/src/packageInfo.ts
+++ b/packages/api/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/api', version: '6.12.2-15' };
diff --git a/packages/rpc-augment/package.json b/packages/rpc-augment/package.json
index d24ad65d7a..09bbe2ea95 100644
--- a/packages/rpc-augment/package.json
+++ b/packages/rpc-augment/package.json
@@ -20,11 +20,11 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/types": "6.12.2-14",
+    "@polkadot/types": "6.12.2-15",
     "rxjs": "^7.4.0"
   }
 }
diff --git a/packages/rpc-augment/src/augment/rpc.ts b/packages/rpc-augment/src/augment/rpc.ts
index 78270dc70b..3ce4d9fd5d 100644
--- a/packages/rpc-augment/src/augment/rpc.ts
+++ b/packages/rpc-augment/src/augment/rpc.ts
@@ -3,7 +3,9 @@
 
 declare module '@polkadot/rpc-augment/rpc' {
   import type { AugmentedRpc } from '@polkadot/rpc-augment/types';
-  import type { Bytes, HashMap, Json, Metadata, Null, Option, StorageKey, Text, U256, U64, Vec, bool, u32, u64 } from '@polkadot/types';
+  import type { Metadata, StorageKey } from '@polkadot/types';
+  import type { Bytes, HashMap, Json, Null, Option, Text, U256, U64, Vec, bool, u32, u64 } from '@polkadot/types-codec';
+  import type { AnyNumber, Codec } from '@polkadot/types-codec/types';
   import type { ExtrinsicOrHash, ExtrinsicStatus } from '@polkadot/types/interfaces/author';
   import type { EpochAuthorship } from '@polkadot/types/interfaces/babe';
   import type { BeefySignedCommitment } from '@polkadot/types/interfaces/beefy';
@@ -22,7 +24,7 @@ declare module '@polkadot/rpc-augment/rpc' {
   import type { AccountId, BlockNumber, H160, H256, H64, Hash, Header, Index, Justification, KeyValue, SignedBlock, StorageData } from '@polkadot/types/interfaces/runtime';
   import type { ReadProof, RuntimeVersion, TraceBlockResponse } from '@polkadot/types/interfaces/state';
   import type { ApplyExtrinsicResult, ChainProperties, ChainType, Health, NetworkState, NodeRole, PeerInfo, SyncState } from '@polkadot/types/interfaces/system';
-  import type { AnyNumber, Codec, IExtrinsic, Observable } from '@polkadot/types/types';
+  import type { IExtrinsic, Observable } from '@polkadot/types/types';
 
   export interface RpcInterface {
     author: {
diff --git a/packages/rpc-augment/src/packageInfo.ts b/packages/rpc-augment/src/packageInfo.ts
index 5941bd6d5a..d3d3631fca 100644
--- a/packages/rpc-augment/src/packageInfo.ts
+++ b/packages/rpc-augment/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-augment', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/rpc-augment', version: '6.12.2-15' };
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
index a4485f7fdc..7907e19266 100644
--- a/packages/rpc-core/package.json
+++ b/packages/rpc-core/package.json
@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/rpc-augment": "6.12.2-14",
-    "@polkadot/rpc-provider": "6.12.2-14",
-    "@polkadot/types": "6.12.2-14",
+    "@polkadot/rpc-augment": "6.12.2-15",
+    "@polkadot/rpc-provider": "6.12.2-15",
+    "@polkadot/types": "6.12.2-15",
     "@polkadot/util": "^8.1.2",
     "rxjs": "^7.4.0"
   },
diff --git a/packages/rpc-core/src/packageInfo.ts b/packages/rpc-core/src/packageInfo.ts
index 64de5222ca..42597d8f31 100644
--- a/packages/rpc-core/src/packageInfo.ts
+++ b/packages/rpc-core/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-core', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/rpc-core', version: '6.12.2-15' };
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index e4596d550a..ed1ca7f545 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -20,11 +20,11 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/types": "6.12.2-14",
+    "@polkadot/types": "6.12.2-15",
     "@polkadot/util": "^8.1.2",
     "@polkadot/util-crypto": "^8.1.2",
     "@polkadot/x-fetch": "^8.1.2",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types": "6.12.2-14",
+    "@polkadot/types": "6.12.2-15",
     "mock-socket": "^9.0.8",
     "nock": "^13.2.1"
   }
diff --git a/packages/rpc-provider/src/packageInfo.ts b/packages/rpc-provider/src/packageInfo.ts
index f3e0dc7492..625273d414 100644
--- a/packages/rpc-provider/src/packageInfo.ts
+++ b/packages/rpc-provider/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-provider', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/rpc-provider', version: '6.12.2-15' };
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index b4373fb46e..537b3a1ea7 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.cjs",
@@ -33,13 +33,13 @@
     "@babel/core": "^7.16.5",
     "@babel/register": "^7.16.5",
     "@babel/runtime": "^7.16.5",
-    "@polkadot/api": "6.12.2-14",
-    "@polkadot/rpc-augment": "6.12.2-14",
-    "@polkadot/rpc-provider": "6.12.2-14",
-    "@polkadot/types": "6.12.2-14",
-    "@polkadot/types-codec": "6.12.2-14",
-    "@polkadot/types-create": "6.12.2-14",
-    "@polkadot/types-support": "6.12.2-14",
+    "@polkadot/api": "6.12.2-15",
+    "@polkadot/rpc-augment": "6.12.2-15",
+    "@polkadot/rpc-provider": "6.12.2-15",
+    "@polkadot/types": "6.12.2-15",
+    "@polkadot/types-codec": "6.12.2-15",
+    "@polkadot/types-create": "6.12.2-15",
+    "@polkadot/types-support": "6.12.2-15",
     "@polkadot/util": "^8.1.2",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
diff --git a/packages/typegen/src/packageInfo.ts b/packages/typegen/src/packageInfo.ts
index 3f046004de..901b86f4ea 100644
--- a/packages/typegen/src/packageInfo.ts
+++ b/packages/typegen/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/typegen', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/typegen', version: '6.12.2-15' };
diff --git a/packages/types-codec/package.json b/packages/types-codec/package.json
index c6fdfd7394..6e5a67071f 100644
--- a/packages/types-codec/package.json
+++ b/packages/types-codec/package.json
@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
     "@polkadot/util": "^8.1.2"
   },
   "devDependencies": {
-    "@polkadot/types": "^6.12.2-14"
+    "@polkadot/types": "^6.12.2-15"
   }
 }
diff --git a/packages/types-codec/src/packageInfo.ts b/packages/types-codec/src/packageInfo.ts
index 4d03deb72a..fa2779846d 100644
--- a/packages/types-codec/src/packageInfo.ts
+++ b/packages/types-codec/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-codec', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/types-codec', version: '6.12.2-15' };
diff --git a/packages/types-create/package.json b/packages/types-create/package.json
index 3a1d213fe0..50cf14ca61 100644
--- a/packages/types-create/package.json
+++ b/packages/types-create/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
diff --git a/packages/types-create/src/packageInfo.ts b/packages/types-create/src/packageInfo.ts
index b814947ad2..6a8313e54d 100644
--- a/packages/types-create/src/packageInfo.ts
+++ b/packages/types-create/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-create', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/types-create', version: '6.12.2-15' };
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
index aaac56d80c..24d110f120 100644
--- a/packages/types-known/package.json
+++ b/packages/types-known/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
     "@polkadot/networks": "^8.1.2",
-    "@polkadot/types": "6.12.2-14",
+    "@polkadot/types": "6.12.2-15",
     "@polkadot/util": "^8.1.2"
   }
 }
diff --git a/packages/types-known/src/packageInfo.ts b/packages/types-known/src/packageInfo.ts
index e5683aa969..fd5f334284 100644
--- a/packages/types-known/src/packageInfo.ts
+++ b/packages/types-known/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-known', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/types-known', version: '6.12.2-15' };
diff --git a/packages/types-support/package.json b/packages/types-support/package.json
index c7cd57dfda..e4c38714bb 100644
--- a/packages/types-support/package.json
+++ b/packages/types-support/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
diff --git a/packages/types-support/src/packageInfo.ts b/packages/types-support/src/packageInfo.ts
index e52f965225..1c20003b88 100644
--- a/packages/types-support/src/packageInfo.ts
+++ b/packages/types-support/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-support', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/types-support', version: '6.12.2-15' };
diff --git a/packages/types/package.json b/packages/types/package.json
index cbc079ac78..b88e05d37a 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.12.2-14",
+  "version": "6.12.2-15",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/types-codec": "6.12.2-14",
-    "@polkadot/types-create": "6.12.2-14",
+    "@polkadot/types-codec": "6.12.2-15",
+    "@polkadot/types-create": "6.12.2-15",
     "@polkadot/util": "^8.1.2",
     "@polkadot/util-crypto": "^8.1.2",
     "rxjs": "^7.4.0"
   },
   "devDependencies": {
     "@polkadot/keyring": "^8.1.2",
-    "@polkadot/types-support": "6.12.2-14"
+    "@polkadot/types-support": "6.12.2-15"
   }
 }
diff --git a/packages/types/src/augment/lookup/types-kusama.ts b/packages/types/src/augment/lookup/types-kusama.ts
index 3919fedb6e..284ab436b0 100644
--- a/packages/types/src/augment/lookup/types-kusama.ts
+++ b/packages/types/src/augment/lookup/types-kusama.ts
@@ -2,9 +2,9 @@
 /* eslint-disable */
 
 declare module '@polkadot/types/lookup' {
-  import type { BitVec, Compact, Enum, Null, Option, Struct, Vec, u16, u32 } from '@polkadot/types';
+  import type { BitVec, Compact, Enum, Null, Option, Struct, Vec, u16, u32 } from '@polkadot/types-codec';
+  import type { ITuple } from '@polkadot/types-codec/types';
   import type { H256, PerU16 } from '@polkadot/types/interfaces/runtime';
-  import type { ITuple } from '@polkadot/types/types';
 
   /** @name KusamaRuntimeProxyType (73) */
   export interface KusamaRuntimeProxyType extends Enum {
diff --git a/packages/types/src/augment/lookup/types-polkadot.ts b/packages/types/src/augment/lookup/types-polkadot.ts
index b1f5c5cba6..23ca6ec3ec 100644
--- a/packages/types/src/augment/lookup/types-polkadot.ts
+++ b/packages/types/src/augment/lookup/types-polkadot.ts
@@ -2,10 +2,10 @@
 /* eslint-disable */
 
 declare module '@polkadot/types/lookup' {
-  import type { BitVec, Bytes, Compact, Enum, Null, Option, Result, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types';
+  import type { BitVec, Bytes, Compact, Enum, Null, Option, Result, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { ITuple } from '@polkadot/types-codec/types';
   import type { EthereumAddress } from '@polkadot/types/interfaces/eth';
   import type { AccountId32, H256, PerU16 } from '@polkadot/types/interfaces/runtime';
-  import type { ITuple } from '@polkadot/types/types';
 
   /** @name PolkadotRuntimeCommonClaimsPalletEvent (64) */
   export interface PolkadotRuntimeCommonClaimsPalletEvent extends Enum {
diff --git a/packages/types/src/augment/lookup/types-substrate.ts b/packages/types/src/augment/lookup/types-substrate.ts
index 3e79bc0354..f54f243c61 100644
--- a/packages/types/src/augment/lookup/types-substrate.ts
+++ b/packages/types/src/augment/lookup/types-substrate.ts
@@ -2,11 +2,12 @@
 /* eslint-disable */
 
 declare module '@polkadot/types/lookup' {
-  import type { BTreeMap, Bytes, Compact, Data, Enum, Null, Option, Result, Set, Struct, Text, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types';
+  import type { Data } from '@polkadot/types';
+  import type { BTreeMap, Bytes, Compact, Enum, Null, Option, Result, Set, Struct, Text, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+  import type { ITuple } from '@polkadot/types-codec/types';
   import type { Vote } from '@polkadot/types/interfaces/elections';
   import type { AccountId32, Call, H256, MultiAddress, PerU16, Perbill, Percent, Perquintill } from '@polkadot/types/interfaces/runtime';
   import type { Event } from '@polkadot/types/interfaces/system';
-  import type { ITuple } from '@polkadot/types/types';
 
   /** @name FrameSystemAccountInfo (3) */
   export interface FrameSystemAccountInfo extends Struct {
diff --git a/packages/types/src/augment/registry.ts b/packages/types/src/augment/registry.ts
index 5d410bf72e..1ff29a3eed 100644
--- a/packages/types/src/augment/registry.ts
+++ b/packages/types/src/augment/registry.ts
@@ -2,7 +2,8 @@
 /* eslint-disable */
 
 declare module '@polkadot/types/types/registry' {
-  import type { BitVec, Bool, Bytes, Data, I128, I16, I256, I32, I64, I8, Json, Null, Raw, StorageKey, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types';
+  import type { Data, StorageKey } from '@polkadot/types';
+  import type { BitVec, Bool, Bytes, I128, I16, I256, I32, I64, I8, Json, Null, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, 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';
   import type { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations';
   import type { RawAuraPreDigest } from '@polkadot/types/interfaces/aura';
diff --git a/packages/types/src/interfaces/assets/types.ts b/packages/types/src/interfaces/assets/types.ts
index 106bdac0f1..aca05f5d7e 100644
--- a/packages/types/src/interfaces/assets/types.ts
+++ b/packages/types/src/interfaces/assets/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, Struct, bool, u32, u64, u8 } from '@polkadot/types';
+import type { Bytes, Compact, Struct, bool, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AccountId, BalanceOf } from '@polkadot/types/interfaces/runtime';
 
 /** @name AssetApproval */
diff --git a/packages/types/src/interfaces/attestations/types.ts b/packages/types/src/interfaces/attestations/types.ts
index a849c1dee4..39275bc3c4 100644
--- a/packages/types/src/interfaces/attestations/types.ts
+++ b/packages/types/src/interfaces/attestations/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, Vec } from '@polkadot/types';
+import type { Struct, Vec } from '@polkadot/types-codec';
 import type { CandidateReceipt, ParaId } from '@polkadot/types/interfaces/parachains';
 import type { AccountId, BlockNumber, H256, Hash } from '@polkadot/types/interfaces/runtime';
 import type { SessionIndex } from '@polkadot/types/interfaces/session';
diff --git a/packages/types/src/interfaces/aura/types.ts b/packages/types/src/interfaces/aura/types.ts
index 0357ecb629..e44fe8aa5c 100644
--- a/packages/types/src/interfaces/aura/types.ts
+++ b/packages/types/src/interfaces/aura/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, u64 } from '@polkadot/types';
+import type { Struct, u64 } from '@polkadot/types-codec';
 
 /** @name RawAuraPreDigest */
 export interface RawAuraPreDigest extends Struct {
diff --git a/packages/types/src/interfaces/author/types.ts b/packages/types/src/interfaces/author/types.ts
index a009445583..80fe225419 100644
--- a/packages/types/src/interfaces/author/types.ts
+++ b/packages/types/src/interfaces/author/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, Text, Vec } from '@polkadot/types';
+import type { Bytes, Enum, Text, Vec } from '@polkadot/types-codec';
 import type { Hash } from '@polkadot/types/interfaces/runtime';
 
 /** @name ExtrinsicOrHash */
diff --git a/packages/types/src/interfaces/authorship/types.ts b/packages/types/src/interfaces/authorship/types.ts
index b40ae8e001..b881aa5ed8 100644
--- a/packages/types/src/interfaces/authorship/types.ts
+++ b/packages/types/src/interfaces/authorship/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Option } from '@polkadot/types';
+import type { Enum, Option } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, BlockNumber, Hash } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name UncleEntryItem */
 export interface UncleEntryItem extends Enum {
diff --git a/packages/types/src/interfaces/babe/types.ts b/packages/types/src/interfaces/babe/types.ts
index 19ccce7bfe..e7e6ab09bb 100644
--- a/packages/types/src/interfaces/babe/types.ts
+++ b/packages/types/src/interfaces/babe/types.ts
@@ -1,10 +1,10 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Option, Struct, U8aFixed, Vec, u32, u64 } from '@polkadot/types';
+import type { Enum, Option, Struct, U8aFixed, Vec, u32, u64 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AuthorityId } from '@polkadot/types/interfaces/consensus';
 import type { Hash, Header } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name AllowedSlots */
 export interface AllowedSlots extends Enum {
diff --git a/packages/types/src/interfaces/balances/types.ts b/packages/types/src/interfaces/balances/types.ts
index cb249e37e5..b93528b25e 100644
--- a/packages/types/src/interfaces/balances/types.ts
+++ b/packages/types/src/interfaces/balances/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Set, Struct, U8aFixed } from '@polkadot/types';
+import type { Enum, Set, Struct, U8aFixed } from '@polkadot/types-codec';
 import type { Balance, BlockNumber, LockIdentifier } from '@polkadot/types/interfaces/runtime';
 
 /** @name AccountData */
diff --git a/packages/types/src/interfaces/beefy/types.ts b/packages/types/src/interfaces/beefy/types.ts
index 950db0a8f0..9e1ec6d7c4 100644
--- a/packages/types/src/interfaces/beefy/types.ts
+++ b/packages/types/src/interfaces/beefy/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Option, Struct, U8aFixed, Vec, u32, u64 } from '@polkadot/types';
+import type { Option, Struct, U8aFixed, Vec, u32, u64 } from '@polkadot/types-codec';
 import type { EcdsaSignature } from '@polkadot/types/interfaces/extrinsics';
 import type { BlockNumber, H256 } from '@polkadot/types/interfaces/runtime';
 
diff --git a/packages/types/src/interfaces/bridges/types.ts b/packages/types/src/interfaces/bridges/types.ts
index d5ba774d86..1b2983130b 100644
--- a/packages/types/src/interfaces/bridges/types.ts
+++ b/packages/types/src/interfaces/bridges/types.ts
@@ -1,12 +1,12 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { BitVec, Bytes, Enum, Null, Struct, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types';
+import type { BitVec, Bytes, Enum, Null, Struct, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { BlockHash } from '@polkadot/types/interfaces/chain';
 import type { MultiSignature } from '@polkadot/types/interfaces/extrinsics';
 import type { AuthorityList, SetId } from '@polkadot/types/interfaces/grandpa';
 import type { AccountId, Balance, BlockNumber, H256, Header, MultiSigner, Weight } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name BridgedBlockHash */
 export interface BridgedBlockHash extends H256 {}
diff --git a/packages/types/src/interfaces/claims/types.ts b/packages/types/src/interfaces/claims/types.ts
index 932b014329..ad9361aeb4 100644
--- a/packages/types/src/interfaces/claims/types.ts
+++ b/packages/types/src/interfaces/claims/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum } from '@polkadot/types';
+import type { Enum } from '@polkadot/types-codec';
 
 /** @name StatementKind */
 export interface StatementKind extends Enum {
diff --git a/packages/types/src/interfaces/collective/types.ts b/packages/types/src/interfaces/collective/types.ts
index f4fb732e56..40a5e9b569 100644
--- a/packages/types/src/interfaces/collective/types.ts
+++ b/packages/types/src/interfaces/collective/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Struct, Vec, u32 } from '@polkadot/types';
+import type { Enum, Struct, Vec, u32 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, BlockNumber } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name CollectiveOrigin */
 export interface CollectiveOrigin extends Enum {
diff --git a/packages/types/src/interfaces/consensus/types.ts b/packages/types/src/interfaces/consensus/types.ts
index ffee2d2c5f..196859c4de 100644
--- a/packages/types/src/interfaces/consensus/types.ts
+++ b/packages/types/src/interfaces/consensus/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { U8aFixed } from '@polkadot/types';
+import type { U8aFixed } from '@polkadot/types-codec';
 import type { AccountId } from '@polkadot/types/interfaces/runtime';
 
 /** @name AuthorityId */
diff --git a/packages/types/src/interfaces/contracts/types.ts b/packages/types/src/interfaces/contracts/types.ts
index dbd7e4e45b..9bbbd108e7 100644
--- a/packages/types/src/interfaces/contracts/types.ts
+++ b/packages/types/src/interfaces/contracts/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, Enum, Null, Option, Raw, Struct, Text, U8aFixed, bool, u32, u64, u8 } from '@polkadot/types';
+import type { Bytes, Compact, Enum, Null, Option, Raw, Struct, Text, U8aFixed, bool, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AccountId, Balance, BlockNumber, Hash, Weight } from '@polkadot/types/interfaces/runtime';
 
 /** @name AliveContractInfo */
diff --git a/packages/types/src/interfaces/contractsAbi/types.ts b/packages/types/src/interfaces/contractsAbi/types.ts
index 0bb8f8cfa4..5927eafe0a 100644
--- a/packages/types/src/interfaces/contractsAbi/types.ts
+++ b/packages/types/src/interfaces/contractsAbi/types.ts
@@ -1,10 +1,10 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { BTreeMap, Bytes, Enum, Option, Raw, Struct, Text, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types';
+import type { BTreeMap, Bytes, Enum, Option, Raw, Struct, Text, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { PortableType } from '@polkadot/types/interfaces/metadata';
 import type { Si0Type, SiLookupTypeId, SiPath } from '@polkadot/types/interfaces/scaleInfo';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name ContractConstructorSpecLatest */
 export interface ContractConstructorSpecLatest extends ContractConstructorSpecV2 {}
diff --git a/packages/types/src/interfaces/crowdloan/types.ts b/packages/types/src/interfaces/crowdloan/types.ts
index f366281697..5dde4c7c04 100644
--- a/packages/types/src/interfaces/crowdloan/types.ts
+++ b/packages/types/src/interfaces/crowdloan/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Option, Struct, u32 } from '@polkadot/types';
+import type { Enum, Option, Struct, u32 } from '@polkadot/types-codec';
 import type { LeasePeriod } from '@polkadot/types/interfaces/parachains';
 import type { AccountId, Balance, BlockNumber, MultiSigner } from '@polkadot/types/interfaces/runtime';
 
diff --git a/packages/types/src/interfaces/cumulus/types.ts b/packages/types/src/interfaces/cumulus/types.ts
index ec1c6cd87f..045a5cfcd2 100644
--- a/packages/types/src/interfaces/cumulus/types.ts
+++ b/packages/types/src/interfaces/cumulus/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, U8aFixed, u32, u64 } from '@polkadot/types';
+import type { Struct, U8aFixed, u32, u64 } from '@polkadot/types-codec';
 import type { Weight } from '@polkadot/types/interfaces/runtime';
 
 /** @name ConfigData */
diff --git a/packages/types/src/interfaces/democracy/types.ts b/packages/types/src/interfaces/democracy/types.ts
index 188a8d0a9a..6458c65ce0 100644
--- a/packages/types/src/interfaces/democracy/types.ts
+++ b/packages/types/src/interfaces/democracy/types.ts
@@ -1,10 +1,10 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, Option, Struct, Vec, bool, u32 } from '@polkadot/types';
+import type { Bytes, Enum, Option, Struct, Vec, bool, u32 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { Vote, VoteThreshold } from '@polkadot/types/interfaces/elections';
 import type { AccountId, Balance, BlockNumber, Call, Hash } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name AccountVote */
 export interface AccountVote extends Enum {
diff --git a/packages/types/src/interfaces/elections/types.ts b/packages/types/src/interfaces/elections/types.ts
index e789043f0e..a045668493 100644
--- a/packages/types/src/interfaces/elections/types.ts
+++ b/packages/types/src/interfaces/elections/types.ts
@@ -1,7 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Compact, Enum, GenericVote, Struct, u32 } from '@polkadot/types';
+import type { GenericVote } from '@polkadot/types';
+import type { Compact, Enum, Struct, u32 } from '@polkadot/types-codec';
 import type { AccountId, Balance } from '@polkadot/types/interfaces/runtime';
 
 /** @name ApprovalFlag */
diff --git a/packages/types/src/interfaces/engine/types.ts b/packages/types/src/interfaces/engine/types.ts
index fd93ca49d0..6c3fe2956c 100644
--- a/packages/types/src/interfaces/engine/types.ts
+++ b/packages/types/src/interfaces/engine/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, bool } from '@polkadot/types';
+import type { Struct, bool } from '@polkadot/types-codec';
 import type { BlockHash } from '@polkadot/types/interfaces/chain';
 
 /** @name CreatedBlock */
diff --git a/packages/types/src/interfaces/eth/types.ts b/packages/types/src/interfaces/eth/types.ts
index f8b9bec7d8..978588e551 100644
--- a/packages/types/src/interfaces/eth/types.ts
+++ b/packages/types/src/interfaces/eth/types.ts
@@ -1,7 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, GenericEthereumAccountId, GenericEthereumLookupSource, Option, Struct, U256, U64, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types';
+import type { GenericEthereumAccountId, GenericEthereumLookupSource } from '@polkadot/types';
+import type { Bytes, Enum, Option, Struct, U256, U64, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types-codec';
 import type { BlockNumber, H160, H2048, H256, H64 } from '@polkadot/types/interfaces/runtime';
 
 /** @name BlockV0 */
diff --git a/packages/types/src/interfaces/evm/types.ts b/packages/types/src/interfaces/evm/types.ts
index 6ca4ef9603..f2eacbba5a 100644
--- a/packages/types/src/interfaces/evm/types.ts
+++ b/packages/types/src/interfaces/evm/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, Struct, Text, Vec, u256 } from '@polkadot/types';
+import type { Bytes, Enum, Struct, Text, Vec, u256 } from '@polkadot/types-codec';
 import type { H160, H256 } from '@polkadot/types/interfaces/runtime';
 
 /** @name EvmAccount */
diff --git a/packages/types/src/interfaces/extrinsics/types.ts b/packages/types/src/interfaces/extrinsics/types.ts
index 442537abcd..016c520b2e 100644
--- a/packages/types/src/interfaces/extrinsics/types.ts
+++ b/packages/types/src/interfaces/extrinsics/types.ts
@@ -1,7 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, GenericExtrinsic, GenericExtrinsicEra, GenericExtrinsicPayload, GenericExtrinsicPayloadUnknown, GenericExtrinsicPayloadV4, GenericExtrinsicSignatureV4, GenericExtrinsicUnknown, GenericExtrinsicV4, GenericImmortalEra, GenericMortalEra, GenericSignerPayload, U8aFixed } from '@polkadot/types';
+import type { GenericExtrinsic, GenericExtrinsicEra, GenericExtrinsicPayload, GenericExtrinsicPayloadUnknown, GenericExtrinsicPayloadV4, GenericExtrinsicSignatureV4, GenericExtrinsicUnknown, GenericExtrinsicV4, GenericImmortalEra, GenericMortalEra, GenericSignerPayload } from '@polkadot/types';
+import type { Enum, U8aFixed } from '@polkadot/types-codec';
 import type { H512 } from '@polkadot/types/interfaces/runtime';
 
 /** @name AnySignature */
diff --git a/packages/types/src/interfaces/genericAsset/types.ts b/packages/types/src/interfaces/genericAsset/types.ts
index 8296ad51a0..f0bf05c9ff 100644
--- a/packages/types/src/interfaces/genericAsset/types.ts
+++ b/packages/types/src/interfaces/genericAsset/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Compact, Enum, Struct } from '@polkadot/types';
+import type { Compact, Enum, Struct } from '@polkadot/types-codec';
 import type { AccountId, Balance } from '@polkadot/types/interfaces/runtime';
 
 /** @name AssetOptions */
diff --git a/packages/types/src/interfaces/gilt/types.ts b/packages/types/src/interfaces/gilt/types.ts
index 68e230263d..503329c46c 100644
--- a/packages/types/src/interfaces/gilt/types.ts
+++ b/packages/types/src/interfaces/gilt/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, u32 } from '@polkadot/types';
+import type { Struct, u32 } from '@polkadot/types-codec';
 import type { AccountId, Balance, BlockNumber, Perquintill } from '@polkadot/types/interfaces/runtime';
 
 /** @name ActiveGilt */
diff --git a/packages/types/src/interfaces/grandpa/types.ts b/packages/types/src/interfaces/grandpa/types.ts
index 6440c84989..7ed519a1e6 100644
--- a/packages/types/src/interfaces/grandpa/types.ts
+++ b/packages/types/src/interfaces/grandpa/types.ts
@@ -1,13 +1,13 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { BTreeSet, Bytes, Enum, Option, Struct, U64, Vec, u32, u64 } from '@polkadot/types';
+import type { BTreeSet, Bytes, Enum, Option, Struct, U64, Vec, u32, u64 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { BlockHash } from '@polkadot/types/interfaces/chain';
 import type { AuthorityId } from '@polkadot/types/interfaces/consensus';
 import type { AuthoritySignature } from '@polkadot/types/interfaces/imOnline';
 import type { BlockNumber, Hash, Header } from '@polkadot/types/interfaces/runtime';
 import type { MembershipProof } from '@polkadot/types/interfaces/session';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name AuthorityIndex */
 export interface AuthorityIndex extends u64 {}
diff --git a/packages/types/src/interfaces/identity/types.ts b/packages/types/src/interfaces/identity/types.ts
index df8c1cd039..7b993ef48a 100644
--- a/packages/types/src/interfaces/identity/types.ts
+++ b/packages/types/src/interfaces/identity/types.ts
@@ -1,9 +1,10 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Data, Enum, Option, Set, Struct, Vec, u32 } from '@polkadot/types';
+import type { Data } from '@polkadot/types';
+import type { Enum, Option, Set, Struct, Vec, u32 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, Balance, H160 } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name IdentityFields */
 export interface IdentityFields extends Set {
diff --git a/packages/types/src/interfaces/imOnline/types.ts b/packages/types/src/interfaces/imOnline/types.ts
index c1dffb58b2..ae3cf31070 100644
--- a/packages/types/src/interfaces/imOnline/types.ts
+++ b/packages/types/src/interfaces/imOnline/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Struct, Vec, u32 } from '@polkadot/types';
+import type { Bytes, Struct, Vec, u32 } from '@polkadot/types-codec';
 import type { Signature } from '@polkadot/types/interfaces/extrinsics';
 import type { BlockNumber } from '@polkadot/types/interfaces/runtime';
 import type { SessionIndex } from '@polkadot/types/interfaces/session';
diff --git a/packages/types/src/interfaces/lottery/types.ts b/packages/types/src/interfaces/lottery/types.ts
index 853d16f16d..352a2b29be 100644
--- a/packages/types/src/interfaces/lottery/types.ts
+++ b/packages/types/src/interfaces/lottery/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, bool, u8 } from '@polkadot/types';
+import type { Struct, bool, u8 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { Balance, BlockNumber } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name CallIndex */
 export interface CallIndex extends ITuple<[u8, u8]> {}
diff --git a/packages/types/src/interfaces/metadata/types.ts b/packages/types/src/interfaces/metadata/types.ts
index 0fd0776199..8126f70137 100644
--- a/packages/types/src/interfaces/metadata/types.ts
+++ b/packages/types/src/interfaces/metadata/types.ts
@@ -1,7 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, Option, PortableRegistry, Struct, Text, Type, Vec, bool, u8 } from '@polkadot/types';
+import type { PortableRegistry } from '@polkadot/types';
+import type { Bytes, Enum, Option, Struct, Text, Type, Vec, bool, u8 } from '@polkadot/types-codec';
 import type { Si1Field, Si1LookupTypeId, Si1Type, SiLookupTypeId } from '@polkadot/types/interfaces/scaleInfo';
 
 /** @name ErrorMetadataLatest */
diff --git a/packages/types/src/interfaces/mmr/types.ts b/packages/types/src/interfaces/mmr/types.ts
index 64a395477a..d8397cbaaf 100644
--- a/packages/types/src/interfaces/mmr/types.ts
+++ b/packages/types/src/interfaces/mmr/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Struct } from '@polkadot/types';
+import type { Bytes, Struct } from '@polkadot/types-codec';
 import type { BlockHash } from '@polkadot/types/interfaces/chain';
 
 /** @name MmrLeafProof */
diff --git a/packages/types/src/interfaces/offchain/types.ts b/packages/types/src/interfaces/offchain/types.ts
index ab065d11a2..ba8e29413e 100644
--- a/packages/types/src/interfaces/offchain/types.ts
+++ b/packages/types/src/interfaces/offchain/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum } from '@polkadot/types';
+import type { Enum } from '@polkadot/types-codec';
 
 /** @name StorageKind */
 export interface StorageKind extends Enum {
diff --git a/packages/types/src/interfaces/offences/types.ts b/packages/types/src/interfaces/offences/types.ts
index dd04c26db5..12b035e77f 100644
--- a/packages/types/src/interfaces/offences/types.ts
+++ b/packages/types/src/interfaces/offences/types.ts
@@ -1,10 +1,10 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Struct, U8aFixed, Vec } from '@polkadot/types';
+import type { Bytes, Struct, U8aFixed, Vec } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, Hash, Perbill } from '@polkadot/types/interfaces/runtime';
 import type { IdentificationTuple, SessionIndex } from '@polkadot/types/interfaces/session';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name DeferredOffenceOf */
 export interface DeferredOffenceOf extends ITuple<[Vec<OffenceDetails>, Vec<Perbill>, SessionIndex]> {}
diff --git a/packages/types/src/interfaces/parachains/types.ts b/packages/types/src/interfaces/parachains/types.ts
index ae90848e89..d9827555fe 100644
--- a/packages/types/src/interfaces/parachains/types.ts
+++ b/packages/types/src/interfaces/parachains/types.ts
@@ -1,11 +1,11 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { BTreeMap, BitVec, Bytes, Enum, Option, Struct, U8aFixed, Vec, bool, u32 } from '@polkadot/types';
+import type { BTreeMap, BitVec, Bytes, Enum, Option, Struct, U8aFixed, Vec, bool, u32 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { Signature } from '@polkadot/types/interfaces/extrinsics';
 import type { AccountId, Balance, BalanceOf, BlockNumber, H256, Hash, Header, StorageProof, ValidatorId, Weight } from '@polkadot/types/interfaces/runtime';
 import type { MembershipProof, SessionIndex } from '@polkadot/types/interfaces/session';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name AbridgedCandidateReceipt */
 export interface AbridgedCandidateReceipt extends Struct {
diff --git a/packages/types/src/interfaces/payment/types.ts b/packages/types/src/interfaces/payment/types.ts
index 2bf63be570..fa86c8814d 100644
--- a/packages/types/src/interfaces/payment/types.ts
+++ b/packages/types/src/interfaces/payment/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Option, Struct } from '@polkadot/types';
+import type { Option, Struct } from '@polkadot/types-codec';
 import type { Balance, Weight } from '@polkadot/types/interfaces/runtime';
 import type { DispatchClass } from '@polkadot/types/interfaces/system';
 
diff --git a/packages/types/src/interfaces/poll/types.ts b/packages/types/src/interfaces/poll/types.ts
index f6d9947a5d..ab41a099cd 100644
--- a/packages/types/src/interfaces/poll/types.ts
+++ b/packages/types/src/interfaces/poll/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Vec, bool } from '@polkadot/types';
+import type { Vec, bool } from '@polkadot/types-codec';
 
 /** @name Approvals */
 export interface Approvals extends Vec<bool> {}
diff --git a/packages/types/src/interfaces/proxy/types.ts b/packages/types/src/interfaces/proxy/types.ts
index 7bdc4a8742..9b463e1c6e 100644
--- a/packages/types/src/interfaces/proxy/types.ts
+++ b/packages/types/src/interfaces/proxy/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Struct } from '@polkadot/types';
+import type { Enum, Struct } from '@polkadot/types-codec';
 import type { AccountId, BlockNumber, Hash } from '@polkadot/types/interfaces/runtime';
 
 /** @name ProxyAnnouncement */
diff --git a/packages/types/src/interfaces/purchase/types.ts b/packages/types/src/interfaces/purchase/types.ts
index 2da53f2183..ecd4ddaaea 100644
--- a/packages/types/src/interfaces/purchase/types.ts
+++ b/packages/types/src/interfaces/purchase/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, Struct } from '@polkadot/types';
+import type { Bytes, Enum, Struct } from '@polkadot/types-codec';
 import type { Balance, Permill } from '@polkadot/types/interfaces/runtime';
 
 /** @name AccountStatus */
diff --git a/packages/types/src/interfaces/recovery/types.ts b/packages/types/src/interfaces/recovery/types.ts
index 8cbbb6f851..153851d975 100644
--- a/packages/types/src/interfaces/recovery/types.ts
+++ b/packages/types/src/interfaces/recovery/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, Vec, u16 } from '@polkadot/types';
+import type { Struct, Vec, u16 } from '@polkadot/types-codec';
 import type { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces/runtime';
 
 /** @name ActiveRecovery */
diff --git a/packages/types/src/interfaces/rpc/types.ts b/packages/types/src/interfaces/rpc/types.ts
index e6a6a3023c..8fe083765d 100644
--- a/packages/types/src/interfaces/rpc/types.ts
+++ b/packages/types/src/interfaces/rpc/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, Text, Vec, u32 } from '@polkadot/types';
+import type { Struct, Text, Vec, u32 } from '@polkadot/types-codec';
 
 /** @name RpcMethods */
 export interface RpcMethods extends Struct {
diff --git a/packages/types/src/interfaces/runtime/types.ts b/packages/types/src/interfaces/runtime/types.ts
index f1f4ef76ee..92000a75f9 100644
--- a/packages/types/src/interfaces/runtime/types.ts
+++ b/packages/types/src/interfaces/runtime/types.ts
@@ -1,11 +1,12 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, DoNotConstruct, Enum, GenericAccountId, GenericAccountIndex, GenericBlock, GenericCall, GenericConsensusEngineId, GenericEthereumAccountId, GenericLookupSource, GenericMultiAddress, Int, Null, Option, StorageKey, Struct, U8aFixed, UInt, Vec, u16, u32, u64, u8 } from '@polkadot/types';
+import type { GenericAccountId, GenericAccountIndex, GenericBlock, GenericCall, GenericConsensusEngineId, GenericEthereumAccountId, GenericLookupSource, GenericMultiAddress, StorageKey } from '@polkadot/types';
+import type { Bytes, Compact, DoNotConstruct, Enum, Int, Null, Option, Struct, U8aFixed, UInt, Vec, u16, u32, u64, u8 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AuthorityId } from '@polkadot/types/interfaces/consensus';
 import type { Signature } from '@polkadot/types/interfaces/extrinsics';
 import type { SystemOrigin } from '@polkadot/types/interfaces/system';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name AccountId */
 export interface AccountId extends AccountId32 {}
diff --git a/packages/types/src/interfaces/scaleInfo/types.ts b/packages/types/src/interfaces/scaleInfo/types.ts
index 754655c167..b134989737 100644
--- a/packages/types/src/interfaces/scaleInfo/types.ts
+++ b/packages/types/src/interfaces/scaleInfo/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Compact, Enum, Null, Option, Struct, Text, Type, Vec, u32, u64, u8 } from '@polkadot/types';
+import type { Compact, Enum, Null, Option, Struct, Text, Type, Vec, u32, u64, u8 } from '@polkadot/types-codec';
 
 /** @name Si0Field */
 export interface Si0Field extends Struct {
diff --git a/packages/types/src/interfaces/scheduler/types.ts b/packages/types/src/interfaces/scheduler/types.ts
index 2744b055af..0640bc77d2 100644
--- a/packages/types/src/interfaces/scheduler/types.ts
+++ b/packages/types/src/interfaces/scheduler/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Option, Struct, u32, u8 } from '@polkadot/types';
+import type { Bytes, Option, Struct, u32, u8 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { BlockNumber, Call, PalletsOrigin } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name Period */
 export interface Period extends ITuple<[BlockNumber, u32]> {}
diff --git a/packages/types/src/interfaces/session/types.ts b/packages/types/src/interfaces/session/types.ts
index d4ae8f26de..fb412be01a 100644
--- a/packages/types/src/interfaces/session/types.ts
+++ b/packages/types/src/interfaces/session/types.ts
@@ -1,10 +1,10 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Struct, U8aFixed, Vec, u32 } from '@polkadot/types';
+import type { Bytes, Struct, U8aFixed, Vec, u32 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, ValidatorId } from '@polkadot/types/interfaces/runtime';
 import type { Exposure } from '@polkadot/types/interfaces/staking';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name BeefyKey */
 export interface BeefyKey extends U8aFixed {}
diff --git a/packages/types/src/interfaces/society/types.ts b/packages/types/src/interfaces/society/types.ts
index 9be8c633f9..5167ff700d 100644
--- a/packages/types/src/interfaces/society/types.ts
+++ b/packages/types/src/interfaces/society/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Struct, u32 } from '@polkadot/types';
+import type { Enum, Struct, u32 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, Balance } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name Bid */
 export interface Bid extends Struct {
diff --git a/packages/types/src/interfaces/staking/types.ts b/packages/types/src/interfaces/staking/types.ts
index 7d161f69d8..830d67a5fe 100644
--- a/packages/types/src/interfaces/staking/types.ts
+++ b/packages/types/src/interfaces/staking/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { BTreeMap, Compact, Enum, Option, Struct, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types';
+import type { BTreeMap, Compact, Enum, Option, Struct, Vec, bool, u128, u16, u32, u64 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, Balance, BlockNumber, Moment, PerU16, Perbill } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name ActiveEraInfo */
 export interface ActiveEraInfo extends Struct {
diff --git a/packages/types/src/interfaces/state/types.ts b/packages/types/src/interfaces/state/types.ts
index f19cedc5e0..57f92f442c 100644
--- a/packages/types/src/interfaces/state/types.ts
+++ b/packages/types/src/interfaces/state/types.ts
@@ -1,9 +1,10 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Enum, HashMap, Option, StorageKey, Struct, Text, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types';
+import type { StorageKey } from '@polkadot/types';
+import type { Bytes, Enum, HashMap, Option, Struct, Text, U8aFixed, Vec, bool, u32, u64 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { Hash, StorageData } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name ApiId */
 export interface ApiId extends U8aFixed {}
diff --git a/packages/types/src/interfaces/support/types.ts b/packages/types/src/interfaces/support/types.ts
index 40b7af6c4a..01ac19a887 100644
--- a/packages/types/src/interfaces/support/types.ts
+++ b/packages/types/src/interfaces/support/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, bool, u8 } from '@polkadot/types';
+import type { Struct, bool, u8 } from '@polkadot/types-codec';
 import type { Balance, Perbill } from '@polkadot/types/interfaces/runtime';
 
 /** @name WeightToFeeCoefficient */
diff --git a/packages/types/src/interfaces/system/types.ts b/packages/types/src/interfaces/system/types.ts
index 7f29fd79f9..2e58133c04 100644
--- a/packages/types/src/interfaces/system/types.ts
+++ b/packages/types/src/interfaces/system/types.ts
@@ -1,10 +1,11 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, Enum, GenericChainProperties, GenericEvent, HashMap, Option, Result, Struct, Text, U8aFixed, Vec, bool, i32, u32, u64, u8 } from '@polkadot/types';
+import type { GenericChainProperties, GenericEvent } from '@polkadot/types';
+import type { Bytes, Compact, Enum, HashMap, Option, Result, Struct, Text, U8aFixed, Vec, bool, i32, u32, u64, u8 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountData } from '@polkadot/types/interfaces/balances';
 import type { AccountId, BlockNumber, Digest, Hash, Index, Pays, Weight } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name AccountInfo */
 export interface AccountInfo extends AccountInfoWithTripleRefCount {}
diff --git a/packages/types/src/interfaces/treasury/types.ts b/packages/types/src/interfaces/treasury/types.ts
index 8d1ae01d7b..2181e603f8 100644
--- a/packages/types/src/interfaces/treasury/types.ts
+++ b/packages/types/src/interfaces/treasury/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Enum, Option, Struct, Vec, bool, u32 } from '@polkadot/types';
+import type { Enum, Option, Struct, Vec, bool, u32 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name Bounty */
 export interface Bounty extends Struct {
diff --git a/packages/types/src/interfaces/uniques/types.ts b/packages/types/src/interfaces/uniques/types.ts
index 862b5d0077..cb1014240f 100644
--- a/packages/types/src/interfaces/uniques/types.ts
+++ b/packages/types/src/interfaces/uniques/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, Option, Struct, bool, u32 } from '@polkadot/types';
+import type { Bytes, Compact, Option, Struct, bool, u32 } from '@polkadot/types-codec';
 import type { AccountId, Balance } from '@polkadot/types/interfaces/runtime';
 
 /** @name ClassDetails */
diff --git a/packages/types/src/interfaces/utility/types.ts b/packages/types/src/interfaces/utility/types.ts
index 21350f05af..065c966ed1 100644
--- a/packages/types/src/interfaces/utility/types.ts
+++ b/packages/types/src/interfaces/utility/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct, Vec, u32 } from '@polkadot/types';
+import type { Struct, Vec, u32 } from '@polkadot/types-codec';
 import type { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces/runtime';
 
 /** @name Multisig */
diff --git a/packages/types/src/interfaces/vesting/types.ts b/packages/types/src/interfaces/vesting/types.ts
index 9892d21ae9..6a9b38e00b 100644
--- a/packages/types/src/interfaces/vesting/types.ts
+++ b/packages/types/src/interfaces/vesting/types.ts
@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Struct } from '@polkadot/types';
+import type { Struct } from '@polkadot/types-codec';
 import type { Balance, BlockNumber } from '@polkadot/types/interfaces/runtime';
 
 /** @name VestingInfo */
diff --git a/packages/types/src/interfaces/xcm/types.ts b/packages/types/src/interfaces/xcm/types.ts
index 6a5d71a3a4..4bac12a569 100644
--- a/packages/types/src/interfaces/xcm/types.ts
+++ b/packages/types/src/interfaces/xcm/types.ts
@@ -1,9 +1,9 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, Enum, Null, Option, Result, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types';
+import type { Bytes, Compact, Enum, Null, Option, Result, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
+import type { ITuple } from '@polkadot/types-codec/types';
 import type { AccountId, BlockNumber, Weight } from '@polkadot/types/interfaces/runtime';
-import type { ITuple } from '@polkadot/types/types';
 
 /** @name AssetInstance */
 export interface AssetInstance extends AssetInstanceV2 {}
diff --git a/packages/types/src/packageInfo.ts b/packages/types/src/packageInfo.ts
index ad91195ae3..8d89316d05 100644
--- a/packages/types/src/packageInfo.ts
+++ b/packages/types/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types', version: '6.12.2-14' };
+export const packageInfo = { name: '@polkadot/types', version: '6.12.2-15' };
diff --git a/yarn.lock b/yarn.lock
index 1b00259710..fb7efec8c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1867,23 +1867,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/api-augment@6.12.2-14, @polkadot/api-augment@workspace:packages/api-augment":
+"@polkadot/api-augment@6.12.2-15, @polkadot/api-augment@workspace:packages/api-augment":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-augment@workspace:packages/api-augment"
   dependencies:
     "@babel/runtime": ^7.16.5
-    "@polkadot/api-base": 6.12.2-14
-    "@polkadot/rpc-core": 6.12.2-14
-    "@polkadot/types": 6.12.2-14
+    "@polkadot/api-base": 6.12.2-15
+    "@polkadot/rpc-core": 6.12.2-15
+    "@polkadot/types": 6.12.2-15
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-base@6.12.2-14, @polkadot/api-base@workspace:packages/api-base":
+"@polkadot/api-base@6.12.2-15, @polkadot/api-base@workspace:packages/api-base":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-base@workspace:packages/api-base"
   dependencies:
     "@babel/runtime": ^7.16.5
-    "@polkadot/types": 6.12.2-14
+    "@polkadot/types": 6.12.2-15
     "@polkadot/util": ^8.1.2
     rxjs: ^7.4.0
   languageName: unknown
@@ -1894,43 +1894,43 @@ __metadata:
   resolution: "@polkadot/api-contract@workspace:packages/api-contract"
   dependencies:
     "@babel/runtime": ^7.16.5
-    "@polkadot/api": 6.12.2-14
-    "@polkadot/types": 6.12.2-14
+    "@polkadot/api": 6.12.2-15
+    "@polkadot/types": 6.12.2-15
     "@polkadot/util": ^8.1.2
     rxjs: ^7.4.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-derive@6.12.2-14, @polkadot/api-derive@workspace:packages/api-derive":
+"@polkadot/api-derive@6.12.2-15, @polkadot/api-derive@workspace:packages/api-derive":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-derive@workspace:packages/api-derive"
   dependencies:
     "@babel/runtime": ^7.16.5
-    "@polkadot/api": 6.12.2-14
-    "@polkadot/api-augment": 6.12.2-14
-    "@polkadot/api-base": 6.12.2-14
-    "@polkadot/rpc-augment": 6.12.2-14
-    "@polkadot/rpc-core": 6.12.2-14
-    "@polkadot/types": 6.12.2-14
-    "@polkadot/types-codec": 6.12.2-14
+    "@polkadot/api": 6.12.2-15
+    "@polkadot/api-augment": 6.12.2-15
+    "@polkadot/api-base": 6.12.2-15
+    "@polkadot/rpc-augment": 6.12.2-15
+    "@polkadot/rpc-core": 6.12.2-15
+    "@polkadot/types": 6.12.2-15
+    "@polkadot/types-codec": 6.12.2-15
   languageName: unknown
   linkType: soft
 
-"@polkadot/api@6.12.2-14, @polkadot/api@workspace:packages/api":
+"@polkadot/api@6.12.2-15, @polkadot/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@polkadot/api@workspace:packages/api"
   dependencies:
     "@babel/runtime": ^7.16.5
-    "@polkadot/api-augment": 6.12.2-14
-    "@polkadot/api-base": 6.12.2-14
-    "@polkadot/api-derive": 6.12.2-14
+    "@polkadot/api-augment": 6.12.2-15
+    "@polkadot/api-base": 6.12.2-15
+    "@polkadot/api-derive": 6.12.2-15
     "@polkadot/keyring": ^8.1.2
-    "@polkadot/rpc-core": 6.12.2-14
-    "@polkadot/rpc-provider": 6.12.2-14
-    "@polkadot/types": 6.12.2-14
-    "@polkadot/types-codec": 6.12.2-14
-    "@polkadot/types-create": 6.12.2-14
-    "@polkadot/types-known": 6.12.2-14
+    "@polkadot/rpc-core": 6.12.2-15
+    "@polkadot/rpc-provider": 6.12.2-15
+    "@polkadot/types": 6.12.2-15
+    "@polkadot/types-codec": 6.12.2-15
+    "@polkadot/types-create": 6.12.2-15
+    "@polkadot/types-known": 6.12.2-15
     "@polkadot/util": ^8.1.2
     "@polkadot/util-crypto": ^8.1.2
     eventemitter3: ^4.0.7
@@ -2052,37 +2052,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-augment@6.12.2-14, @polkadot/rpc-augment@workspace:packages/rpc-augment":
+"@polkadot/rpc-augment@6.12.2-15, @polkadot/rpc-augment@workspace:packages/rpc-augment":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-augment@workspace:packages/rpc-augment"
   dependencies:
     "@babel/runtime": ^7.16.5
-    "@polkadot/types": 6.12.2-14
+    "@polkadot/types": 6.12.2-15
     rxjs: ^7.4.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-core@6.12.2-14, @polkadot/rpc-core@workspace:packages/rpc-core":
+"@polkadot/rpc-core@6.12.2-15, @polkadot/rpc-core@workspace:packages/rpc-core":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-core@workspace:packages/rpc-core"
   dependencies:
     "@babel/runtime": ^7.16.5
     "@polkadot/keyring": ^8.1.2
-    "@polkadot/rpc-augment": 6.12.2-14
-    "@polkadot/rpc-provider": 6.12.2-14
-    "@polkadot/types": 6.12.2-14
+    "@polkadot/rpc-augment": 6.12.2-15
+    "@polkadot/rpc-provider": 6.12.2-15
+    "@polkadot/types": 6.12.2-15
     "@polkadot/util": ^8.1.2
     rxjs: ^7.4.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-provider@6.12.2-14, @polkadot/rpc-provider@workspace:packages/rpc-provider":
+"@polkadot/rpc-provider@6.12.2-15, @polkadot/rpc-provider@workspace:packages/rpc-provider":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider"
   dependencies:
     "@babel/runtime": ^7.16.5
     "@polkadot/keyring": ^8.1.2
-    "@polkadot/types": 6.12.2-14
+    "@polkadot/types": 6.12.2-15
     "@polkadot/util": ^8.1.2
     "@polkadot/util-crypto": ^8.1.2
     "@polkadot/x-fetch": ^8.1.2
@@ -2110,13 +2110,13 @@ __metadata:
     "@babel/core": ^7.16.5
     "@babel/register": ^7.16.5
     "@babel/runtime": ^7.16.5
-    "@polkadot/api": 6.12.2-14
-    "@polkadot/rpc-augment": 6.12.2-14
-    "@polkadot/rpc-provider": 6.12.2-14
-    "@polkadot/types": 6.12.2-14
-    "@polkadot/types-codec": 6.12.2-14
-    "@polkadot/types-create": 6.12.2-14
-    "@polkadot/types-support": 6.12.2-14
+    "@polkadot/api": 6.12.2-15
+    "@polkadot/rpc-augment": 6.12.2-15
+    "@polkadot/rpc-provider": 6.12.2-15
+    "@polkadot/types": 6.12.2-15
+    "@polkadot/types-codec": 6.12.2-15
+    "@polkadot/types-create": 6.12.2-15
+    "@polkadot/types-support": 6.12.2-15
     "@polkadot/util": ^8.1.2
     "@types/websocket": ^1.0.4
     "@types/yargs": ^17.0.7
@@ -2132,17 +2132,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-codec@6.12.2-14, @polkadot/types-codec@workspace:packages/types-codec":
+"@polkadot/types-codec@6.12.2-15, @polkadot/types-codec@workspace:packages/types-codec":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-codec@workspace:packages/types-codec"
   dependencies:
     "@babel/runtime": ^7.16.5
-    "@polkadot/types": ^6.12.2-14
+    "@polkadot/types": ^6.12.2-15
     "@polkadot/util": ^8.1.2
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-create@6.12.2-14, @polkadot/types-create@workspace:packages/types-create":
+"@polkadot/types-create@6.12.2-15, @polkadot/types-create@workspace:packages/types-create":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-create@workspace:packages/types-create"
   dependencies:
@@ -2151,18 +2151,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-known@6.12.2-14, @polkadot/types-known@workspace:packages/types-known":
+"@polkadot/types-known@6.12.2-15, @polkadot/types-known@workspace:packages/types-known":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-known@workspace:packages/types-known"
   dependencies:
     "@babel/runtime": ^7.16.5
     "@polkadot/networks": ^8.1.2
-    "@polkadot/types": 6.12.2-14
+    "@polkadot/types": 6.12.2-15
     "@polkadot/util": ^8.1.2
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-support@6.12.2-14, @polkadot/types-support@workspace:packages/types-support":
+"@polkadot/types-support@6.12.2-15, @polkadot/types-support@workspace:packages/types-support":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-support@workspace:packages/types-support"
   dependencies:
@@ -2171,15 +2171,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types@6.12.2-14, @polkadot/types@^6.12.2-14, @polkadot/types@workspace:packages/types":
+"@polkadot/types@6.12.2-15, @polkadot/types@^6.12.2-15, @polkadot/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
     "@babel/runtime": ^7.16.5
     "@polkadot/keyring": ^8.1.2
-    "@polkadot/types-codec": 6.12.2-14
-    "@polkadot/types-create": 6.12.2-14
-    "@polkadot/types-support": 6.12.2-14
+    "@polkadot/types-codec": 6.12.2-15
+    "@polkadot/types-create": 6.12.2-15
+    "@polkadot/types-support": 6.12.2-15
     "@polkadot/util": ^8.1.2
     "@polkadot/util-crypto": ^8.1.2
     rxjs: ^7.4.0