@ocap/mcrypto 1.6.5 → 1.6.10

package/README.md

@@ -2,7 +2,7 @@
 
 [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![docs](https://img.shields.io/badge/powered%20by-arcblock-green.svg)](https://docs.arcblock.io)
-[![Gitter](https://badges.gitter.im/ArcBlock/community.svg)](https://gitter.im/ArcBlock/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/ArcBlock/community.svg)](https://gitter.im/ArcBlock/community?utm_source=badge\&utm_medium=badge\&utm_campaign=pr-badge)
 
 > Forge [mcrypto](https://github.com/ArcBlock/mcrypto) implementation for javascript, just a wrapper around existing javascript crypto libraries.
 
@@ -37,21 +37,21 @@ const hash = Hasher.SHA2.hash256(message);
 
 ## Documentation
 
-For full documentation, checkout [https://ocap-js.netlify.com](https://ocap-js.netlify.com/)
+For full documentation, checkout [https://asset-chain.netlify.com](https://asset-chain.netlify.com/)
 
 ## Implementation
 
 ### Hasher
 
--   keccakf1600: js-sha3
--   sha2: hash.js
--   sha3: js-sha3
+*   keccakf1600: js-sha3
+*   sha2: hash.js
+*   sha3: js-sha3
 
 ### Signer
 
--   [`ed25519`](https://github.com/ArcBlock/ocap-js/commit/ed25519): tweetnacl
--   secp256k1: elliptic
+*   [`ed25519`](https://github.com/ArcBlock/asset-chain/commit/ed25519): tweetnacl
+*   secp256k1: elliptic
 
 ### Crypter
 
--   aes-cbc-256: crypto-js
+*   aes-cbc-256: crypto-js

package/lib/encode.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(data: any, encoding?: string): any;
+export = _exports;

package/lib/index.js

@@ -148,10 +148,13 @@ const Mcrypto = (module.exports = {
       ROLE_TX: 10,
       ROLE_TETHER: 11,
       ROLE_SWAP: 12,
-      ROLE_DELEGATE: 13,
+      ROLE_DELEGATION: 13,
       ROLE_VC: 14, // verifiable credential
       ROLE_BLOCKLET: 15, // blocklet
       ROLE_REGISTRY: 16, // blocklet registry
+      ROLE_TOKEN: 17,
+      ROLE_FACTORY: 18,
+      ROLE_ROLLUP: 19,
       ROLE_ANY: 63,
     },
 

package/lib/signer/ed25519.js

@@ -34,7 +34,7 @@ class Ed25519Signer extends Signer {
    * @memberof Ed25519Signer
    */
   genKeyPair(userSeed, encoding = 'hex') {
-    const seed = userSeed ? toUint8Array(userSeed) : Uint8Array.from(randomBytes(32));
+    const seed = userSeed ? toUint8Array(userSeed) : new Uint8Array(randomBytes(32));
     if (seed.byteLength !== 32) {
       throw new Error('Invalid seed to generate key pair');
     }

package/lib/signer/ethereum.js

@@ -1,5 +1,9 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable no-useless-constructor */
+const Account = require('eth-lib/lib/account');
+const Hash = require('eth-lib/lib/hash');
+const { isHexStrict, utf8ToHex, hexToBytes } = require('@ocap/util');
+
 const { Secp256k1Signer } = require('./secp256k1');
 
 /**
@@ -12,6 +16,24 @@ class EthereumSigner extends Secp256k1Signer {
     super();
     this.pkHasFormatPrefix = false;
   }
+
+  ethHash(data) {
+    const messageHex = isHexStrict(data) ? data : utf8ToHex(data);
+    const messageBytes = hexToBytes(messageHex);
+    const messageBuffer = Buffer.from(messageBytes);
+    const preamble = `\x19Ethereum Signed Message:\n${messageBytes.length}`;
+    const preambleBuffer = Buffer.from(preamble);
+    const ethMessage = Buffer.concat([preambleBuffer, messageBuffer]);
+    return Hash.keccak256s(ethMessage);
+  }
+
+  ethSign(data, privateKey) {
+    return Account.sign(data, privateKey);
+  }
+
+  ethRecover(data, signature) {
+    return Account.recover(data, signature);
+  }
 }
 
 module.exports = new EthereumSigner();

package/lib/signer/secp256k1.js

@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable no-useless-constructor */
 const EC = require('elliptic').ec;
-const BN = require('bn.js');
+const { BN } = require('@ocap/util');
 const randomBytes = require('randombytes');
 const { stripHexPrefix, toHex, toBuffer, toUint8Array } = require('@ocap/util');
 const Signer = require('../protocols/signer');
@@ -44,7 +44,7 @@ class Secp256k1Signer extends Signer {
   genKeyPair(encoding = 'hex') {
     let sk = null;
     do {
-      sk = Uint8Array.from(randomBytes(32));
+      sk = new Uint8Array(randomBytes(32));
     } while (!this.isValidSK(sk));
     const pk = this.getPublicKey(toHex(sk));
     return { secretKey: encode(sk, encoding), publicKey: encode(pk, encoding) };

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@ocap/mcrypto",
-  "version": "1.6.5",
+  "version": "1.6.10",
   "description": "Crypto lib that provides signer,crypter,hasher interface",
   "keywords": [
     "crypto",
-    "forge",
     "arcblock",
     "blockchain",
     "sdk"
@@ -17,40 +16,44 @@
     "email": "shijun@arcblock.io",
     "url": "https://github.com/wangshijun"
   },
-  "homepage": "https://github.com/ArcBlock/ocap-js/tree/master/core/mcrypto",
+  "contributors": [
+    "wangshijun <shijun@arcblock.io> (https://github.com/wangshijun)"
+  ],
+  "homepage": "https://github.com/ArcBlock/asset-chain/tree/master/core/mcrypto",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
   "devDependencies": {
-    "jest": "^26.6.3",
-    "jsdoc-to-markdown": "^5.0.0"
+    "jest": "^27.3.1",
+    "jsdoc-to-markdown": "^7.1.1"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ArcBlock/ocap-js.git"
+    "url": "git+https://github.com/ArcBlock/asset-chain.git"
   },
   "scripts": {
     "lint": "eslint tests lib",
     "lint:fix": "eslint --fix tests lib",
-    "docs": "yarn generate-dts && yarn generate-docs && yarn cleanup-docs && yarn format-docs",
-    "cleanup-docs": "node ../../tools/cleanup-docs.js docs/README.md $npm_package_name",
-    "generate-dts": "j2d lib/index.js",
+    "docs": "yarn gen-dts && yarn gen-docs && yarn cleanup-docs && yarn format-docs",
+    "cleanup-docs": "node ../../scripts/cleanup-docs.js docs/README.md $npm_package_name",
+    "gen-dts": "j2d lib/index.js",
     "prepush": "CI=1 yarn test",
-    "test": "node tools/jest.js",
+    "test": "jest --forceExit --detectOpenHandles",
     "format-docs": "remark . -o",
-    "generate-docs": "jsdoc2md lib/index.js > docs/README.md",
+    "gen-docs": "jsdoc2md lib/index.js > docs/README.md",
     "coverage": "yarn test -- --coverage"
   },
   "bugs": {
-    "url": "https://github.com/ArcBlock/ocap-js/issues"
+    "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
   "dependencies": {
-    "@ocap/util": "^1.6.5",
-    "bn.js": "5.1.3",
+    "@ocap/util": "1.6.10",
+    "bn.js": "5.2.0",
     "crypto-js": "^4.0.0",
     "elliptic": "^6.5.3",
+    "eth-lib": "^0.2.8",
     "hash.js": "^1.1.7",
     "interface": "^1.2.1",
     "js-sha3": "^0.8.0",
@@ -58,8 +61,8 @@
     "tweetnacl": "^1.0.3"
   },
   "resolutions": {
-    "bn.js": "5.1.3",
+    "bn.js": "5.2.0",
     "elliptic": "6.5.3"
   },
-  "gitHead": "5779448f13824de38978df3c84c9da0c1e1ad989"
+  "gitHead": "ab272e8db3a15c6571cc7fae7cc3d3e0fdd4bdb1"
 }