feat: query chain swap transactions

BoltzExchange · Mar 23, 2024 · c1f72d3 · c1f72d3
1 parent 9dbcbf6
commit c1f72d3
Show file tree

Hide file tree

Showing 12 changed files with 300 additions and 197 deletions.
diff --git a/cliff.toml b/cliff.toml
@@ -26,14 +26,14 @@ body = """
     | filter(attribute="scope")
     | sort(attribute="scope") %}
         - **({{commit.scope}})**{% if commit.breaking %} [**breaking**]{% endif %} \
-            {{ commit.message }} - ([{{ commit.id | truncate(length=7, end="") }}]($REPO/commit/{{ commit.id }})) - {{ commit.author.name }}
+            {{ commit.message }} - ([{{ commit.id | truncate(length=7, end="") }}]($REPO/commit/{{ commit.id }}))
     {%- endfor -%}
     {% raw %}\n{% endraw %}\
     {%- for commit in commits %}
         {%- if commit.scope -%}
         {% else -%}
             - {% if commit.breaking %} [**breaking**]{% endif %}\
-                {{ commit.message }} - ([{{ commit.id | truncate(length=7, end="") }}]($REPO/commit/{{ commit.id }})) - {{ commit.author.name }}
+                {{ commit.message }} - ([{{ commit.id | truncate(length=7, end="") }}]($REPO/commit/{{ commit.id }}))
         {% endif -%}
     {% endfor -%}
 {% endfor %}\n

diff --git a/lib/api/Controller.ts b/lib/api/Controller.ts
@@ -220,7 +220,8 @@ class Controller {
         { name: 'id', type: 'string' },
       ]);
 
-      const response = await this.service.getSwapTransaction(id);
+      const response =
+        await this.service.transactionFetcher.getSubmarineTransaction(id);
       successResponse(res, response);
     } catch (error) {
       errorResponse(this.logger, req, res, error);

diff --git a/lib/api/v2/routers/SwapRouter.ts b/lib/api/v2/routers/SwapRouter.ts
@@ -967,6 +967,10 @@ class SwapRouter extends RouterBase {
 
     router.get('/chain', this.handleError(this.getChain));
     router.post('/chain', this.handleError(this.createChain));
+    router.get(
+      '/chain/:id/transactions',
+      this.handleError(this.getChainSwapTransactions),
+    );
     router.get(
       '/chain/:id/claim',
       this.handleError(this.getChainSwapClaimDetails),
@@ -975,7 +979,7 @@ class SwapRouter extends RouterBase {
 
     router.get(
       '/chain/:id/refund',
-      // We can use the exact same handler sas for Submarine swaps
+      // We can use the exact same handler as for Submarine Swaps
       this.handleError(this.refundEvm),
     );
     router.post(
@@ -1140,7 +1144,7 @@ class SwapRouter extends RouterBase {
     ]);
 
     const { transactionHex, transactionId, timeoutBlockHeight, timeoutEta } =
-      await this.service.getSwapTransaction(id);
+      await this.service.transactionFetcher.getSubmarineTransaction(id);
     successResponse(res, {
       id: transactionId,
       hex: transactionHex,
@@ -1290,7 +1294,7 @@ class SwapRouter extends RouterBase {
     ]);
 
     const { transactionHex, transactionId, timeoutBlockHeight } =
-      await this.service.getReverseSwapTransaction(id);
+      await this.service.transactionFetcher.getReverseSwapTransaction(id);
     successResponse(res, {
       id: transactionId,
       hex: transactionHex,
@@ -1408,10 +1412,6 @@ class SwapRouter extends RouterBase {
       pubNonce: getHexString(details.pubNonce),
       publicKey: getHexString(details.publicKey),
       transactionHash: getHexString(details.transactionHash),
-      lockupTransaction: {
-        id: details.lockupTransaction.getId(),
-        hex: details.lockupTransaction.toHex(),
-      },
     });
   };
 
@@ -1458,6 +1458,23 @@ class SwapRouter extends RouterBase {
     });
   };
 
+  private getChainSwapTransactions = async (req: Request, res: Response) => {
+    const { id } = validateRequest(req.params, [
+      { name: 'id', type: 'string' },
+    ]);
+
+    const chainSwap = await ChainSwapRepository.getChainSwap({ id });
+    if (chainSwap === null) {
+      errorResponse(this.logger, req, res, Errors.SWAP_NOT_FOUND(id), 404);
+      return;
+    }
+
+    successResponse(
+      res,
+      await this.service.transactionFetcher.getChainSwapTransactions(chainSwap),
+    );
+  };
+
   private signUtxoRefund =
     (signer: MusigSigner | ChainSwapSigner) =>
     async (req: Request, res: Response) => {
@@ -1468,10 +1485,10 @@ class SwapRouter extends RouterBase {
         : {};
 
       const { id, pubNonce, index, transaction } = validateRequest(req.body, [
-        { name: 'id', type: 'string', optional: params.id !== undefined },
         { name: 'index', type: 'number' },
         { name: 'pubNonce', type: 'string', hex: true },
         { name: 'transaction', type: 'string', hex: true },
+        { name: 'id', type: 'string', optional: params.id !== undefined },
       ]);
 
       const sig = await signer.signRefund(
@@ -1507,13 +1524,7 @@ class SwapRouter extends RouterBase {
     if (response) {
       successResponse(res, response);
     } else {
-      errorResponse(
-        this.logger,
-        req,
-        res,
-        `could not find swap with id: ${id}`,
-        404,
-      );
+      errorResponse(this.logger, req, res, Errors.SWAP_NOT_FOUND(id), 404);
     }
   };
 }

diff --git a/lib/cli/BoltzApiClient.ts b/lib/cli/BoltzApiClient.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { SwapUpdateEvent } from '../consts/Enums';
+import { ChainSwapTransactions } from '../service/TransactionFetcher';
 
 type PartialSignature = {
   pubNonce: string;
@@ -68,16 +69,18 @@ class BoltzApiClient {
       })
     ).data;
 
+  public getChainTransactions = async (
+    swapId: string,
+  ): Promise<ChainSwapTransactions> =>
+    (await axios.get(`${this.endpoint}/v2/swap/chain/${swapId}/transactions`))
+      .data;
+
   public getChainSwapClaimDetails = async (
     swapId: string,
   ): Promise<{
     pubNonce: string;
     publicKey: string;
     transactionHash: string;
-    lockupTransaction: {
-      id: string;
-      hex: string;
-    };
   }> =>
     (await axios.get(`${this.endpoint}/v2/swap/chain/${swapId}/claim`)).data;
 

diff --git a/lib/cli/commands/CooperativeChainClaim.ts → lib/cli/commands/CooperativeClaimChain.ts b/lib/cli/commands/CooperativeChainClaim.ts → lib/cli/commands/CooperativeClaimChain.ts
@@ -105,9 +105,11 @@ export const handler = async (
     argv.blindingKey,
   );
 
-  const apiClaimDetails = await boltzClient.getChainSwapClaimDetails(
-    argv.swapId,
-  );
+  const [apiClaimDetails, swapTransactions] = await Promise.all([
+    boltzClient.getChainSwapClaimDetails(argv.swapId),
+    boltzClient.getChainTransactions(argv.swapId),
+  ]);
+
   const theirClaimType = treeIsBitcoin(refundTree)
     ? CurrencyType.BitcoinLike
     : CurrencyType.Liquid;
@@ -117,7 +119,10 @@ export const handler = async (
     refundTree,
     ECPair.fromPrivateKey(getHexBuffer(argv.refundKeys)),
     extractClaimPublicKeyFromReverseSwapTree,
-    parseTransaction(theirClaimType, apiClaimDetails.lockupTransaction.hex),
+    parseTransaction(
+      theirClaimType,
+      swapTransactions.userLock!.transaction.hex!,
+    ),
   );
   theirClaimDetails.musig.aggregateNonces([
     [theirClaimDetails.theirPublicKey, getHexBuffer(apiClaimDetails.pubNonce)],

diff --git a/lib/notifications/CommandHandler.ts b/lib/notifications/CommandHandler.ts
@@ -231,7 +231,7 @@ class CommandHandler {
 
         if (commandInfo) {
           this.logger.debug(
-            `Executing Discord command: ${command} ${args.join(', ')}`,
+            `Executing ${this.notificationClient.serviceName} command: ${command} ${args.join(', ')}`,
           );
           await commandInfo.executor(args);
         }