Internal ss58Format handling (#283)

This commit is contained in:
Jaco Greeff
2020-02-18 17:07:53 +01:00
committed by GitHub
parent 826de3ddf0
commit 2ba4444ca4
4 changed files with 20 additions and 16 deletions
+4
View File
@@ -1,3 +1,7 @@
# 0.52.0-beta.x
- Remove internal ui-keyring ss58Format mapping, rather set it directly on internal keyring
# 0.51.1 Feb 18, 2020
- Support formatting of addresses via createPair base on latest upstream keyring
+1 -1
View File
@@ -27,7 +27,7 @@
},
"devDependencies": {
"@polkadot/keyring": "^2.4.1",
"@polkadot/types": "^1.3.1",
"@polkadot/types": "^1.4.0-beta.5",
"@polkadot/util": "^2.4.1",
"@types/ledgerhq__hw-transport-node-hid": "^4.21.1",
"@types/ledgerhq__hw-transport-u2f": "^4.21.1",
+5 -5
View File
@@ -30,8 +30,6 @@ export default class Base {
protected _store!: KeyringStore;
private _ss58Format?: Prefix;
constructor () {
this._accounts = accounts;
this._addresses = addresses;
@@ -96,8 +94,10 @@ export default class Base {
return password.length > 0 && password.length <= MAX_PASS_LEN;
}
public setSS58Format (ss58Format: Prefix): void {
this._ss58Format = ss58Format;
public setSS58Format (ss58Format?: Prefix): void {
if (this._keyring && ss58Format) {
this._keyring.setSS58Format(ss58Format);
}
}
public setDevMode (isDevelopment: boolean): void {
@@ -105,7 +105,7 @@ export default class Base {
}
protected initKeyring (options: KeyringOptions): void {
const keyring = testKeyring({ ss58Format: this._ss58Format, ...options }, true);
const keyring = testKeyring(options, true);
if (isBoolean(options.isDevelopment)) {
this.setDevMode(options.isDevelopment);
+10 -10
View File
@@ -2337,13 +2337,13 @@
"@polkadot/util" "^2.4.1"
"@polkadot/util-crypto" "^2.4.1"
"@polkadot/metadata@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.3.1.tgz#1324195c67c0ec7b01873a30ac77dcb5303ad359"
integrity sha512-sdtitMkdPzcnVfdDNyE1f916B35kRa4I/PGTrFR7/Q9xW5p/A1XbMNjApcXg3HGudrS9JRddebUM6q2MYsaGTA==
"@polkadot/metadata@^1.4.0-beta.5":
version "1.4.0-beta.5"
resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.4.0-beta.5.tgz#90b8d36a003fbd57866bdc8b874adcb11ea9ddf8"
integrity sha512-SoPNZ11E+VrGTu2l93FfZiRWvu2krrcwFacMW2M08FGwo1TiHBuVHzjNhxNA7vKcLi6HqbKrTKi/Mj+FaPu7bA==
dependencies:
"@babel/runtime" "^7.8.4"
"@polkadot/types" "^1.3.1"
"@polkadot/types" "^1.4.0-beta.5"
"@polkadot/util" "^2.4.1"
"@polkadot/util-crypto" "^2.4.1"
bn.js "^5.1.1"
@@ -2355,13 +2355,13 @@
dependencies:
"@types/chrome" "^0.0.95"
"@polkadot/types@^1.3.1":
version "1.3.1"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.3.1.tgz#849050c11f0cbe119822e601a4500d2d2822fbc8"
integrity sha512-BJOVE9rjeBOCCcl8Z2DlBXooavipovQwPs4HDMGykdypYmjKIpr1iEVBKWhDspANfNUi7PntfoLGNvsga0PSiw==
"@polkadot/types@^1.4.0-beta.5":
version "1.4.0-beta.5"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.4.0-beta.5.tgz#bd09e7c52aaec78bcf9d66a5bcf5f6cdcd757690"
integrity sha512-dNy18407wM16MMiC1/VRBD4xYG+7HjuK42SHtvB0oaSfP1av8eIqOPnYKNK+LgBARHFw3DoyISj3dsjEE5yESw==
dependencies:
"@babel/runtime" "^7.8.4"
"@polkadot/metadata" "^1.3.1"
"@polkadot/metadata" "^1.4.0-beta.5"
"@polkadot/util" "^2.4.1"
"@polkadot/util-crypto" "^2.4.1"
"@types/bn.js" "^4.11.6"