feat: batch claim Chain Swaps (#741)

BoltzExchange · Dec 12, 2024 · 8978a59 · 8978a59
1 parent 51e03ca
commit 8978a59
Show file tree

Hide file tree

Showing 17 changed files with 924 additions and 587 deletions.
diff --git a/lib/cli/ethereum/commands/Refund.ts b/lib/cli/ethereum/commands/Refund.ts
@@ -42,7 +42,9 @@ export const handler = async (argv: Arguments<any>): Promise<void> => {
         argv.queryStartHeightDelta,
       ),
     );
-    transaction = await erc20Swap.refund(
+    transaction = await erc20Swap[
+      'refund(bytes32,uint256,address,address,uint256)'
+    ](
       preimageHash,
       erc20SwapValues.amount,
       erc20SwapValues.tokenAddress,
@@ -58,7 +60,7 @@ export const handler = async (argv: Arguments<any>): Promise<void> => {
         argv.queryStartHeightDelta,
       ),
     );
-    transaction = await etherSwap.refund(
+    transaction = await etherSwap['refund(bytes32,uint256,address,uint256)'](
       preimageHash,
       etherSwapValues.amount,
       etherSwapValues.claimAddress,

diff --git a/lib/db/repositories/ChainSwapRepository.ts b/lib/db/repositories/ChainSwapRepository.ts
@@ -202,6 +202,11 @@ class ChainSwapRepository {
     return swaps.filter((s) => symbols.includes(s.sendingData.symbol));
   };
 
+  public static getChainSwapsClaimable = () =>
+    this.getChainSwaps({
+      status: SwapUpdateEvent.TransactionClaimPending,
+    });
+
   public static addChainSwap = (args: {
     chainSwap: ChainSwapType;
     sendingData: ChainSwapDataType;
@@ -318,6 +323,17 @@ class ChainSwapRepository {
       return swap;
     });
 
+  public static setTransactionClaimPending = async (
+    swap: ChainSwapInfo,
+    preimage: Buffer,
+  ) => {
+    swap.chainSwap = await swap.chainSwap.update({
+      preimage: getHexString(preimage),
+      status: SwapUpdateEvent.TransactionClaimPending,
+    });
+    return swap;
+  };
+
   public static setClaimMinerFee = async (
     swap: ChainSwapInfo,
     preimage: Buffer,

diff --git a/lib/grpc/GrpcService.ts b/lib/grpc/GrpcService.ts
@@ -6,7 +6,7 @@ import { dumpHeap } from '../HeapDump';
 import Logger, { LogLevel as BackendLevel } from '../Logger';
 import { wait } from '../PromiseUtils';
 import { getHexString, getUnixTime } from '../Utils';
-import { CurrencyType } from '../consts/Enums';
+import { CurrencyType, swapTypeToPrettyString } from '../consts/Enums';
 import TransactionLabelRepository from '../db/repositories/TransactionLabelRepository';
 import * as boltzrpc from '../proto/boltzrpc_pb';
 import { LogLevel } from '../proto/boltzrpc_pb';
@@ -271,8 +271,9 @@ class GrpcService {
         swapToClaim
           .map((toClaim) => {
             const pendingSweep = new boltzrpc.PendingSweep();
-            pendingSweep.setSwapId(toClaim.swap.id);
-            pendingSweep.setOnchainAmount(toClaim.swap.onchainAmount || 0);
+            pendingSweep.setSwapId(toClaim.id);
+            pendingSweep.setOnchainAmount(toClaim.onchainAmount || 0);
+            pendingSweep.setType(swapTypeToPrettyString(toClaim.type));
             return pendingSweep;
           })
           .forEach((pendingSweep) =>

diff --git a/lib/proto/boltzrpc_pb.d.ts b/lib/proto/boltzrpc_pb.d.ts
diff --git a/lib/proto/boltzrpc_pb.js b/lib/proto/boltzrpc_pb.js
diff --git a/lib/service/Service.ts b/lib/service/Service.ts
@@ -101,7 +101,6 @@ import TimeoutDeltaProvider, {
 } from './TimeoutDeltaProvider';
 import TransactionFetcher from './TransactionFetcher';
 import { calculateTimeoutDate, getCurrency } from './Utils';
-import { SwapToClaimPreimage } from './cooperative/DeferredClaimer';
 import MusigSigner from './cooperative/MusigSigner';
 
 type NetworkContracts = {
@@ -999,7 +998,7 @@ class Service {
     return res;
   };
 
-  public getPendingSweeps = (): Map<string, SwapToClaimPreimage[]> => {
+  public getPendingSweeps = () => {
     return this.swapManager.deferredClaimer.pendingSweepsValues();
   };
 

diff --git a/lib/service/cooperative/CoopSignerBase.ts b/lib/service/cooperative/CoopSignerBase.ts
@@ -17,6 +17,7 @@ import { getHexBuffer } from '../../Utils';
 import { IChainClient } from '../../chain/ChainClient';
 import { SwapType, swapTypeToPrettyString } from '../../consts/Enums';
 import TypedEventEmitter from '../../consts/TypedEventEmitter';
+import { AnySwap } from '../../consts/Types';
 import ChainSwapData from '../../db/models/ChainSwapData';
 import Swap from '../../db/models/Swap';
 import { ChainSwapInfo } from '../../db/repositories/ChainSwapRepository';
@@ -82,7 +83,7 @@ abstract class CoopSignerBase<
           await this.constructClaimDetails(
             chainCurrency.chainClient!,
             wallet,
-            toClaim,
+            toClaim.swap,
           ),
         ] as ClaimDetails[] | LiquidClaimDetails[],
         address,
@@ -104,17 +105,16 @@ abstract class CoopSignerBase<
   /**
    * Cooperative when the preimage is undefined
    */
-  protected constructClaimDetails = async (
+  protected constructClaimDetails = async <T extends AnySwap>(
     chainClient: IChainClient,
     wallet: Wallet,
-    toClaim: SwapToClaim<T>,
+    toClaim: T,
     preimage?: Buffer,
   ): Promise<ClaimDetails | LiquidClaimDetails> => {
-    const { swap } = toClaim;
     const details =
-      swap.type === SwapType.Submarine
-        ? (swap as Swap)
-        : (swap as ChainSwapInfo).receivingData;
+      toClaim.type === SwapType.Submarine
+        ? (toClaim as Swap)
+        : (toClaim as ChainSwapInfo).receivingData;
 
     const tx = parseTransaction(
       wallet.type,