From 4c33d1d10736581185ba60e37fa3d8c82794e212 Mon Sep 17 00:00:00 2001 From: dangershony Date: Wed, 18 Dec 2024 23:43:22 +0000 Subject: [PATCH 01/16] Put a limit to founder if amount was not reached --- src/Angor/Client/Pages/Spend.razor | 310 +++++++++++++++-------------- src/Angor/Client/Pages/View.razor | 5 +- 2 files changed, 168 insertions(+), 147 deletions(-) diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index d33848c0..2c730ad5 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -64,184 +64,191 @@ +@if (firstTimeRefreshSpinner && refreshSpinner) +{ +
+
+
+} - @if (firstTimeRefreshSpinner && refreshSpinner) - { -
-
-
- } - +@if (!targetInvestmentReached && projectDateStarted) +{ + +} - @foreach (var stage in stageDatas) - { - bool stageisActive = stage.Stage.ReleaseDate < DateTime.UtcNow; - var investedCount = stage.Items.Count(c => c.IsSpent == false); - var investedAmount = stage.Items.Where(c => c.IsSpent == false).Sum(c => c.Amount); - bool noCoinsToClaim = investedCount == 0 || stage.StageSpinner == true; +@foreach (var stage in stageDatas) +{ + bool stageisActive = stage.Stage.ReleaseDate < DateTime.UtcNow; + var investedCount = stage.Items.Count(c => c.IsSpent == false); + var investedAmount = stage.Items.Where(c => c.IsSpent == false).Sum(c => c.Amount); + bool noCoinsToClaim = investedCount == 0 || stage.StageSpinner == true; -
-
-
-
Stage @stage.StageIndex (@stage.Stage.AmountToRelease %) - @investedAmount @network.CoinTicker (@investedCount trx)
- @if (stageisActive) - { +
+
+
+
Stage @stage.StageIndex (@stage.Stage.AmountToRelease %) - @investedAmount @network.CoinTicker (@investedCount trx)
+ @if (stageisActive) + { - - } - else - { - - } + } + + } + else + { + + } -
-

Estimated completion time: @stage.Stage.ReleaseDate.ToString("dd/MM/yyyy")

+
+

Estimated completion time: @stage.Stage.ReleaseDate.ToString("dd/MM/yyyy")

- + - @if (stage.StageIndex == expandedStageId) - { -
- @foreach (var transaction in stage.Items) - { - bool isTicked = IsUtxoSelected(transaction.Trxid, transaction.Outputindex); - string statusClass = transaction.IsSpent ? "bg-warning text-dark" : "bg-success text-light"; - string statusText = transaction.IsSpent ? "Spent" : "Unspent"; - -
- - -
- } + @if (stage.StageIndex == expandedStageId) + { +
+ @foreach (var transaction in stage.Items) + { + bool isTicked = IsUtxoSelected(transaction.Trxid, transaction.Outputindex); + string statusClass = transaction.IsSpent ? "bg-warning text-dark" : "bg-success text-light"; + string statusText = transaction.IsSpent ? "Spent" : "Unspent"; + +
+ + +
+ } -
- } -
+
+ }
- } +
+} - @if (showCreateModal) - { - -
-
-
-
-
Confirmation
- - - -
-
+@if (showCreateModal) +{ + +
+
+
+
+
Confirmation
+ + + +
+
-

Project Identifier: @project.ProjectIdentifier

+

Project Identifier: @project.ProjectIdentifier

-

The transactions to be spent @signedTransaction.Transaction.Outputs.Sum(s => s.Value.ToUnit(MoneyUnit.BTC)) @network.CoinTicker

-

Miner fee @Money.Satoshis(signedTransaction.TransactionFee).ToUnit(MoneyUnit.BTC) @network.CoinTicker

+

The transactions to be spent @signedTransaction.Transaction.Outputs.Sum(s => s.Value.ToUnit(MoneyUnit.BTC)) @network.CoinTicker

+

Miner fee @Money.Satoshis(signedTransaction.TransactionFee).ToUnit(MoneyUnit.BTC) @network.CoinTicker

-
+
-
- - -
+
+ + +
-
+
-
Stages
- @foreach (var utxo in selectedUtxos) +
Stages
+ @foreach (var utxo in selectedUtxos) + { + if (utxo.Value) // check if the UTXO is selected { - if (utxo.Value) // check if the UTXO is selected - { - var utxoKey = utxo.Key; - - var stageIndex = GetStageIndexForUtxo(utxoKey); + var utxoKey = utxo.Key; -

Stage: @stageIndex, Transaction: @utxoKey.Trxid, Output Index: @utxoKey.Outputindex

- } + var stageIndex = GetStageIndexForUtxo(utxoKey); + +

Stage: @stageIndex, Transaction: @utxoKey.Trxid, Output Index: @utxoKey.Outputindex

} + } -
+
-

Are you sure you want to continue?

+

Are you sure you want to continue?

-
-
- - -
+
+
+ +
+
- } +} -
-
-
-
Project Statistics
-
-

Total Invested Amount (Spent + Unspent): @(totalAvailableInvestedAmount + totalSpentAmount) @network.CoinTicker

-

Total Unspent Invested Amount: @totalAvailableInvestedAmount @network.CoinTicker

-

Total Withdrawable Amount: @currentWithdrawableAmount @network.CoinTicker

-

Total Transactions: @totalInvestedTransactions

-

Total Unspent Transactions: @(totalInvestedTransactions - totalSpentTransactions)

-

Total Spent Amount: @totalSpentAmount @network.CoinTicker

-

Total Spent Transactions: @totalSpentTransactions

-

Total Stages: @totalStages

- @if (timeUntilNextStage.HasValue) - { -

Time until next stage: @timeUntilNextStage.Value.Days days, @timeUntilNextStage.Value.Hours hours, @timeUntilNextStage.Value.Minutes minutes

- } - else - { -

No upcoming stages.

- } +
+
+
+
Project Statistics
+

Total Invested Amount (Spent + Unspent): @(totalAvailableInvestedAmount + totalSpentAmount) @network.CoinTicker

+

Total Unspent Invested Amount: @totalAvailableInvestedAmount @network.CoinTicker

+

Total Withdrawable Amount: @currentWithdrawableAmount @network.CoinTicker

+

Total Transactions: @totalInvestedTransactions

+

Total Unspent Transactions: @(totalInvestedTransactions - totalSpentTransactions)

+

Total Spent Amount: @totalSpentAmount @network.CoinTicker

+

Total Spent Transactions: @totalSpentTransactions

+

Total Stages: @totalStages

+ @if (timeUntilNextStage.HasValue) + { +

Time until next stage: @timeUntilNextStage.Value.Days days, @timeUntilNextStage.Value.Hours hours, @timeUntilNextStage.Value.Minutes minutes

+ } + else + { +

No upcoming stages.

+ }
+
@code { @@ -250,7 +257,7 @@ private int? expandedStageId; private bool showCreateModal; - + private bool showRawTransactionModal = false; private string rawTransactionJson; @@ -259,6 +266,8 @@ private bool spendSpinner = false; decimal totalAvailableInvestedAmount = 0.0m; + bool targetInvestmentReached = false; + bool projectDateStarted = false; int totalInvestedTransactions = 0; decimal totalSpentAmount = 0.0m; int totalSpentTransactions = 0; @@ -299,8 +308,6 @@ protected override async Task OnInitializedAsync() { - - project = storage.GetFounderProjects().FirstOrDefault(p => p.ProjectInfo.ProjectIdentifier == ProjectId)?.ProjectInfo; firstTimeRefreshSpinner = true; @@ -342,6 +349,9 @@ currentWithdrawableAmount += availableInvestedAmount; } } + + targetInvestmentReached = totalAvailableInvestedAmount >= project.TargetAmount; + projectDateStarted = DateTime.UtcNow > project.StartDate; } protected override async Task OnAfterRenderAsync(bool firstRender) @@ -501,6 +511,11 @@ private async Task ClaimCoins(int stageId) { + if (!targetInvestmentReached) + { + throw new InvalidOperationException("Target investment amount has not been reached, you can only release the funds back to the investors."); + } + var stage = stageDatas.First(s => s.StageIndex == stageId); stage.StageSpinner = true; @@ -548,14 +563,14 @@ finally { CalculateTotalValues(); - + if (selectedUtxos.Keys.Any(utxoKey => GetStageIndexForUtxo(utxoKey) == selectedStageId)) { selectedUtxos.Clear(); } stage.StageSpinner = false; } - + StateHasChanged(); } @@ -664,7 +679,7 @@ selectedUtxos[key] = true; } } - + private bool IsUtxoSelected(string trxId, int outputIndex) { return selectedUtxos.ContainsKey(new UtxoKey(trxId, outputIndex)); @@ -692,7 +707,7 @@ await _clipboardService.WriteTextAsync(trxData); StateHasChanged(); } - + public struct UtxoKey { public string Trxid { get; set; } @@ -749,4 +764,9 @@ { showRawTransactionModal = isVisible; } + + private void ReleaseFundsToInvestors(MouseEventArgs e) + { + throw new NotImplementedException(); + } } \ No newline at end of file diff --git a/src/Angor/Client/Pages/View.razor b/src/Angor/Client/Pages/View.razor index a61c9780..17995d03 100644 --- a/src/Angor/Client/Pages/View.razor +++ b/src/Angor/Client/Pages/View.razor @@ -492,7 +492,7 @@ else { founder = true; projectStats.Loading = false; - SetProjectLinksAndRefreshBalance(); + SetProjectLinksAndRefreshBalance(); // dont block let it update the ui later return; } @@ -502,14 +502,15 @@ else invested = investorProject.InvestedInProject(); myProjectExplorerLink = _NetworkConfiguration.GetExplorerUrl().Url + $"/transaction/{investorProject.TransactionId}"; projectStats.Loading = false; + SetProjectLinksAndRefreshBalance(); // dont block let it update the ui later return; } project = SessionStorage.GetProjectById(ProjectId); if (project != null) { - await SetProjectLinksAndRefreshBalance(); projectStats.Loading = false; + SetProjectLinksAndRefreshBalance(); // dont block let it update the ui later StateHasChanged(); return; } From 98d87a5b9d5f0d2cddb1dc9f0837465026c9a8de Mon Sep 17 00:00:00 2001 From: dangershony Date: Mon, 23 Dec 2024 22:41:08 +0000 Subject: [PATCH 02/16] Prepare the methods that will be used to release funds (WIP) --- src/Angor/Client/Pages/Spend.razor | 33 +++++++++++++++++-- .../ProtocolNew/FounderTransactionActions.cs | 2 -- .../IInvestorTransactionActions.cs | 2 ++ .../ProtocolNew/InvestorTransactionActions.cs | 10 ++++-- .../IInvestmentTransactionBuilder.cs | 3 ++ .../InvestmentTransactionBuilder.cs | 17 ++++++++++ 6 files changed, 61 insertions(+), 6 deletions(-) diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index 2c730ad5..4d12e641 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -20,9 +20,11 @@ @inject IDerivationOperations _derivationOperations @inject IWalletOperations _WalletOperations @inject IFounderTransactionActions _founderTransactionActions +@inject IInvestorTransactionActions _investorTransactionActions @inject ILogger Logger; @inject IClipboardService _clipboardService + @inherits BaseComponent @@ -543,7 +545,6 @@ founderContext.InvestmentTrasnactionsHex.Add(trx.Transaction.ToHex(network.Consensus.ConsensusFactory)); } - var accountInfo = storage.GetAccountInfo(network.Name); var address = accountInfo.GetNextReceiveAddress(); var addressScript = BitcoinWitPubKeyAddress.Create(address, network).ScriptPubKey; @@ -767,6 +768,34 @@ private void ReleaseFundsToInvestors(MouseEventArgs e) { - throw new NotImplementedException(); + foreach (var transaction in transactions) + { + // todo: in the initial communication between the founder and investor the investor should provide the address to send the funds on a release. + string releaseAddress = string.Empty; + + var sigs = SignReleaseOfFunds(transaction.Transaction, project, null, releaseAddress); + + // publish the sigs to the investors pubkey on nostr under a specific tag an investor will know it is a release of funds sig response + + } + + } + + private SignatureInfo SignReleaseOfFunds(Transaction investorTrx, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) + { + var transactionHex = investorTrx.ToHex(); + + + // build sigs + var recoveryTrx = _investorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); + var sig = _founderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); + + // todo: make a similar method for release funds to investors + //if (!_investorTransactionActions.CheckInvestorRecoverySignatures(info, investorTrx, sig)) + // throw new InvalidOperationException(); + + + return sig; } + } \ No newline at end of file diff --git a/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs b/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs index 6c1c3f38..e91c4e49 100644 --- a/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs +++ b/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs @@ -55,8 +55,6 @@ public SignatureInfo SignInvestorRecoveryTransactions(ProjectInfo projectInfo, s SignatureInfo info = new SignatureInfo { ProjectIdentifier = projectInfo.ProjectIdentifier }; - AssemblyLogger.LogAssemblyVersion(key.GetType(), _logger); - // todo: david change to Enumerable.Range for (var stageIndex = 0; stageIndex < projectInfo.Stages.Count; stageIndex++) { diff --git a/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs b/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs index 6377e0a4..ac73edd8 100644 --- a/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs +++ b/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs @@ -7,6 +7,8 @@ public interface IInvestorTransactionActions { Transaction CreateInvestmentTransaction(ProjectInfo projectInfo, string investorKey, long totalInvestmentAmount); Transaction BuildRecoverInvestorFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction); + Transaction BuildReleaseInvestorFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, string investorReleaseKey); + TransactionInfo RecoverEndOfProjectFunds(string transactionHex, ProjectInfo projectInfo, int stageIndex, string investorReceiveAddress, string investorPrivateKey, FeeEstimation feeEstimation); TransactionInfo RecoverRemainingFundsWithOutPenalty(string transactionHex, ProjectInfo projectInfo, int stageIndex, string investorReceiveAddress, string investorPrivateKey, FeeEstimation feeEstimation, IEnumerable seederSecrets); diff --git a/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs b/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs index 4378d493..5b97fd24 100644 --- a/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs +++ b/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs @@ -93,6 +93,14 @@ public Transaction BuildRecoverInvestorFundsTransaction(ProjectInfo projectInfo, return _investmentTransactionBuilder.BuildUpfrontRecoverFundsTransaction(projectInfo, investmentTransaction, projectInfo.PenaltyDays, investorKey); } + public Transaction BuildReleaseInvestorFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, string investorReleaseKey) + { + // todo: build the release trx + //var (investorKey, secretHash) = _projectScriptsBuilder.GetInvestmentDataFromOpReturnScript(investmentTransaction.Outputs.First(_ => _.ScriptPubKey.IsUnspendable).ScriptPubKey); + + return _investmentTransactionBuilder.BuildUpfrontReleaseFundsTransaction(projectInfo, investmentTransaction, projectInfo.PenaltyDays, investorReleaseKey); + } + public TransactionInfo BuildAndSignRecoverReleaseFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, Transaction recoveryTransaction, string investorReceiveAddress, FeeEstimation feeEstimation, string investorPrivateKey) { @@ -282,8 +290,6 @@ public bool CheckInvestorRecoverySignatures(ProjectInfo projectInfo, Transaction .Select(_ => _.TxOut) .ToArray(); - AssemblyLogger.LogAssemblyVersion(pubkey.GetType(), _logger); - // todo: David change to Enumerable.Range bool failedValidation = false; for (var stageIndex = 0; stageIndex < projectInfo.Stages.Count; stageIndex++) diff --git a/src/Angor/Shared/ProtocolNew/TransactionBuilders/IInvestmentTransactionBuilder.cs b/src/Angor/Shared/ProtocolNew/TransactionBuilders/IInvestmentTransactionBuilder.cs index 56031858..b199b30f 100644 --- a/src/Angor/Shared/ProtocolNew/TransactionBuilders/IInvestmentTransactionBuilder.cs +++ b/src/Angor/Shared/ProtocolNew/TransactionBuilders/IInvestmentTransactionBuilder.cs @@ -11,4 +11,7 @@ Transaction BuildInvestmentTransaction(ProjectInfo projectInfo, Script opReturnS Transaction BuildUpfrontRecoverFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, int penaltyDays, string investorKey); + + Transaction BuildUpfrontReleaseFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, int penaltyDays, + string investorReleaseKey); } \ No newline at end of file diff --git a/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs b/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs index 5a80f61f..1ba4c2a6 100644 --- a/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs +++ b/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs @@ -68,4 +68,21 @@ public Transaction BuildUpfrontRecoverFundsTransaction(ProjectInfo projectInfo, return transaction; } + + public Transaction BuildUpfrontReleaseFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, int penaltyDays, string investorReleaseKey) + { + // for the release we just send to a regular witness address + var spendingScript = new PubKey(investorReleaseKey).WitHash.ScriptPubKey; + + var transaction = _networkConfiguration.GetNetwork().CreateTransaction(); + + foreach (var output in investmentTransaction.Outputs.AsIndexedOutputs().Skip(2).Take(projectInfo.Stages.Count)) + { + transaction.Inputs.Add(new TxIn(output.ToOutPoint())); + + transaction.Outputs.Add(new TxOut(output.TxOut.Value, spendingScript)); + } + + return transaction; + } } \ No newline at end of file From 370aaf0ea2cca8e73e9ff80faa5ed6f4702543e0 Mon Sep 17 00:00:00 2001 From: dangershony Date: Tue, 7 Jan 2025 16:55:53 +0000 Subject: [PATCH 03/16] mrege master fixes --- src/Angor/Client/Pages/Spend.razor | 53 +++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index a6851171..eae65640 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -20,6 +20,7 @@ @inject IDerivationOperations _derivationOperations @inject IWalletOperations _WalletOperations @inject IFounderTransactionActions _founderTransactionActions +@inject IInvestorTransactionActions _investorTransactionActions @inject ILogger Logger; @inject IClipboardService _clipboardService @@ -62,8 +63,14 @@
- - +@if (!targetInvestmentReached && projectDateStarted) +{ + +}
@@ -479,6 +486,9 @@ int totalStages; TimeSpan? timeUntilNextStage; + bool targetInvestmentReached = false; + bool projectDateStarted = false; + private ProjectInfo project; private FeeData feeData = new(); @@ -512,8 +522,6 @@ protected override async Task OnInitializedAsync() { - - project = storage.GetFounderProjects().FirstOrDefault(p => p.ProjectInfo.ProjectIdentifier == ProjectId)?.ProjectInfo; firstTimeRefreshSpinner = true; @@ -555,6 +563,9 @@ currentWithdrawableAmount += availableInvestedAmount; } } + + targetInvestmentReached = totalAvailableInvestedAmount >= project.TargetAmount; + projectDateStarted = DateTime.UtcNow > project.StartDate; } protected override async Task OnAfterRenderAsync(bool firstRender) @@ -699,6 +710,11 @@ protected async Task ClaimCoinsCheckPassword(int stageId) { + if (!targetInvestmentReached) + { + throw new InvalidOperationException("Target investment amount has not been reached, you can only release the funds back to the investors."); + } + if (passwordComponent.HasPassword()) { await ClaimCoins(stageId); @@ -968,4 +984,33 @@ { showRawTransactionModal = isVisible; } + + private void ReleaseFundsToInvestors(MouseEventArgs e) + { + foreach (var transaction in transactions) + { + // todo: in the initial communication between the founder and investor the investor should provide the address to send the funds on a release. + string releaseAddress = string.Empty; + + var sigs = SignReleaseOfFunds(transaction.Transaction, project, null, releaseAddress); + + // publish the sigs to the investors pubkey on nostr under a specific tag an investor will know it is a release of funds sig response + } + } + + private SignatureInfo SignReleaseOfFunds(Transaction investorTrx, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) + { + var transactionHex = investorTrx.ToHex(); + + // build sigs + var recoveryTrx = _investorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); + var sig = _founderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); + + // todo: make a similar method for release funds to investors + //if (!_investorTransactionActions.CheckInvestorRecoverySignatures(info, investorTrx, sig)) + // throw new InvalidOperationException(); + + return sig; + } + } \ No newline at end of file From ddbd786076b9536fdd58d605af402c6d3b9ab7ce Mon Sep 17 00:00:00 2001 From: dangershony Date: Thu, 9 Jan 2025 21:36:47 +0000 Subject: [PATCH 04/16] move the box inside the spinner section --- src/Angor/Client/Pages/Spend.razor | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index eae65640..467e16f9 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -63,16 +63,6 @@
-@if (!targetInvestmentReached && projectDateStarted) -{ - -} - -
@if (firstTimeRefreshSpinner && refreshSpinner) @@ -85,6 +75,15 @@ } else { + @if (!targetInvestmentReached && projectDateStarted) + { + + } +
@@ -712,7 +711,8 @@ { if (!targetInvestmentReached) { - throw new InvalidOperationException("Target investment amount has not been reached, you can only release the funds back to the investors."); + notificationComponent.ShowErrorMessage("Target investment amount has not been reached, you can only release the funds back to the investors"); + return; } if (passwordComponent.HasPassword()) From 7e200139f1fd800abf8826075188068980316f94 Mon Sep 17 00:00:00 2001 From: dangershony Date: Thu, 9 Jan 2025 21:48:20 +0000 Subject: [PATCH 05/16] create a release page --- src/Angor/Client/Pages/Release.razor | 120 +++++++++++++++++++++++++++ src/Angor/Client/Pages/Spend.razor | 26 +----- 2 files changed, 121 insertions(+), 25 deletions(-) create mode 100644 src/Angor/Client/Pages/Release.razor diff --git a/src/Angor/Client/Pages/Release.razor b/src/Angor/Client/Pages/Release.razor new file mode 100644 index 00000000..3c71aac0 --- /dev/null +++ b/src/Angor/Client/Pages/Release.razor @@ -0,0 +1,120 @@ +@page "/release/{ProjectIdentifier}" +@using Angor.Shared +@using Angor.Client.Storage +@using Angor.Shared.Models +@using Angor.Shared.ProtocolNew +@using Angor.Client.Models +@using Angor.Shared.Services +@using Blockcore.Consensus.TransactionInfo + +@inject IJSRuntime JS + +@inject ILogger Logger +@inject IDerivationOperations DerivationOperations +@inject IClientStorage Storage; +@inject ISignService SignService +@inject IInvestorTransactionActions InvestorTransactionActions +@inject IFounderTransactionActions FounderTransactionActions +@inject ISerializer serializer +@inject IEncryptionService encryption + +@inherits BaseComponent + + + + +@if (!hasWallet) +{ + NavigationManager.NavigateTo($"/wallet"); + return; +} +
+
+
+
+ + + +
+
+ Release funds +
+ +
+
+
+

+ Project ID: + @ProjectIdentifier +

+
+
+ + + + +@code { + [Parameter] + public string ProjectIdentifier { get; set; } + + public FounderProject FounderProject { get; set; } + + List<(Transaction Transaction, string TrxId)> transactions = new(); + + + bool messagesReceived; + bool scanedForApprovals; + + private bool isLoading = false; + private bool refreshButtonSpinner = false; + + protected override async Task OnInitializedAsync() + { + Logger.LogDebug("OnInitializedAsync"); + if (hasWallet) + { + FounderProject = Storage.GetFounderProjects() + .FirstOrDefault(_ => _.ProjectInfo.ProjectIdentifier == ProjectIdentifier) + ?? throw new ArgumentException("The project was not found, try to scan in the founder page"); + + //await FetchPendingSignatures(FounderProject); + } + Logger.LogDebug("End of OnInitializedAsync"); + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + Logger.LogDebug("OnAfterRenderAsync"); + // await FetchSignaturesCheckPassword(); + } + + + private void ReleaseFundsToInvestors(MouseEventArgs e) + { + foreach (var transaction in transactions) + { + // todo: in the initial communication between the founder and investor the investor should provide the address to send the funds on a release. + string releaseAddress = string.Empty; + + var sigs = SignReleaseOfFunds(transaction.Transaction, FounderProject.ProjectInfo, null, releaseAddress); + + // publish the sigs to the investors pubkey on nostr under a specific tag an investor will know it is a release of funds sig response + } + } + + + private SignatureInfo SignReleaseOfFunds(Transaction investorTrx, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) + { + var transactionHex = investorTrx.ToHex(); + + // build sigs + var recoveryTrx = InvestorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); + var sig = FounderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); + + // todo: make a similar method for release funds to investors + //if (!_investorTransactionActions.CheckInvestorRecoverySignatures(info, investorTrx, sig)) + // throw new InvalidOperationException(); + + return sig; + } +} \ No newline at end of file diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index 467e16f9..c400e19f 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -987,30 +987,6 @@ private void ReleaseFundsToInvestors(MouseEventArgs e) { - foreach (var transaction in transactions) - { - // todo: in the initial communication between the founder and investor the investor should provide the address to send the funds on a release. - string releaseAddress = string.Empty; - - var sigs = SignReleaseOfFunds(transaction.Transaction, project, null, releaseAddress); - - // publish the sigs to the investors pubkey on nostr under a specific tag an investor will know it is a release of funds sig response - } + NavigationManager.NavigateTo($"/release/{ProjectId}"); } - - private SignatureInfo SignReleaseOfFunds(Transaction investorTrx, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) - { - var transactionHex = investorTrx.ToHex(); - - // build sigs - var recoveryTrx = _investorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); - var sig = _founderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); - - // todo: make a similar method for release funds to investors - //if (!_investorTransactionActions.CheckInvestorRecoverySignatures(info, investorTrx, sig)) - // throw new InvalidOperationException(); - - return sig; - } - } \ No newline at end of file From 10ce92f0867469c56bc331144910482fcfb7f9b1 Mon Sep 17 00:00:00 2001 From: dangershony Date: Fri, 10 Jan 2025 22:06:15 +0000 Subject: [PATCH 06/16] lookup release sigs --- src/Angor/Client/Pages/Release.razor | 79 ++++++++++++++++++- .../Shared/Models/SignRecoveryRequest.cs | 7 +- src/Angor/Shared/Services/ISignService.cs | 4 + src/Angor/Shared/Services/SignService.cs | 52 ++++++++++++ 4 files changed, 137 insertions(+), 5 deletions(-) diff --git a/src/Angor/Client/Pages/Release.razor b/src/Angor/Client/Pages/Release.razor index 3c71aac0..af281ff5 100644 --- a/src/Angor/Client/Pages/Release.razor +++ b/src/Angor/Client/Pages/Release.razor @@ -50,7 +50,42 @@
- +
+
+
+
+
+
+
Approved Signatures
+
+
+
+
+
+ + + + + + + + + + @foreach (var approval in approvalsDictionary) + { + + + + + + } + +
Investor Public KeyTime ApprovedStatus
@approval.Key@approval.Value.TimeApproved.ToString("g")@approval.Value.EventId
+
+
+
+
+
@code { @@ -60,7 +95,8 @@ public FounderProject FounderProject { get; set; } List<(Transaction Transaction, string TrxId)> transactions = new(); - + Dictionary approvalsDictionary = new(); + bool messagesReceived; bool scanedForApprovals; @@ -77,17 +113,52 @@ .FirstOrDefault(_ => _.ProjectInfo.ProjectIdentifier == ProjectIdentifier) ?? throw new ArgumentException("The project was not found, try to scan in the founder page"); - //await FetchPendingSignatures(FounderProject); + await FetchApprovedSignatures(FounderProject); } Logger.LogDebug("End of OnInitializedAsync"); } + private async Task FetchApprovedSignatures(FounderProject founderProject) + { + // Fetch all approvals + SignService.LookupInvestmentRequestApprovals( + founderProject.ProjectInfo.NostrPubKey, + (investorNostrPubKey, timeApproved, reqEventId) => + { + approvalsDictionary[investorNostrPubKey] = (timeApproved, reqEventId); + }, + async () => + { + // After fetching approvals, look up all release signatures + foreach (var investorNostrPubKey in approvalsDictionary.Keys.ToList()) + { + SignService.LookupReleaseSigs( + investorNostrPubKey, + founderProject.ProjectInfo.NostrPubKey, + approvalsDictionary[investorNostrPubKey].TimeApproved, + approvalsDictionary[investorNostrPubKey].EventId, + async (releaseSigContent) => + { + // Mark the item in the dictionary as found + approvalsDictionary[investorNostrPubKey] = (approvalsDictionary[investorNostrPubKey].TimeApproved, "Found"); + }); + } + + // Log the results + foreach (var approval in approvalsDictionary) + { + Logger.LogDebug($"Investor: {approval.Key}, TimeApproved: {approval.Value.TimeApproved}, Status: {approval.Value.EventId}"); + } + + StateHasChanged(); + }); + } + protected override async Task OnAfterRenderAsync(bool firstRender) { Logger.LogDebug("OnAfterRenderAsync"); // await FetchSignaturesCheckPassword(); } - private void ReleaseFundsToInvestors(MouseEventArgs e) { diff --git a/src/Angor/Shared/Models/SignRecoveryRequest.cs b/src/Angor/Shared/Models/SignRecoveryRequest.cs index 6abe8e8d..e95495b6 100644 --- a/src/Angor/Shared/Models/SignRecoveryRequest.cs +++ b/src/Angor/Shared/Models/SignRecoveryRequest.cs @@ -6,7 +6,12 @@ public class SignRecoveryRequest public string InvestorNostrPrivateKey { get; set; } public string NostrPubKey { get; set; } - + + /// + /// An address that will be used to release the funds to the investor in case the target amount is not reached. + /// + public string ReleaseAddress{ get; set; } + public string InvestmentTransaction { get; set; } public string EncryptedContent { get; set; } diff --git a/src/Angor/Shared/Services/ISignService.cs b/src/Angor/Shared/Services/ISignService.cs index f9c29cd6..96da4307 100644 --- a/src/Angor/Shared/Services/ISignService.cs +++ b/src/Angor/Shared/Services/ISignService.cs @@ -15,4 +15,8 @@ void LookupInvestmentRequestApprovals(string nostrPubKey, Action action); } \ No newline at end of file diff --git a/src/Angor/Shared/Services/SignService.cs b/src/Angor/Shared/Services/SignService.cs index 68deba79..9e24cb35 100644 --- a/src/Angor/Shared/Services/SignService.cs +++ b/src/Angor/Shared/Services/SignService.cs @@ -159,6 +159,58 @@ public DateTime SendSignaturesToInvestor(string encryptedSignatureInfo, string n return ev.CreatedAt.Value; } + public DateTime SendReleaseSigsToInvestor(string encryptedReleaseSigInfo, string nostrPrivateKeyHex, string investorNostrPubKey, string eventId) + { + var nostrPrivateKey = NostrPrivateKey.FromHex(nostrPrivateKeyHex); + + var ev = new NostrEvent + { + Kind = NostrKind.EncryptedDm, + CreatedAt = DateTime.UtcNow, + Content = encryptedReleaseSigInfo, + Tags = new NostrEventTags(new[] + { + NostrEventTag.Profile(investorNostrPubKey), + NostrEventTag.Event(eventId), + new NostrEventTag("subject", "Release transaction signatures"), + }) + }; + + var signed = ev.Sign(nostrPrivateKey); + + var nostrClient = _communicationFactory.GetOrCreateClient(_networkService); + nostrClient.Send(new NostrEventRequest(signed)); + + return ev.CreatedAt.Value; + } + + public void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime releaseRequestSentTime, string releaseRequestEventId, Func action) + { + var nostrClient = _communicationFactory.GetOrCreateClient(_networkService); + var subscriptionKey = projectNostrPubKey + "release_sigs"; + + if (!_subscriptionsHanding.RelaySubscriptionAdded(subscriptionKey)) + { + var subscription = nostrClient.Streams.EventStream + .Where(_ => _.Subscription == subscriptionKey) + .Where(_ => _.Event.Kind == NostrKind.EncryptedDm) + .Where(_ => _.Event.Tags.FindFirstTagValue("subject") == "Release transaction signatures") + .Subscribe(_ => { action.Invoke(_.Event.Content); }); + + _subscriptionsHanding.TryAddRelaySubscription(subscriptionKey, subscription); + } + + nostrClient.Send(new NostrRequest(subscriptionKey, new NostrFilter + { + Authors = new[] { projectNostrPubKey }, // From founder + P = new[] { investorNostrPubKey }, // To investor + Kinds = new[] { NostrKind.EncryptedDm }, + Since = releaseRequestSentTime, + E = new[] { releaseRequestEventId }, + Limit = 1, + })); + } + public void CloseConnection() { _subscriptionsHanding.Dispose(); From 4765868e67b6980d0db1b70fedf03424bb6f4d82 Mon Sep 17 00:00:00 2001 From: dangershony Date: Mon, 13 Jan 2025 17:03:40 +0000 Subject: [PATCH 07/16] Add the code so sign and validate the release trx and also add a test method to check it all works --- .../InvestmentIntegrationsTests.cs | 78 ++++++++++++++++ .../IInvestorTransactionActions.cs | 3 +- .../ProtocolNew/InvestorTransactionActions.cs | 88 ++++++++++++++++++- 3 files changed, 166 insertions(+), 3 deletions(-) diff --git a/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs b/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs index e25f5f69..140d98a3 100644 --- a/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs +++ b/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs @@ -635,5 +635,83 @@ public void InvestorTransaction_NoPenalty_Test(int stageIndex) investorInvTrx.Outputs.AsCoins().Where(c => c.Amount > 0)); } } + + [Fact] + public void SpendInvestorReleaseTest() + { + var network = Networks.Bitcoin.Testnet(); + + var words = new WalletWords { Words = new Mnemonic(Wordlist.English, WordCount.Twelve).ToString() }; + + // Create the investor params + var investorKey = new Key(); + var investorChangeKey = new Key(); + + var funderKey = _derivationOperations.DeriveFounderKey(words, 1); + var angorKey = _derivationOperations.DeriveAngorKey(funderKey, angorRootKey); + var founderRecoveryKey = _derivationOperations.DeriveFounderRecoveryKey(words, 1); + var funderPrivateKey = _derivationOperations.DeriveFounderPrivateKey(words, 1); + var founderRecoveryPrivateKey = _derivationOperations.DeriveFounderRecoveryPrivateKey(words, 1); + + var investorContext = new InvestorContext + { + ProjectInfo = new ProjectInfo + { + TargetAmount = 3, + StartDate = DateTime.UtcNow, + ExpiryDate = DateTime.UtcNow.AddDays(5), + PenaltyDays = 5, + Stages = new List + { + new() { AmountToRelease = 1, ReleaseDate = DateTime.UtcNow.AddDays(1) }, + new() { AmountToRelease = 1, ReleaseDate = DateTime.UtcNow.AddDays(2) }, + new() { AmountToRelease = 1, ReleaseDate = DateTime.UtcNow.AddDays(3) } + }, + FounderKey = funderKey, + FounderRecoveryKey = founderRecoveryKey, + ProjectIdentifier = angorKey, + ProjectSeeders = new ProjectSeeders() + }, + InvestorKey = Encoders.Hex.EncodeData(investorKey.PubKey.ToBytes()), + ChangeAddress = investorChangeKey.PubKey.GetSegwitAddress(network).ToString() + }; + + var investorReleaseKey = new Key(); + var investorReleasePubKey = Encoders.Hex.EncodeData(investorReleaseKey.PubKey.ToBytes()); + + // Create the investment transaction + var investmentTransaction = _investorTransactionActions.CreateInvestmentTransaction(investorContext.ProjectInfo, investorContext.InvestorKey, + Money.Coins(investorContext.ProjectInfo.TargetAmount).Satoshi); + + investorContext.TransactionHex = investmentTransaction.ToHex(); + + // Build the release transaction + var releaseTransaction = _investorTransactionActions.BuildReleaseInvestorFundsTransaction(investorContext.ProjectInfo, investmentTransaction, investorReleasePubKey); + + // Sign the release transaction + var founderSignatures = _founderTransactionActions.SignInvestorRecoveryTransactions(investorContext.ProjectInfo, + investmentTransaction.ToHex(), releaseTransaction, + Encoders.Hex.EncodeData(founderRecoveryPrivateKey.ToBytes())); + + var signedReleaseTransaction = _investorTransactionActions.AddSignaturesToReleaseFundsTransaction(investorContext.ProjectInfo, + investmentTransaction, founderSignatures, Encoders.Hex.EncodeData(investorKey.ToBytes()), investorReleasePubKey); + + // Validate the signatures + var sigCheckResult = _investorTransactionActions.CheckInvestorReleaseSignatures(investorContext.ProjectInfo, investmentTransaction, founderSignatures, investorReleasePubKey); + Assert.True(sigCheckResult, "Failed to validate the founder's signatures"); + + List coins = new(); + foreach (var indexedTxOut in investmentTransaction.Outputs.AsIndexedOutputs().Where(w => !w.TxOut.ScriptPubKey.IsUnspendable)) + { + coins.Add(new Blockcore.NBitcoin.Coin(indexedTxOut)); + coins.Add(new Blockcore.NBitcoin.Coin(Blockcore.NBitcoin.uint256.Zero, 0, new Blockcore.NBitcoin.Money(1000), + new Script("4a8a3d6bb78a5ec5bf2c599eeb1ea522677c4b10132e554d78abecd7561e4b42"))); // Adding fee inputs + } + + signedReleaseTransaction.Inputs.Add(new Blockcore.Consensus.TransactionInfo.TxIn( + new Blockcore.Consensus.TransactionInfo.OutPoint(Blockcore.NBitcoin.uint256.Zero, 0), null)); // Add fee to the transaction + + TransactionValidation.ThanTheTransactionHasNoErrors(signedReleaseTransaction, coins); + } } } \ No newline at end of file diff --git a/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs b/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs index ac73edd8..8d2cf90a 100644 --- a/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs +++ b/src/Angor/Shared/ProtocolNew/IInvestorTransactionActions.cs @@ -15,8 +15,9 @@ public interface IInvestorTransactionActions TransactionInfo BuildAndSignRecoverReleaseFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, Transaction recoveryTransaction, string investorReceiveAddress, FeeEstimation feeEstimation, string investorPrivateKey); Transaction AddSignaturesToRecoverSeederFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures, string investorPrivateKey); + Transaction AddSignaturesToReleaseFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures, string investorPrivateKey, string investorReleaseKey); bool CheckInvestorRecoverySignatures(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures); - + bool CheckInvestorReleaseSignatures(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures, string investorReleaseKey); ProjectScriptType DiscoverUsedScript(ProjectInfo projectInfo, Transaction investmentTransaction, int stageIndex, string witScript); } \ No newline at end of file diff --git a/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs b/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs index 5b97fd24..7d179d1f 100644 --- a/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs +++ b/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs @@ -230,7 +230,7 @@ public TransactionInfo RecoverRemainingFundsWithOutPenalty(string transactionHex }); } - public Transaction AddSignaturesToRecoverSeederFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures, string investorPrivateKey) + public Transaction AddSignaturesToRecoverSeederFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures, string investorPrivateKey) { var (investorKey, secretHash) = _projectScriptsBuilder.GetInvestmentDataFromOpReturnScript(investmentTransaction.Outputs.First(_ => _.ScriptPubKey.IsUnspendable).ScriptPubKey); @@ -272,7 +272,49 @@ public Transaction AddSignaturesToRecoverSeederFundsTransaction(ProjectInfo proj return recoveryTransaction; } - public bool CheckInvestorRecoverySignatures(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures) + public Transaction AddSignaturesToReleaseFundsTransaction(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures, string investorPrivateKey, string investorReleaseKey) + { + var (investorKey, secretHash) = _projectScriptsBuilder.GetInvestmentDataFromOpReturnScript(investmentTransaction.Outputs.First(_ => _.ScriptPubKey.IsUnspendable).ScriptPubKey); + + var releaseFundsTransaction = _investmentTransactionBuilder.BuildUpfrontReleaseFundsTransaction(projectInfo, investmentTransaction, projectInfo.PenaltyDays, investorReleaseKey); + + var nbitcoinNetwork = NetworkMapper.Map(_networkConfiguration.GetNetwork()); + var nbitcoinRecoveryTransaction = NBitcoin.Transaction.Parse(releaseFundsTransaction.ToHex(), nbitcoinNetwork); + var nbitcoinInvestmentTransaction = NBitcoin.Transaction.Parse(investmentTransaction.ToHex(), nbitcoinNetwork); + + var key = new NBitcoin.Key(Encoders.Hex.DecodeData(investorPrivateKey)); + var sigHash = TaprootSigHash.Single | TaprootSigHash.AnyoneCanPay; + + var outputs = nbitcoinInvestmentTransaction.Outputs.AsIndexedOutputs() + .Skip(2).Take(projectInfo.Stages.Count) + .Select(_ => _.TxOut) + .ToArray(); + + // todo: david change to Enumerable.Range + for (var stageIndex = 0; stageIndex < projectInfo.Stages.Count; stageIndex++) + { + var scriptStages = _investmentScriptBuilder.BuildProjectScriptsForStage(projectInfo, investorKey, stageIndex, secretHash); + var controlBlock = _taprootScriptBuilder.CreateControlBlock(scriptStages, _ => _.Recover); + + var execData = new TaprootExecutionData(stageIndex, new NBitcoin.Script(scriptStages.Recover.ToBytes()).TaprootV1LeafHash) { SigHash = sigHash }; + var hash = nbitcoinRecoveryTransaction.GetSignatureHashTaproot(outputs, execData); + + _logger.LogInformation($"project={projectInfo.ProjectIdentifier}; investor-pubkey={key.PubKey.ToHex()}; stage={stageIndex}; hash={hash}"); + + var investorSignature = key.SignTaprootKeySpend(hash, sigHash); + + releaseFundsTransaction.Inputs[stageIndex].WitScript = new Blockcore.Consensus.TransactionInfo.WitScript( + new WitScript( + Op.GetPushOp(investorSignature.ToBytes()), + Op.GetPushOp(TaprootSignature.Parse(founderSignatures.Signatures.First(f => f.StageIndex == stageIndex).Signature).ToBytes()), + Op.GetPushOp(scriptStages.Recover.ToBytes()), + Op.GetPushOp(controlBlock.ToBytes())).ToBytes()); + } + + return releaseFundsTransaction; + } + + public bool CheckInvestorRecoverySignatures(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures) { var (investorKey, secretHash) = _projectScriptsBuilder.GetInvestmentDataFromOpReturnScript(investmentTransaction.Outputs.First(_ => _.ScriptPubKey.IsUnspendable).ScriptPubKey); @@ -313,4 +355,46 @@ public bool CheckInvestorRecoverySignatures(ProjectInfo projectInfo, Transaction return true; } + + public bool CheckInvestorReleaseSignatures(ProjectInfo projectInfo, Transaction investmentTransaction, SignatureInfo founderSignatures, string investorReleaseKey) + { + var (investorKey, secretHash) = _projectScriptsBuilder.GetInvestmentDataFromOpReturnScript(investmentTransaction.Outputs.First(_ => _.ScriptPubKey.IsUnspendable).ScriptPubKey); + + var releaseFundsTransaction = _investmentTransactionBuilder.BuildUpfrontReleaseFundsTransaction(projectInfo, investmentTransaction, projectInfo.PenaltyDays, investorReleaseKey); + + var nbitcoinNetwork = NetworkMapper.Map(_networkConfiguration.GetNetwork()); + var nBitcoinRecoveryTransaction = NBitcoin.Transaction.Parse(releaseFundsTransaction.ToHex(), nbitcoinNetwork); + var nbitcoinInvestmentTransaction = NBitcoin.Transaction.Parse(investmentTransaction.ToHex(), nbitcoinNetwork); + + var pubkey = new NBitcoin.PubKey(projectInfo.FounderRecoveryKey).GetTaprootFullPubKey(); + var sigHash = TaprootSigHash.Single | TaprootSigHash.AnyoneCanPay; + + var outputs = nbitcoinInvestmentTransaction.Outputs.AsIndexedOutputs() + .Skip(2).Take(projectInfo.Stages.Count) + .Select(_ => _.TxOut) + .ToArray(); + + // todo: David change to Enumerable.Range + bool failedValidation = false; + for (var stageIndex = 0; stageIndex < projectInfo.Stages.Count; stageIndex++) + { + var scriptStages = _investmentScriptBuilder.BuildProjectScriptsForStage(projectInfo, investorKey, stageIndex, secretHash); + + var execData = new TaprootExecutionData(stageIndex, new NBitcoin.Script(scriptStages.Recover.ToBytes()).TaprootV1LeafHash) { SigHash = sigHash }; + var hash = nBitcoinRecoveryTransaction.GetSignatureHashTaproot(outputs, execData); + var sig = founderSignatures.Signatures.First(f => f.StageIndex == stageIndex).Signature; + + var result = pubkey.VerifySignature(hash, TaprootSignature.Parse(sig).SchnorrSignature); + + _logger.LogInformation($"verifying sig for project={projectInfo.ProjectIdentifier}; success = {result}; founder-recovery-pubkey={projectInfo.FounderRecoveryKey}; stage={stageIndex}; hash={hash}; signature-hex={sig}"); + + if (result == false) + failedValidation = true; + } + + if (failedValidation) + throw new Exception("Invalid signatures provided by founder"); + + return true; + } } \ No newline at end of file From cc31c271cfd8cf3a720a5bdb20618de988b28904 Mon Sep 17 00:00:00 2001 From: dangershony Date: Tue, 14 Jan 2025 22:07:35 +0000 Subject: [PATCH 08/16] Filter events by subject --- src/Angor/Shared/Services/SignService.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Angor/Shared/Services/SignService.cs b/src/Angor/Shared/Services/SignService.cs index 9e24cb35..5b6bbea0 100644 --- a/src/Angor/Shared/Services/SignService.cs +++ b/src/Angor/Shared/Services/SignService.cs @@ -55,6 +55,7 @@ public void LookupSignatureForInvestmentRequest(string investorNostrPubKey, stri var subscription = nostrClient.Streams.EventStream .Where(_ => _.Subscription == projectNostrPubKey) .Where(_ => _.Event.Kind == NostrKind.EncryptedDm) + .Where(_ => _.Event.Tags.FindFirstTagValue("subject") == "Re:Investment offer") .Subscribe(_ => { action.Invoke(_.Event.Content); }); _subscriptionsHanding.TryAddRelaySubscription(projectNostrPubKey, subscription); @@ -82,6 +83,7 @@ public Task LookupInvestmentRequestsAsync(string nostrPubKey, string? senderNpub { var subscription = nostrClient.Streams.EventStream .Where(_ => _.Subscription == subscriptionKey) + .Where(_ => _.Event.Tags.FindFirstTagValue("subject") == "Investment offer") .Select(_ => _.Event) .Subscribe(nostrEvent => { @@ -116,6 +118,7 @@ public void LookupInvestmentRequestApprovals(string nostrPubKey, Action _.Subscription == subscriptionKey) + .Where(_ => _.Event.Tags.FindFirstTagValue("subject") == "Re:Investment offer") .Select(_ => _.Event) .Subscribe(nostrEvent => { From 118c85a320c013029177e5501afc5aaa5adc0ec4 Mon Sep 17 00:00:00 2001 From: dangershony Date: Wed, 15 Jan 2025 20:58:22 +0000 Subject: [PATCH 09/16] Write the code to sign the release sigs --- src/Angor/Client/Models/FounderProject.cs | 25 ++- src/Angor/Client/Pages/Release.razor | 191 ---------------------- src/Angor/Client/Pages/Signatures.razor | 107 +++++++++++- src/Angor/Client/Pages/Spend.razor | 21 ++- src/Angor/Shared/Models/SignatureInfo.cs | 5 + 5 files changed, 147 insertions(+), 202 deletions(-) delete mode 100644 src/Angor/Client/Pages/Release.razor diff --git a/src/Angor/Client/Models/FounderProject.cs b/src/Angor/Client/Models/FounderProject.cs index 0d4a09ab..36d00c44 100644 --- a/src/Angor/Client/Models/FounderProject.cs +++ b/src/Angor/Client/Models/FounderProject.cs @@ -9,7 +9,30 @@ public class FounderProject : Project public string ProjectInfoEventId { get; set; } public bool NostrProfileCreated { get; set; } - + + + /// + /// The total amount of the project that has been invested in, + /// This parameter will only be set once the founder went to the spend page + /// and was able to calaulate to total amount of funds that have been invested in the project. + /// + /// The intention is to use this parameter to know if the founder should be forced to release + /// the funds back to the investor by sending signature of a trx that spend coins to the investors address + /// + public decimal? TotalAvailableInvestedAmount { get; set; } + + public DateTime? ReleaseSignaturesTime { get; set; } + + public bool TargetInvestmentReached() + { + return TotalAvailableInvestedAmount >= ProjectInfo.TargetAmount; + } + + public bool ProjectDateStarted() + { + return DateTime.UtcNow > ProjectInfo.StartDate; + } + public bool NostrMetadataCreated() { return !string.IsNullOrEmpty(Metadata?.Name); diff --git a/src/Angor/Client/Pages/Release.razor b/src/Angor/Client/Pages/Release.razor deleted file mode 100644 index af281ff5..00000000 --- a/src/Angor/Client/Pages/Release.razor +++ /dev/null @@ -1,191 +0,0 @@ -@page "/release/{ProjectIdentifier}" -@using Angor.Shared -@using Angor.Client.Storage -@using Angor.Shared.Models -@using Angor.Shared.ProtocolNew -@using Angor.Client.Models -@using Angor.Shared.Services -@using Blockcore.Consensus.TransactionInfo - -@inject IJSRuntime JS - -@inject ILogger Logger -@inject IDerivationOperations DerivationOperations -@inject IClientStorage Storage; -@inject ISignService SignService -@inject IInvestorTransactionActions InvestorTransactionActions -@inject IFounderTransactionActions FounderTransactionActions -@inject ISerializer serializer -@inject IEncryptionService encryption - -@inherits BaseComponent - - - - -@if (!hasWallet) -{ - NavigationManager.NavigateTo($"/wallet"); - return; -} -
-
-
-
- - - -
-
- Release funds -
- -
-
-
-

- Project ID: - @ProjectIdentifier -

-
-
- -
-
-
-
-
-
-
Approved Signatures
-
-
-
-
-
- - - - - - - - - - @foreach (var approval in approvalsDictionary) - { - - - - - - } - -
Investor Public KeyTime ApprovedStatus
@approval.Key@approval.Value.TimeApproved.ToString("g")@approval.Value.EventId
-
-
-
-
-
- - -@code { - [Parameter] - public string ProjectIdentifier { get; set; } - - public FounderProject FounderProject { get; set; } - - List<(Transaction Transaction, string TrxId)> transactions = new(); - Dictionary approvalsDictionary = new(); - - - bool messagesReceived; - bool scanedForApprovals; - - private bool isLoading = false; - private bool refreshButtonSpinner = false; - - protected override async Task OnInitializedAsync() - { - Logger.LogDebug("OnInitializedAsync"); - if (hasWallet) - { - FounderProject = Storage.GetFounderProjects() - .FirstOrDefault(_ => _.ProjectInfo.ProjectIdentifier == ProjectIdentifier) - ?? throw new ArgumentException("The project was not found, try to scan in the founder page"); - - await FetchApprovedSignatures(FounderProject); - } - Logger.LogDebug("End of OnInitializedAsync"); - } - - private async Task FetchApprovedSignatures(FounderProject founderProject) - { - // Fetch all approvals - SignService.LookupInvestmentRequestApprovals( - founderProject.ProjectInfo.NostrPubKey, - (investorNostrPubKey, timeApproved, reqEventId) => - { - approvalsDictionary[investorNostrPubKey] = (timeApproved, reqEventId); - }, - async () => - { - // After fetching approvals, look up all release signatures - foreach (var investorNostrPubKey in approvalsDictionary.Keys.ToList()) - { - SignService.LookupReleaseSigs( - investorNostrPubKey, - founderProject.ProjectInfo.NostrPubKey, - approvalsDictionary[investorNostrPubKey].TimeApproved, - approvalsDictionary[investorNostrPubKey].EventId, - async (releaseSigContent) => - { - // Mark the item in the dictionary as found - approvalsDictionary[investorNostrPubKey] = (approvalsDictionary[investorNostrPubKey].TimeApproved, "Found"); - }); - } - - // Log the results - foreach (var approval in approvalsDictionary) - { - Logger.LogDebug($"Investor: {approval.Key}, TimeApproved: {approval.Value.TimeApproved}, Status: {approval.Value.EventId}"); - } - - StateHasChanged(); - }); - } - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - Logger.LogDebug("OnAfterRenderAsync"); - // await FetchSignaturesCheckPassword(); - } - - private void ReleaseFundsToInvestors(MouseEventArgs e) - { - foreach (var transaction in transactions) - { - // todo: in the initial communication between the founder and investor the investor should provide the address to send the funds on a release. - string releaseAddress = string.Empty; - - var sigs = SignReleaseOfFunds(transaction.Transaction, FounderProject.ProjectInfo, null, releaseAddress); - - // publish the sigs to the investors pubkey on nostr under a specific tag an investor will know it is a release of funds sig response - } - } - - - private SignatureInfo SignReleaseOfFunds(Transaction investorTrx, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) - { - var transactionHex = investorTrx.ToHex(); - - // build sigs - var recoveryTrx = InvestorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); - var sig = FounderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); - - // todo: make a similar method for release funds to investors - //if (!_investorTransactionActions.CheckInvestorRecoverySignatures(info, investorTrx, sig)) - // throw new InvalidOperationException(); - - return sig; - } -} \ No newline at end of file diff --git a/src/Angor/Client/Pages/Signatures.razor b/src/Angor/Client/Pages/Signatures.razor index 08b8095f..faf697b0 100644 --- a/src/Angor/Client/Pages/Signatures.razor +++ b/src/Angor/Client/Pages/Signatures.razor @@ -95,6 +95,11 @@
Signatures
+ @if (!FounderProject.TargetInvestmentReached() && FounderProject.ProjectDateStarted()) + { +
@FounderProject.ReleaseSignaturesTime.HasValue ? "release at " + FounderProject.ReleaseSignaturesTime : "not released yet"
+ + }
@@ -296,6 +301,10 @@ pendingSignature.AmountToInvest = investorTrx.Outputs.AsIndexedOutputs().Skip(2).Take(investorTrx.Outputs.Count - 3) //Todo get the actual outputs with taproot type .Sum(_ => _.TxOut.Value.ToUnit(MoneyUnit.BTC)); + + // todo: here we must get the release address when we will + // change the type that is passed from the investor to the founder + pendingSignature.ReleaseAddressKey = string.Empty; } catch (FormatException fe) { @@ -555,6 +564,100 @@ if (!InvestorTransactionActions.CheckInvestorRecoverySignatures(info, investorTrx, sig)) throw new InvalidOperationException(); + sig.SignatureType = "recover"; + + return sig; + } + + + private async Task ReleaseAllSignatures() + { + if (passwordComponent.HasPassword()) + { + await ProcessReleaseSignatures(); + } + else + { + passwordComponent.ShowPassword(async () => + { + await ProcessReleaseSignatures(); + }); + } + } + + private async Task ProcessReleaseSignatures() + { + isLoading = true; + StateHasChanged(); + + try + { + var releaseSignatures = signaturesRequests.Where(s => s.TransactionHex != null && s.AmountToInvest != null && s.TimeApproved == null).ToList(); + numOfSignatureToSign = releaseSignatures.Count; + numOfSignaturesSigned = 0; + + var words = await passwordComponent.GetWalletAsync(); + + foreach (var signature in releaseSignatures) + { + await PerformReleaseSignature(signature, words); + numOfSignaturesSigned++; + StateHasChanged(); + } + } + catch (Exception e) + { + notificationComponent.ShowErrorMessage(e.Message,e); + } + finally + { + isLoading = false; + passwordComponent.ClearPassword(); + } + + StateHasChanged(); + } + + private async Task PerformReleaseSignature(SignatureRequest signature, WalletWords words) + { + try + { + var key = DerivationOperations.DeriveFounderRecoveryPrivateKey(words, FounderProject.ProjectIndex); + var signatureInfo = SignReleaseOfFunds(signature.TransactionHex, FounderProject.ProjectInfo, Encoders.Hex.EncodeData(key.ToBytes()), signature.ReleaseAddressKey); + + var sigJson = serializer.Serialize(signatureInfo); + + var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); + var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); + + var encryptedContent = await encryption.EncryptNostrContentAsync( + nostrPrivateKeyHex, signature.investorNostrPubKey, sigJson); + + FounderProject.ReleaseSignaturesTime = SignService.SendReleaseSigsToInvestor(encryptedContent, nostrPrivateKeyHex, signature.investorNostrPubKey, signature.EventId); + + Storage.UpdateFounderProject(FounderProject); + + return new OperationResult { Success = true }; + } + catch (Exception ex) + { + return new OperationResult { Success = false, Message = $"An error occurred: {ex.Message}" }; + } + } + + private SignatureInfo SignReleaseOfFunds(string transactionHex, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) + { + var investorTrx = _networkConfiguration.GetNetwork().CreateTransaction(transactionHex); + + // build sigs + var recoveryTrx = InvestorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); + var sig = FounderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); + + if (!InvestorTransactionActions.CheckInvestorReleaseSignatures(info, investorTrx, sig, investorReleaseAddress)) + throw new InvalidOperationException(); + + sig.SignatureType = "release"; + return sig; } @@ -564,6 +667,8 @@ public decimal? AmountToInvest { get; set; } + public string ReleaseAddressKey { get; set; } + public DateTime TimeArrived { get; set; } public DateTime? TimeApproved { get; set; } diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index c400e19f..23335bf6 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -11,6 +11,7 @@ @using Angor.Shared.Utilities @using ITransactionSignature = NBitcoin.ITransactionSignature @using System.Text.Json +@using Angor.Client.Models @inject IClientStorage storage; @@ -75,7 +76,7 @@ } else { - @if (!targetInvestmentReached && projectDateStarted) + @if (!founderProject.TargetInvestmentReached() && founderProject.ProjectDateStarted()) { +
+ + } + } + } +
+
+ + } } @@ -138,7 +274,7 @@ else public SignatureInfo? InvestorReleaseSigInfo; - private List signaturesRequests = new(); + private List signaturesReleaseItems = new(); private FeeData feeData = new(); @@ -146,13 +282,16 @@ else bool messagesReceived; bool scanedForApprovals; + bool scanedReleaseApprovals; bool releaseCoinsSpinner = false; bool prepareToReleaseCoinsConfirmSpinner = false; private Transaction? unsignedReleaseTransaction; private TransactionInfo? releaseTransaction; - private bool CanApproveAllSignatures => signaturesRequests != null && signaturesRequests.Any(s => s.SignRecoveryRequest?.InvestmentTransactionHex != null && s.AmountToInvest != null && s.TimeApproved == null); + ProjectStats? projectStats; + + private bool CanApproveAllSignatures => signaturesReleaseItems != null && signaturesReleaseItems.Any(s => s.TimeApproved == null); private string ApproveButtonClass => CanApproveAllSignatures ? "btn-border-success" : "btn-border"; @@ -183,14 +322,7 @@ else } } - if (IsFounder) - { - await FetchPendingSignatures(FounderProject); - } - else - { - await FetchInvestorCheckPassword(); - } + projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); } } @@ -198,7 +330,10 @@ else { if (IsFounder) { - await FetchSignaturesCheckPassword(); + if (FounderProject!.ProjectDateStarted()) + { + await RefreshSignaturesInternal(); + } } else { @@ -206,20 +341,27 @@ else } } + public bool TargetInvestmentReached() + { + if (projectStats != null) + { + return projectStats?.AmountInvested >= Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi; + } + + return FounderProject.TargetInvestmentReached(); + } + // ==== code for the investor ==== protected async Task FetchInvestorCheckPassword() { - if (signaturesRequests.Any(x => x.AmountToInvest == null)) + if (passwordComponent.HasPassword()) { - if (passwordComponent.HasPassword()) - { - await FetchInvestorReleaseSignatures(); - } - else - { - passwordComponent.ShowPassword(FetchInvestorReleaseSignatures); - } + await FetchInvestorReleaseSignatures(); + } + else + { + passwordComponent.ShowPassword(FetchInvestorReleaseSignatures); } } @@ -230,15 +372,15 @@ else InvestorProject.ProjectInfo.NostrPubKey, null, InvestorProject.SignaturesInfo.SignatureRequestEventId, - signatureContent => HandleReleaseSignatureReceivedAsync(InvestorProject.ProjectInfo.NostrPubKey, signatureContent) + signatureContent => HandleReleaseInvestorSignatureReceivedAsync(InvestorProject.ProjectInfo.NostrPubKey, signatureContent) ); } - private async Task HandleReleaseSignatureReceivedAsync(string nostrPubKey, string signatureContent) + private async Task HandleReleaseInvestorSignatureReceivedAsync(string nostrPubKey, string signatureContent) { if (!passwordComponent.HasPassword()) { - passwordComponent.ShowPassword(() => HandleReleaseSignatureReceivedAsync(nostrPubKey, signatureContent)); + passwordComponent.ShowPassword(() => HandleReleaseInvestorSignatureReceivedAsync(nostrPubKey, signatureContent)); return; } @@ -333,7 +475,7 @@ else } } - private async Task ReleaseFeeRangeChanged(ChangeEventArgs e) + private async Task ReleaseInvestorFeeRangeChanged(ChangeEventArgs e) { var selected = e.Value?.ToString(); @@ -364,7 +506,7 @@ else } } - private async Task ReleaseCoins() + private async Task ReleaseInvestorCoins() { prepareToReleaseCoinsConfirmSpinner = true; StateHasChanged(); @@ -406,21 +548,6 @@ else // ==== code for the founder ==== - protected async Task FetchSignaturesCheckPassword() - { - if (signaturesRequests.Any(x => x.AmountToInvest == null)) - { - if (passwordComponent.HasPassword()) - { - await FetchOrDecryptSignaturesRequest(); - } - else - { - passwordComponent.ShowPassword(FetchOrDecryptSignaturesRequest); - } - } - } - private async Task RefreshSignaturesInternal() { if (passwordComponent.HasPassword()) @@ -441,10 +568,18 @@ else refreshButtonSpinner = true; StateHasChanged(); + if (!passwordComponent.HasPassword()) + { + notificationComponent.ShowErrorMessage("no wallet password"); + return; + } + try { - await FetchPendingSignatures(FounderProject); - await FetchOrDecryptSignaturesRequest(); + await FetchAndDecryptSignatureRequests(); + + projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); + await Task.Delay(1000); } catch (Exception e) @@ -459,82 +594,18 @@ else } } - protected async Task FetchOrDecryptSignaturesRequest() + private async Task FetchAndDecryptSignatureRequests() { - Logger.LogDebug($"handled = {signaturesRequests.Count(x => x.AmountToInvest.HasValue)}, total = {signaturesRequests.Count}"); - - if (signaturesRequests.Any(x => x.AmountToInvest == null)) - { - if (!scanedForApprovals) - { - FetchFounderApprovalsSignatures(FounderProject); - return; - } - - if (!passwordComponent.HasPassword()) - { - notificationComponent.ShowErrorMessage("no wallet password"); - return; - } - - var words = await passwordComponent.GetWalletAsync(); - - var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); - - var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); - - foreach (var pendingSignature in signaturesRequests.Where(_ => _.EncryptedMessage != null && _.AmountToInvest == null)) - { - try - { - var sigResJson = await encryption.DecryptNostrContentAsync( - nostrPrivateKeyHex, pendingSignature.investorNostrPubKey, pendingSignature.EncryptedMessage); - - pendingSignature.SignRecoveryRequest = serializer.Deserialize(sigResJson); - - if (pendingSignature.SignRecoveryRequest is null) - { - throw new Exception("Error deserializing signature request"); - } - - var investorTrx = _networkConfiguration.GetNetwork().CreateTransaction(pendingSignature.SignRecoveryRequest.InvestmentTransactionHex); - - pendingSignature.AmountToInvest = investorTrx.Outputs.AsIndexedOutputs().Skip(2).Take(investorTrx.Outputs.Count - 3) //Todo get the actual outputs with taproot type - .Sum(_ => _.TxOut.Value.ToUnit(MoneyUnit.BTC)); - } - catch (FormatException fe) - { - Logger.LogError("Format error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", pendingSignature?.SignRecoveryRequest?.InvestmentTransactionHex, fe.Message); - pendingSignature.SignRecoveryRequest = null; - } - catch (CryptographicException ce) - { - Logger.LogError("Cryptographic error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", pendingSignature?.SignRecoveryRequest?.InvestmentTransactionHex, ce.Message); - pendingSignature.SignRecoveryRequest = null; - } - catch (Exception e) - { - Logger.LogError("Error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", pendingSignature?.SignRecoveryRequest?.InvestmentTransactionHex, e.Message); - pendingSignature.SignRecoveryRequest = null; - } - } - Logger.LogDebug($"Calling StateHasChanged in OnAfterRenderAsync"); - messagesReceived = false; - StateHasChanged(); - } - - Logger.LogDebug("OnAfterRenderAsync Completed"); - Logger.LogDebug($"Signatures retrieved: {signaturesRequests.Count}"); - } + var words = await passwordComponent.GetWalletAsync(); + var nostrPrivateKey = DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex).Result; + var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); - private async Task FetchPendingSignatures(FounderProject project) - { - await SignService.LookupInvestmentRequestsAsync(project.ProjectInfo.NostrPubKey, null, null,// project.LastRequestForSignaturesTime , async + await SignService.LookupInvestmentRequestsAsync(FounderProject.ProjectInfo.NostrPubKey, null, null, (eventId, investorNostrPubKey, encryptedMessage, timeArrived) => { Logger.LogDebug($"Sig request event received investorNostrPubKey: {investorNostrPubKey} - timeArrived: {timeArrived}"); - var sigReq = signaturesRequests.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); + var sigReq = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); if (sigReq != null) { @@ -546,23 +617,43 @@ else Logger.LogDebug($"Sig request event received is replaced"); // this is a newer sig request so replace it - signaturesRequests.Remove(sigReq); + signaturesReleaseItems.Remove(sigReq); } Logger.LogDebug($"Sig request event received is new"); messagesReceived = true; - var signatureRequest = new SignatureReleaseItem + var signatureReleaseItem = new SignatureReleaseItem { investorNostrPubKey = investorNostrPubKey, TimeArrived = timeArrived, - EncryptedMessage = encryptedMessage, //To be encrypted after js interop is loaded + EncryptedSignRecoveryMessage = encryptedMessage, //To be encrypted after js interop is loaded EventId = eventId }; - signaturesRequests.Add(signatureRequest); + signaturesReleaseItems.Add(signatureReleaseItem); Logger.LogDebug($"Added to pendingSignatures"); + + // decrypt the message + + try + { + var sigResJson = encryption.DecryptNostrContentAsync( + nostrPrivateKeyHex, signatureReleaseItem.investorNostrPubKey, signatureReleaseItem.EncryptedSignRecoveryMessage).Result; + + signatureReleaseItem.SignRecoveryRequest = serializer.Deserialize(sigResJson); + + if (signatureReleaseItem.SignRecoveryRequest is null) + { + throw new Exception("Error deserializing signature request"); + } + } + catch (Exception e) + { + Logger.LogError("Error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", signatureReleaseItem?.SignRecoveryRequest?.InvestmentTransactionHex, e.Message); + signatureReleaseItem.SignRecoveryRequest = null; + } }, () => { @@ -571,21 +662,25 @@ else if (!messagesReceived) return; + // fetch all the approvals + FetchFounderApprovalsSignatures(); + FetchFounderReleaseSignatures(); + Logger.LogDebug($"Calling StateHasChanged in EOSE"); StateHasChanged(); }); } - private void FetchFounderApprovalsSignatures(FounderProject project) + private void FetchFounderApprovalsSignatures() { - SignService.LookupInvestmentRequestApprovals(project.ProjectInfo.NostrPubKey, + SignService.LookupInvestmentRequestApprovals(FounderProject.ProjectInfo.NostrPubKey, (investorNostrPubKey, timeApproved, reqEventId) => { Logger.LogDebug($"Sig response event received investorNostrPubKey: {investorNostrPubKey} - timeApproved: {timeApproved} - reqEventId: {reqEventId}"); - var signatureRequest = signaturesRequests.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); + var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); - if (signatureRequest is null || signatureRequest.TimeApproved != null) + if (signatureRequest is null) return; //multiple relays could mean the same massage multiple times if (signatureRequest.TimeArrived > timeApproved) @@ -610,23 +705,51 @@ else { scanedForApprovals = true; - if (signaturesRequests.Any(_ => _.TimeApproved != null)) + Logger.LogDebug($"Calling StateHasChanged in EOSE"); + StateHasChanged(); + Logger.LogDebug($"End of messages on EOSE"); + }); + } + + protected void FetchFounderReleaseSignatures() + { + SignService.LookupSignedReleaseSigs( + InvestorProject.InvestorNPub, + InvestorProject.ProjectInfo.NostrPubKey, + null, + InvestorProject.SignaturesInfo.SignatureRequestEventId, (investorNostrPubKey, timeReleased, reqEventId) => + { + Logger.LogDebug($"Sig release response event received investorNostrPubKey: {investorNostrPubKey} - timeReleased: {timeReleased} - reqEventId: {reqEventId}"); + + var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); + + if (signatureRequest is null) + return; //multiple relays could mean the same massage multiple times + + if (signatureRequest.TimeReleased > timeReleased) { - var latestApprovedTime = signaturesRequests - .Where(x => x.TimeApproved != null) - .Max(x => x.TimeArrived); + Logger.LogDebug($"The event received is replaced by time"); + return; // sig of an old request + } - if (FounderProject.LastRequestForSignaturesTime is null || FounderProject.LastRequestForSignaturesTime < latestApprovedTime) - { - FounderProject.LastRequestForSignaturesTime = latestApprovedTime; - Storage.UpdateFounderProject(FounderProject); - } + if (reqEventId != null && signatureRequest.EventId != reqEventId) + { + Logger.LogDebug($"The event received is replaced by eventid"); + return; // sig of an old request } - Logger.LogDebug($"Calling StateHasChanged in EOSE"); + Logger.LogDebug($"The event received is new"); + + signatureRequest.TimeReleased = timeReleased; + + Logger.LogDebug($"Added to pendingSignatures"); + }, () => + { + scanedReleaseApprovals = true; + StateHasChanged(); - Logger.LogDebug($"End of messages on EOSE"); }); + } protected async Task ApproveReleaseSignatureCheckPassword(SignatureReleaseItem signature) @@ -694,7 +817,7 @@ else try { - var releaseSignatures = signaturesRequests.Where(s => s.SignRecoveryRequest?.InvestmentTransactionHex != null && s.AmountToInvest != null && s.TimeApproved == null).ToList(); + var releaseSignatures = signaturesReleaseItems.Where(s => s.TimeReleased == null).ToList(); numOfSignatureToSign = releaseSignatures.Count; numOfSignaturesSigned = 0; @@ -767,14 +890,17 @@ else { public string investorNostrPubKey { get; set; } - public decimal? AmountToInvest { get; set; } - public DateTime TimeArrived { get; set; } public DateTime? TimeApproved { get; set; } + public DateTime? TimeReleased { get; set; } public SignRecoveryRequest? SignRecoveryRequest { get; set; } - public string? EncryptedMessage { get; set; } + public SignatureInfo? InvestorReleaseSigInfo { get; set; } + + public string? EncryptedSignRecoveryMessage { get; set; } + + public string? EncryptedSignReleaseMessage { get; set; } public string EventId { get; set; } } diff --git a/src/Angor/Client/Pages/Signatures.razor b/src/Angor/Client/Pages/Signatures.razor index d3060bc0..36203944 100644 --- a/src/Angor/Client/Pages/Signatures.razor +++ b/src/Angor/Client/Pages/Signatures.razor @@ -2,17 +2,13 @@ @using Angor.Shared @using Angor.Client.Storage @using Angor.Shared.Models -@using Angor.Client.Services @using Angor.Shared.ProtocolNew @using Angor.Client.Models @using Blockcore.NBitcoin @using Blockcore.NBitcoin.DataEncoders -@using System.Text.Json @using Angor.Shared.Services @using System.Security.Cryptography -@inject IJSRuntime JS - @inject ILogger Logger @inject IDerivationOperations DerivationOperations @inject IClientStorage Storage; @@ -95,11 +91,6 @@
Signatures
- @if (!FounderProject.TargetInvestmentReached() && FounderProject.ProjectDateStarted()) - { -
@FounderProject.ReleaseSignaturesTime.HasValue ? "release at " + FounderProject.ReleaseSignaturesTime : "not released yet"
- - } + } + else + { + @if (!refreshSpinner) { - - } + @if (StageInfo.CanRelease) + { +

Total funds in penalty = @StageInfo.TotalInPenalty @network.CoinTicker

+ } + + @if (StageInfo.CanRecover && !StageInfo.EndOfProject) + { + + } - @if (StageInfo.CanRelease) - { - - } + @if (StageInfo.CanRelease) + { + + } - @if (StageInfo.EndOfProject && StageInfo.TotalSpendable > 0) - { - + @if (StageInfo.EndOfProject && StageInfo.TotalSpendable > 0) + { + + } } }
@@ -364,6 +371,8 @@ private TransactionInfo? releaseRecoveryTransaction; private TransactionInfo? endOfProjectTransaction; + private bool releaseSigsfound = false; + StageData StageInfo = new(); string explorerLink; @@ -423,6 +432,8 @@ try { + CheckReleaseSignatures(); + await FindInvestments(); await CheckSpentFund(); @@ -441,6 +452,21 @@ await Task.Delay(10); } + protected void CheckReleaseSignatures() + { + SignService.LookupReleaseSigs( + project.InvestorNPub, + project.ProjectInfo.NostrPubKey, + null, + project.SignaturesInfo?.SignatureRequestEventId!, + _ => + { + releaseSigsfound = true; + StateHasChanged(); + return Task.CompletedTask; + }); + } + private async Task FindInvestments() { if (StageInfo.TransactionInfo != null) @@ -1003,4 +1029,10 @@ passwordComponent.ClearPassword(); } } + + private void NavigatetoReleaseSigs() + { + NavigationManager.NavigateTo($"/release/{ProjectId}"); + } + } diff --git a/src/Angor/Client/Pages/Release.razor b/src/Angor/Client/Pages/Release.razor index a05e128b..658ea25b 100644 --- a/src/Angor/Client/Pages/Release.razor +++ b/src/Angor/Client/Pages/Release.razor @@ -125,141 +125,114 @@ else { // handle founder - @if (!signaturesReleaseItems.Any()) - { -
-
-
- - - - No pending signatures yet... -
-
-
- } - else - { - -
-
+
+
+ + @if (!FounderProject.ProjectDateStarted()) + { +
+
- @if (!FounderProject.ProjectDateStarted()) +
Project didn't start yet
+
+
+ } + else + { + @if (TargetInvestmentReached()) {
-
Project didn't start yet
+
Target reached
} else { - @if (TargetInvestmentReached()) - { -
-
- -
Target reached
-
-
- } - else - { - @if (messagesReceived || isLoading) - { -
-
- @if (isLoading) - { -
Creating Release Signatures... @numOfSignaturesSigned / @numOfSignatureToSign
- } -
+
+
+
+
+
+
Signatures
+
+
+ + +
- } - else - { -
-
-
-
-
-
Signatures
-
-
- @if (!FounderProject.TargetInvestmentReached() && FounderProject.ProjectDateStarted()) +
+ + +
+ + + + + + + + + + @foreach (var signature in signaturesReleaseItems.Where(_ => _.SignRecoveryRequest?.InvestmentTransactionHex != null)) + { + + + + @if (signature.TimeReleased is null) { -
@FounderProject.ReleaseSignaturesTime.HasValue ? "release at " + FounderProject.ReleaseSignaturesTime : "not released yet"
- + } - - - - -
- - -
-
Time ArrivedTime ApprovedTime Released
@signature.TimeArrived.ToString("g")@signature.TimeApproved?.ToString("g") + +
- - - - - - - - - @foreach (var signature in signaturesReleaseItems.Where(_ => _ is { SignRecoveryRequest.InvestmentTransactionHex: not null })) + else { - - - @if (signature.TimeApproved is null) - { - - } - else - { - - } - + } - -
Investment amountReceived atStatus
@signature.TimeArrived.ToString("g") - - Approved on - @signature.TimeApproved.ToString()
@signature.TimeReleased.ToString()
-
-
+ + } + +
- - } - } +
+
} -
+ }
- - } +
} @@ -278,9 +251,8 @@ else private FeeData feeData = new(); - private Dictionary signaturesRequestsApproving = new(); + private Dictionary signaturesReleaseApproving = new(); - bool messagesReceived; bool scanedForApprovals; bool scanedReleaseApprovals; @@ -291,16 +263,24 @@ else ProjectStats? projectStats; - private bool CanApproveAllSignatures => signaturesReleaseItems != null && signaturesReleaseItems.Any(s => s.TimeApproved == null); + private bool CanApproveAllSignatures => signaturesReleaseItems?.Any(s => s.TimeReleased == null) ?? false; private string ApproveButtonClass => CanApproveAllSignatures ? "btn-border-success" : "btn-border"; private bool ApproveButtonDisabled => !CanApproveAllSignatures; + private bool releasingAll = false; private bool showReleaseModal = false; - private bool isLoading = false; + private bool receivingMessages = false; private bool refreshButtonSpinner = false; - private int numOfSignatureToSign = 0; - private int numOfSignaturesSigned = 0; + + private bool isRefreshing + { + get + { + return refreshButtonSpinner == true || receivingMessages == true; + + } + } protected override async Task OnInitializedAsync() { @@ -323,31 +303,45 @@ else } projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); + + Logger.LogInformation($"Fetching project stats stats AmountInvested = {projectStats?.AmountInvested} InvestorCount = {projectStats?.InvestorCount}"); } } protected override async Task OnAfterRenderAsync(bool firstRender) { - if (IsFounder) + if (firstRender) { - if (FounderProject!.ProjectDateStarted()) + if (hasWallet) { - await RefreshSignaturesInternal(); + if (IsFounder) + { + if (FounderProject!.ProjectDateStarted()) + { + await RefreshSignaturesInternal(); + } + } + else + { + await FetchInvestorCheckPassword(); + } } } - else - { - await FetchInvestorCheckPassword(); - } } public bool TargetInvestmentReached() { if (projectStats != null) { - return projectStats?.AmountInvested >= Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi; + var targetReached = projectStats?.AmountInvested >= Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi; + + Logger.LogInformation($"Indexer stats for target reached = {targetReached} AmountInvested = {projectStats?.AmountInvested} TargetAmount = {Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi}"); + + return targetReached; } + Logger.LogInformation($"None indexer stats for target reached = {FounderProject.TargetInvestmentReached()} AmountInvested = {FounderProject.TotalAvailableInvestedAmount} TargetAmount = {Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi}"); + return FounderProject.TargetInvestmentReached(); } @@ -366,45 +360,46 @@ else } protected async Task FetchInvestorReleaseSignatures() - { - SignService.LookupReleaseSigs( - InvestorProject.InvestorNPub, - InvestorProject.ProjectInfo.NostrPubKey, - null, - InvestorProject.SignaturesInfo.SignatureRequestEventId, - signatureContent => HandleReleaseInvestorSignatureReceivedAsync(InvestorProject.ProjectInfo.NostrPubKey, signatureContent) - ); - } - - private async Task HandleReleaseInvestorSignatureReceivedAsync(string nostrPubKey, string signatureContent) { if (!passwordComponent.HasPassword()) { - passwordComponent.ShowPassword(() => HandleReleaseInvestorSignatureReceivedAsync(nostrPubKey, signatureContent)); + notificationComponent.ShowErrorMessage("no wallet password"); return; } var words = await passwordComponent.GetWalletAsync(); - var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); - var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); - var signatureJson = await encryption.DecryptNostrContentAsync( - nostrPrivateKeyHex, InvestorProject.ProjectInfo.NostrPubKey, signatureContent); + SignService.LookupReleaseSigs( + InvestorProject.InvestorNPub, + InvestorProject.ProjectInfo.NostrPubKey, + null, + InvestorProject.SignaturesInfo.SignatureRequestEventId, + signatureContent => + { + InvokeAsync(async () => + { + var signatureJson = await encryption.DecryptNostrContentAsync( + nostrPrivateKeyHex, InvestorProject.ProjectInfo.NostrPubKey, signatureContent); + + Logger.LogInformation("signature : " + signatureJson); - Logger.LogInformation("signature : " + signatureJson); + InvestorReleaseSigInfo = serializer.Deserialize(signatureJson); - InvestorReleaseSigInfo = serializer.Deserialize(signatureJson); + if (InvestorReleaseSigInfo?.SignatureType != "release") + { + notificationComponent.ShowErrorMessage("Incorrect signatures received"); + Logger.LogError("Incorrect signatures received"); + InvestorReleaseSigInfo = null; + } - if (InvestorReleaseSigInfo?.SignatureType != "release") - { - notificationComponent.ShowErrorMessage("Incorrect signatures received"); - Logger.LogError("Incorrect signatures received"); - InvestorReleaseSigInfo = null; - } + StateHasChanged(); - StateHasChanged(); + }); + + return Task.CompletedTask; + }); } private async Task ClaimInvestorCoinsPasswordAsync() @@ -576,10 +571,12 @@ else try { - await FetchAndDecryptSignatureRequests(); + await FetchSignatureRequests(); projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); + Logger.LogInformation($"Fetching project stats stats AmountInvested = {projectStats?.AmountInvested} InvestorCount = {projectStats?.InvestorCount}"); + await Task.Delay(1000); } catch (Exception e) @@ -594,12 +591,14 @@ else } } - private async Task FetchAndDecryptSignatureRequests() + private async Task FetchSignatureRequests() { var words = await passwordComponent.GetWalletAsync(); - var nostrPrivateKey = DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex).Result; + var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); + receivingMessages = true; + await SignService.LookupInvestmentRequestsAsync(FounderProject.ProjectInfo.NostrPubKey, null, null, (eventId, investorNostrPubKey, encryptedMessage, timeArrived) => { @@ -622,8 +621,6 @@ else Logger.LogDebug($"Sig request event received is new"); - messagesReceived = true; - var signatureReleaseItem = new SignatureReleaseItem { investorNostrPubKey = investorNostrPubKey, @@ -634,56 +631,70 @@ else signaturesReleaseItems.Add(signatureReleaseItem); Logger.LogDebug($"Added to pendingSignatures"); - - // decrypt the message - - try - { - var sigResJson = encryption.DecryptNostrContentAsync( - nostrPrivateKeyHex, signatureReleaseItem.investorNostrPubKey, signatureReleaseItem.EncryptedSignRecoveryMessage).Result; - - signatureReleaseItem.SignRecoveryRequest = serializer.Deserialize(sigResJson); - - if (signatureReleaseItem.SignRecoveryRequest is null) - { - throw new Exception("Error deserializing signature request"); - } - } - catch (Exception e) - { - Logger.LogError("Error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", signatureReleaseItem?.SignRecoveryRequest?.InvestmentTransactionHex, e.Message); - signatureReleaseItem.SignRecoveryRequest = null; - } }, () => { Logger.LogDebug($"End of messages"); - if (!messagesReceived) - return; + // we cannot directly call a method that needs to be awaited + // so we do it inside the InvokeAsync delegate. + + // decrypt the message + InvokeAsync(async () => { await DecryptMessages(nostrPrivateKeyHex); }); + + receivingMessages = false; // fetch all the approvals - FetchFounderApprovalsSignatures(); - FetchFounderReleaseSignatures(); + FetchFounderApprovalsSignatures(nostrPrivateKeyHex); + FetchFounderReleaseSignatures(nostrPrivateKeyHex); Logger.LogDebug($"Calling StateHasChanged in EOSE"); StateHasChanged(); }); } - private void FetchFounderApprovalsSignatures() + private async Task DecryptMessages(string nostrPrivateKeyHex) + { + foreach (var signatureReleaseItem in signaturesReleaseItems) + { + try + { + Logger.LogInformation($"Decrypting recovery request for key {signatureReleaseItem.investorNostrPubKey}"); + + var sigResJson = await encryption.DecryptNostrContentAsync(nostrPrivateKeyHex, signatureReleaseItem.investorNostrPubKey, signatureReleaseItem.EncryptedSignRecoveryMessage); + + signatureReleaseItem.SignRecoveryRequest = serializer.Deserialize(sigResJson); + + Logger.LogInformation($"Decrypted recovery request for key {signatureReleaseItem.investorNostrPubKey} content = {sigResJson}"); + + if (signatureReleaseItem.SignRecoveryRequest is null) + { + throw new Exception("Error deserializing signature request"); + } + } + catch (Exception e) + { + Logger.LogError("Error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", signatureReleaseItem?.SignRecoveryRequest?.InvestmentTransactionHex, e.Message); + signatureReleaseItem.SignRecoveryRequest = null; + } + } + + StateHasChanged(); + } + + private void FetchFounderApprovalsSignatures(string nostrPrivateKeyHex) { SignService.LookupInvestmentRequestApprovals(FounderProject.ProjectInfo.NostrPubKey, - (investorNostrPubKey, timeApproved, reqEventId) => + (investorNostrPubKey, timeEventCreated, reqEventId) => { - Logger.LogDebug($"Sig response event received investorNostrPubKey: {investorNostrPubKey} - timeApproved: {timeApproved} - reqEventId: {reqEventId}"); + Logger.LogDebug($"Sig response event received investorNostrPubKey: {investorNostrPubKey} - timeApproved: {timeEventCreated} - reqEventId: {reqEventId}"); var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); if (signatureRequest is null) - return; //multiple relays could mean the same massage multiple times + return; // ignore it could be a fake message - if (signatureRequest.TimeArrived > timeApproved) + if (signatureRequest.TimeArrived > timeEventCreated) { Logger.LogDebug($"The event received is replaced by time"); return; // sig of an old request @@ -697,7 +708,7 @@ else Logger.LogDebug($"The event received is new"); - signatureRequest.TimeApproved = timeApproved; + signatureRequest.TimeApproved = timeEventCreated; Logger.LogDebug($"Added to pendingSignatures"); }, @@ -711,28 +722,25 @@ else }); } - protected void FetchFounderReleaseSignatures() + protected void FetchFounderReleaseSignatures(string nostrPrivateKeyHex) { - SignService.LookupSignedReleaseSigs( - InvestorProject.InvestorNPub, - InvestorProject.ProjectInfo.NostrPubKey, - null, - InvestorProject.SignaturesInfo.SignatureRequestEventId, (investorNostrPubKey, timeReleased, reqEventId) => + SignService.LookupSignedReleaseSigs(FounderProject.ProjectInfo.NostrPubKey, + (item) => { - Logger.LogDebug($"Sig release response event received investorNostrPubKey: {investorNostrPubKey} - timeReleased: {timeReleased} - reqEventId: {reqEventId}"); + Logger.LogDebug($"Sig release response event received investorNostrPubKey: {item.ProfileIdentifier} - timeReleased: {item.EventCreatedAt} - reqEventId: {item.EventIdentifier}"); - var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); + var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == item.ProfileIdentifier); if (signatureRequest is null) - return; //multiple relays could mean the same massage multiple times + return; // ignore it could be a message we do not recognize - if (signatureRequest.TimeReleased > timeReleased) + if (signatureRequest.TimeReleased > item.EventCreatedAt) { Logger.LogDebug($"The event received is replaced by time"); return; // sig of an old request } - if (reqEventId != null && signatureRequest.EventId != reqEventId) + if (item.EventIdentifier != null && signatureRequest.EventId != item.EventIdentifier) { Logger.LogDebug($"The event received is replaced by eventid"); return; // sig of an old request @@ -740,16 +748,15 @@ else Logger.LogDebug($"The event received is new"); - signatureRequest.TimeReleased = timeReleased; + signatureRequest.TimeReleased = item.EventCreatedAt; - Logger.LogDebug($"Added to pendingSignatures"); + Logger.LogDebug($"signatureRequest.TimeReleased was updated to {signatureRequest.TimeReleased}"); }, () => { scanedReleaseApprovals = true; StateHasChanged(); }); - } protected async Task ApproveReleaseSignatureCheckPassword(SignatureReleaseItem signature) @@ -769,7 +776,7 @@ else private async Task ApproveReleaseSignature(SignatureReleaseItem signature) { - signaturesRequestsApproving.Add(signature, string.Empty); + signaturesReleaseApproving.Add(signature, string.Empty); StateHasChanged(); try @@ -789,7 +796,7 @@ else } finally { - signaturesRequestsApproving.Remove(signature); + signaturesReleaseApproving.Remove(signature); } StateHasChanged(); @@ -812,21 +819,18 @@ else private async Task ProcessReleaseSignatures() { - isLoading = true; + releasingAll = true; StateHasChanged(); try { var releaseSignatures = signaturesReleaseItems.Where(s => s.TimeReleased == null).ToList(); - numOfSignatureToSign = releaseSignatures.Count; - numOfSignaturesSigned = 0; var words = await passwordComponent.GetWalletAsync(); foreach (var signature in releaseSignatures) { await PerformReleaseSignature(signature, words); - numOfSignaturesSigned++; StateHasChanged(); } } @@ -836,7 +840,7 @@ else } finally { - isLoading = false; + releasingAll = false; passwordComponent.ClearPassword(); } @@ -858,9 +862,7 @@ else var encryptedContent = await encryption.EncryptNostrContentAsync( nostrPrivateKeyHex, signature.investorNostrPubKey, sigJson); - FounderProject.ReleaseSignaturesTime = SignService.SendReleaseSigsToInvestor(encryptedContent, nostrPrivateKeyHex, signature.investorNostrPubKey, signature.EventId); - - Storage.UpdateFounderProject(FounderProject); + signature.TimeReleased = SignService.SendReleaseSigsToInvestor(encryptedContent, nostrPrivateKeyHex, signature.investorNostrPubKey, signature.EventId); return new OperationResult { Success = true }; } @@ -896,6 +898,8 @@ else public SignRecoveryRequest? SignRecoveryRequest { get; set; } + public SignatureInfo? InvestorRecoverySigInfo { get; set; } + public SignatureInfo? InvestorReleaseSigInfo { get; set; } public string? EncryptedSignRecoveryMessage { get; set; } diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index 23335bf6..214d3173 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -990,6 +990,6 @@ private void ReleaseFundsToInvestors(MouseEventArgs e) { - NavigationManager.NavigateTo($"/signatures/{ProjectId}"); + NavigationManager.NavigateTo($"/release/{ProjectId}"); } } \ No newline at end of file diff --git a/src/Angor/Shared/Services/ISignService.cs b/src/Angor/Shared/Services/ISignService.cs index 17ea67d7..66b4ee80 100644 --- a/src/Angor/Shared/Services/ISignService.cs +++ b/src/Angor/Shared/Services/ISignService.cs @@ -20,5 +20,5 @@ DateTime SendSignaturesToInvestor(string encryptedSignatureInfo, string nostrPri void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Func action); - void LookupSignedReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Action action, Action onAllMessagesReceived); + void LookupSignedReleaseSigs(string projectNostrPubKey, Action action, Action onAllMessagesReceived); } \ No newline at end of file diff --git a/src/Angor/Shared/Services/NostrCommunicationFactory.cs b/src/Angor/Shared/Services/NostrCommunicationFactory.cs index 3e3be8be..96037620 100644 --- a/src/Angor/Shared/Services/NostrCommunicationFactory.cs +++ b/src/Angor/Shared/Services/NostrCommunicationFactory.cs @@ -45,7 +45,7 @@ public INostrClient GetOrCreateClient(INetworkService networkService) _serviceSubscriptions.Add(_nostrMultiWebsocketClient.Streams.EventStream .Where(_ => _.Event?.AdditionalData?.Any() ?? false).Subscribe(_ => - _logger.LogInformation( + _logger.LogDebug( $"EventStream {_.Subscription} {_.Event?.Id} {_.Event?.AdditionalData}"))); _serviceSubscriptions.Add(_nostrMultiWebsocketClient.Streams.NoticeStream.Subscribe(_ => @@ -68,21 +68,21 @@ private void ConnectToAllRelaysInTheSettings(INetworkService networkService) _serviceSubscriptions.Add(client.Streams.EoseStream.Subscribe(x => { - _logger.LogInformation($"{x.CommunicatorName} EOSE {x.Subscription}"); + _logger.LogDebug($"{x.CommunicatorName} EOSE {x.Subscription}"); if (_eoseCalledOnSubscriptionClients.TryGetValue(x.Subscription ?? string.Empty, out var clientsReceivedList)) { - _logger.LogInformation($"EOSE {x.Subscription} adding {x.CommunicatorName}"); + _logger.LogDebug($"EOSE {x.Subscription} adding {x.CommunicatorName}"); clientsReceivedList.Add(x.CommunicatorName); } })); _serviceSubscriptions.Add(client.Streams.OkStream.Subscribe(x => { - _logger.LogInformation($"{x.CommunicatorName} OK {x.EventId} {x.Accepted}"); + _logger.LogDebug($"{x.CommunicatorName} OK {x.EventId} {x.Accepted}"); if (_okCalledOnSubscriptionClients.TryGetValue(x.EventId ?? string.Empty, out var clientsReceivedList)) { - _logger.LogInformation($"OK {x.EventId} adding {x.CommunicatorName}"); + _logger.LogDebug($"OK {x.EventId} adding {x.CommunicatorName}"); clientsReceivedList.Add(x.CommunicatorName); } })); @@ -103,26 +103,26 @@ public bool EoseEventReceivedOnAllRelays(string subscription) if (!_eoseCalledOnSubscriptionClients.ContainsKey(subscription)) return true; //If not monitoring than no need to block - _logger.LogInformation($"Checking for all Eose on monitored subscription {subscription}"); + _logger.LogDebug($"Checking for all Eose on monitored subscription {subscription}"); bool response = _nostrMultiWebsocketClient?.Clients .All(x => _eoseCalledOnSubscriptionClients[subscription].Contains(x.Communicator.Name)) ?? false; - _logger.LogInformation($"Eose on monitored subscription {subscription} received from all clients - {response}"); + _logger.LogDebug($"Eose on monitored subscription {subscription} received from all clients - {response}"); return response; } public bool MonitoringEoseReceivedOnSubscription(string subscription) { - _logger.LogInformation($"Started monitoring subscription {subscription}"); + _logger.LogDebug($"Started monitoring subscription {subscription}"); return _eoseCalledOnSubscriptionClients.TryAdd(subscription, new List()); } public void ClearEoseReceivedOnSubscriptionMonitoring(string subscription) { - _logger.LogInformation($"Stopped monitoring subscription {subscription}"); + _logger.LogDebug($"Stopped monitoring subscription {subscription}"); _eoseCalledOnSubscriptionClients.Remove(subscription); } @@ -131,26 +131,26 @@ public bool OkEventReceivedOnAllRelays(string eventId) if (!_okCalledOnSubscriptionClients.ContainsKey(eventId)) return true; //If not monitoring than no need to block - _logger.LogInformation($"Checking for all Ok on monitored subscription {eventId}"); + _logger.LogDebug($"Checking for all Ok on monitored subscription {eventId}"); bool response = _nostrMultiWebsocketClient?.Clients .All(x => _okCalledOnSubscriptionClients[eventId].Contains(x.Communicator.Name)) ?? false; - _logger.LogInformation($"Eose on monitored subscription {eventId} received from all clients - {response}"); + _logger.LogDebug($"Eose on monitored subscription {eventId} received from all clients - {response}"); return response; } public void MonitoringOkReceivedOnSubscription(string eventId) { - _logger.LogInformation($"Started monitoring event id {eventId}"); + _logger.LogDebug($"Started monitoring event id {eventId}"); _okCalledOnSubscriptionClients.Add(eventId, new List()); } public void ClearOkReceivedOnSubscriptionMonitoring(string eventId) { - _logger.LogInformation($"Started monitoring event id {eventId}"); + _logger.LogDebug($"Started monitoring event id {eventId}"); _okCalledOnSubscriptionClients.Remove(eventId); } @@ -174,7 +174,7 @@ public INostrCommunicator CreateCommunicator(string uri, string relayName) "Relay {relayName} disconnected, type: {Type}, reason: {CloseStatusDescription}", relayName, e.Type, e.CloseStatusDescription); else - _logger.LogInformation( + _logger.LogDebug( "Relay {relayName} disconnected, type: {Type}, reason: {CloseStatusDescription}", relayName, e.Type, e.CloseStatusDescription); })); @@ -183,7 +183,7 @@ public INostrCommunicator CreateCommunicator(string uri, string relayName) { _serviceSubscriptions.Add(nostrCommunicator.MessageReceived.Subscribe(e => { - _logger.LogInformation( + _logger.LogDebug( "message received on communicator {relayName} - {Text} Relay message received, type: {MessageType}", relayName, e.Text, e.MessageType); })); diff --git a/src/Angor/Shared/Services/RelaySubscriptionsHandling.cs b/src/Angor/Shared/Services/RelaySubscriptionsHandling.cs index ddd7e7de..3b6522d4 100644 --- a/src/Angor/Shared/Services/RelaySubscriptionsHandling.cs +++ b/src/Angor/Shared/Services/RelaySubscriptionsHandling.cs @@ -50,7 +50,7 @@ public bool TryAddOKAction(string eventId, Action action) public void HandleOkMessages(NostrOkResponse okResponse) { - _logger.LogInformation($"OkStream {okResponse.Accepted} message - {okResponse.Message}"); + _logger.LogDebug($"OkStream {okResponse.Accepted} message - {okResponse.Message}"); if (!OkVerificationActions.TryGetValue(okResponse?.EventId ?? string.Empty, out var action)) return; @@ -69,21 +69,21 @@ public bool TryAddEoseAction(string subscriptionName, Action action) var add = _communicationFactory.MonitoringEoseReceivedOnSubscription(subscriptionName); if (!add) - _logger.LogWarning($"Subscription {subscriptionName} is already being monitored"); + _logger.LogDebug($"Subscription {subscriptionName} is already being monitored"); return userEoseActions.TryAdd(subscriptionName,action); } public void HandleEoseMessages(NostrEoseResponse _) { - _logger.LogInformation($"EoseStream {_.Subscription} message - {_.AdditionalData}"); + _logger.LogDebug($"EoseStream {_.Subscription} message - {_.AdditionalData}"); if (!_communicationFactory.EoseEventReceivedOnAllRelays(_.Subscription)) return; if (userEoseActions.TryGetValue(_.Subscription, out var action)) { - _logger.LogInformation($"Invoking action on EOSE - {_.Subscription}"); + _logger.LogDebug($"Invoking action on EOSE - {_.Subscription}"); try { action.Invoke(); @@ -94,7 +94,7 @@ public void HandleEoseMessages(NostrEoseResponse _) } userEoseActions.Remove(_.Subscription); - _logger.LogInformation($"Removed action on EOSE for subscription - {_.Subscription}"); + _logger.LogDebug($"Removed action on EOSE for subscription - {_.Subscription}"); } _communicationFactory.ClearEoseReceivedOnSubscriptionMonitoring(_.Subscription); @@ -102,7 +102,7 @@ public void HandleEoseMessages(NostrEoseResponse _) if (!relaySubscriptions.ContainsKey(_.Subscription)) return; - _logger.LogInformation($"Disposing of subscription - {_.Subscription}"); + _logger.LogDebug($"Disposing of subscription - {_.Subscription}"); _communicationFactory .GetOrCreateClient(_networkService) @@ -110,7 +110,7 @@ public void HandleEoseMessages(NostrEoseResponse _) relaySubscriptions[_.Subscription].Dispose(); relaySubscriptions.Remove(_.Subscription); - _logger.LogInformation($"subscription disposed - {_.Subscription}"); + _logger.LogDebug($"subscription disposed - {_.Subscription}"); } public bool RelaySubscriptionAdded(string subscriptionKey) diff --git a/src/Angor/Shared/Services/SignService.cs b/src/Angor/Shared/Services/SignService.cs index eb9c8cb3..1a9cd9a3 100644 --- a/src/Angor/Shared/Services/SignService.cs +++ b/src/Angor/Shared/Services/SignService.cs @@ -190,7 +190,7 @@ public DateTime SendReleaseSigsToInvestor(string encryptedReleaseSigInfo, string public void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Func action) { var nostrClient = _communicationFactory.GetOrCreateClient(_networkService); - var subscriptionKey = projectNostrPubKey + "release_sigs"; + var subscriptionKey = projectNostrPubKey.Substring(0, 20) + "rel_sigs"; if (!_subscriptionsHanding.RelaySubscriptionAdded(subscriptionKey)) { @@ -214,10 +214,10 @@ public void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPub })); } - public void LookupSignedReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Action action, Action onAllMessagesReceived) + public void LookupSignedReleaseSigs(string projectNostrPubKey, Action action, Action onAllMessagesReceived) { var nostrClient = _communicationFactory.GetOrCreateClient(_networkService); - var subscriptionKey = projectNostrPubKey + "release_approved_sigs"; + var subscriptionKey = projectNostrPubKey.Substring(0, 20) + "sing_sigs"; if (!_subscriptionsHanding.RelaySubscriptionAdded(subscriptionKey)) { @@ -228,7 +228,13 @@ public void LookupSignedReleaseSigs(string investorNostrPubKey, string projectNo .Select(_ => _.Event) .Subscribe(nostrEvent => { - action.Invoke(nostrEvent.Tags.FindFirstTagValue(NostrEventTag.ProfileIdentifier), nostrEvent.CreatedAt.Value, nostrEvent.Tags.FindFirstTagValue(NostrEventTag.EventIdentifier)); + action.Invoke(new SignServiceLookupItem + { + NostrEvent = nostrEvent, + ProfileIdentifier = nostrEvent.Tags.FindFirstTagValue(NostrEventTag.ProfileIdentifier), + EventCreatedAt = nostrEvent.CreatedAt.Value, + EventIdentifier = nostrEvent.Tags.FindFirstTagValue(NostrEventTag.EventIdentifier) + }); }); _subscriptionsHanding.TryAddRelaySubscription(subscriptionKey, subscription); @@ -248,4 +254,15 @@ public void CloseConnection() _subscriptionsHanding.Dispose(); } } + + public class SignServiceLookupItem + { + public DateTime EventCreatedAt { get; set; } + + public string ProfileIdentifier { get; set; } + + public string EventIdentifier { get; set; } + + public NostrEvent NostrEvent { get; set; } + } } From 487131e7ad840e3cc28f8776f5e483622294c6e1 Mon Sep 17 00:00:00 2001 From: dangershony Date: Wed, 29 Jan 2025 12:55:08 +0000 Subject: [PATCH 15/16] check if a message was already decrypted --- src/Angor/Client/Pages/Release.razor | 30 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/Angor/Client/Pages/Release.razor b/src/Angor/Client/Pages/Release.razor index 658ea25b..539b559e 100644 --- a/src/Angor/Client/Pages/Release.razor +++ b/src/Angor/Client/Pages/Release.razor @@ -378,26 +378,30 @@ else InvestorProject.SignaturesInfo.SignatureRequestEventId, signatureContent => { - InvokeAsync(async () => + if (InvestorReleaseSigInfo != null) { - var signatureJson = await encryption.DecryptNostrContentAsync( - nostrPrivateKeyHex, InvestorProject.ProjectInfo.NostrPubKey, signatureContent); + // if we already decrypted the message from another relay just ignore it - Logger.LogInformation("signature : " + signatureJson); + InvokeAsync(async () => + { + var signatureJson = await encryption.DecryptNostrContentAsync( + nostrPrivateKeyHex, InvestorProject.ProjectInfo.NostrPubKey, signatureContent); - InvestorReleaseSigInfo = serializer.Deserialize(signatureJson); + Logger.LogInformation("signature : " + signatureJson); - if (InvestorReleaseSigInfo?.SignatureType != "release") - { - notificationComponent.ShowErrorMessage("Incorrect signatures received"); - Logger.LogError("Incorrect signatures received"); - InvestorReleaseSigInfo = null; - } + InvestorReleaseSigInfo = serializer.Deserialize(signatureJson); - StateHasChanged(); + if (InvestorReleaseSigInfo?.SignatureType != "release") + { + notificationComponent.ShowErrorMessage("Incorrect signatures received"); + Logger.LogError("Incorrect signatures received"); + InvestorReleaseSigInfo = null; + } - }); + StateHasChanged(); + }); + } return Task.CompletedTask; }); } From 3fb58a1afeaef57f173836901b74ada13d923794 Mon Sep 17 00:00:00 2001 From: dangershony Date: Fri, 31 Jan 2025 18:34:10 +0000 Subject: [PATCH 16/16] flow now works end to end --- src/Angor/Client/Models/InvestorProject.cs | 10 +- src/Angor/Client/Pages/Investor.razor | 30 +- src/Angor/Client/Pages/Recover.razor | 3 +- src/Angor/Client/Pages/Release.razor | 731 ++++----------------- src/Angor/Client/Pages/Spend.razor | 2 +- src/Angor/Client/Pages/Unfunded.razor | 634 ++++++++++++++++++ src/Angor/Shared/Services/ISignService.cs | 2 +- src/Angor/Shared/Services/SignService.cs | 10 +- 8 files changed, 818 insertions(+), 604 deletions(-) create mode 100644 src/Angor/Client/Pages/Unfunded.razor diff --git a/src/Angor/Client/Models/InvestorProject.cs b/src/Angor/Client/Models/InvestorProject.cs index d78a5fc3..c1e1894e 100644 --- a/src/Angor/Client/Models/InvestorProject.cs +++ b/src/Angor/Client/Models/InvestorProject.cs @@ -18,8 +18,16 @@ public class InvestorProject : Project public string InvestorPublicKey { get; set; } public string InvestorNPub { get; set; } + /// + /// The address to release the funds to if the project did not reach the target. + /// This will be used by the founder when signing the release outputs + /// public string ReleaseAddress { get; set; } - public string ReleaseTransactionId { get; set; } + + /// + /// The trxid of an unfunded project that the investor has released the funds without a penalty + /// + public string ReleaseTransactionId { get; set; } public bool WaitingForFounderResponse() { diff --git a/src/Angor/Client/Pages/Investor.razor b/src/Angor/Client/Pages/Investor.razor index 13973368..2f7cee7e 100644 --- a/src/Angor/Client/Pages/Investor.razor +++ b/src/Angor/Client/Pages/Investor.razor @@ -229,12 +229,24 @@ Pending }
- @if (hasInvestmentReleaseRequests) - { -
- Founder Released Funds -
- } + +
+ Founder Released Funds + @if (hasInvestmentReleaseRequests) + { + @if (project.ReleaseTransactionId == null) + { + + Release funds + + } + else + { + Funds released + } + } +
+
View Project @@ -352,15 +364,13 @@ return Task.CompletedTask; } - private Task HandleReleaseSignatureReceivedAsync(string nostrPubKey, string signatureContent) + private void HandleReleaseSignatureReceivedAsync(string nostrPubKey, string signatureContent) { if (releaseRequestsMap.ContainsKey(nostrPubKey)) { releaseRequestsMap[nostrPubKey] = true; StateHasChanged(); } - - return Task.CompletedTask; } private void CheckSignatureFromFounder() @@ -391,7 +401,7 @@ null, project.SignaturesInfo.SignatureRequestEventId, signatureContent => HandleReleaseSignatureReceivedAsync(project.ProjectInfo.NostrPubKey, signatureContent) - ); + , () => {}); } } diff --git a/src/Angor/Client/Pages/Recover.razor b/src/Angor/Client/Pages/Recover.razor index 1fe6717b..62fde51d 100644 --- a/src/Angor/Client/Pages/Recover.razor +++ b/src/Angor/Client/Pages/Recover.razor @@ -463,8 +463,7 @@ { releaseSigsfound = true; StateHasChanged(); - return Task.CompletedTask; - }); + }, () => {}); } private async Task FindInvestments() diff --git a/src/Angor/Client/Pages/Release.razor b/src/Angor/Client/Pages/Release.razor index 539b559e..0f1c2d50 100644 --- a/src/Angor/Client/Pages/Release.razor +++ b/src/Angor/Client/Pages/Release.razor @@ -42,7 +42,7 @@
- Release Funds + Claim released funds without a penalty
@@ -55,253 +55,168 @@
-@if (!IsFounder) -{ - // handle investor +
+
+

Waiting for the founder to approve

+
+ +
+
+ + @if (InvestorProject.ReleaseTransactionId != null) + { +

+ Transaction ID: @InvestorProject.ReleaseTransactionId | + View on explorer +

- @if (InvestorReleaseSigInfo != null) +

+ Coin have already been release . +

+ } + else { - +
+ + } } +
- @if (showReleaseModal) - { -
-
-
-
-
-
Recovery Confirmation
- -
-
- -

Claim back your investment without a penalty

- -

Miner fee: @Money.Satoshis(releaseTransaction?.TransactionFee ?? 0).ToUnit(MoneyUnit.BTC) @network.CoinTicker

+@if (showReleaseModal) +{ +
+
+
+
+
+
Recovery Confirmation
+ +
+
-
+

Claim back your investment without a penalty

-
- - -
+

Miner fee: @Money.Satoshis(releaseTransaction?.TransactionFee ?? 0).ToUnit(MoneyUnit.BTC) @network.CoinTicker

-
+
-

Are you sure you want to claim back these funds?

+
+ +
-
- - -
-
-
-
-
- } -} -else -{ - // handle founder - -
-
- @if (!FounderProject.ProjectDateStarted()) - { -
-
- -
Project didn't start yet
-
-
- } - else - { - @if (TargetInvestmentReached()) - { -
-
+
-
Target reached
-
+

Are you sure you want to claim back these funds?

- } - else - { -
-
-
-
-
-
Signatures
-
-
- - -
-
-
-
- - -
- - - - - - - - - - @foreach (var signature in signaturesReleaseItems.Where(_ => _.SignRecoveryRequest?.InvestmentTransactionHex != null)) - { - - - - @if (signature.TimeReleased is null) - { - - } - else - { - - } - - } - -
Time ArrivedTime ApprovedTime Released
@signature.TimeArrived.ToString("g")@signature.TimeApproved?.ToString("g") - - @signature.TimeReleased.ToString()
-
-
-
+
+ +
- } - } +
+
} - @code { [Parameter] public string ProjectIdentifier { get; set; } - public FounderProject FounderProject { get; set; } public InvestorProject InvestorProject { get; set; } - public bool IsFounder { get; set; } - public SignatureInfo? InvestorReleaseSigInfo; - private List signaturesReleaseItems = new(); - private FeeData feeData = new(); - private Dictionary signaturesReleaseApproving = new(); - - bool scanedForApprovals; - bool scanedReleaseApprovals; - - bool releaseCoinsSpinner = false; bool prepareToReleaseCoinsConfirmSpinner = false; private Transaction? unsignedReleaseTransaction; private TransactionInfo? releaseTransaction; ProjectStats? projectStats; - private bool CanApproveAllSignatures => signaturesReleaseItems?.Any(s => s.TimeReleased == null) ?? false; - - private string ApproveButtonClass => CanApproveAllSignatures ? "btn-border-success" : "btn-border"; - - private bool ApproveButtonDisabled => !CanApproveAllSignatures; - private bool releasingAll = false; private bool showReleaseModal = false; - private bool receivingMessages = false; - private bool refreshButtonSpinner = false; - - private bool isRefreshing - { - get - { - return refreshButtonSpinner == true || receivingMessages == true; + private bool claimCoinSpinner = false; + private bool refreshSpinner = false; - } - } + private long? totalInvested = null; + string signedTransactionHex; + string explorerLink; protected override async Task OnInitializedAsync() { if (hasWallet) { - FounderProject = Storage.GetFounderProjects().FirstOrDefault(_ => _.ProjectInfo.ProjectIdentifier == ProjectIdentifier); + InvestorProject = Storage.GetInvestmentProjects().FirstOrDefault(_ => _.ProjectInfo.ProjectIdentifier == ProjectIdentifier); - if (FounderProject is not null) + if (InvestorProject is null) { - IsFounder = true; + throw new ArgumentException("The project is not founder or investor"); } - else + + if (InvestorProject.ReleaseTransactionId != null) { - InvestorProject = Storage.GetInvestmentProjects().FirstOrDefault(_ => _.ProjectInfo.ProjectIdentifier == ProjectIdentifier); + explorerLink = _networkConfiguration.GetExplorerUrl().Url + $"/transaction/{InvestorProject.ReleaseTransactionId}"; + } - if (InvestorProject is null) - { - throw new ArgumentException("The project is not founder or investor"); - } + signedTransactionHex = InvestorProject.SignedTransactionHex; + + if (signedTransactionHex is null) + { + signedTransactionHex = await _IndexerService.GetTransactionHexByIdAsync(InvestorProject.TransactionId); } + var investmentTransaction = _networkConfiguration.GetNetwork().CreateTransaction(signedTransactionHex); + totalInvested = investmentTransaction.Outputs.Skip(2).Take(InvestorProject.ProjectInfo.Stages.Count).Sum(_ => _.Value); + projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); Logger.LogInformation($"Fetching project stats stats AmountInvested = {projectStats?.AmountInvested} InvestorCount = {projectStats?.InvestorCount}"); @@ -314,39 +229,11 @@ else { if (hasWallet) { - if (IsFounder) - { - if (FounderProject!.ProjectDateStarted()) - { - await RefreshSignaturesInternal(); - } - } - else - { - await FetchInvestorCheckPassword(); - } + await FetchInvestorCheckPassword(); } } } - public bool TargetInvestmentReached() - { - if (projectStats != null) - { - var targetReached = projectStats?.AmountInvested >= Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi; - - Logger.LogInformation($"Indexer stats for target reached = {targetReached} AmountInvested = {projectStats?.AmountInvested} TargetAmount = {Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi}"); - - return targetReached; - } - - Logger.LogInformation($"None indexer stats for target reached = {FounderProject.TargetInvestmentReached()} AmountInvested = {FounderProject.TotalAvailableInvestedAmount} TargetAmount = {Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi}"); - - return FounderProject.TargetInvestmentReached(); - } - - // ==== code for the investor ==== - protected async Task FetchInvestorCheckPassword() { if (passwordComponent.HasPassword()) @@ -367,8 +254,11 @@ else return; } + refreshSpinner = true; + StateHasChanged(); + var words = await passwordComponent.GetWalletAsync(); - var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); + var nostrPrivateKey = DerivationOperations.DeriveProjectNostrInvestorPrivateKey(words, InvestorProject.ProjectInfo.ProjectIdentifier); var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); SignService.LookupReleaseSigs( @@ -378,12 +268,18 @@ else InvestorProject.SignaturesInfo.SignatureRequestEventId, signatureContent => { - if (InvestorReleaseSigInfo != null) + Logger.LogInformation($"LookupReleaseSigs received a message {signatureContent}"); + + if (InvestorReleaseSigInfo == null) { + Logger.LogInformation($"InvestorReleaseSigInfo is null"); + // if we already decrypted the message from another relay just ignore it InvokeAsync(async () => { + Logger.LogInformation($"decrypting"); + var signatureJson = await encryption.DecryptNostrContentAsync( nostrPrivateKeyHex, InvestorProject.ProjectInfo.NostrPubKey, signatureContent); @@ -393,16 +289,19 @@ else if (InvestorReleaseSigInfo?.SignatureType != "release") { - notificationComponent.ShowErrorMessage("Incorrect signatures received"); - Logger.LogError("Incorrect signatures received"); + notificationComponent.ShowErrorMessage("Incorrect signature types received"); + Logger.LogError("Incorrect signature types received"); InvestorReleaseSigInfo = null; } - + StateHasChanged(); }); } - return Task.CompletedTask; + }, () => + { + refreshSpinner = false; + StateHasChanged(); }); } @@ -423,7 +322,7 @@ else private async Task PrepareToReleaseInvestorCoinsAsync() { - releaseCoinsSpinner = true; + claimCoinSpinner = true; StateHasChanged(); await Task.Delay(10); @@ -439,11 +338,16 @@ else var investorPrivateKey = DerivationOperations.DeriveInvestorPrivateKey(words, InvestorProject.ProjectInfo.FounderKey); - string signedTransactionHex = InvestorProject.SignedTransactionHex; - if (signedTransactionHex is null) { - signedTransactionHex = await _IndexerService.GetTransactionHexByIdAsync(InvestorProject.TransactionId); + if (InvestorProject.SignedTransactionHex != null) + { + signedTransactionHex = InvestorProject.SignedTransactionHex; + } + else + { + signedTransactionHex = await _IndexerService.GetTransactionHexByIdAsync(InvestorProject.TransactionId); + } } var investmentTransaction = _networkConfiguration.GetNetwork().CreateTransaction(signedTransactionHex); @@ -460,6 +364,8 @@ else // add fee to the recovery trx releaseTransaction = _WalletOperations.AddFeeAndSignTransaction(accountInfo.GetNextChangeReceiveAddress(), unsignedReleaseTransaction, words, accountInfo, feeData.SelectedFeeEstimation); + explorerLink = _networkConfiguration.GetExplorerUrl().Url + $"/transaction/{InvestorProject.ReleaseTransactionId}"; + Logger.LogInformation($"recoveryTransaction={releaseTransaction.Transaction.GetHash().ToString()}"); showReleaseModal = true; @@ -470,7 +376,7 @@ else } finally { - releaseCoinsSpinner = false; + claimCoinSpinner = false; } } @@ -532,7 +438,6 @@ else _walletUIService.AddTransactionToPending(releaseTransaction.Transaction); notificationComponent.ShowNotificationMessage("Done", 1); - } catch (Exception e) { @@ -543,355 +448,11 @@ else prepareToReleaseCoinsConfirmSpinner = false; passwordComponent.ClearPassword(); } - } - - // ==== code for the founder ==== - - private async Task RefreshSignaturesInternal() - { - if (passwordComponent.HasPassword()) - { - await RefreshSignatures(); - } - else - { - passwordComponent.ShowPassword(async () => - { - await RefreshSignatures(); - }); - } - } - - private async Task RefreshSignatures() - { - refreshButtonSpinner = true; - StateHasChanged(); - - if (!passwordComponent.HasPassword()) - { - notificationComponent.ShowErrorMessage("no wallet password"); - return; - } - - try - { - await FetchSignatureRequests(); - - projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); - - Logger.LogInformation($"Fetching project stats stats AmountInvested = {projectStats?.AmountInvested} InvestorCount = {projectStats?.InvestorCount}"); - - await Task.Delay(1000); - } - catch (Exception e) - { - Logger.LogError($"Error fetching signatures: {e.Message}"); - } - finally - { - - refreshButtonSpinner = false; - StateHasChanged(); - } - } - - private async Task FetchSignatureRequests() - { - var words = await passwordComponent.GetWalletAsync(); - var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); - var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); - - receivingMessages = true; - - await SignService.LookupInvestmentRequestsAsync(FounderProject.ProjectInfo.NostrPubKey, null, null, - (eventId, investorNostrPubKey, encryptedMessage, timeArrived) => - { - Logger.LogDebug($"Sig request event received investorNostrPubKey: {investorNostrPubKey} - timeArrived: {timeArrived}"); - - var sigReq = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); - - if (sigReq != null) - { - if (sigReq.TimeArrived >= timeArrived) - { - return; //multiple relays could mean the same massage multiple times - } - - Logger.LogDebug($"Sig request event received is replaced"); - - // this is a newer sig request so replace it - signaturesReleaseItems.Remove(sigReq); - } - - Logger.LogDebug($"Sig request event received is new"); - - var signatureReleaseItem = new SignatureReleaseItem - { - investorNostrPubKey = investorNostrPubKey, - TimeArrived = timeArrived, - EncryptedSignRecoveryMessage = encryptedMessage, //To be encrypted after js interop is loaded - EventId = eventId - }; - - signaturesReleaseItems.Add(signatureReleaseItem); - Logger.LogDebug($"Added to pendingSignatures"); - }, - () => - { - Logger.LogDebug($"End of messages"); - - // we cannot directly call a method that needs to be awaited - // so we do it inside the InvokeAsync delegate. - - // decrypt the message - InvokeAsync(async () => { await DecryptMessages(nostrPrivateKeyHex); }); - - receivingMessages = false; - - // fetch all the approvals - FetchFounderApprovalsSignatures(nostrPrivateKeyHex); - FetchFounderReleaseSignatures(nostrPrivateKeyHex); - - Logger.LogDebug($"Calling StateHasChanged in EOSE"); - StateHasChanged(); - }); - } - - private async Task DecryptMessages(string nostrPrivateKeyHex) - { - foreach (var signatureReleaseItem in signaturesReleaseItems) - { - try - { - Logger.LogInformation($"Decrypting recovery request for key {signatureReleaseItem.investorNostrPubKey}"); - - var sigResJson = await encryption.DecryptNostrContentAsync(nostrPrivateKeyHex, signatureReleaseItem.investorNostrPubKey, signatureReleaseItem.EncryptedSignRecoveryMessage); - - signatureReleaseItem.SignRecoveryRequest = serializer.Deserialize(sigResJson); - - Logger.LogInformation($"Decrypted recovery request for key {signatureReleaseItem.investorNostrPubKey} content = {sigResJson}"); - - if (signatureReleaseItem.SignRecoveryRequest is null) - { - throw new Exception("Error deserializing signature request"); - } - } - catch (Exception e) - { - Logger.LogError("Error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", signatureReleaseItem?.SignRecoveryRequest?.InvestmentTransactionHex, e.Message); - signatureReleaseItem.SignRecoveryRequest = null; - } - } - - StateHasChanged(); - } - private void FetchFounderApprovalsSignatures(string nostrPrivateKeyHex) - { - SignService.LookupInvestmentRequestApprovals(FounderProject.ProjectInfo.NostrPubKey, - (investorNostrPubKey, timeEventCreated, reqEventId) => - { - Logger.LogDebug($"Sig response event received investorNostrPubKey: {investorNostrPubKey} - timeApproved: {timeEventCreated} - reqEventId: {reqEventId}"); - - var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); - - if (signatureRequest is null) - return; // ignore it could be a fake message - - if (signatureRequest.TimeArrived > timeEventCreated) - { - Logger.LogDebug($"The event received is replaced by time"); - return; // sig of an old request - } - - if (reqEventId != null && signatureRequest.EventId != reqEventId) - { - Logger.LogDebug($"The event received is replaced by eventid"); - return; // sig of an old request - } - - Logger.LogDebug($"The event received is new"); - - signatureRequest.TimeApproved = timeEventCreated; - - Logger.LogDebug($"Added to pendingSignatures"); - }, - () => - { - scanedForApprovals = true; - - Logger.LogDebug($"Calling StateHasChanged in EOSE"); - StateHasChanged(); - Logger.LogDebug($"End of messages on EOSE"); - }); - } - - protected void FetchFounderReleaseSignatures(string nostrPrivateKeyHex) - { - SignService.LookupSignedReleaseSigs(FounderProject.ProjectInfo.NostrPubKey, - (item) => - { - Logger.LogDebug($"Sig release response event received investorNostrPubKey: {item.ProfileIdentifier} - timeReleased: {item.EventCreatedAt} - reqEventId: {item.EventIdentifier}"); - - var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == item.ProfileIdentifier); - - if (signatureRequest is null) - return; // ignore it could be a message we do not recognize - - if (signatureRequest.TimeReleased > item.EventCreatedAt) - { - Logger.LogDebug($"The event received is replaced by time"); - return; // sig of an old request - } - - if (item.EventIdentifier != null && signatureRequest.EventId != item.EventIdentifier) - { - Logger.LogDebug($"The event received is replaced by eventid"); - return; // sig of an old request - } - - Logger.LogDebug($"The event received is new"); - - signatureRequest.TimeReleased = item.EventCreatedAt; - - Logger.LogDebug($"signatureRequest.TimeReleased was updated to {signatureRequest.TimeReleased}"); - }, () => - { - scanedReleaseApprovals = true; - - StateHasChanged(); - }); - } - - protected async Task ApproveReleaseSignatureCheckPassword(SignatureReleaseItem signature) - { - if (passwordComponent.HasPassword()) - { - await ApproveReleaseSignature(signature); - } - else - { - passwordComponent.ShowPassword(async () => - { - await ApproveReleaseSignature(signature); - }); - } - } - - private async Task ApproveReleaseSignature(SignatureReleaseItem signature) - { - signaturesReleaseApproving.Add(signature, string.Empty); - StateHasChanged(); - - try - { - var words = await passwordComponent.GetWalletAsync(); - - var operationResult = await PerformReleaseSignature(signature, words); - - if (!operationResult.Success) - { - notificationComponent.ShowErrorMessage(operationResult.Message); - } - } - catch (Exception e) - { - notificationComponent.ShowErrorMessage(e.Message,e); - } - finally - { - signaturesReleaseApproving.Remove(signature); - } - - StateHasChanged(); - } - - private async Task ReleaseAllSignatures() - { - if (passwordComponent.HasPassword()) - { - await ProcessReleaseSignatures(); - } - else - { - passwordComponent.ShowPassword(async () => - { - await ProcessReleaseSignatures(); - }); - } - } - - private async Task ProcessReleaseSignatures() - { - releasingAll = true; - StateHasChanged(); - - try - { - var releaseSignatures = signaturesReleaseItems.Where(s => s.TimeReleased == null).ToList(); - - var words = await passwordComponent.GetWalletAsync(); - - foreach (var signature in releaseSignatures) - { - await PerformReleaseSignature(signature, words); - StateHasChanged(); - } - } - catch (Exception e) - { - notificationComponent.ShowErrorMessage(e.Message,e); - } - finally - { - releasingAll = false; - passwordComponent.ClearPassword(); - } - StateHasChanged(); } - private async Task PerformReleaseSignature(SignatureReleaseItem signature, WalletWords words) - { - try - { - var key = DerivationOperations.DeriveFounderRecoveryPrivateKey(words, FounderProject.ProjectIndex); - var signatureInfo = CreateReleaseSignatures(signature.SignRecoveryRequest?.InvestmentTransactionHex, FounderProject.ProjectInfo, Encoders.Hex.EncodeData(key.ToBytes()), signature.SignRecoveryRequest?.ReleaseAddress ?? signature.SignRecoveryRequest.ReleaseKey); - - var sigJson = serializer.Serialize(signatureInfo); - - var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); - var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); - - var encryptedContent = await encryption.EncryptNostrContentAsync( - nostrPrivateKeyHex, signature.investorNostrPubKey, sigJson); - - signature.TimeReleased = SignService.SendReleaseSigsToInvestor(encryptedContent, nostrPrivateKeyHex, signature.investorNostrPubKey, signature.EventId); - - return new OperationResult { Success = true }; - } - catch (Exception ex) - { - return new OperationResult { Success = false, Message = $"An error occurred: {ex.Message}" }; - } - } - - private SignatureInfo CreateReleaseSignatures(string transactionHex, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) - { - var investorTrx = _networkConfiguration.GetNetwork().CreateTransaction(transactionHex); - - // build sigs - var recoveryTrx = InvestorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); - var sig = FounderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); - - if (!InvestorTransactionActions.CheckInvestorReleaseSignatures(info, investorTrx, sig, investorReleaseAddress)) - throw new InvalidOperationException(); - - sig.SignatureType = "release"; - - return sig; - } - + public class SignatureReleaseItem { public string investorNostrPubKey { get; set; } diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index 214d3173..a8313000 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -990,6 +990,6 @@ private void ReleaseFundsToInvestors(MouseEventArgs e) { - NavigationManager.NavigateTo($"/release/{ProjectId}"); + NavigationManager.NavigateTo($"/unfunded/{ProjectId}"); } } \ No newline at end of file diff --git a/src/Angor/Client/Pages/Unfunded.razor b/src/Angor/Client/Pages/Unfunded.razor new file mode 100644 index 00000000..1b602b3d --- /dev/null +++ b/src/Angor/Client/Pages/Unfunded.razor @@ -0,0 +1,634 @@ +@page "/unfunded/{ProjectIdentifier}" +@using Angor.Shared +@using Angor.Client.Storage +@using Angor.Shared.Models +@using Angor.Shared.ProtocolNew +@using Angor.Client.Models +@using Blockcore.NBitcoin +@using Blockcore.NBitcoin.DataEncoders +@using Angor.Shared.Services +@using System.Security.Cryptography +@using Blockcore.Consensus.TransactionInfo + +@inject ILogger Logger +@inject IDerivationOperations DerivationOperations +@inject IClientStorage Storage; +@inject ISignService SignService +@inject IInvestorTransactionActions InvestorTransactionActions +@inject IFounderTransactionActions FounderTransactionActions +@inject ISerializer serializer +@inject IEncryptionService encryption +@inject IIndexerService _IndexerService +@inject IWalletOperations _WalletOperations +@inject IWalletUIService _walletUIService; + +@inherits BaseComponent + + + + +@if (!hasWallet) +{ + NavigationManager.NavigateTo($"/wallet"); + return; +} + +
+
+
+
+ + + +
+
+ Release Funds for unfunded projects +
+ +
+
+
+

+ Project ID: + @ProjectIdentifier +

+
+
+ + +
+
+ + @if (!FounderProject.ProjectDateStarted()) + { +
+
+ +
Project didn't start yet
+
+
+ } + else + { + @if (TargetInvestmentReached()) + { +
+
+ +
Target reached
+
+
+ } + else + { +
+
+
+
+
+
Signatures
+
+
+ + +
+
+
+
+ + +
+ + + + + + + + + + @foreach (var signature in signaturesReleaseItems.Where(_ => _.SignRecoveryRequest?.InvestmentTransactionHex != null)) + { + + + + @if (signature.TimeReleased is null) + { + + } + else + { + + } + + } + +
Time ArrivedTime ApprovedTime Released
@signature.TimeArrived.ToString("g")@signature.TimeApproved?.ToString("g") + + @signature.TimeReleased?.ToString("g")
+
+
+
+
+ } + } +
+
+ + + +@code { + [Parameter] + public string ProjectIdentifier { get; set; } + + public FounderProject FounderProject { get; set; } + + public SignatureInfo? InvestorReleaseSigInfo; + + private List signaturesReleaseItems = new(); + + private FeeData feeData = new(); + + private Dictionary signaturesReleaseApproving = new(); + + + bool releaseCoinsSpinner = false; + bool prepareToReleaseCoinsConfirmSpinner = false; + private Transaction? unsignedReleaseTransaction; + private TransactionInfo? releaseTransaction; + + ProjectStats? projectStats; + + private bool CanApproveAllSignatures => signaturesReleaseItems?.Any(s => s.TimeReleased == null) ?? false; + + private string ApproveButtonClass => CanApproveAllSignatures ? "btn-border-success" : "btn-border"; + + private bool ApproveButtonDisabled => !CanApproveAllSignatures; + private bool releasingAll = false; + private bool showReleaseModal = false; + private bool scanningForSigRequests = false; // scan for requests made by investors + private bool scanningForApprovals = false; // scanning for investment signatures by founders + private bool scanningForReleaseApprovals = false; // scanning for releasing investment signatures by founders + + private bool refreshButtonSpinner = false; + + /// + /// We consider the ui to be refreshing while we still signature request messages from nostr + /// The consequence of this is that the refresh button is disabled and will still show animation + /// + private bool isRefreshing + { + get + { + return refreshButtonSpinner == true || scanningForSigRequests == true; + + } + } + + protected override async Task OnInitializedAsync() + { + if (hasWallet) + { + FounderProject = Storage.GetFounderProjects().FirstOrDefault(_ => _.ProjectInfo.ProjectIdentifier == ProjectIdentifier); + + if (FounderProject is null) + { + throw new ArgumentException("The project is not founder or investor"); + } + + projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); + + Logger.LogInformation($"Fetching project stats stats AmountInvested = {projectStats?.AmountInvested} InvestorCount = {projectStats?.InvestorCount}"); + } + } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + if (hasWallet) + { + if (FounderProject!.ProjectDateStarted()) + { + await RefreshSignaturesInternal(); + } + } + } + } + + public bool TargetInvestmentReached() + { + if (projectStats != null) + { + var targetReached = projectStats?.AmountInvested >= Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi; + + Logger.LogInformation($"Indexer stats for target reached = {targetReached} AmountInvested = {projectStats?.AmountInvested} TargetAmount = {Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi}"); + + return targetReached; + } + + Logger.LogInformation($"None indexer stats for target reached = {FounderProject.TargetInvestmentReached()} AmountInvested = {FounderProject.TotalAvailableInvestedAmount} TargetAmount = {Money.Coins(FounderProject.ProjectInfo.TargetAmount).Satoshi}"); + + return FounderProject.TargetInvestmentReached(); + } + + private async Task RefreshSignaturesInternal() + { + if (passwordComponent.HasPassword()) + { + await RefreshSignatures(); + } + else + { + passwordComponent.ShowPassword(async () => + { + await RefreshSignatures(); + }); + } + } + + private async Task RefreshSignatures() + { + refreshButtonSpinner = true; + StateHasChanged(); + + if (!passwordComponent.HasPassword()) + { + notificationComponent.ShowErrorMessage("no wallet password"); + return; + } + + try + { + await FetchSignatureRequests(); + + projectStats = await _IndexerService.GetProjectStatsAsync(ProjectIdentifier); + + Logger.LogInformation($"Fetching project stats stats AmountInvested = {projectStats?.AmountInvested} InvestorCount = {projectStats?.InvestorCount}"); + + await Task.Delay(1000); + } + catch (Exception e) + { + Logger.LogError($"Error fetching signatures: {e.Message}"); + } + finally + { + + refreshButtonSpinner = false; + StateHasChanged(); + } + } + + private async Task FetchSignatureRequests() + { + var words = await passwordComponent.GetWalletAsync(); + var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); + var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); + + scanningForSigRequests = true; + + await SignService.LookupInvestmentRequestsAsync(FounderProject.ProjectInfo.NostrPubKey, null, null, + (eventId, investorNostrPubKey, encryptedMessage, timeArrived) => + { + Logger.LogDebug($"Sig request event received investorNostrPubKey: {investorNostrPubKey} - timeArrived: {timeArrived}"); + + var sigReq = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); + + if (sigReq != null) + { + if (sigReq.TimeArrived >= timeArrived) + { + return; //multiple relays could mean the same massage multiple times + } + + Logger.LogDebug($"Sig request event received is replaced"); + + // this is a newer sig request so replace it + signaturesReleaseItems.Remove(sigReq); + } + + Logger.LogDebug($"Sig request event received is new"); + + var signatureReleaseItem = new SignatureReleaseItem + { + investorNostrPubKey = investorNostrPubKey, + TimeArrived = timeArrived, + EncryptedSignRecoveryMessage = encryptedMessage, //To be encrypted after js interop is loaded + EventId = eventId + }; + + signaturesReleaseItems.Add(signatureReleaseItem); + Logger.LogDebug($"Added to pendingSignatures"); + }, + () => + { + Logger.LogDebug($"End of messages"); + + // we cannot directly call a method that needs to be awaited + // so we do it inside the InvokeAsync delegate. + + // decrypt the message + InvokeAsync(async () => { await DecryptMessages(nostrPrivateKeyHex); }); + + scanningForSigRequests = false; + + // fetch all the approvals + FetchFounderApprovalsSignatures(nostrPrivateKeyHex); + FetchFounderReleaseSignatures(nostrPrivateKeyHex); + + Logger.LogDebug($"Calling StateHasChanged in EOSE"); + StateHasChanged(); + }); + } + + private async Task DecryptMessages(string nostrPrivateKeyHex) + { + foreach (var signatureReleaseItem in signaturesReleaseItems) + { + try + { + Logger.LogInformation($"Decrypting recovery request for key {signatureReleaseItem.investorNostrPubKey}"); + + var sigResJson = await encryption.DecryptNostrContentAsync(nostrPrivateKeyHex, signatureReleaseItem.investorNostrPubKey, signatureReleaseItem.EncryptedSignRecoveryMessage); + + signatureReleaseItem.SignRecoveryRequest = serializer.Deserialize(sigResJson); + + Logger.LogInformation($"Decrypted recovery request for key {signatureReleaseItem.investorNostrPubKey} content = {sigResJson}"); + + if (signatureReleaseItem.SignRecoveryRequest is null) + { + throw new Exception("Error deserializing signature request"); + } + } + catch (Exception e) + { + Logger.LogError("Error decrypting transaction hex: {TransactionHex}, Exception: {ExceptionMessage}", signatureReleaseItem?.SignRecoveryRequest?.InvestmentTransactionHex, e.Message); + signatureReleaseItem.SignRecoveryRequest = null; // should we remove the item instead? + } + } + + StateHasChanged(); + } + + private void FetchFounderApprovalsSignatures(string nostrPrivateKeyHex) + { + scanningForApprovals = true; + + SignService.LookupInvestmentRequestApprovals(FounderProject.ProjectInfo.NostrPubKey, + (investorNostrPubKey, timeEventCreated, reqEventId) => + { + Logger.LogDebug($"Sig response event received investorNostrPubKey: {investorNostrPubKey} - timeApproved: {timeEventCreated} - reqEventId: {reqEventId}"); + + var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == investorNostrPubKey); + + if (signatureRequest is null) + return; // ignore it could be a fake message + + if (signatureRequest.TimeArrived > timeEventCreated) + { + Logger.LogDebug($"The event received is replaced by time"); + return; // sig of an old request + } + + if (reqEventId != null && signatureRequest.EventId != reqEventId) + { + Logger.LogDebug($"The event received is replaced by eventid"); + return; // sig of an old request + } + + Logger.LogDebug($"The event received is new"); + + signatureRequest.TimeApproved = timeEventCreated; + + Logger.LogDebug($"Added to pendingSignatures"); + }, + () => + { + scanningForApprovals = false; + + Logger.LogDebug($"Calling StateHasChanged in EOSE"); + StateHasChanged(); + Logger.LogDebug($"End of messages on EOSE"); + }); + } + + protected void FetchFounderReleaseSignatures(string nostrPrivateKeyHex) + { + scanningForReleaseApprovals = true; + + SignService.LookupSignedReleaseSigs(FounderProject.ProjectInfo.NostrPubKey, + (item) => + { + Logger.LogDebug($"Sig release response event received investorNostrPubKey: {item.ProfileIdentifier} - timeReleased: {item.EventCreatedAt} - reqEventId: {item.EventIdentifier}"); + + var signatureRequest = signaturesReleaseItems.FirstOrDefault(_ => _.investorNostrPubKey == item.ProfileIdentifier); + + if (signatureRequest is null) + return; // ignore it could be a message we do not recognize + + if (signatureRequest.TimeReleased > item.EventCreatedAt) + { + Logger.LogDebug($"The event received is replaced by time"); + return; // sig of an old request + } + + if (item.EventIdentifier != null && signatureRequest.EventId != item.EventIdentifier) + { + Logger.LogDebug($"The event received is replaced by eventid"); + return; // sig of an old request + } + + Logger.LogDebug($"The event received is new"); + + signatureRequest.TimeReleased = item.EventCreatedAt; + + Logger.LogDebug($"signatureRequest.TimeReleased was updated to {signatureRequest.TimeReleased}"); + }, () => + { + scanningForReleaseApprovals = false; + + StateHasChanged(); + }); + } + + protected async Task ApproveReleaseSignatureCheckPassword(SignatureReleaseItem signature) + { + if (passwordComponent.HasPassword()) + { + await ApproveReleaseSignature(signature); + } + else + { + passwordComponent.ShowPassword(async () => + { + await ApproveReleaseSignature(signature); + }); + } + } + + private async Task ApproveReleaseSignature(SignatureReleaseItem signature) + { + signaturesReleaseApproving.Add(signature, string.Empty); + StateHasChanged(); + + try + { + var words = await passwordComponent.GetWalletAsync(); + + var operationResult = await PerformReleaseSignature(signature, words); + + if (!operationResult.Success) + { + notificationComponent.ShowErrorMessage(operationResult.Message); + } + } + catch (Exception e) + { + notificationComponent.ShowErrorMessage(e.Message,e); + } + finally + { + signaturesReleaseApproving.Remove(signature); + } + + StateHasChanged(); + } + + private async Task ReleaseAllSignatures() + { + if (passwordComponent.HasPassword()) + { + await ProcessReleaseSignatures(); + } + else + { + passwordComponent.ShowPassword(async () => + { + await ProcessReleaseSignatures(); + }); + } + } + + private async Task ProcessReleaseSignatures() + { + releasingAll = true; + StateHasChanged(); + + try + { + var releaseSignatures = signaturesReleaseItems.Where(s => s.TimeReleased == null).ToList(); + + var words = await passwordComponent.GetWalletAsync(); + + foreach (var signature in releaseSignatures) + { + await PerformReleaseSignature(signature, words); + StateHasChanged(); + } + } + catch (Exception e) + { + notificationComponent.ShowErrorMessage(e.Message,e); + } + finally + { + releasingAll = false; + passwordComponent.ClearPassword(); + } + + StateHasChanged(); + } + + private async Task PerformReleaseSignature(SignatureReleaseItem signature, WalletWords words) + { + try + { + var key = DerivationOperations.DeriveFounderRecoveryPrivateKey(words, FounderProject.ProjectIndex); + var signatureInfo = CreateReleaseSignatures(signature.SignRecoveryRequest?.InvestmentTransactionHex, FounderProject.ProjectInfo, Encoders.Hex.EncodeData(key.ToBytes()), signature.SignRecoveryRequest?.ReleaseAddress ?? signature.SignRecoveryRequest.ReleaseKey); + + var sigJson = serializer.Serialize(signatureInfo); + + var nostrPrivateKey = await DerivationOperations.DeriveProjectNostrPrivateKeyAsync(words, FounderProject.ProjectIndex); + var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes()); + + var encryptedContent = await encryption.EncryptNostrContentAsync( + nostrPrivateKeyHex, signature.investorNostrPubKey, sigJson); + + signature.TimeReleased = SignService.SendReleaseSigsToInvestor(encryptedContent, nostrPrivateKeyHex, signature.investorNostrPubKey, signature.EventId); + + return new OperationResult { Success = true }; + } + catch (Exception ex) + { + return new OperationResult { Success = false, Message = $"An error occurred: {ex.Message}" }; + } + } + + private SignatureInfo CreateReleaseSignatures(string transactionHex, ProjectInfo info, string founderSigningPrivateKey, string investorReleaseAddress) + { + var investorTrx = _networkConfiguration.GetNetwork().CreateTransaction(transactionHex); + + // build sigs + var recoveryTrx = InvestorTransactionActions.BuildReleaseInvestorFundsTransaction(info, investorTrx, investorReleaseAddress); + var sig = FounderTransactionActions.SignInvestorRecoveryTransactions(info, transactionHex, recoveryTrx, founderSigningPrivateKey); + + if (!InvestorTransactionActions.CheckInvestorReleaseSignatures(info, investorTrx, sig, investorReleaseAddress)) + throw new InvalidOperationException(); + + sig.SignatureType = "release"; + + return sig; + } + + public class SignatureReleaseItem + { + public string investorNostrPubKey { get; set; } + + public DateTime TimeArrived { get; set; } + public DateTime? TimeApproved { get; set; } + public DateTime? TimeReleased { get; set; } + + public SignRecoveryRequest? SignRecoveryRequest { get; set; } + + public SignatureInfo? InvestorRecoverySigInfo { get; set; } + + public SignatureInfo? InvestorReleaseSigInfo { get; set; } + + public string? EncryptedSignRecoveryMessage { get; set; } + + public string? EncryptedSignReleaseMessage { get; set; } + + public string EventId { get; set; } + } +} \ No newline at end of file diff --git a/src/Angor/Shared/Services/ISignService.cs b/src/Angor/Shared/Services/ISignService.cs index 66b4ee80..fa2bd268 100644 --- a/src/Angor/Shared/Services/ISignService.cs +++ b/src/Angor/Shared/Services/ISignService.cs @@ -18,7 +18,7 @@ DateTime SendSignaturesToInvestor(string encryptedSignatureInfo, string nostrPri DateTime SendReleaseSigsToInvestor(string encryptedReleaseSigInfo, string nostrPrivateKeyHex, string investorNostrPubKey, string eventId); - void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Func action); + void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Action action, Action onAllMessagesReceived); void LookupSignedReleaseSigs(string projectNostrPubKey, Action action, Action onAllMessagesReceived); } \ No newline at end of file diff --git a/src/Angor/Shared/Services/SignService.cs b/src/Angor/Shared/Services/SignService.cs index 1a9cd9a3..7b09091f 100644 --- a/src/Angor/Shared/Services/SignService.cs +++ b/src/Angor/Shared/Services/SignService.cs @@ -67,7 +67,7 @@ public void LookupSignatureForInvestmentRequest(string investorNostrPubKey, stri Authors = new[] { projectNostrPubKey }, //From founder P = new[] { investorNostrPubKey }, // To investor Kinds = new[] { NostrKind.EncryptedDm }, - Since = sigRequestSentTime, + //Since = sigRequestSentTime, E = new [] { sigRequestEventId }, Limit = 1, })); @@ -187,7 +187,7 @@ public DateTime SendReleaseSigsToInvestor(string encryptedReleaseSigInfo, string return ev.CreatedAt.Value; } - public void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Func action) + public void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPubKey, DateTime? releaseRequestSentTime, string releaseRequestEventId, Action action, Action onAllMessagesReceived) { var nostrClient = _communicationFactory.GetOrCreateClient(_networkService); var subscriptionKey = projectNostrPubKey.Substring(0, 20) + "rel_sigs"; @@ -203,12 +203,14 @@ public void LookupReleaseSigs(string investorNostrPubKey, string projectNostrPub _subscriptionsHanding.TryAddRelaySubscription(subscriptionKey, subscription); } + _subscriptionsHanding.TryAddEoseAction(subscriptionKey, onAllMessagesReceived); + nostrClient.Send(new NostrRequest(subscriptionKey, new NostrFilter { Authors = new[] { projectNostrPubKey }, // From founder P = new[] { investorNostrPubKey }, // To investor - Kinds = new[] { NostrKind.EncryptedDm }, - Since = releaseRequestSentTime, + Kinds = new[] { NostrKind.EncryptedDm }, + // Since = releaseRequestSentTime, E = new[] { releaseRequestEventId }, Limit = 1, }));