@ocap/wallet 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)
 
 > Utility function to create and use a forge compatible wallet, the wallet is also DID compatible.
 
@@ -44,4 +44,4 @@ const wallet2 = fromJSON(wallet.toJSON());
 
 ## 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/)

package/lib/index.d.ts

@@ -30,7 +30,7 @@
  *   hash: types.HashType.SHA3,
  * });
  */
-declare function DidType(type?: string | any): any;
+declare function DidType(type?: DidType | string): object;
 /**
  * Generate a wallet from secretKey
  *

package/lib/index.js

@@ -43,10 +43,12 @@ function Wallet(keyPair, type = 'default') {
     type,
     secretKey: keyPair.sk,
     publicKey: keyPair.pk,
+    address: keyPair.pk ? DIDFromPublicKey(keyPair.pk, type) : keyPair.address,
 
     hash(data, round = 1) {
       return hasher(data, round);
     },
+
     sign(data, hashBeforeSign = true) {
       if (!keyPair.sk) {
         throw new Error('Cannot sign data without a secretKey');
@@ -60,6 +62,7 @@ function Wallet(keyPair, type = 'default') {
 
       return signer.sign(data, keyPair.sk);
     },
+
     verify(data, signature, hashBeforeVerify = true) {
       if (!keyPair.pk) {
         throw new Error('Cannot verify data without a publicKey');
@@ -68,15 +71,47 @@ function Wallet(keyPair, type = 'default') {
       // console.log('verify.hash', hash.replace(/^0x/i, '').toUpperCase());
       return signer.verify(hash, signature, keyPair.pk);
     },
+
+    ethHash(data) {
+      if (typeof signer.ethHash !== 'function') {
+        throw new Error('ethHash is not supported by signer');
+      }
+      return signer.ethHash(data);
+    },
+
+    ethSign(data, hashBeforeSign = true) {
+      if (!keyPair.sk) {
+        throw new Error('Cannot sign data without a secretKey');
+      }
+      if (typeof signer.ethHash !== 'function') {
+        throw new Error('ethSign is not supported by signer');
+      }
+
+      if (hashBeforeSign) {
+        return signer.ethSign(signer.ethHash(data), keyPair.sk);
+      }
+
+      return signer.ethSign(data, keyPair.sk);
+    },
+
+    ethVerify(data, signature, hashBeforeVerify = true) {
+      if (typeof signer.ethHash !== 'function') {
+        throw new Error('ethVerify is not supported by signer');
+      }
+      const hash = hashBeforeVerify ? signer.ethHash(data) : data;
+      return signer.ethRecover(hash, signature) === this.address;
+    },
+
     toAddress() {
       return keyPair.pk ? DIDFromPublicKey(keyPair.pk, type) : keyPair.address;
     },
+
     toJSON() {
       return {
         type: DidType.toJSON(type),
         sk: keyPair.sk,
         pk: keyPair.pk,
-        address: this.toAddress(),
+        address: this.address,
       };
     },
   };

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@ocap/wallet",
-  "version": "1.6.5",
+  "version": "1.6.10",
   "description": "Utility function to create and use an forge compatible crypto wallet",
   "keywords": [
     "crypto",
-    "forge",
     "arcblock",
     "wallet"
   ],
@@ -16,37 +15,40 @@
     "email": "shijun@arcblock.io",
     "url": "https://github.com/wangshijun"
   },
-  "homepage": "https://github.com/ArcBlock/ocap-js/tree/master/core/forge-wallet",
+  "contributors": [
+    "wangshijun <shijun@arcblock.io> (https://github.com/wangshijun)"
+  ],
+  "homepage": "https://github.com/ArcBlock/asset-chain/tree/master/core/forge-wallet",
   "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 gen-dts && yarn gen-docs && yarn cleanup-docs && yarn format-docs",
-    "cleanup-docs": "node ../../tools/cleanup-docs.js docs/README.md $npm_package_name",
+    "cleanup-docs": "node ../../scripts/cleanup-docs.js docs/README.md $npm_package_name",
     "gen-docs": "jsdoc2md lib/index.js > docs/README.md",
     "gen-dts": "j2d lib/index.js",
     "format-docs": "remark . -o",
-    "test": "node tools/jest.js",
+    "test": "jest --forceExit --detectOpenHandles",
     "coverage": "yarn test -- --coverage"
   },
   "bugs": {
-    "url": "https://github.com/ArcBlock/ocap-js/issues"
+    "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
   "dependencies": {
-    "@arcblock/did": "^1.6.5",
-    "@ocap/mcrypto": "^1.6.5"
+    "@arcblock/did": "1.6.10",
+    "@ocap/mcrypto": "1.6.10"
   },
-  "gitHead": "5779448f13824de38978df3c84c9da0c1e1ad989"
+  "gitHead": "ab272e8db3a15c6571cc7fae7cc3d3e0fdd4bdb1"
 }