[CI Skip] release/stable 9.13.5

skip-checks: true

CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 9.13.5 Feb 2, 2023
+
+Changes:
+
+- Adjust `Weight` alias for 1.5 chains
+- Ensure correct registry is pass through for runtime TS generation
+
+
+## 9.13.4 Feb 1, 2023
+
+Changes:
+
+- None from 9.13.3 (The previous version had npm registry publishing issues)
+
+
 ## 9.13.3 Feb 1, 2023
 
 Changes:

CONTRIBUTORS

@@ -1,4 +1,4 @@
-    3352	Jaco                          	Adjust Weight alias for WeightV0 injection (#5462)
+    3354	Jaco                          	Adjust for aliasses for Weight 1.5 (#5465)
       83	Amaury Martiny                	StatementKind: Regular and Saft (#2303)
       37	Keith Ingram                  	Update contract types and rpc (#4541)
       35	Stefanie Doll                 	Updated child storage parameters (#1709)

package.json

@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "versions": {
-    "git": "9.13.3",
+    "git": "9.13.5",
-    "npm": "9.13.3"
+    "npm": "9.13.5"
   },
   "workspaces": [
     "packages/*"
@@ -39,7 +39,7 @@
     "@babel/core": "^7.20.12",
     "@babel/register": "^7.18.9",
     "@babel/runtime": "^7.20.13",
-    "@polkadot/dev": "^0.68.2",
+    "@polkadot/dev": "^0.68.3",
     "@polkadot/typegen": "workspace:packages/typegen",
     "@types/jest": "^29.4.0",
     "copyfiles": "^2.4.1"

packages/api-augment/package.json

@@ -20,15 +20,15 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/api-base": "9.13.3",
+    "@polkadot/api-base": "9.13.5",
-    "@polkadot/rpc-augment": "9.13.3",
+    "@polkadot/rpc-augment": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-augment": "9.13.3",
+    "@polkadot/types-augment": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
     "@polkadot/util": "^10.3.1"
   }
 }

packages/api-augment/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-augment', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/api-augment', path: 'auto', type: 'auto', version: '9.13.5' };

packages/api-base/package.json

@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/rpc-core": "9.13.3",
+    "@polkadot/rpc-core": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "rxjs": "^7.8.0"
   }

packages/api-base/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-base', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/api-base', path: 'auto', type: 'auto', version: '9.13.5' };

packages/api-contract/package.json

@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/api": "9.13.3",
+    "@polkadot/api": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
-    "@polkadot/types-create": "9.13.3",
+    "@polkadot/types-create": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "@polkadot/util-crypto": "^10.3.1",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "9.13.3",
+    "@polkadot/api-augment": "9.13.5",
     "@polkadot/keyring": "^10.3.1"
   }
 }

packages/api-contract/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-contract', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/api-contract', path: 'auto', type: 'auto', version: '9.13.5' };

packages/api-derive/package.json

@@ -20,25 +20,25 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/api": "9.13.3",
+    "@polkadot/api": "9.13.5",
-    "@polkadot/api-augment": "9.13.3",
+    "@polkadot/api-augment": "9.13.5",
-    "@polkadot/api-base": "9.13.3",
+    "@polkadot/api-base": "9.13.5",
-    "@polkadot/rpc-core": "9.13.3",
+    "@polkadot/rpc-core": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "@polkadot/util-crypto": "^10.3.1",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
-    "@polkadot/api": "9.13.3",
+    "@polkadot/api": "9.13.5",
-    "@polkadot/api-augment": "9.13.3",
+    "@polkadot/api-augment": "9.13.5",
-    "@polkadot/rpc-augment": "9.13.3",
+    "@polkadot/rpc-augment": "9.13.5",
-    "@polkadot/rpc-provider": "9.13.3",
+    "@polkadot/rpc-provider": "9.13.5",
-    "@polkadot/types-support": "9.13.3"
+    "@polkadot/types-support": "9.13.5"
   }
 }

packages/api-derive/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api-derive', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/api-derive', path: 'auto', type: 'auto', version: '9.13.5' };

packages/api/package.json

@@ -20,29 +20,29 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/api-augment": "9.13.3",
+    "@polkadot/api-augment": "9.13.5",
-    "@polkadot/api-base": "9.13.3",
+    "@polkadot/api-base": "9.13.5",
-    "@polkadot/api-derive": "9.13.3",
+    "@polkadot/api-derive": "9.13.5",
     "@polkadot/keyring": "^10.3.1",
-    "@polkadot/rpc-augment": "9.13.3",
+    "@polkadot/rpc-augment": "9.13.5",
-    "@polkadot/rpc-core": "9.13.3",
+    "@polkadot/rpc-core": "9.13.5",
-    "@polkadot/rpc-provider": "9.13.3",
+    "@polkadot/rpc-provider": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-augment": "9.13.3",
+    "@polkadot/types-augment": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
-    "@polkadot/types-create": "9.13.3",
+    "@polkadot/types-create": "9.13.5",
-    "@polkadot/types-known": "9.13.3",
+    "@polkadot/types-known": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "@polkadot/util-crypto": "^10.3.1",
     "eventemitter3": "^5.0.0",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "9.13.3",
+    "@polkadot/api-augment": "9.13.5",
-    "@polkadot/types-support": "9.13.3"
+    "@polkadot/types-support": "9.13.5"
   }
 }

packages/api/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/api', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/api', path: 'auto', type: 'auto', version: '9.13.5' };

packages/rpc-augment/package.json

@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/rpc-core": "9.13.3",
+    "@polkadot/rpc-core": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
     "@polkadot/util": "^10.3.1"
   }
 }

packages/rpc-augment/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/rpc-augment', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/rpc-augment', path: 'auto', type: 'auto', version: '9.13.5' };

packages/rpc-core/package.json

@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/rpc-augment": "9.13.3",
+    "@polkadot/rpc-augment": "9.13.5",
-    "@polkadot/rpc-provider": "9.13.3",
+    "@polkadot/rpc-provider": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
     "@polkadot/keyring": "^10.3.1",
-    "@polkadot/rpc-augment": "9.13.3"
+    "@polkadot/rpc-augment": "9.13.5"
   }
 }

packages/rpc-core/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/rpc-core', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/rpc-core', path: 'auto', type: 'auto', version: '9.13.5' };

packages/rpc-provider/package.json

@@ -20,13 +20,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "@polkadot/keyring": "^10.3.1",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-support": "9.13.3",
+    "@polkadot/types-support": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "@polkadot/util-crypto": "^10.3.1",
     "@polkadot/x-fetch": "^10.3.1",

packages/rpc-provider/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/rpc-provider', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/rpc-provider', path: 'auto', type: 'auto', version: '9.13.5' };

packages/typegen/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.cjs",
@@ -33,15 +33,15 @@
     "@babel/core": "^7.20.12",
     "@babel/register": "^7.18.9",
     "@babel/runtime": "^7.20.13",
-    "@polkadot/api": "9.13.3",
+    "@polkadot/api": "9.13.5",
-    "@polkadot/api-augment": "9.13.3",
+    "@polkadot/api-augment": "9.13.5",
-    "@polkadot/rpc-augment": "9.13.3",
+    "@polkadot/rpc-augment": "9.13.5",
-    "@polkadot/rpc-provider": "9.13.3",
+    "@polkadot/rpc-provider": "9.13.5",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-augment": "9.13.3",
+    "@polkadot/types-augment": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
-    "@polkadot/types-create": "9.13.3",
+    "@polkadot/types-create": "9.13.5",
-    "@polkadot/types-support": "9.13.3",
+    "@polkadot/types-support": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "@polkadot/util-crypto": "^10.3.1",
     "@polkadot/x-ws": "^10.3.1",
@@ -51,6 +51,6 @@
   },
   "devDependencies": {
     "@types/websocket": "^1.0.5",
-    "@types/yargs": "^17.0.20"
+    "@types/yargs": "^17.0.22"
   }
 }

packages/typegen/src/fromChain.ts

@@ -9,7 +9,7 @@ import yargs from 'yargs';
 import { Definitions } from '@polkadot/types/types';
 import { formatNumber } from '@polkadot/util';
 
-import { generateDefaultCalls, generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultQuery, generateDefaultRpc, generateDefaultTx } from './generate';
+import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultQuery, generateDefaultRpc, generateDefaultRuntime, generateDefaultTx } from './generate';
 import { assertDir, assertFile, getMetadataViaWs, HEADER, writeFile } from './util';
 
 function generate (metaHex: HexString, pkg: string | undefined, output: string, isStrict?: boolean): void {
@@ -45,8 +45,8 @@ function generate (metaHex: HexString, pkg: string | undefined, output: string,
   generateDefaultEvents(path.join(outputPath, 'augment-api-events.ts'), metaHex, extraTypes, isStrict, customLookupDefinitions);
   generateDefaultQuery(path.join(outputPath, 'augment-api-query.ts'), metaHex, extraTypes, isStrict, customLookupDefinitions);
   generateDefaultRpc(path.join(outputPath, 'augment-api-rpc.ts'), extraTypes);
+  generateDefaultRuntime(path.join(outputPath, 'augment-api-runtime.ts'), metaHex, extraTypes, isStrict, customLookupDefinitions);
   generateDefaultTx(path.join(outputPath, 'augment-api-tx.ts'), metaHex, extraTypes, isStrict, customLookupDefinitions);
-  generateDefaultCalls(path.join(outputPath, 'augment-api-runtime.ts'), metaHex, extraTypes, isStrict, customLookupDefinitions);
 
   writeFile(path.join(outputPath, 'augment-api.ts'), (): string =>
     [

packages/typegen/src/generate/index.ts

@@ -8,6 +8,6 @@ export { generateDefaultInterface } from './interfaceRegistry';
 export { generateDefaultLookup } from './lookup';
 export { generateDefaultQuery } from './query';
 export { generateDefaultRpc } from './rpc';
-export { generateDefaultCalls } from './runtime';
+export { generateDefaultRuntime } from './runtime';
 export { generateDefaultTsDef } from './tsDef';
 export { generateDefaultTx } from './tx';

packages/typegen/src/generate/runtime.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Metadata } from '@polkadot/types/metadata/Metadata';
-import type { DefinitionCallNamed, Definitions } from '@polkadot/types/types';
+import type { DefinitionCallNamed, Definitions, Registry } from '@polkadot/types/types';
 import type { HexString } from '@polkadot/util/types';
 import type { ExtraTypes } from './types';
 
@@ -67,7 +67,7 @@ function getDefs (apis: Apis | null, defs: Record<string, Definitions>): Record<
 }
 
 /** @internal */
-export function generateCallTypes (meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean, customLookupDefinitions?: Definitions): void {
+export function generateCallTypes (registry: Registry, meta: Metadata, dest: string, extraTypes: ExtraTypes, isStrict: boolean, customLookupDefinitions?: Definitions): void {
   writeFile(dest, (): string => {
     const allTypes: ExtraTypes = {
       '@polkadot/types-augment': {
@@ -83,8 +83,7 @@ export function generateCallTypes (meta: Metadata, dest: string, extraTypes: Ext
 
     // find the system.Version in metadata
     let apis: Apis | null = null;
-    const { pallets, registry } = meta.asLatest;
+    const sysp = meta.asLatest.pallets.find(({ name }) => name.eq('System'));
-    const sysp = pallets.find(({ name }) => name.eq('System'));
 
     if (sysp) {
       const verc = sysp.constants.find(({ name }) => name.eq('Version'));
@@ -163,10 +162,11 @@ export function generateCallTypes (meta: Metadata, dest: string, extraTypes: Ext
   });
 }
 
-export function generateDefaultCalls (dest: string, data: HexString, extraTypes: ExtraTypes = {}, isStrict = false, customLookupDefinitions?: Definitions): void {
+export function generateDefaultRuntime (dest: string, data: HexString, extraTypes: ExtraTypes = {}, isStrict = false, customLookupDefinitions?: Definitions): void {
-  const { metadata } = initMeta(data, extraTypes);
+  const { metadata, registry } = initMeta(data, extraTypes);
 
   generateCallTypes(
+    registry,
     metadata,
     dest,
     extraTypes,

packages/typegen/src/interfacesTs.ts

@@ -7,7 +7,7 @@ import kusama from '@polkadot/types-support/metadata/static-kusama';
 import polkadot from '@polkadot/types-support/metadata/static-polkadot';
 import substrate from '@polkadot/types-support/metadata/static-substrate';
 
-import { generateDefaultCalls, generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultInterface, generateDefaultLookup, generateDefaultQuery, generateDefaultRpc, generateDefaultTsDef, generateDefaultTx } from './generate';
+import { generateDefaultConsts, generateDefaultErrors, generateDefaultEvents, generateDefaultInterface, generateDefaultLookup, generateDefaultQuery, generateDefaultRpc, generateDefaultRuntime, generateDefaultTsDef, generateDefaultTx } from './generate';
 
 const BASE = 'packages/api-augment/src';
 const METAS = Object.entries<HexString>({ kusama, polkadot, substrate });
@@ -26,7 +26,7 @@ export function main (): void {
     generateDefaultErrors(`${BASE}/${name}/errors.ts`, staticMeta);
     generateDefaultEvents(`${BASE}/${name}/events.ts`, staticMeta);
     generateDefaultQuery(`${BASE}/${name}/query.ts`, staticMeta);
+    generateDefaultRuntime(`${BASE}/${name}/runtime.ts`, staticMeta);
     generateDefaultTx(`${BASE}/${name}/tx.ts`, staticMeta);
-    generateDefaultCalls(`${BASE}/${name}/runtime.ts`, staticMeta);
   }
 }

packages/typegen/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/typegen', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/typegen', path: 'auto', type: 'auto', version: '9.13.5' };

packages/types-augment/package.json

@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
     "@polkadot/util": "^10.3.1"
   }
 }

packages/types-augment/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-augment', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/types-augment', path: 'auto', type: 'auto', version: '9.13.5' };

packages/types-codec/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
@@ -28,9 +28,9 @@
     "@polkadot/x-bigint": "^10.3.1"
   },
   "devDependencies": {
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-augment": "9.13.3",
+    "@polkadot/types-augment": "9.13.5",
-    "@polkadot/types-support": "9.13.3",
+    "@polkadot/types-support": "9.13.5",
     "@polkadot/util-crypto": "^10.3.1"
   }
 }

packages/types-codec/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-codec', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/types-codec', path: 'auto', type: 'auto', version: '9.13.5' };

packages/types-create/package.json

@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
     "@polkadot/util": "^10.3.1"
   },
   "devDependencies": {
-    "@polkadot/types": "9.13.3"
+    "@polkadot/types": "9.13.5"
   }
 }

packages/types-create/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-create', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/types-create', path: 'auto', type: 'auto', version: '9.13.5' };

packages/types-known/package.json

@@ -20,17 +20,17 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "@polkadot/networks": "^10.3.1",
-    "@polkadot/types": "9.13.3",
+    "@polkadot/types": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
-    "@polkadot/types-create": "9.13.3",
+    "@polkadot/types-create": "9.13.5",
     "@polkadot/util": "^10.3.1"
   },
   "devDependencies": {
-    "@polkadot/api": "9.13.3"
+    "@polkadot/api": "9.13.5"
   }
 }

packages/types-known/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-known', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/types-known', path: 'auto', type: 'auto', version: '9.13.5' };

packages/types-support/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",

packages/types-support/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types-support', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/types-support', path: 'auto', type: 'auto', version: '9.13.5' };

packages/types/package.json

@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "9.13.3",
+  "version": "9.13.5",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "@polkadot/keyring": "^10.3.1",
-    "@polkadot/types-augment": "9.13.3",
+    "@polkadot/types-augment": "9.13.5",
-    "@polkadot/types-codec": "9.13.3",
+    "@polkadot/types-codec": "9.13.5",
-    "@polkadot/types-create": "9.13.3",
+    "@polkadot/types-create": "9.13.5",
     "@polkadot/util": "^10.3.1",
     "@polkadot/util-crypto": "^10.3.1",
     "rxjs": "^7.8.0"
   },
   "devDependencies": {
     "@polkadot/keyring": "^10.3.1",
-    "@polkadot/types-support": "9.13.3"
+    "@polkadot/types-support": "9.13.5"
   }
 }

packages/types/src/create/registry.ts

@@ -540,24 +540,28 @@ export class TypeRegistry implements Registry {
     // attach the lookup before we register any types
     this.setLookup(lookup);
 
-    // default to V1 - this includes 1.5 (with single field)
+    // we detect based on runtime configuration
-    let weightType = 'WeightV1';
+    let Weight: string | null = null;
-    const WeightV2 = this.get<WeightV2>('SpWeightsWeightV2Weight');
 
-    // detection for WeightV2 type
+    if (this.hasType('SpWeightsWeightV2Weight')) {
-    if (WeightV2) {
+      // detection for WeightV2 type based on latest naming
-      const weight = new WeightV2(this);
+      const weightv2 = this.createType<WeightV2>('SpWeightsWeightV2Weight');
 
-      if (weight.refTime && weight.proofSize) {
+      Weight = weightv2.refTime && weightv2.proofSize
-        weightType = 'SpWeightsWeightV2Weight';
+        // with both refTime & proofSize we use as-is (WeightV2)
-      }
+        ? 'SpWeightsWeightV2Weight'
-    }
+        // fallback to WeightV1 (WeightV1.5 is a struct, single field)
-
+        : 'WeightV1';
-    if (weightType !== 'WeightV1' || !isBn(this.createType<WeightV1>('Weight'))) {
+    } else if (!isBn(this.createType<WeightV1>('Weight'))) {
-      // where we have an already-supplied override, we don't clobber
+      // where we have an already-supplied BN override, we don't clobber
       // it with our detected value (This protects against pre-defines
       // where Weight may be aliassed to WeightV0, e.g. in early Kusama chains)
-      this.register({ Weight: weightType });
+      Weight = 'WeightV1';
+    }
+
+    if (Weight) {
+      // we have detected a version, adjust the definition
+      this.register({ Weight });
     }
   };
 

packages/types/src/metadata/PortableRegistry/PortableRegistry.ts

@@ -47,9 +47,8 @@ const PATHS_ALIAS = splitNamespace([
   'sp_core::crypto::AccountId32',
   'sp_runtime::generic::era::Era',
   'sp_runtime::multiaddress::MultiAddress',
-  // weights 2 (1.5+) is a structure, potentially can be flatenned
+  // weights 1.5+ is a structure can be flatenned
   'frame_support::weights::weight_v2::Weight',
-  'sp_weights::weight_v2::Weight',
   // ethereum overrides (Frontier, Moonbeam, Polkadot claims)
   'account::AccountId20',
   'polkadot_runtime_common::claims::EthereumAddress',
@@ -152,12 +151,7 @@ function matchParts (first: string[], second: (string | Text)[]): boolean {
 }
 
 /** @internal check if the path matches the PATHS_ALIAS (with wildcards) */
-function getAliasPath ({ def, path }: SiType): string | null {
+function getAliasPath ({ path }: SiType): string | null {
-  // specific logic for weights - we only override when non-complex struct
-  if (path.join('::') === 'sp_weights::weight_v2::Weight' && def.isComposite && def.asComposite.fields.length !== 1) {
-    return null;
-  }
-
   // TODO We need to handle ink! Balance in some way
   return path.length && PATHS_ALIAS.some((a) => matchParts(a, path))
     ? path[path.length - 1].toString()

packages/types/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/types', path: 'auto', type: 'auto', version: '9.13.3' };
+export const packageInfo = { name: '@polkadot/types', path: 'auto', type: 'auto', version: '9.13.5' };