Fix ss58Prefix extraction (#4274)

jacogr · web-flow · commit bacb757d7d69 · 2021-11-30T16:07:50.000+02:00
* Fix ss58Prefix extraction

* allow fallback

* adjust
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 6.10.3 Nov 30, 2021
+
+Upgrade priority: Medium. Recommended for 6.10.x users
+
+Changes:
+
+- Fix ss58Prefix extraction
+
+
 ## 6.10.2 Nov 30, 2021
 
 Upgrade priority: Low. Aligns TS augmentation and decoration with older behavior for ALL_CAPS identifiers.
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "commonjs",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "workspaces": [
     "packages/*"
   ],
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@polkadot/api": "6.10.2",
-    "@polkadot/types": "6.10.2",
+    "@polkadot/api": "6.10.3",
+    "@polkadot/types": "6.10.3",
     "@polkadot/util": "^8.0.4",
     "rxjs": "^7.4.0"
   }
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
@@ -20,19 +20,19 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@polkadot/api": "6.10.2",
-    "@polkadot/rpc-core": "6.10.2",
-    "@polkadot/types": "6.10.2",
+    "@polkadot/api": "6.10.3",
+    "@polkadot/rpc-core": "6.10.3",
+    "@polkadot/types": "6.10.3",
     "@polkadot/util": "^8.0.4",
     "@polkadot/util-crypto": "^8.0.4",
     "rxjs": "^7.4.0"
   },
   "devDependencies": {
     "@polkadot/keyring": "^8.0.4",
-    "@polkadot/rpc-provider": "6.10.2"
+    "@polkadot/rpc-provider": "6.10.3"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -20,16 +20,16 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@polkadot/api-derive": "6.10.2",
+    "@polkadot/api-derive": "6.10.3",
     "@polkadot/keyring": "^8.0.4",
-    "@polkadot/rpc-core": "6.10.2",
-    "@polkadot/rpc-provider": "6.10.2",
-    "@polkadot/types": "6.10.2",
-    "@polkadot/types-known": "6.10.2",
+    "@polkadot/rpc-core": "6.10.3",
+    "@polkadot/rpc-provider": "6.10.3",
+    "@polkadot/types": "6.10.3",
+    "@polkadot/types-known": "6.10.3",
     "@polkadot/util": "^8.0.4",
     "@polkadot/util-crypto": "^8.0.4",
     "eventemitter3": "^4.0.7",
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@polkadot/rpc-provider": "6.10.2",
-    "@polkadot/types": "6.10.2",
+    "@polkadot/rpc-provider": "6.10.3",
+    "@polkadot/types": "6.10.3",
     "@polkadot/util": "^8.0.4",
     "rxjs": "^7.4.0"
   },
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
@@ -20,11 +20,11 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@polkadot/types": "6.10.2",
+    "@polkadot/types": "6.10.3",
     "@polkadot/util": "^8.0.4",
     "@polkadot/util-crypto": "^8.0.4",
     "@polkadot/x-fetch": "^8.0.4",
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^8.0.4",
-    "@polkadot/types": "6.10.2",
+    "@polkadot/types": "6.10.3",
     "mock-socket": "^9.0.8",
     "nock": "^13.2.1"
   }
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.cjs",
@@ -33,10 +33,10 @@
     "@babel/core": "^7.16.0",
     "@babel/register": "^7.16.0",
     "@babel/runtime": "^7.16.3",
-    "@polkadot/api": "6.10.2",
-    "@polkadot/rpc-provider": "6.10.2",
-    "@polkadot/types": "6.10.2",
-    "@polkadot/types-support": "6.10.2",
+    "@polkadot/api": "6.10.3",
+    "@polkadot/rpc-provider": "6.10.3",
+    "@polkadot/types": "6.10.3",
+    "@polkadot/types-support": "6.10.3",
     "@polkadot/util": "^8.0.4",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@polkadot/networks": "^8.0.4",
-    "@polkadot/types": "6.10.2",
+    "@polkadot/types": "6.10.3",
     "@polkadot/util": "^8.0.4"
   }
 }
diff --git a/packages/types-support/package.json b/packages/types-support/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "6.10.2",
+  "version": "6.10.3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@polkadot/types-known": "6.10.2",
+    "@polkadot/types-known": "6.10.3",
     "@polkadot/util": "^8.0.4",
     "@polkadot/util-crypto": "^8.0.4",
     "rxjs": "^7.4.0"
   },
   "devDependencies": {
     "@polkadot/keyring": "^8.0.4",
-    "@polkadot/types-support": "6.10.2",
+    "@polkadot/types-support": "6.10.3",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.12.0"
   }
diff --git a/packages/types/src/create/registry.ts b/packages/types/src/create/registry.ts
@@ -122,7 +122,7 @@ function injectExtrinsics (registry: Registry, { lookup, pallets }: MetadataLate
 function extractProperties (registry: Registry, metadata: Metadata): ChainProperties | undefined {
   const original = registry.getChainProperties();
   const constants = decorateConstants(registry, metadata.asLatest, metadata.version);
-  const ss58Format = constants.system?.ss58Prefix;
+  const ss58Format = constants.system && (constants.system.sS58Prefix || constants.system.ss58Prefix);
 
   if (!ss58Format) {
     return original;
diff --git a/yarn.lock b/yarn.lock
@@ -1852,40 +1852,40 @@ __metadata:
   resolution: "@polkadot/api-contract@workspace:packages/api-contract"
   dependencies:
     "@babel/runtime": ^7.16.3
-    "@polkadot/api": 6.10.2
-    "@polkadot/types": 6.10.2
+    "@polkadot/api": 6.10.3
+    "@polkadot/types": 6.10.3
     "@polkadot/util": ^8.0.4
     rxjs: ^7.4.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-derive@6.10.2, @polkadot/api-derive@workspace:packages/api-derive":
+"@polkadot/api-derive@6.10.3, @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.3
-    "@polkadot/api": 6.10.2
+    "@polkadot/api": 6.10.3
     "@polkadot/keyring": ^8.0.4
-    "@polkadot/rpc-core": 6.10.2
-    "@polkadot/rpc-provider": 6.10.2
-    "@polkadot/types": 6.10.2
+    "@polkadot/rpc-core": 6.10.3
+    "@polkadot/rpc-provider": 6.10.3
+    "@polkadot/types": 6.10.3
     "@polkadot/util": ^8.0.4
     "@polkadot/util-crypto": ^8.0.4
     rxjs: ^7.4.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/api@6.10.2, @polkadot/api@workspace:packages/api":
+"@polkadot/api@6.10.3, @polkadot/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@polkadot/api@workspace:packages/api"
   dependencies:
     "@babel/runtime": ^7.16.3
-    "@polkadot/api-derive": 6.10.2
+    "@polkadot/api-derive": 6.10.3
     "@polkadot/keyring": ^8.0.4
-    "@polkadot/rpc-core": 6.10.2
-    "@polkadot/rpc-provider": 6.10.2
-    "@polkadot/types": 6.10.2
-    "@polkadot/types-known": 6.10.2
+    "@polkadot/rpc-core": 6.10.3
+    "@polkadot/rpc-provider": 6.10.3
+    "@polkadot/types": 6.10.3
+    "@polkadot/types-known": 6.10.3
     "@polkadot/util": ^8.0.4
     "@polkadot/util-crypto": ^8.0.4
     eventemitter3: ^4.0.7
@@ -2007,26 +2007,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-core@6.10.2, @polkadot/rpc-core@workspace:packages/rpc-core":
+"@polkadot/rpc-core@6.10.3, @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.3
     "@polkadot/keyring": ^8.0.4
-    "@polkadot/rpc-provider": 6.10.2
-    "@polkadot/types": 6.10.2
+    "@polkadot/rpc-provider": 6.10.3
+    "@polkadot/types": 6.10.3
     "@polkadot/util": ^8.0.4
     rxjs: ^7.4.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-provider@6.10.2, @polkadot/rpc-provider@workspace:packages/rpc-provider":
+"@polkadot/rpc-provider@6.10.3, @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.3
     "@polkadot/keyring": ^8.0.4
-    "@polkadot/types": 6.10.2
+    "@polkadot/types": 6.10.3
     "@polkadot/util": ^8.0.4
     "@polkadot/util-crypto": ^8.0.4
     "@polkadot/x-fetch": ^8.0.4
@@ -2054,10 +2054,10 @@ __metadata:
     "@babel/core": ^7.16.0
     "@babel/register": ^7.16.0
     "@babel/runtime": ^7.16.3
-    "@polkadot/api": 6.10.2
-    "@polkadot/rpc-provider": 6.10.2
-    "@polkadot/types": 6.10.2
-    "@polkadot/types-support": 6.10.2
+    "@polkadot/api": 6.10.3
+    "@polkadot/rpc-provider": 6.10.3
+    "@polkadot/types": 6.10.3
+    "@polkadot/types-support": 6.10.3
     "@polkadot/util": ^8.0.4
     "@types/websocket": ^1.0.4
     "@types/yargs": ^17.0.7
@@ -2073,18 +2073,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-known@6.10.2, @polkadot/types-known@workspace:packages/types-known":
+"@polkadot/types-known@6.10.3, @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.3
     "@polkadot/networks": ^8.0.4
-    "@polkadot/types": 6.10.2
+    "@polkadot/types": 6.10.3
     "@polkadot/util": ^8.0.4
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-support@6.10.2, @polkadot/types-support@workspace:packages/types-support":
+"@polkadot/types-support@6.10.3, @polkadot/types-support@workspace:packages/types-support":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-support@workspace:packages/types-support"
   dependencies:
@@ -2093,14 +2093,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types@6.10.2, @polkadot/types@workspace:packages/types":
+"@polkadot/types@6.10.3, @polkadot/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
     "@babel/runtime": ^7.16.3
     "@polkadot/keyring": ^8.0.4
-    "@polkadot/types-known": 6.10.2
-    "@polkadot/types-support": 6.10.2
+    "@polkadot/types-known": 6.10.3
+    "@polkadot/types-support": 6.10.3
     "@polkadot/util": ^8.0.4
     "@polkadot/util-crypto": ^8.0.4
     "@types/bn.js": ^4.11.6
