LND: onchain batching

backends/CLightningREST.ts

@@ -272,5 +272,6 @@ export default class CLightningREST extends LND {
     supportsSimpleTaprootChannels = () => false;
     supportsCustomPreimages = () => false;
     supportsSweep = () => true;
+    supportsOnchainBatching = () => false;
     isLNDBased = () => false;
 }

backends/Eclair.ts

@@ -504,6 +504,7 @@ export default class Eclair {
     supportsSimpleTaprootChannels = () => false;
     supportsCustomPreimages = () => false;
     supportsSweep = () => false;
+    supportsOnchainBatching = () => false;
     isLNDBased = () => false;
 }
 

backends/EmbeddedLND.ts

@@ -267,5 +267,6 @@ export default class EmbeddedLND extends LND {
     supportsSimpleTaprootChannels = () => this.supports('v0.17.0');
     supportsCustomPreimages = () => true;
     supportsSweep = () => true;
+    supportsOnchainBatching = () => true;
     isLNDBased = () => true;
 }

backends/LND.ts

@@ -610,5 +610,6 @@ export default class LND {
     supportsSimpleTaprootChannels = () => this.supports('v0.17.0');
     supportsCustomPreimages = () => true;
     supportsSweep = () => true;
+    supportsOnchainBatching = () => true;
     isLNDBased = () => true;
 }

backends/LightningNodeConnect.ts

@@ -451,5 +451,6 @@ export default class LightningNodeConnect {
     supportsSimpleTaprootChannels = () => this.supports('v0.17.0');
     supportsCustomPreimages = () => true;
     supportsSweep = () => true;
+    supportsOnchainBatching = () => true;
     isLNDBased = () => true;
 }

backends/LndHub.ts

@@ -152,5 +152,6 @@ export default class LndHub extends LND {
     supportsSimpleTaprootChannels = () => false;
     supportsCustomPreimages = () => false;
     supportsSweep = () => false;
+    supportsOnchainBatching = () => false;
     isLNDBased = () => false;
 }

backends/Spark.ts

@@ -378,5 +378,6 @@ export default class Spark {
     supportsSimpleTaprootChannels = () => false;
     supportsCustomPreimages = () => false;
     supportsSweep = () => false;
+    supportsOnchainBatching = () => false;
     isLNDBased = () => false;
 }

locales/en.json

@@ -598,6 +598,8 @@
     "views.Send.noOnchainBalance": "No on-chain balance available. Close a channel or receive an on-chain transaction first.",
     "views.Send.noLightningBalance": "No lightning balance available. Open a channel or receive a lightning payment first.",
     "views.Send.zaplockerWarning": "This is a Zaplocker invoices that will hold payment up to 24 hours. Open ZEUS regularly after payment to help mitigate the risk of a force closed channel. Proceed at your own risk.",
+    "views.Send.addOutput": "Add output",
+    "views.Send.removeOutput": "Remove output",
     "views.SendingLightning.sending": "Sending Transaction",
     "views.SendingLightning.success": "Transaction successfully sent",
     "views.SendingLightning.paymentHash": "Payment Hash",

models/TransactionRequest.ts

@@ -1,5 +1,11 @@
 type FeeLimit = { percent: string } | { fixed: string };
 
+export interface AdditionalOutput {
+    address: string;
+    amount: string;
+    satAmount: string | number;
+}
+
 export default interface TransactionRequest {
     target_conf?: number | null; // optional
     addr?: string;
@@ -11,6 +17,7 @@ export default interface TransactionRequest {
     spend_unconfirmed?: boolean;
     send_all?: boolean;
     account?: string;
+    additional_outputs: Array<AdditionalOutput>;
 }
 
 export type SendPaymentRequest =

stores/TransactionsStore.ts

@@ -128,7 +128,11 @@ export default class TransactionsStore {
         this.loading = true;
 
         // Decode the raw transaction hex string
-        const tx = bitcoin.Transaction.fromHex(raw_final_tx);
+        const tx = bitcoin.Transaction.fromHex(
+            raw_final_tx.includes('=')
+                ? Base64Utils.base64ToHex(raw_final_tx)
+                : raw_final_tx
+        );
         // Get the transaction ID (txid)
         const txid = tx.getId();
 
@@ -261,8 +265,14 @@ export default class TransactionsStore {
     public sendCoinsLNDCoinControl = (
         transactionRequest: TransactionRequest
     ) => {
-        const { utxos, addr, amount, sat_per_vbyte, account } =
-            transactionRequest;
+        const {
+            utxos,
+            addr,
+            amount,
+            sat_per_vbyte,
+            account,
+            additional_outputs
+        } = transactionRequest;
         const inputs: any = [];
         const outputs: any = {};
 
@@ -277,6 +287,10 @@ export default class TransactionsStore {
             outputs[addr] = Number(amount);
         }
 
+        additional_outputs.map((output) => {
+            outputs[output.address] = Number(output.satAmount);
+        });
+
         const fundPsbtRequest = {
             raw: {
                 outputs,
@@ -321,9 +335,10 @@ export default class TransactionsStore {
         this.loading = true;
 
         if (
-            BackendUtils.isLNDBased() &&
-            transactionRequest.utxos &&
-            transactionRequest.utxos.length > 0
+            (BackendUtils.isLNDBased() &&
+                transactionRequest.utxos &&
+                transactionRequest.utxos.length > 0) ||
+            transactionRequest.additional_outputs.length > 0
         ) {
             return this.sendCoinsLNDCoinControl(transactionRequest);
         }

utils/BackendUtils.ts

@@ -144,6 +144,7 @@ class BackendUtils {
         this.call('supportsSimpleTaprootChannels');
     supportsCustomPreimages = () => this.call('supportsCustomPreimages');
     supportsSweep = () => this.call('supportsSweep');
+    supportsOnchainBatching = () => this.call('supportsOnchainBatching');
     isLNDBased = () => this.call('isLNDBased');
 
     // LNC

views/OpenChannel.tsx

@@ -835,7 +835,7 @@ export default class OpenChannel extends React.Component<
                                                     request
                                                 );
 
-                                            await this.subscribeOpenChannelStream(
+                                            this.subscribeOpenChannelStream(
                                                 request,
                                                 streamingCall
                                             );