@dfns/lib-bitcoinjs 0.6.0-rc1 → 0.6.0

package/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { DfnsApiClient } from '@dfns/sdk';
+import { GetWalletResponse } from '@dfns/sdk/types/wallets';
 import { Network, Psbt, SignerAsync } from 'bitcoinjs-lib';
 export type DfnsWalletOptions = {
     walletId: string;
@@ -8,12 +9,17 @@ export type DfnsWalletOptions = {
 export declare class DfnsWallet implements SignerAsync {
     private readonly metadata;
     private readonly dfnsClient;
+    readonly scheme: GetWalletResponse['signingKey']['scheme'];
     readonly publicKey: Buffer;
+    readonly internalPubkey?: Buffer;
     private constructor();
     static init(options: DfnsWalletOptions): Promise<DfnsWallet>;
     get address(): string | undefined;
     sign(hash: Buffer): Promise<Buffer>;
+    signSchnorr(hash: Buffer): Promise<Buffer>;
+    private _sign;
     SignPsbt(psbt: Psbt): Promise<Psbt>;
+    tweakSigner(taprootMerkleRoot: Buffer): SignerAsync;
 }
 export declare const litecoin: {
     mainnet: Network;

package/index.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.litecoin = exports.DfnsWallet = void 0;
 const sdk_1 = require("@dfns/sdk");
 const bitcoinjs_lib_1 = require("bitcoinjs-lib");
-const compatibleNetworks = ['Bitcoin', 'BitcoinTestnet3', 'Litecoin', 'LitecoinTestnet'];
+const bip341_1 = require("bitcoinjs-lib/src/payments/bip341");
+const compatibleNetworks = ['Bitcoin', 'BitcoinSignet', 'BitcoinTestnet3', 'Litecoin', 'LitecoinTestnet'];
 const assertSigned = (res) => {
     if (res.status === 'Failed') {
         throw new sdk_1.DfnsError(-1, 'signing failed', res);
@@ -12,11 +13,24 @@ const assertSigned = (res) => {
         throw new sdk_1.DfnsError(-1, 'cannot complete signing synchronously because this wallet action requires policy approval', res);
     }
 };
+const xOnlyPubkey = (publicKey) => {
+    return publicKey.subarray(1, 33);
+};
+const getTweakedPublicKey = (publicKey, taprootMerkleRoot) => {
+    const xOnlyPublicKey = xOnlyPubkey(publicKey);
+    const tweakedKey = (0, bip341_1.tweakKey)(xOnlyPublicKey, taprootMerkleRoot);
+    return Buffer.concat([Uint8Array.from([tweakedKey.parity + 2]), tweakedKey.x]);
+};
 class DfnsWallet {
     constructor(metadata, options) {
         this.metadata = metadata;
         this.dfnsClient = options.dfnsClient;
+        this.scheme = metadata.signingKey.scheme;
         this.publicKey = Buffer.from(metadata.signingKey.publicKey, 'hex');
+        if (this.scheme === 'Schnorr') {
+            this.internalPubkey = this.publicKey;
+            this.publicKey = getTweakedPublicKey(this.internalPubkey, undefined);
+        }
     }
     static async init(options) {
         const { walletId, dfnsClient } = options;
@@ -33,9 +47,15 @@ class DfnsWallet {
         return this.metadata.address;
     }
     async sign(hash) {
+        return this._sign(hash);
+    }
+    async signSchnorr(hash) {
+        return this._sign(hash, Buffer.alloc(0));
+    }
+    async _sign(hash, taprootMerkleRoot) {
         const res = await this.dfnsClient.wallets.generateSignature({
             walletId: this.metadata.id,
-            body: { kind: 'Hash', hash: `0x${hash.toString('hex')}` },
+            body: { kind: 'Hash', hash: `0x${hash.toString('hex')}`, taprootMerkleRoot: taprootMerkleRoot && `0x${taprootMerkleRoot.toString('hex')}` },
         });
         assertSigned(res);
         if (!res.signature) {
@@ -57,6 +77,24 @@ class DfnsWallet {
         }
         return bitcoinjs_lib_1.Psbt.fromHex(res.signedData.replace(/^0x/, ''));
     }
+    tweakSigner(taprootMerkleRoot) {
+        if (this.scheme !== 'Schnorr') {
+            throw new sdk_1.DfnsError(400, 'Only available for Schnorr keys');
+        }
+        const publicKey = getTweakedPublicKey(this.internalPubkey, taprootMerkleRoot);
+        const wallet = this;
+        return new (class {
+            get publicKey() {
+                return publicKey;
+            }
+            async sign(_hash) {
+                throw new sdk_1.DfnsError(400, 'Expecting to only do schnorr signatures');
+            }
+            async signSchnorr(hash) {
+                return wallet._sign(hash, taprootMerkleRoot);
+            }
+        })();
+    }
 }
 exports.DfnsWallet = DfnsWallet;
 /// Litecoin networks

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dfns/lib-bitcoinjs",
-  "version": "0.6.0-rc1",
+  "version": "0.6.0",
   "peerDependencies": {
     "bitcoinjs-lib": "^6.0.0",
-    "@dfns/sdk": "0.6.0-rc1"
+    "@dfns/sdk": "0.6.0"
   },
   "dependencies": {
     "buffer": "6.0.3",