@btc-vision/wallet-sdk 1.0.6 → 1.0.7

package/lib/keyring/interfaces/SimpleKeyringOptions.d.ts

@@ -38,7 +38,7 @@ export declare abstract class IKeyringBase<T extends BaseKeyringOptions> extends
     verifyMessage(publicKey: string, text: string, sig: string): Promise<boolean>;
     signData(publicKey: string, data: string, type?: 'ecdsa' | 'schnorr'): string;
     abstract getAccounts(): string[];
-    signMessage(publicKey: string, text: string): string;
+    signMessage(publicKey: string, message: string | Buffer): string;
     exportAccount(publicKey: string): string | undefined;
     signTransaction(psbt: Psbt, inputs: {
         index: number;

package/lib/keyring/interfaces/SimpleKeyringOptions.js

@@ -33,9 +33,9 @@ export class IKeyringBase extends EventEmitter {
             throw new Error('Not support type');
         }
     }
-    signMessage(publicKey, text) {
+    signMessage(publicKey, message) {
         const keyPair = this._getPrivateKeyFor(publicKey);
-        return signMessageOfDeterministicECDSA(keyPair, text);
+        return signMessageOfDeterministicECDSA(keyPair, message);
     }
     exportAccount(publicKey) {
         const wallet = this._getWalletForAccount(publicKey);

package/lib/keyring/keystone-keyring.d.ts

@@ -76,7 +76,7 @@ export declare class KeystoneKeyring extends IKeyringBase<DeserializeOptionKeyst
         cbor: string;
     }>;
     parseSignMsgUr(type: string, cbor: string): Promise<import("@keystonehq/keystone-sdk").BtcSignature>;
-    signMessage(publicKey: string, text: string): string;
+    signMessage(publicKey: string, message: string | Buffer): string;
     verifyMessage(publicKey: string, text: string, sig: string): Promise<boolean>;
 }
 export {};

package/lib/keyring/keystone-keyring.js

@@ -309,7 +309,7 @@ export class KeystoneKeyring extends IKeyringBase {
         return keystoneSDK.btc.parseSignature(new UR(Buffer.from(cbor, 'hex'), type));
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    signMessage(publicKey, text) {
+    signMessage(publicKey, message) {
         return 'Signing Message with Keystone should use genSignMsgUr and parseSignMsgUr';
     }
     async verifyMessage(publicKey, text, sig) {

package/lib/message/bip322-simple.d.ts

@@ -2,7 +2,7 @@ import * as bitcoin from '@btc-vision/bitcoin';
 import { NetworkType } from '../network';
 import { AbstractWallet } from '../wallet';
 export declare function genPsbtOfBIP322Simple({ message, address, networkType }: {
-    message: string;
+    message: string | Buffer;
     address: string;
     networkType: NetworkType;
 }): bitcoin.Psbt;
@@ -11,7 +11,7 @@ export declare function getSignatureFromPsbtOfBIP322Simple(psbt: bitcoin.Psbt):
  * reference: https://github.com/bitcoin/bips/blob/master/bip-0322.mediawiki
  */
 export declare function signMessageOfBIP322Simple({ message, address, networkType, wallet }: {
-    message: string;
+    message: string | Buffer;
     address: string;
     networkType: NetworkType;
     wallet: AbstractWallet;

package/lib/message/bip322-simple.js

@@ -8,7 +8,8 @@ function bip0322_hash(message) {
     const { sha256 } = bitcoin.crypto;
     const tag = 'BIP0322-signed-message';
     const tagHash = sha256(Buffer.from(tag));
-    const result = sha256(Buffer.concat([tagHash, tagHash, Buffer.from(message)]));
+    const messageBuffer = typeof message === 'string' ? Buffer.from(message, 'utf8') : message;
+    const result = sha256(Buffer.concat([tagHash, tagHash, messageBuffer]));
     return result.toString('hex');
 }
 export function genPsbtOfBIP322Simple({ message, address, networkType }) {
@@ -43,9 +44,11 @@ export function genPsbtOfBIP322Simple({ message, address, networkType }) {
 export function getSignatureFromPsbtOfBIP322Simple(psbt) {
     const txToSign = psbt.extractTransaction();
     function encodeVarString(b) {
-        return Buffer.concat([encode(b.byteLength), b]);
+        const { buffer: vb } = encode(b.length);
+        return Buffer.concat([Buffer.from(vb), b]);
     }
-    const len = encode(txToSign.ins[0].witness.length).buffer;
+    const { buffer: varintBuf } = encode(txToSign.ins[0].witness.length);
+    const len = Buffer.from(varintBuf);
     const result = Buffer.concat([len, ...txToSign.ins[0].witness.map((w) => encodeVarString(w))]);
     const signature = result.toString('base64');
     return signature;

package/lib/message/deterministic-ecdsa.d.ts

@@ -1,2 +1,2 @@
 import { ECPairInterface } from '../bitcoin-core';
-export declare function signMessageOfDeterministicECDSA(ecpair: ECPairInterface, message: string): string;
+export declare function signMessageOfDeterministicECDSA(ecpair: ECPairInterface, message: string | Buffer): string;

package/lib/message/deterministic-ecdsa.js

@@ -30,7 +30,7 @@ function varintBufNum(n) {
 }
 function magicHash(message) {
     const prefix1 = varintBufNum(MAGIC_BYTES.length);
-    const messageBuffer = Buffer.from(message);
+    const messageBuffer = typeof message === 'string' ? Buffer.from(message) : message;
     const prefix2 = varintBufNum(messageBuffer.length);
     const buf = Buffer.concat([prefix1, MAGIC_BYTES, prefix2, messageBuffer]);
     return bitcoin.crypto.hash256(buf);

package/lib/wallet/abstract-wallet.d.ts

@@ -2,5 +2,5 @@ import { bitcoin } from '../bitcoin-core';
 import { SignPsbtOptions } from '../types';
 export interface AbstractWallet {
     signPsbt(psbt: bitcoin.Psbt, opts?: SignPsbtOptions): Promise<bitcoin.Psbt>;
-    signMessage(text: string, type: 'bip322-simple' | 'ecdsa'): Promise<string>;
+    signMessage(message: string | Buffer, type: 'bip322-simple' | 'ecdsa'): Promise<string>;
 }

package/lib/wallet/estimate-wallet.d.ts

@@ -18,6 +18,6 @@ export declare class EstimateWallet implements AbstractWallet {
     getNetworkType(): NetworkType;
     signPsbt(psbt: bitcoin.Psbt, opts?: SignPsbtOptions): Promise<bitcoin.Psbt>;
     getPublicKey(): Promise<string>;
-    signMessage(text: string, type: 'bip322-simple' | 'ecdsa'): Promise<string>;
+    signMessage(message: string | Buffer, type: 'bip322-simple' | 'ecdsa'): Promise<string>;
     private formatOptionsToSignInputs;
 }

package/lib/wallet/estimate-wallet.js

@@ -76,10 +76,10 @@ export class EstimateWallet {
         const pubkeys = await this.keyring.getAccounts();
         return pubkeys[0];
     }
-    async signMessage(text, type) {
+    async signMessage(message, type) {
         if (type === 'bip322-simple') {
             return await signMessageOfBIP322Simple({
-                message: text,
+                message,
                 address: this.address,
                 networkType: this.networkType,
                 wallet: this
@@ -87,7 +87,7 @@ export class EstimateWallet {
         }
         else {
             const pubkey = await this.getPublicKey();
-            return await this.keyring.signMessage(pubkey, text);
+            return this.keyring.signMessage(pubkey, message);
         }
     }
     async formatOptionsToSignInputs(_psbt, options) {

package/lib/wallet/local-wallet.d.ts

@@ -17,7 +17,7 @@ export declare class LocalWallet implements AbstractWallet {
     getNetworkType(): NetworkType;
     signPsbt(psbt: bitcoin.Psbt, opts?: SignPsbtOptions): Promise<bitcoin.Psbt>;
     getPublicKey(): string;
-    signMessage(text: string, type: 'bip322-simple' | 'ecdsa'): Promise<string>;
+    signMessage(message: string | Buffer, type: 'bip322-simple' | 'ecdsa'): Promise<string>;
     signData(data: string, type?: 'ecdsa' | 'schnorr'): Promise<string>;
     private formatOptionsToSignInputs;
 }

package/lib/wallet/local-wallet.js

@@ -82,10 +82,10 @@ export class LocalWallet {
         const pubkeys = this.keyring.getAccounts();
         return pubkeys[0];
     }
-    async signMessage(text, type) {
+    async signMessage(message, type) {
         if (type === 'bip322-simple') {
             return await signMessageOfBIP322Simple({
-                message: text,
+                message,
                 address: this.address,
                 networkType: this.networkType,
                 wallet: this
@@ -93,7 +93,7 @@ export class LocalWallet {
         }
         else {
             const pubkey = this.getPublicKey();
-            return this.keyring.signMessage(pubkey, text);
+            return this.keyring.signMessage(pubkey, message);
         }
     }
     async signData(data, type = 'ecdsa') {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@btc-vision/wallet-sdk",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "description": "OP_WALLET SDK",
     "keywords": [
         "bitcoin",