expand tx notif upodate

btcpayserver · May 9, 2024 · 1aec903 · 1aec903
1 parent 71d4f23
commit 1aec903
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/BTCPayApp.Core/Attempt2/BTCPayAppServerClient.cs b/BTCPayApp.Core/Attempt2/BTCPayAppServerClient.cs
@@ -30,10 +30,11 @@ public async Task NotifyNetwork(string network)
 
     }
 
-    public async Task TransactionDetected(string identifier, string txid)
+    public async Task TransactionDetected(string identifier, string txId, string[] relatedScripts, bool confirmed)
     {
-        _logger.LogInformation("OnTransactionDetected: {Txid}", txid);
-        await OnTransactionDetected?.Invoke(this, txid);
+
+        _logger.LogInformation("OnTransactionDetected: {Txid}", txId);
+        await OnTransactionDetected?.Invoke(this, (identifier, txId, relatedScripts, confirmed));
     }
 
     public async Task NewBlock(string block)
@@ -76,7 +77,7 @@ public async Task<List<LightningPayment>> GetLightningInvoices(ListInvoicesParam
     }
 
     public event AsyncEventHandler<string>? OnNewBlock;
-    public event AsyncEventHandler<string>? OnTransactionDetected;
+    public event AsyncEventHandler<(string identifier, string txId, string[] relatedScripts, bool confirmed)>? OnTransactionDetected;
     public event AsyncEventHandler<string>? OnNotifyNetwork;
 
 

diff --git a/BTCPayApp.Core/Attempt2/OnChainWalletManager.cs b/BTCPayApp.Core/Attempt2/OnChainWalletManager.cs
@@ -205,14 +205,12 @@ protected override async Task ExecuteStopAsync(CancellationToken cancellationTok
         State = OnChainWalletState.Init;
     }
 
-    private Task OnTransactionDetected(object? sender, string e)
+    private async Task OnTransactionDetected(object? sender, (string identifier, string txId, string[] relatedScripts, bool confirmed) valueTuple)
     {
-        throw new NotImplementedException();
     }
 
-    private Task OnNewBlock(object? sender, string e)
+    private async Task OnNewBlock(object? sender, string e)
     {
-        throw new NotImplementedException();
     }
 
     public async Task<Script> DeriveScript(string derivation)

diff --git a/BTCPayApp.Core/LDK/LDKChannelSync.cs b/BTCPayApp.Core/LDK/LDKChannelSync.cs
@@ -105,20 +105,20 @@ public async Task StartAsync(CancellationToken cancellationToken)
             action => _appHubClient.OnNewBlock -= action, OnNewBlock,
             cancellationToken)); 
 
-        _disposables.Add(ChannelExtensions.SubscribeToEventWithChannelQueue<string>(
+        _disposables.Add(ChannelExtensions.SubscribeToEventWithChannelQueue<(string identifier, string txId, string[] relatedScripts, bool confirmed)>(
             action => _appHubClient.OnTransactionDetected += action,
             action => _appHubClient.OnTransactionDetected -= action, OnTransactionUpdate,
             cancellationToken));
     }
 
 
 
-    private async Task OnTransactionUpdate(string txUpdate, CancellationToken cancellationToken)
+    private async Task OnTransactionUpdate((string identifier, string txId, string[] relatedScripts, bool confirmed) txUpdate, CancellationToken cancellationToken)
     {
-        var txResult = await  _connectionManager.HubProxy.FetchTxsAndTheirBlockHeads(new[] {txUpdate});
-        var tx = txResult.Txs[txUpdate];
+        var txResult = await  _connectionManager.HubProxy.FetchTxsAndTheirBlockHeads(new[] {txUpdate.txId});
+        var tx = txResult.Txs[txUpdate.txId];
 
-        var txHash = new uint256(txUpdate);
+        var txHash = new uint256(txUpdate.txId);
         var txHashBytes = txHash.ToBytes();
 
         byte[]? headerBytes = null;