use util-crypto to replace blake2 lib (#40)

* use util-crypto to replace blake2 lib * update yarn.lock update yarn.lock
uuosio · Jun 4, 2021 · 852772b · 852772b
1 parent 1482e8f
commit 852772b
Show file tree

Hide file tree

Showing 5 changed files with 540 additions and 458 deletions.
diff --git a/as-packages/lang/package.json b/as-packages/lang/package.json
@@ -11,7 +11,6 @@
     "as-scale-codec": "0.2.1"
   },
   "devDependencies": {
-    "@types/blake2": "^4.0.1",
     "assemblyscript": "0.18",
     "@types/node": "14",
     "ts-node": "9",

diff --git a/ts-packages/contract-metadata/package.json b/ts-packages/contract-metadata/package.json
@@ -6,7 +6,6 @@
   "author": "yjhmelody <[email protected]>",
   "devDependencies": {
     "ts-jest": "^26.3.0",
-    "@types/blake2": "^4.0.1",
     "assemblyscript": "0.18",
     "@types/node": "14",
     "ts-node": "9",

diff --git a/ts-packages/transform/package.json b/ts-packages/transform/package.json
@@ -14,11 +14,8 @@
   },
   "dependencies": {
     "assemblyscript": "0.18",
-    "blake2": "4.0.2",
+    "@polkadot/util-crypto": "^6.6",
     "handlebars": "4.7.6",
     "contract-metadata": "0.1.0"
-  },
-  "devDependencies": {
-    "@types/blake2": "^4.0.1"
   }
 }
diff --git a/ts-packages/transform/src/preprocess/selector.ts b/ts-packages/transform/src/preprocess/selector.ts
@@ -1,5 +1,4 @@
-import * as blake2 from "blake2";
-
+import { blake2AsHex  } from "@polkadot/util-crypto";
 export class KeySelector {
     hex: string;
     short: string;
@@ -8,9 +7,8 @@ export class KeySelector {
     key: string;
     constructor(key: string) {
         this.key = key;
-        let keyHash = blake2.createHash('blake2b', { digestLength: 32 });
-        keyHash.update(Buffer.from(key));
-        let hexStr = keyHash.digest("hex");
+        // remove 0x
+        let hexStr = blake2AsHex(key, 256).substring(2);
         let selectorArr = [];
         for (let index = 0; index < 32; index++) {
             selectorArr.push("0x" + hexStr.substring(index * 2, index * 2 + 2));