diff --git a/src/Angor/Client/Pages/Invest.razor b/src/Angor/Client/Pages/Invest.razor index a770c32f..b6e3ffc7 100644 --- a/src/Angor/Client/Pages/Invest.razor +++ b/src/Angor/Client/Pages/Invest.razor @@ -2,12 +2,13 @@ @using Angor.Shared @using Angor.Client.Storage @using Angor.Shared.Models -@using Blockcore.Consensus.TransactionInfo @using Blockcore.NBitcoin @using Angor.Client.Services @using Angor.Shared.ProtocolNew @using Blockcore.NBitcoin.DataEncoders @using JSException = Microsoft.JSInterop.JSException +@using Money = Blockcore.NBitcoin.Money +@using Transaction = Blockcore.Consensus.TransactionInfo.Transaction @inject IJSRuntime JS @@ -160,16 +161,19 @@ } } - @if (recoverySigs != null) + @if (recoverySigs?.Signatures.Count == project.Stages.Count) { -
-
-
-
-
The founder has signed the recovery transaction
- -
-
+
+
+ @if (!validatingsignaturs) + { +
The founder has signed the recovery transaction
+ + } + else + { +
+ }
} @@ -190,6 +194,7 @@ Transaction unSignedTransaction; SignatureInfo recoverySigs; + bool validatingsignaturs; private FeeData feeData = new(); @@ -404,31 +409,7 @@ content = encryptedContent, NostrPubKey = project.NostrPubKey, InvestorNostrPrivateKey = nostrPrivateKeyHex - }, async _ => - { - var test = await javascriptNostrToolsModule.InvokeAsync( - "decryptNostr", - nostrPrivateKeyHex, - project.NostrPubKey, - _); - - _Logger.LogInformation("signature : " + test); - - recoverySigs ??= new SignatureInfo(); - - - recoverySigs.Signatures.Add(new SignatureInfoItem - { - Signature = test, StageIndex = recoverySigs.Signatures.Count() - }); - - - if (recoverySigs.Signatures.Count == project.Stages.Count()) - { - StateHasChanged(); - } - - }); + }, async _ => await HandleSignatureReceivedAsync(nostrPrivateKeyHex, _)); return new OperationResult { Success = true, }; }); @@ -443,8 +424,34 @@ } } + private async Task HandleSignatureReceivedAsync(string? nostrPrivateKeyHex, string _) + { + var signatureJson = await javascriptNostrToolsModule.InvokeAsync( + "decryptNostr", + nostrPrivateKeyHex, + project.NostrPubKey, + _); + + var signature = System.Text.Json.JsonSerializer.Deserialize(signatureJson); + + _Logger.LogInformation("signature : " + signatureJson); + + recoverySigs ??= new SignatureInfo(); + + recoverySigs.Signatures.Add(new SignatureInfoItem + { + Signature = signature, StageIndex = recoverySigs.Signatures.Count() + }); + + if (recoverySigs.Signatures.Count == project.Stages.Count()) + { + StateHasChanged(); + } + } + public async Task PublishSignedTransactionAsync() { + validatingsignaturs = true; var operationResult = await notificationComponent.LongOperation(async () => { var validSignatures = _InvestorTransactionActions.CheckInvestorRecoverySignatures(project, signedTransaction, recoverySigs); @@ -461,7 +468,9 @@ var response = await _WalletOperations.PublishTransactionAsync(network, signedTransaction); - return !response.Success ? response : new OperationResult { Success = true }; + //TODO David remove signatures from storage on fail? + + return response.Success ? new SuccessOperationResult() : response; }); if (operationResult.Success) @@ -474,7 +483,9 @@ } else { + validatingsignaturs = false; notificationComponent.ShowErrorMessage(operationResult.Message); + StateHasChanged(); } } diff --git a/src/Angor/Client/Pages/Settings.razor b/src/Angor/Client/Pages/Settings.razor index 6a535aeb..e04ffc11 100644 --- a/src/Angor/Client/Pages/Settings.razor +++ b/src/Angor/Client/Pages/Settings.razor @@ -166,13 +166,13 @@ return; } - if (!(uri.Scheme == "http" || uri.Scheme == "https")) + if (uri.Scheme is not ("http" or "https")) { notificationComponent.ShowErrorMessage($"invalid url {newIndexerLink} schema must be http or https"); return; } - newIndexerLink = new Uri($"{uri.Scheme}://{uri.Host}/").ToString(); + newIndexerLink = new Uri($"{uri.Scheme}://{uri.Host}").ToString(); if (settingsInfo.Indexers.Any(a => a.Url == newIndexerLink)) { @@ -198,13 +198,13 @@ return; } - if (!(uri.Scheme == "ws" || uri.Scheme == "wss")) + if (uri.Scheme is not ("ws" or "wss")) { notificationComponent.ShowErrorMessage($"invalid url {newRelayLink} schema must be ws or wss"); return; } - newRelayLink = new Uri($"{uri.Scheme}://{uri.Host}/").ToString(); + newRelayLink = new Uri($"{uri.Scheme}://{uri.Host}").ToString(); if (settingsInfo.Relays.Any(a => a.Url == newRelayLink)) { diff --git a/src/Angor/Server/TestNostrSigningFromRelay.cs b/src/Angor/Server/TestNostrSigningFromRelay.cs index 92796e48..6ace0ab7 100644 --- a/src/Angor/Server/TestNostrSigningFromRelay.cs +++ b/src/Angor/Server/TestNostrSigningFromRelay.cs @@ -101,51 +101,18 @@ public async Task SignTransactionsFromNostrAsync(string projectIdentifier) _nostrClient.Streams.EventStream.Where(_ => _.Subscription == nostrPubKey + "1") .Where(_ => _.Event.Kind == NostrKind.ApplicationSpecificData) - //.Where(_ => _.Event.Pubkey == nostrPubKey) .Subscribe(_ => { _clientLogger.LogInformation("application specific data" + _.Event.Content); - _storage.Add(JsonConvert.DeserializeObject(_.Event.Content,NostrSerializer.Settings)); + _storage.Add(System.Text.Json.JsonSerializer.Deserialize(_.Event.Content)); }); _nostrClient.Streams.EventStream.Where(_ => _.Subscription == nostrPubKey + "2") .Where(_ => _.Event.Kind == NostrKind.EncryptedDm) - // .Where(_ => _.Event.Tags.ContainsTag("p",nostrPubKey)) .Select(_ => _.Event as NostrEncryptedEvent) .Subscribe(nostrEvent => { - _clientLogger.LogInformation("encrypted direct message"); - var project = (_storage.Get().GetAwaiter().GetResult()).First(_ => _.ProjectIdentifier == projectIdentifier); - var transactionHex = nostrEvent.DecryptContent(nostrPrivateKey); - - _clientLogger.LogInformation(transactionHex); - - var sig = signProject(transactionHex,project,projectKeys.founderSigningPrivateKey); - - var stages = sig.Signatures.Select(_ => _.Signature ); - - foreach (var stage in sig.Signatures) - { - var sigJson = JsonConvert.SerializeObject(stage.Signature); - //JsonConvert.SerializeObject(sig.Signatures.OrderBy(_ => _.StageIndex).Select(_ => _.Signature), NostrSerializer.Settings); - - _logger.LogInformation($"Signature to send for stage {stage.StageIndex}: {sigJson}"); - - var ev = new NostrEvent - { - Kind = NostrKind.EncryptedDm, - CreatedAt = DateTime.UtcNow, - Content = sigJson, - Tags = new NostrEventTags(new[] { NostrEventTag.Profile(nostrEvent.Pubkey) }) - }; - - var signed = NostrEncryptedEvent.EncryptDirectMessage(ev, nostrPrivateKey) - .Sign(nostrPrivateKey); - - _nostrClient.Send(new NostrEventRequest(signed)); - } - - + SignInvestorTransactionsAsync(projectIdentifier, nostrEvent, nostrPrivateKey, projectKeys); }); _nostrClient.Send(new NostrRequest( nostrPubKey + "1", new NostrFilter @@ -154,15 +121,47 @@ public async Task SignTransactionsFromNostrAsync(string projectIdentifier) Kinds = new[] { NostrKind.ApplicationSpecificData }, Limit = 1 })); - + _nostrClient.Send(new NostrRequest(nostrPubKey + "2", new NostrFilter { - P = new []{nostrPubKey}, - Kinds = new[] {NostrKind.EncryptedDm }, + P = new[] { nostrPubKey }, + Kinds = new[] { NostrKind.EncryptedDm }, Since = DateTime.UtcNow })); } + private void SignInvestorTransactionsAsync(string projectIdentifier, NostrEncryptedEvent? nostrEvent, + NostrPrivateKey nostrPrivateKey, ProjectKeys projectKeys) + { + _clientLogger.LogInformation("encrypted direct message"); + var project = (_storage.Get().GetAwaiter().GetResult()).First(_ => _.ProjectIdentifier == projectIdentifier); + var transactionHex = nostrEvent.DecryptContent(nostrPrivateKey); + + _clientLogger.LogInformation(transactionHex); + + var sig = signProject(transactionHex, project, projectKeys.founderSigningPrivateKey); + + foreach (var stage in sig.Signatures) + { + var sigJson = System.Text.Json.JsonSerializer.Serialize(stage.Signature); + + _logger.LogInformation($"Signature to send for stage {stage.StageIndex}: {sigJson}"); + + var ev = new NostrEvent + { + Kind = NostrKind.EncryptedDm, + CreatedAt = DateTime.UtcNow, + Content = sigJson, + Tags = new NostrEventTags(new[] { NostrEventTag.Profile(nostrEvent.Pubkey) }) + }; + + var signed = NostrEncryptedEvent.EncryptDirectMessage(ev, nostrPrivateKey) + .Sign(nostrPrivateKey); + + _nostrClient.Send(new NostrEventRequest(signed)); + } + } + private SignatureInfo signProject(string transactionHex,ProjectInfo info, string founderSigningPrivateKey) { var investorTrx = _networkConfiguration.GetNetwork().CreateTransaction(transactionHex); diff --git a/src/Angor/Shared/Models/OperationResult.cs b/src/Angor/Shared/Models/OperationResult.cs index 20b838aa..10a8deef 100644 --- a/src/Angor/Shared/Models/OperationResult.cs +++ b/src/Angor/Shared/Models/OperationResult.cs @@ -6,6 +6,14 @@ public class OperationResult public bool Success { get; set; } } +public class SuccessOperationResult : OperationResult +{ + public SuccessOperationResult() + { + Success = true; + } +} + public class OperationResult : OperationResult { public T? Data { get; set; } diff --git a/src/Angor/Shared/Services/RelayService.cs b/src/Angor/Shared/Services/RelayService.cs index 69455950..51796266 100644 --- a/src/Angor/Shared/Services/RelayService.cs +++ b/src/Angor/Shared/Services/RelayService.cs @@ -1,10 +1,11 @@ using System.Reactive.Linq; +using System.Text.Json; using Angor.Shared.Models; +using Angor.Shared.Utilities; using Nostr.Client.Requests; using Microsoft.Extensions.Logging; using Nostr.Client.Client; using Nostr.Client.Communicator; -using Nostr.Client.Json; using Nostr.Client.Keys; using Nostr.Client.Messages; using Nostr.Client.Messages.Metadata; @@ -74,11 +75,10 @@ public Task LookupProjectsInfoByPubKeysAsync(Action responseDataAction,par { var subscription = _nostrClient.Streams.EventStream .Where(_ => _.Subscription == subscriptionName) - //.Where(_ => nostrPubKeys.Contains(_.Event.Pubkey)) .Select(_ => _.Event) .Subscribe(ev => { - responseDataAction(Newtonsoft.Json.JsonConvert.DeserializeObject(ev.Content, NostrSerializer.Settings)); + responseDataAction(JsonSerializer.Deserialize(ev.Content,settings)); }); subscriptions.Add(subscriptionName, subscription); @@ -129,7 +129,7 @@ public Task AddProjectAsync(ProjectInfo project, string hexPrivateKey) if (!project.NostrPubKey.Contains(key.DerivePublicKey().Hex)) throw new ArgumentException($"The nostr pub key on the project does not fit the npub calculated from the nsec {project.NostrPubKey} {key.DerivePublicKey().Hex}"); - var content = Newtonsoft.Json.JsonConvert.SerializeObject(project, NostrSerializer.Settings); + var content = JsonSerializer.Serialize(project,settings); var signed = GetNip78NostrEvent(content) .Sign(key); @@ -146,7 +146,7 @@ public Task CreateNostrProfileAsync(NostrMetadata metadata, string hexPr { var key = NostrPrivateKey.FromHex(hexPrivateKey); - var content = Newtonsoft.Json.JsonConvert.SerializeObject(metadata, NostrSerializer.Settings); + var content = JsonSerializer.Serialize(metadata,settings); var signed = new NostrEvent { @@ -281,6 +281,20 @@ private void SetupNostrCommunicator() info.Text, info.MessageType); }); } + + private JsonSerializerOptions settings => new () + { + // Equivalent to Formatting = Formatting.None + WriteIndented = false, + + // Equivalent to NullValueHandling = NullValueHandling.Ignore + DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull, + + // PropertyNamingPolicy equivalent to CamelCasePropertyNamesContractResolver + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + + Converters = { new UnixDateTimeConverter() } + }; } } diff --git a/src/Angor/Shared/Services/SignService.cs b/src/Angor/Shared/Services/SignService.cs index 46ed249f..72150c21 100644 --- a/src/Angor/Shared/Services/SignService.cs +++ b/src/Angor/Shared/Services/SignService.cs @@ -13,7 +13,7 @@ namespace Angor.Client.Services public interface ISignService { Task AddSignKeyAsync(ProjectInfo project, string founderRecoveryPrivateKey, string nostrPrivateKey); - Task RequestInvestmentSigsAsync(SignRecoveryRequest signRecoveryRequest, Action action); + Task RequestInvestmentSigsAsync(SignRecoveryRequest signRecoveryRequest, Func action); } public class SignService : ISignService @@ -56,7 +56,7 @@ public async Task AddSignKeyAsync(ProjectInfo project, string founderRecoveryPri response.EnsureSuccessStatusCode(); } - public Task RequestInvestmentSigsAsync(SignRecoveryRequest signRecoveryRequest, Action action) + public Task RequestInvestmentSigsAsync(SignRecoveryRequest signRecoveryRequest, Func action) { var sender = NostrPrivateKey.FromHex(signRecoveryRequest.InvestorNostrPrivateKey); //var receiver = NostrPublicKey.FromHex(signRecoveryRequest.NostrPubKey); @@ -85,7 +85,8 @@ public Task RequestInvestmentSigsAsync(SignRecoveryRequest signRecoveryR Authors = new []{signRecoveryRequest.NostrPubKey}, P = new []{nostrPubKey}, Kinds = new[] { NostrKind.EncryptedDm}, - Since = timeOfMessage + Since = timeOfMessage, + Limit = 1 })); var subscription = _nostrClient.Streams.EventStream diff --git a/src/Angor/Shared/Utilities/UnixDateTimeConverter.cs b/src/Angor/Shared/Utilities/UnixDateTimeConverter.cs new file mode 100644 index 00000000..a61a7316 --- /dev/null +++ b/src/Angor/Shared/Utilities/UnixDateTimeConverter.cs @@ -0,0 +1,24 @@ +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Angor.Shared.Utilities; + +public class UnixDateTimeConverter : JsonConverter +{ + public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType != JsonTokenType.Number) + { + throw new JsonException("Expected a number for Unix timestamp."); + } + + var unixTime = reader.GetInt64(); + return DateTimeOffset.FromUnixTimeSeconds(unixTime).UtcDateTime; + } + + public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options) + { + var unixTime = new DateTimeOffset(value).ToUnixTimeSeconds(); + writer.WriteNumberValue(unixTime); + } +} \ No newline at end of file