@ocap/wallet 1.18.8 → 1.18.10

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { EncodingType, BytesType } from '@ocap/util';
 import { DidType, DIDType, DIDTypeStr, DIDTypeArg } from '@arcblock/did';
-declare type KeyPairType = {
-    sk?: BytesType;
-    pk?: BytesType;
+declare type KeyPairType<T extends BytesType = string> = {
+    sk?: T;
+    pk?: T;
     address?: string;
 };
 export declare type SerializedWallet = {
@@ -12,10 +12,10 @@ export declare type SerializedWallet = {
     sk: string;
     address: string;
 };
-export interface WalletObject {
+export interface WalletObject<T extends BytesType = string> {
     type: DIDType;
-    secretKey: BytesType;
-    publicKey: BytesType;
+    secretKey: T;
+    publicKey: T;
     address: string;
     hash(data: BytesType, round?: number, encoding?: 'hex'): string;
     hash(data: BytesType, round?: number, encoding?: 'base16'): string;
@@ -45,7 +45,7 @@ export declare const WalletType: typeof DidType;
 /**
  * Generate an wallet instance that can be used to sign a message or verify a signature
  */
-export declare function Wallet(keyPair: KeyPairType, t?: DIDTypeArg): WalletObject;
+export declare function Wallet<T extends BytesType = string>(keyPair: KeyPairType<T>, t?: DIDTypeArg): WalletObject<T>;
 /**
  * Generate a wallet from secretKey
  *
@@ -64,25 +64,25 @@ export declare function Wallet(keyPair: KeyPairType, t?: DIDTypeArg): WalletObje
  * assert.equal(signature, sig, "signature should match");
  * assert.ok(wallet.verify(message, signature), "signature should be verified");
  */
-export declare function fromSecretKey(sk: BytesType, _type?: DIDTypeArg): WalletObject;
+export declare function fromSecretKey<T extends BytesType = string>(sk: T, _type?: DIDTypeArg): WalletObject<T>;
 /**
  * Generate a wallet from publicKey
  */
-export declare function fromPublicKey(pk: BytesType, _type?: DIDTypeArg): WalletObject;
+export declare function fromPublicKey<T extends BytesType = string>(pk: T, _type?: DIDTypeArg): WalletObject<T>;
 /**
  * Generate a wallet from address (did)
  *
  * Since we do not know the publicKey and secretKey, this kind of wallet cannot be used for signing and verifying
  */
-export declare function fromAddress(address: string): WalletObject;
+export declare function fromAddress<T extends BytesType = string>(address: string): WalletObject<T>;
 /**
  * Generate a wallet by generating a random secretKey
  */
-export declare function fromRandom(_type?: DIDTypeArg): WalletObject;
+export declare function fromRandom<T extends BytesType = string>(_type?: DIDTypeArg): WalletObject<T>;
 /**
  * Generating a wallet from a serialized json presentation of another wallet
  */
-export declare function fromJSON(json: SerializedWallet): WalletObject;
+export declare function fromJSON<T extends BytesType = string>(json: SerializedWallet): WalletObject<T>;
 /**
  * Check if an object is valid wallet object
  */

package/lib/index.js

@@ -28,7 +28,7 @@ function Wallet(keyPair, t = 'default') {
             }
             if (hashBeforeSign) {
                 const hash = hasher(data, 1);
-                return signer.sign(hash, keyPair.sk);
+                return signer.sign(hash, keyPair.sk, encoding);
             }
             return signer.sign(data, keyPair.sk, encoding);
         },
@@ -134,6 +134,7 @@ exports.fromRandom = fromRandom;
  */
 function fromJSON(json) {
     const type = did_1.DidType.fromJSON(json.type);
+    // @ts-ignore
     return Wallet(json, type);
 }
 exports.fromJSON = fromJSON;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocap/wallet",
-  "version": "1.18.8",
+  "version": "1.18.10",
   "description": "Utility function to create and use an forge compatible crypto wallet",
   "keywords": [
     "crypto",
@@ -52,9 +52,9 @@
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.8",
-    "@ocap/mcrypto": "1.18.8",
-    "@ocap/util": "1.18.8"
+    "@arcblock/did": "1.18.10",
+    "@ocap/mcrypto": "1.18.10",
+    "@ocap/util": "1.18.10"
   },
-  "gitHead": "8482e912fdeb7b52529f0add5632c62fc202d825"
+  "gitHead": "1c857951c380626c02c423d00a7b7e8c0a63faa2"
 }