fix: harden Taproot signature generation

BoltzExchange · Apr 8, 2024 · 622f291 · 622f291
1 parent acd0b56
commit 622f291
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 18 deletions.
diff --git a/lib/db/repositories/ReverseSwapRepository.ts b/lib/db/repositories/ReverseSwapRepository.ts
@@ -70,6 +70,9 @@ class ReverseSwapRepository {
     });
   };
 
+  public static setPreimage = (reverseSwap: ReverseSwap, preimage: string) =>
+    reverseSwap.update({ preimage });
+
   public static setInvoiceSettled = (
     reverseSwap: ReverseSwap,
     preimage: string,

diff --git a/lib/service/cooperative/MusigSigner.ts b/lib/service/cooperative/MusigSigner.ts
@@ -131,27 +131,36 @@ class MusigSigner {
     }
 
     this.logger.debug(
-      `Creating partial signature for claim of Reverse Swap ${swap.id}`,
+      `Got preimage for Reverse Swap ${swap.id}: ${getHexString(preimage)}`,
     );
+    await ReverseSwapRepository.setPreimage(swap, getHexString(preimage));
 
-    if (swap.status !== SwapUpdateEvent.InvoiceSettled) {
-      await this.nursery.lock.acquire(SwapNursery.reverseSwapLock, async () => {
+    return this.nursery.lock.acquire(SwapNursery.reverseSwapLock, async () => {
+      if (swap.status !== SwapUpdateEvent.InvoiceSettled) {
         await this.nursery.settleReverseSwapInvoice(swap, preimage);
-      });
-    }
+      }
 
-    const { base, quote } = splitPairId(swap.pair);
-    const swapTree = SwapTreeSerializer.deserializeSwapTree(swap.redeemScript!);
+      this.logger.debug(
+        `Creating partial signature for claim of Reverse Swap ${swap.id}`,
+      );
 
-    return this.createPartialSignature(
-      this.currencies.get(getChainCurrency(base, quote, swap.orderSide, true))!,
-      swapTree,
-      swap.keyIndex!,
-      getHexBuffer(swap.claimPublicKey!),
-      theirNonce,
-      rawTransaction,
-      index,
-    );
+      const { base, quote } = splitPairId(swap.pair);
+      const swapTree = SwapTreeSerializer.deserializeSwapTree(
+        swap.redeemScript!,
+      );
+
+      return this.createPartialSignature(
+        this.currencies.get(
+          getChainCurrency(base, quote, swap.orderSide, true),
+        )!,
+        swapTree,
+        swap.keyIndex!,
+        getHexBuffer(swap.claimPublicKey!),
+        theirNonce,
+        rawTransaction,
+        index,
+      );
+    });
   };
 
   public static isEligibleForRefund = async (

diff --git a/test/integration/lightning/LndClient.spec.ts b/test/integration/lightning/LndClient.spec.ts
@@ -112,8 +112,6 @@ describe('LndClient', () => {
 
     expect(bindPort).toEqual(serverPort);
 
-    server.start();
-
     // Connect to the mocked LND gRPC server
     const lndClient = new LndClient(Logger.disabledLogger, 'MOCK', {
       host: serverHost,

diff --git a/test/integration/service/cooperative/MusigSigner.spec.ts b/test/integration/service/cooperative/MusigSigner.spec.ts
@@ -350,6 +350,7 @@ describe('MusigSigner', () => {
       preimageHash: getHexString(crypto.sha256(preimage)),
       redeemScript: JSON.stringify(SwapTreeSerializer.serializeSwapTree(tree)),
     });
+    ReverseSwapRepository.setPreimage = jest.fn();
 
     btcWallet.getKeysByIndex = jest.fn().mockReturnValue(refundKeys);
 
@@ -365,6 +366,10 @@ describe('MusigSigner', () => {
       await ReverseSwapRepository.getReverseSwap({}),
       preimage,
     );
+    expect(ReverseSwapRepository.setPreimage).toHaveBeenCalledWith(
+      expect.anything(),
+      getHexString(preimage),
+    );
 
     musig.aggregateNonces([[refundKeys.publicKey, boltzPartialSig.pubNonce]]);
     musig.initializeSession(await hashForWitnessV1(btcCurrency, claimTx, 0));