quantus/wasm
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Small cleanups (#182)

Browse Source 
* Small cleanups

* Detect wasm-crypt-* alongside detectPackage

* Adjust alias imports

* Adjust

* Adjust
This commit is contained in:
Jaco Greeff
2021-03-04 17:59:38 +01:00
committed by GitHub
parent 98bc7147e3
commit 641ea0f9d8
10 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.123trigger
+1 -1
View File
@@ -2,4 +2,4 @@
3.2.2
3.2.3
3.2.4
3.2.4
.nvmrc
-1
View File
@@ -1 +0,0 @@
12
packages/wasm-crypto-wasm/src/base64.ts
+4 -3
View File
@@ -47,6 +47,7 @@ export function toByteArray (b64: string): Uint8Array {
const arr = new Uint8Array(((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen);
let curByte = 0;
let i;
let tmp;
// if there are placeholders, only get up to the last complete 4 chars
const len = placeHoldersLen > 0
@@ -54,7 +55,7 @@ export function toByteArray (b64: string): Uint8Array {
: validLen;
for (i = 0; i < len; i += 4) {
const tmp =
tmp =
(revLookup[b64.charCodeAt(i)] << 18) |
(revLookup[b64.charCodeAt(i + 1)] << 12) |
(revLookup[b64.charCodeAt(i + 2)] << 6) |
@@ -66,13 +67,13 @@ export function toByteArray (b64: string): Uint8Array {
}
if (placeHoldersLen === 2) {
const tmp =
tmp =
(revLookup[b64.charCodeAt(i)] << 2) |
(revLookup[b64.charCodeAt(i + 1)] >> 4);
arr[curByte++] = tmp & 0xFF;
} else if (placeHoldersLen === 1) {
const tmp =
tmp =
(revLookup[b64.charCodeAt(i)] << 10) |
(revLookup[b64.charCodeAt(i + 1)] << 4) |
(revLookup[b64.charCodeAt(i + 2)] >> 2);
packages/wasm-crypto/package.json
+2 -2
View File
@@ -14,8 +14,8 @@
"@polkadot/wasm-crypto-wasm": "^4.0.1-5"
},
"devDependencies": {
"@polkadot/util": "^6.0.1-4",
"@polkadot/x-randomvalues": "^6.0.1-4"
"@polkadot/util": "^6.0.1-6",
"@polkadot/x-randomvalues": "^6.0.1-6"
},
"peerDependencies": {
"@polkadot/util": "*",
packages/wasm-crypto/src/detectPackage.ts
+3 -1
View File
@@ -2,9 +2,11 @@
// SPDX-License-Identifier: Apache-2.0
import { detectPackage } from '@polkadot/util';
import { packageInfo as asmInfo } from '@polkadot/wasm-crypto-asmjs/packageInfo';
import { packageInfo as wasmInfo } from '@polkadot/wasm-crypto-wasm/packageInfo';
import { packageInfo } from './packageInfo';
detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname);
detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [asmInfo, wasmInfo]);
export { packageInfo };
packages/wasm-crypto/test/alias-imports.cjs
+8 -5
View File
@@ -1,12 +1,15 @@
// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
// SPDX-License-Identifier: Apache-2.0
const rootIncl = ['@polkadot/wasm-crypto-asmjs', '@polkadot/wasm-crypto-wasm'];
const detcIncl = rootIncl.map((p) => `${p}/packageInfo`);
require('override-require')(
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs') ||
request.endsWith('@polkadot/wasm-crypto-wasm'),
rootIncl.some((p) => request.endsWith(p)) ||
detcIncl.some((p) => request.endsWith(p)),
(request) =>
request.endsWith('@polkadot/wasm-crypto-asmjs')
? require('../../wasm-crypto-asmjs/build/data.cjs')
: require('../../wasm-crypto-wasm/build/empty.cjs')
rootIncl.some((p) => request.endsWith(p))
? require(`${rootIncl.find((p) => request.endsWith(p))}/build/data.cjs`)
: require(`${detcIncl.find((p) => request.endsWith(p)).replace('packageInfo', 'build/packageInfo.cjs')}`)
);
scripts/build-wasm.sh
+1 -1
View File
@@ -30,7 +30,7 @@ echo "*** Optimising WASM output"
# convert wasm to base64 structure
echo "*** Packing WASM into baseX"
node ../scripts/pack-wasm-base.js
node ../scripts/pack-wasm-base.cjs
# build asmjs version from the input (optimised) WASM
echo "*** Building asm.js version"
scripts/pack-wasm-base.js → scripts/pack-wasm-base.cjs
+4 -8
View File
@@ -1,6 +1,7 @@
// Copyright 2019-2021 @polkadot/wasm authors & contributors
// SPDX-License-Identifier: Apache-2.0
const fflate = require('fflate/node');
const fs = require('fs');
const { formatNumber } = require('@polkadot/util');
@@ -15,16 +16,11 @@ function hdr (package) {
`;
}
// only one of the deps are included, here are the details for package.json -
// "fflate": "^0.4.2"
// "lz4js": "^0.2.0"
function getWasmBuffer (lib = 'fflate') {
function getWasmBuffer () {
const data = fs.readFileSync('./bytes/wasm_opt.wasm');
const compressed = lib === 'fflate'
? Buffer.from(require('fflate/node').zlibSync(data, { level: 9 }))
: Buffer.from(require('lz4js').compress(data));
const compressed = Buffer.from(fflate.zlibSync(data, { level: 9 }));
console.log(`*** Compressed WASM via ${lib}: ${formatNumber(data.length)} -> ${formatNumber(compressed.length)} (${(100 * compressed.length / data.length).toFixed(2)}%)`);
console.log(`*** Compressed WASM: ${formatNumber(data.length)} -> ${formatNumber(compressed.length)} (${(100 * compressed.length / data.length).toFixed(2)}%)`);
return { compressed, sizeUncompressed: data.length };
}
tsconfig.json
+2
View File
@@ -7,7 +7,9 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@polkadot/wasm-crypto-asmjs/packageInfo": [ "packages/wasm-crypto-asmjs/src/packageInfo" ],
"@polkadot/wasm-crypto-asmjs": [ "packages/wasm-crypto-asmjs/src/data" ],
"@polkadot/wasm-crypto-wasm/packageInfo": [ "packages/wasm-crypto-wasm/src/packageInfo" ],
"@polkadot/wasm-crypto-wasm": [ "packages/wasm-crypto-wasm/src/data" ],
"@polkadot/wasm-crypto": [ "packages/wasm-crypto/src" ]
},
yarn.lock
+27 -27
View File
@@ -1863,18 +1863,18 @@ __metadata:
languageName: node
linkType: hard
"@polkadot/util@npm:^6.0.1-4":
version: 6.0.1-4
resolution: "@polkadot/util@npm:6.0.1-4"
"@polkadot/util@npm:^6.0.1-6":
version: 6.0.1-6
resolution: "@polkadot/util@npm:6.0.1-6"
dependencies:
"@babel/runtime": ^7.13.9
"@polkadot/x-textdecoder": 6.0.1-4
"@polkadot/x-textencoder": 6.0.1-4
"@polkadot/x-textdecoder": 6.0.1-6
"@polkadot/x-textencoder": 6.0.1-6
"@types/bn.js": ^4.11.6
bn.js: ^4.11.9
camelcase: ^5.3.1
ip-regex: ^4.3.0
checksum: a70f54aad399cecf7f301d3aa188332d2974fc2ecaa6afda0fe09648a616f6274ba3d5d78e49800d68050cae820ebbcc3f583fa58bd332b016534fad4227d877
checksum: c98a505874ccddf90488e8af15a36f5e6f6c92470b359023b36343547bd8ee087c0fc51d4f1463734a5872f17149698e2de9915d1cf2848249c27d7876c7c63a
languageName: node
linkType: hard
@@ -1899,54 +1899,54 @@ __metadata:
resolution: "@polkadot/wasm-crypto@workspace:packages/wasm-crypto"
dependencies:
"@babel/runtime": ^7.13.9
"@polkadot/util": ^6.0.1-4
"@polkadot/util": ^6.0.1-6
"@polkadot/wasm-crypto-asmjs": ^4.0.1-5
"@polkadot/wasm-crypto-wasm": ^4.0.1-5
"@polkadot/x-randomvalues": ^6.0.1-4
"@polkadot/x-randomvalues": ^6.0.1-6
peerDependencies:
"@polkadot/util": "*"
"@polkadot/x-randomvalues": "*"
languageName: unknown
linkType: soft
"@polkadot/x-global@npm:6.0.1-4":
version: 6.0.1-4
resolution: "@polkadot/x-global@npm:6.0.1-4"
"@polkadot/x-global@npm:6.0.1-6":
version: 6.0.1-6
resolution: "@polkadot/x-global@npm:6.0.1-6"
dependencies:
"@babel/runtime": ^7.13.9
"@types/node-fetch": ^2.5.8
node-fetch: ^2.6.1
checksum: d910b66d55f2b12f88f0a1c05416caa525ad9022c9cb70d407001fbd2ab345d734815a43d704988d6ea5255950149cd5e7d6c8233b64a03a19df2de4bd50faa7
checksum: b3df8d5a581e4b5025defd5479ada703b73cbad3830c3794556387e7d1f98f4f2ce002062bb84898fe4b7b9690943de8c84dddb9611412d1f64d519748727f68
languageName: node
linkType: hard
"@polkadot/x-randomvalues@npm:^6.0.1-4":
version: 6.0.1-4
resolution: "@polkadot/x-randomvalues@npm:6.0.1-4"
"@polkadot/x-randomvalues@npm:^6.0.1-6":
version: 6.0.1-6
resolution: "@polkadot/x-randomvalues@npm:6.0.1-6"
dependencies:
"@babel/runtime": ^7.13.9
"@polkadot/x-global": 6.0.1-4
checksum: a44bc45b525213842393a89370eeb0f5a632bc7247a2d07843d30f8a11d7a5618d9399542c936eb5dc53bce5477b15872f0eed56109f9e39a7b818d2d85bb786
"@polkadot/x-global": 6.0.1-6
checksum: 1633c1e7df23660a066419733d64aa7853fce2546507ebfbe9503d666ac5fdbc4aebd9a09ae22e898a7aa7885565d646039806e1d788cfd8110b62b2e169f995
languageName: node
linkType: hard
"@polkadot/x-textdecoder@npm:6.0.1-4":
version: 6.0.1-4
resolution: "@polkadot/x-textdecoder@npm:6.0.1-4"
"@polkadot/x-textdecoder@npm:6.0.1-6":
version: 6.0.1-6
resolution: "@polkadot/x-textdecoder@npm:6.0.1-6"
dependencies:
"@babel/runtime": ^7.13.9
"@polkadot/x-global": 6.0.1-4
checksum: 96d65ba6fe6ebd8b684b32169ff74821b986e93f0afd9ba03b5d6204d0b861d9950d1fcbe34d8a06d7dfe701f6bc178bad8867d7a6f9211aa5d05ae9350dd9ed
"@polkadot/x-global": 6.0.1-6
checksum: 47fd1f9de7130e62c7d077b4f7d52d9d1ddc85a02ffcbf95bcd380a44769efb364ff4e6f19f74d4225e3c738e6ffdfeb9ab792f039543828400746e9ca8ef717
languageName: node
linkType: hard
"@polkadot/x-textencoder@npm:6.0.1-4":
version: 6.0.1-4
resolution: "@polkadot/x-textencoder@npm:6.0.1-4"
"@polkadot/x-textencoder@npm:6.0.1-6":
version: 6.0.1-6
resolution: "@polkadot/x-textencoder@npm:6.0.1-6"
dependencies:
"@babel/runtime": ^7.13.9
"@polkadot/x-global": 6.0.1-4
checksum: 67e49a4da502725c3e05bfabbafd7edf5133a393da8ccbed601502ca13def35f324a8cc6772bcbfed06b18790dd3e5deafc7f9c5d2f7e250431847423d1f3697
"@polkadot/x-global": 6.0.1-6
checksum: 18abe24f5f8ea559920564bae87f0615c78643422742354af75c6177e8c3c926d7c232c64de3a268691247cf9b7f705d5f143300b7b6161d0fab45f4539fcf2d
languageName: node
linkType: hard