From eb167f873533d4edfe9cb377e6bd01ae527dfe13 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 18 Mar 2019 10:25:02 +0100 Subject: [PATCH] Use wasm-schnorrkel package (#371) * Use wasm-schnorrkel package * wasm-schnorrkel 0.1.1 --- packages/util-crypto/package.json | 2 +- packages/util-crypto/src/schnorrkel/deriveHard.ts | 2 +- packages/util-crypto/src/schnorrkel/deriveSoft.ts | 2 +- .../util-crypto/src/schnorrkel/keypair/fromSeed.ts | 2 +- packages/util-crypto/src/schnorrkel/polyfill.ts | 2 +- packages/util-crypto/src/schnorrkel/ready.ts | 2 +- packages/util-crypto/src/schnorrkel/sign.ts | 2 +- packages/util-crypto/src/schnorrkel/verify.ts | 2 +- yarn.lock | 10 +++++----- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/util-crypto/package.json b/packages/util-crypto/package.json index 1b179f11b..42a9bba8e 100644 --- a/packages/util-crypto/package.json +++ b/packages/util-crypto/package.json @@ -29,8 +29,8 @@ "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util-crypto#readme", "dependencies": { "@babel/runtime": "^7.3.4", - "@polkadot/schnorrkel-js": "^0.2.0-12", "@polkadot/util": "^0.38.0-beta.4", + "@polkadot/wasm-schnorrkel": "^0.1.1", "@types/bip39": "^2.4.2", "@types/pbkdf2": "^3.0.0", "@types/secp256k1": "^3.5.0", diff --git a/packages/util-crypto/src/schnorrkel/deriveHard.ts b/packages/util-crypto/src/schnorrkel/deriveHard.ts index 5654230e8..1ad9220a5 100644 --- a/packages/util-crypto/src/schnorrkel/deriveHard.ts +++ b/packages/util-crypto/src/schnorrkel/deriveHard.ts @@ -6,7 +6,7 @@ import { Keypair } from '../types'; import './polyfill'; -import schnorrkel from '@polkadot/schnorrkel-js'; +import schnorrkel from '@polkadot/wasm-schnorrkel'; import keypairFromU8a from './keypair/fromU8a'; import keypairToU8a from './keypair/toU8a'; diff --git a/packages/util-crypto/src/schnorrkel/deriveSoft.ts b/packages/util-crypto/src/schnorrkel/deriveSoft.ts index eb70c4243..fb38e7d7a 100644 --- a/packages/util-crypto/src/schnorrkel/deriveSoft.ts +++ b/packages/util-crypto/src/schnorrkel/deriveSoft.ts @@ -6,7 +6,7 @@ import { Keypair } from '../types'; import './polyfill'; -import schnorrkel from '@polkadot/schnorrkel-js'; +import schnorrkel from '@polkadot/wasm-schnorrkel'; import keypairFromU8a from './keypair/fromU8a'; import keypairToU8a from './keypair/toU8a'; diff --git a/packages/util-crypto/src/schnorrkel/keypair/fromSeed.ts b/packages/util-crypto/src/schnorrkel/keypair/fromSeed.ts index 398e9afbf..d638e8f86 100644 --- a/packages/util-crypto/src/schnorrkel/keypair/fromSeed.ts +++ b/packages/util-crypto/src/schnorrkel/keypair/fromSeed.ts @@ -6,7 +6,7 @@ import { Keypair } from '../../types'; import '../polyfill'; -import schnorrkel from '@polkadot/schnorrkel-js'; +import schnorrkel from '@polkadot/wasm-schnorrkel'; import keypairFromU8a from './fromU8a'; diff --git a/packages/util-crypto/src/schnorrkel/polyfill.ts b/packages/util-crypto/src/schnorrkel/polyfill.ts index 5af7775f6..3b29a6679 100644 --- a/packages/util-crypto/src/schnorrkel/polyfill.ts +++ b/packages/util-crypto/src/schnorrkel/polyfill.ts @@ -2,4 +2,4 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import '@polkadot/schnorrkel-js/crypto-polyfill'; +import '@polkadot/wasm-schnorrkel/crypto-polyfill'; diff --git a/packages/util-crypto/src/schnorrkel/ready.ts b/packages/util-crypto/src/schnorrkel/ready.ts index 2b5b04dd9..9a74a907c 100644 --- a/packages/util-crypto/src/schnorrkel/ready.ts +++ b/packages/util-crypto/src/schnorrkel/ready.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import schnorrkel from '@polkadot/schnorrkel-js'; +import schnorrkel from '@polkadot/wasm-schnorrkel'; export default function schnorrkelWaitReady (): Promise { return schnorrkel.waitReady(); diff --git a/packages/util-crypto/src/schnorrkel/sign.ts b/packages/util-crypto/src/schnorrkel/sign.ts index a3f40fbcd..48c3ffc0c 100644 --- a/packages/util-crypto/src/schnorrkel/sign.ts +++ b/packages/util-crypto/src/schnorrkel/sign.ts @@ -6,8 +6,8 @@ import { Keypair } from '../types'; import './polyfill'; -import schnorrkel from '@polkadot/schnorrkel-js'; import { assert } from '@polkadot/util'; +import schnorrkel from '@polkadot/wasm-schnorrkel'; /** * @name schnorrkelSign diff --git a/packages/util-crypto/src/schnorrkel/verify.ts b/packages/util-crypto/src/schnorrkel/verify.ts index 8cb10ef1d..2bc4e5170 100644 --- a/packages/util-crypto/src/schnorrkel/verify.ts +++ b/packages/util-crypto/src/schnorrkel/verify.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import './polyfill'; -import schnorrkel from '@polkadot/schnorrkel-js'; +import schnorrkel from '@polkadot/wasm-schnorrkel'; /** * @name schnorrkelVerify diff --git a/yarn.lock b/yarn.lock index 6b5aa75e0..ebfabba41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1429,16 +1429,16 @@ typescript "^3.3.3333" vuepress "^1.0.0-alpha.40" -"@polkadot/schnorrkel-js@^0.2.0-12": - version "0.2.0-12" - resolved "https://registry.yarnpkg.com/@polkadot/schnorrkel-js/-/schnorrkel-js-0.2.0-12.tgz#fd70f3b79d2c7a97874c26ae41bf331ef8763b77" - integrity sha512-S/tbdME58VDzP5nXE4kWseZnrWGkaMFFmEdW43KlwGlWvxNMREpgncUdDfTFip6lDahcKNSU98n+QJJlkaSB+A== - "@polkadot/ts@^0.1.56": version "0.1.56" resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.56.tgz#ffd6e9c95704a7fb90b918193b9dc5c440114b27" integrity sha512-wnt4zXxZXyz6WaubTO/I+nUElwV2DogFzdl6CrKfVn2PTWp8uHN06W9s40FH57ORtmQfDr9rLRP8Nq+oIyElbg== +"@polkadot/wasm-schnorrkel@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@polkadot/wasm-schnorrkel/-/wasm-schnorrkel-0.1.1.tgz#3864d0e1393dcea571c80f2ea795d5f667fe90f8" + integrity sha512-5BnRq6kHS1d8PH9NSDql+x1boVY/51lrsC9EvbMFSRpSc67p3h+LjG0/BiJVgMOD7P/HZYy2oACJU0Khrwq2gA== + "@types/base-x@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/base-x/-/base-x-3.0.0.tgz#a1365259d1d3fa3ff973ab543192a6bdd4cb2f90"