diff --git a/package.json b/package.json index bcd6b070..31177498 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", - "@polkadot/dev": "^0.40.17", + "@polkadot/dev": "^0.40.18", "@polkadot/ts": "^0.2.3", "babel-plugin-transform-vue-template": "^0.4.2", "empty": "^0.10.1", diff --git a/packages/exampleReactNative/package.json b/packages/exampleReactNative/package.json index dd7b983a..943aba78 100644 --- a/packages/exampleReactNative/package.json +++ b/packages/exampleReactNative/package.json @@ -40,9 +40,9 @@ "devDependencies": { "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", - "@polkadot/keyring": "^2.4.0-beta.0", - "@polkadot/util": "^2.4.0-beta.0", - "@polkadot/util-crypto": "^2.4.0-beta.0", + "@polkadot/keyring": "^2.4.0-beta.2", + "@polkadot/util": "^2.4.0-beta.2", + "@polkadot/util-crypto": "^2.4.0-beta.2", "@react-native-community/cli-platform-ios": "^3.0.0", "@types/react-test-renderer": "16.9.2", "babel-jest": "^25.1.0", diff --git a/packages/react-identicon/package.json b/packages/react-identicon/package.json index 81bcdbc4..68a0fc41 100644 --- a/packages/react-identicon/package.json +++ b/packages/react-identicon/package.json @@ -26,9 +26,9 @@ "react-is": "*" }, "devDependencies": { - "@polkadot/keyring": "^2.4.0-beta.0", - "@polkadot/util": "^2.4.0-beta.0", - "@polkadot/util-crypto": "^2.4.0-beta.0", + "@polkadot/keyring": "^2.4.0-beta.2", + "@polkadot/util": "^2.4.0-beta.2", + "@polkadot/util-crypto": "^2.4.0-beta.2", "@types/react-copy-to-clipboard": "^4.3.0", "@types/react-dom": "^16.9.5", "@types/styled-components": "^4.4.3", diff --git a/packages/reactnative-identicon/package.json b/packages/reactnative-identicon/package.json index 28176ce3..081c6f00 100644 --- a/packages/reactnative-identicon/package.json +++ b/packages/reactnative-identicon/package.json @@ -19,7 +19,7 @@ "react-native": "*" }, "devDependencies": { - "@polkadot/util-crypto": "^2.4.0-beta.0", + "@polkadot/util-crypto": "^2.4.0-beta.2", "@types/react-native": "^0.61.12" } } diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index a4378aab..0eff1ab4 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -26,9 +26,9 @@ "store": "^2.0.12" }, "devDependencies": { - "@polkadot/keyring": "^2.4.0-beta.0", - "@polkadot/types": "^1.3.0-beta.8", - "@polkadot/util": "^2.4.0-beta.0", + "@polkadot/keyring": "^2.4.0-beta.2", + "@polkadot/types": "^1.3.0-beta.11", + "@polkadot/util": "^2.4.0-beta.2", "@types/ledgerhq__hw-transport-node-hid": "^4.21.1", "@types/ledgerhq__hw-transport-u2f": "^4.21.1", "@types/mkdirp": "^0.5.2", diff --git a/packages/ui-keyring/src/Keyring.ts b/packages/ui-keyring/src/Keyring.ts index 6fcf3e22..6821bb70 100644 --- a/packages/ui-keyring/src/Keyring.ts +++ b/packages/ui-keyring/src/Keyring.ts @@ -263,7 +263,7 @@ export class Keyring extends Base implements KeyringStruct { public restoreAccount (json: KeyringPair$Json, password: string): KeyringPair { const type = Array.isArray(json.encoding.content) ? json.encoding.content[1] : 'ed25519'; const pair = createPair( - type, + { toSS58: this.encodeAddress, type }, { // FIXME Just for the transition period (ignoreChecksum) publicKey: this.decodeAddress(json.address, true) diff --git a/packages/ui-settings/package.json b/packages/ui-settings/package.json index 8f81272b..ef398ab9 100644 --- a/packages/ui-settings/package.json +++ b/packages/ui-settings/package.json @@ -13,7 +13,7 @@ "store": "^2.0.12" }, "devDependencies": { - "@polkadot/util": "^2.4.0-beta.0", + "@polkadot/util": "^2.4.0-beta.2", "@types/store": "^2.0.2" }, "peerDependencies": { diff --git a/packages/ui-shared/package.json b/packages/ui-shared/package.json index 81e3cf48..4f524c62 100644 --- a/packages/ui-shared/package.json +++ b/packages/ui-shared/package.json @@ -16,7 +16,7 @@ "@polkadot/util-crypto": "*" }, "devDependencies": { - "@polkadot/util-crypto": "^2.4.0-beta.0", + "@polkadot/util-crypto": "^2.4.0-beta.2", "@types/color": "^3.0.1" } } diff --git a/packages/vue-identicon/package.json b/packages/vue-identicon/package.json index 277645e0..7f2bf705 100644 --- a/packages/vue-identicon/package.json +++ b/packages/vue-identicon/package.json @@ -18,7 +18,7 @@ "vue": "*" }, "devDependencies": { - "@polkadot/util-crypto": "^2.4.0-beta.0", + "@polkadot/util-crypto": "^2.4.0-beta.2", "vue": "^2.6.11" } } diff --git a/yarn.lock b/yarn.lock index b59b2426..904992e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2267,10 +2267,10 @@ dependencies: "@types/node" ">= 8" -"@polkadot/dev@^0.40.17": - version "0.40.17" - resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.40.17.tgz#493f4a7263797e416b12e6b735b39d428f6c0ef1" - integrity sha512-tAfUlcdOzixa6c4/5fxaXjO4cEmXpGZzx3EAIyqsQw+74FBFVR1BKEeGoGuWetTQfIWKqAMOKsFjF5O6VS+VfA== +"@polkadot/dev@^0.40.18": + version "0.40.18" + resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.40.18.tgz#6ca40304bcc7c75b26c0190d60cb5b892a512dc5" + integrity sha512-SEkmrdZPYcnFzXnfpIjnvNfrwdBS3uAenEt8ZYBMkay59+XgFnPKi7xKV92x5iGYEiAXfcKFYjCAN0Nk2rXV5Q== dependencies: "@babel/cli" "^7.8.4" "@babel/core" "^7.8.4" @@ -2328,24 +2328,24 @@ webpack-cli "^3.3.11" yargs "^15.1.0" -"@polkadot/keyring@^2.4.0-beta.0": - version "2.4.0-beta.0" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.4.0-beta.0.tgz#d43996daf38c53b35eccd3016246726a26c7b483" - integrity sha512-dv4wonHpWnXDNHyidWdKzXZQnDesxQWWbATbDeZUv4P1Hwbn4zpa8+nQoRuKi7v5OmFJvm0Ailb84/sWQweoYA== +"@polkadot/keyring@^2.4.0-beta.2": + version "2.4.0-beta.2" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.4.0-beta.2.tgz#0667b238e466930ce4ace2e2ab11d72a779feda6" + integrity sha512-QX+iWU68UeTHQNpp5EXOl+n6inl+M/EEh2FMUxtq+MR0Yt7uYDGIYr9Vcch6jdxoR9nHx7mLFJgcSlCPz4Ld5Q== dependencies: "@babel/runtime" "^7.8.4" + "@polkadot/util" "^2.4.0-beta.2" + "@polkadot/util-crypto" "^2.4.0-beta.2" + +"@polkadot/metadata@^1.3.0-beta.11": + version "1.3.0-beta.11" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.3.0-beta.11.tgz#a177bd0067f210e5c8310b81ce09a99fba3c3198" + integrity sha512-mCdGqkVQKWCAEd5awcCjAb6o52/b3/pt2w0d68ksfSQ1B3zSoDX+v58RDU4imQvBGsglT4S3aRJx9ry19hnzPQ== + dependencies: + "@babel/runtime" "^7.8.4" + "@polkadot/types" "^1.3.0-beta.11" "@polkadot/util" "^2.4.0-beta.0" "@polkadot/util-crypto" "^2.4.0-beta.0" - -"@polkadot/metadata@^1.3.0-beta.8": - version "1.3.0-beta.8" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.3.0-beta.8.tgz#f327962aa64cdf8b70802339ead419016414ba94" - integrity sha512-FrdCeasJHlLhg0xYPxOWmkK42mLxH+qJiBjy+COVS5q7Oqds8KMG5+Yl7wfxUnWKC9JdAB9txetaGVeeDo4HxQ== - dependencies: - "@babel/runtime" "^7.8.4" - "@polkadot/types" "^1.3.0-beta.8" - "@polkadot/util" "^2.3.1" - "@polkadot/util-crypto" "^2.3.1" bn.js "^5.1.1" "@polkadot/ts@^0.2.3": @@ -2355,39 +2355,20 @@ dependencies: "@types/chrome" "^0.0.95" -"@polkadot/types@^1.3.0-beta.8": - version "1.3.0-beta.8" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.3.0-beta.8.tgz#9c6cb4c7e724a5bac06e01f6a11bce1f360f09d4" - integrity sha512-bDlaxcqT63B23duQFUA9QhThJEVC4HjtK6qYZ2mUhmAHF9K33kDR57JWPzCr7DRGPoDKSZVM7dO/zKkbcsKPxw== +"@polkadot/types@^1.3.0-beta.11": + version "1.3.0-beta.11" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.3.0-beta.11.tgz#66a15207005b448cba3e9171dabe154cf15ea6cf" + integrity sha512-DcvTeeI78+gWBAJJTYuX3Oa6WDeBUsxDrQoB1mczyO4fgB2c5N0kwIbUxzYMkzkDjTuPQW8HGkfAZq9/pDzVcw== dependencies: "@babel/runtime" "^7.8.4" - "@polkadot/metadata" "^1.3.0-beta.8" - "@polkadot/util" "^2.3.1" - "@polkadot/util-crypto" "^2.3.1" + "@polkadot/metadata" "^1.3.0-beta.11" + "@polkadot/util" "^2.4.0-beta.0" + "@polkadot/util-crypto" "^2.4.0-beta.0" "@types/bn.js" "^4.11.6" bn.js "^5.1.1" memoizee "^0.4.14" rxjs "^6.5.4" -"@polkadot/util-crypto@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.3.1.tgz#e95bace6ef59408657df1068f8044766744f453c" - integrity sha512-I9lKhheW/cWeFSs5NBgiw5WkkfAsceEzW4/eWf/s39TLVueUnOiXG/+fcaRHBZmBDMhK9Mc2FxvLn2Df6YQGUg== - dependencies: - "@babel/runtime" "^7.8.4" - "@polkadot/util" "^2.3.1" - "@polkadot/wasm-crypto" "^1.0.1" - base-x "^3.0.7" - bip39 "^3.0.2" - blakejs "^1.1.0" - bn.js "^5.1.1" - bs58 "^4.0.1" - elliptic "^6.5.2" - js-sha3 "^0.8.0" - pbkdf2 "^3.0.9" - tweetnacl "^1.0.3" - xxhashjs "^0.2.2" - "@polkadot/util-crypto@^2.4.0-beta.0": version "2.4.0-beta.0" resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.4.0-beta.0.tgz#a821c29835ca6e23b0db6faecf3edc263fac75fb" @@ -2407,10 +2388,29 @@ tweetnacl "^1.0.3" xxhashjs "^0.2.2" -"@polkadot/util@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.3.1.tgz#ea4142386e66db14eae78c8fda4fb62693cf072a" - integrity sha512-g00HThGm0t1sciOxDKuqnSsh6fyGUKtazVac0v58fMOtbX0geTu0TpddRdFav/L5KO6lkq8DBFUQW95x9Cf4gw== +"@polkadot/util-crypto@^2.4.0-beta.2": + version "2.4.0-beta.2" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.4.0-beta.2.tgz#b41dec80803f3d203cbae6d4bd339a40cac7cb36" + integrity sha512-SvQvQbYmFdmw8NCcATxoy1rgw5PIDS5tM3BKOsHkIN9bwyxhInRVJlhUAlBkopc6CNIhqz5/zBQVoWWJQgjWFA== + dependencies: + "@babel/runtime" "^7.8.4" + "@polkadot/util" "^2.4.0-beta.2" + "@polkadot/wasm-crypto" "^1.0.1" + base-x "^3.0.7" + bip39 "^3.0.2" + blakejs "^1.1.0" + bn.js "^5.1.1" + bs58 "^4.0.1" + elliptic "^6.5.2" + js-sha3 "^0.8.0" + pbkdf2 "^3.0.9" + tweetnacl "^1.0.3" + xxhashjs "^0.2.2" + +"@polkadot/util@^2.4.0-beta.0": + version "2.4.0-beta.0" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.4.0-beta.0.tgz#2a289a1a9da1f59b1e07399252fdf8fbe2bf5d76" + integrity sha512-mSC/NSpqImx45f9FWf6qjzjqDpRnF1v7dfeRfRxkPGX94zrRRS/jTjPbPmOhnbfA3+vokShq3/t3DvESwYH9ZQ== dependencies: "@babel/runtime" "^7.8.4" bn.js "^5.1.1" @@ -2418,10 +2418,10 @@ chalk "^3.0.0" ip-regex "^4.1.0" -"@polkadot/util@^2.4.0-beta.0": - version "2.4.0-beta.0" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.4.0-beta.0.tgz#2a289a1a9da1f59b1e07399252fdf8fbe2bf5d76" - integrity sha512-mSC/NSpqImx45f9FWf6qjzjqDpRnF1v7dfeRfRxkPGX94zrRRS/jTjPbPmOhnbfA3+vokShq3/t3DvESwYH9ZQ== +"@polkadot/util@^2.4.0-beta.2": + version "2.4.0-beta.2" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.4.0-beta.2.tgz#c0e4095d9df54bef50a57906962765a22eec89dc" + integrity sha512-FJEzE5DjCGOMn49vkqrFJOXgqftuACu1MO9LQ5YpoShfqdIRclAZYJbhSxLLXBJwDudHsxiqe3nFBg/FFWv+kw== dependencies: "@babel/runtime" "^7.8.4" bn.js "^5.1.1"