feat: add event for not payable invoices

BoltzExchange · Mar 8, 2019 · 98bfa5c · 98bfa5c
1 parent de7b64c
commit 98bfa5c
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 6 deletions.
diff --git a/lib/chain/ChainClient.ts b/lib/chain/ChainClient.ts
@@ -89,8 +89,9 @@ interface ChainClient {
 }
 
 class ChainClient extends BaseClient {
+  public zmqClient: ZmqClient;
+
   private client: RpcClient;
-  private zmqClient: ZmqClient;
 
   private static readonly decimals = 100000000;
 

diff --git a/lib/grpc/GrpcService.ts b/lib/grpc/GrpcService.ts
@@ -102,6 +102,14 @@ class GrpcService {
       call.write(response);
     });
 
+    this.service.on('invoice.failedToPay', (invoice: string) => {
+      const response = new boltzrpc.SubscribeInvoicesResponse();
+      response.setEvent(boltzrpc.InvoiceEvent.FAILED_TO_PAY);
+      response.setInvoice(invoice);
+
+      call.write(response);
+    });
+
     this.service.on('invoice.settled', (invoice: string, preimage: string) => {
       const response = new boltzrpc.SubscribeInvoicesResponse();
       response.setEvent(boltzrpc.InvoiceEvent.SETTLED);

diff --git a/lib/proto/boltzrpc_grpc_pb.js b/lib/proto/boltzrpc_grpc_pb.js
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
@@ -36,6 +36,9 @@ interface Service {
   on(even: 'invoice.paid', listener: (invoice: string) => void): this;
   emit(event: 'invoice.paid', invoice: string): boolean;
 
+  on(event: 'invoice.failedToPay', listener: (invoice: string) => void): this;
+  emit(event: 'invoice.failedToPay', invoice: string): boolean;
+
   on(event: 'invoice.settled', listener: (invoice: string, preimage: string) => void): this;
   emit(event: 'invoice.settled', string: string, preimage: string): boolean;
 
@@ -401,6 +404,10 @@ class Service extends EventEmitter {
         this.emit('invoice.settled', invoice, preimage);
       });
     });
+
+    this.serviceComponents.swapManager.nursery.on('invoice.failedToPay', (invoice) => {
+      this.emit('invoice.failedToPay', invoice);
+    });
   }
 
   /**

diff --git a/lib/swap/SwapNursery.ts b/lib/swap/SwapNursery.ts
@@ -35,6 +35,9 @@ type SwapMaps = {
 interface SwapNursery {
   on(event: 'refund', listener: (lockupTransactionHash: string) => void): this;
   emit(event: 'refund', lockupTransactionHash: string): boolean;
+
+  on(event: 'invoice.failedToPay', listener: (invoice: string) => void): this;
+  emit(event: 'invoice.failedToPay', invoice: string): boolean;
 }
 
 class SwapNursery extends EventEmitter {
@@ -94,6 +97,8 @@ class SwapNursery extends EventEmitter {
 
     if (payInvoice.paymentError !== '') {
       this.logger.warn(`Could not pay ${currency.symbol} invoice ${details.invoice}: ${payInvoice.paymentError}`);
+
+      this.emit('invoice.failedToPay', details.invoice);
       return;
     }
 

diff --git a/lib/wallet/Wallet.ts b/lib/wallet/Wallet.ts
@@ -378,6 +378,8 @@ class Wallet {
 
         utxo.set('confirmed', true);
         await utxo.save();
+      } else {
+        this.chainClient.zmqClient.utxos.add(transactionId);
       }
     }
   }

diff --git a/proto/boltzrpc.proto b/proto/boltzrpc.proto
@@ -27,7 +27,7 @@ service Boltz {
   /* Subscribes to a stream of confirmed transactions to addresses that were specified with "ListenOnAddress" */
   rpc SubscribeTransactions (SubscribeTransactionsRequest) returns (stream SubscribeTransactionsResponse);
 
-  /* Subscribes to a stream of settled invoices and those paid by Boltz */
+  /* Subscribes to a stream of invoice events */
   rpc SubscribeInvoices (SubscribeInvoicesRequest) returns (stream SubscribeInvoicesResponse);
 
   /* Subscribes to a stream of lockup transactions that Boltz refunds */
@@ -56,7 +56,8 @@ enum OrderSide {
 
 enum InvoiceEvent {
   PAID = 0;
-  SETTLED = 1;
+  FAILED_TO_PAY = 1;
+  SETTLED = 2;
 }
 
 message GetInfoRequest {}