[Greenfield] Add sentTimestamp field to delivery data (Fix #3146)

BTCPayServer.Client/Models/WebhookDeliveryData.cs

@@ -10,6 +10,8 @@ public class WebhookDeliveryData
  public string Id { get; set; }
  [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
  public DateTimeOffset Timestamp { get; set; }
+ [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+ public DateTimeOffset? SentTimestamp { get; set; }
  public int? HttpCode { get; set; }
  public string ErrorMessage { get; set; }
  [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -812,6 +812,8 @@ void AssertHook(FakeServer fakeServer, Client.Models.StoreWebhookData hook)
  fakeServer.Done();
  var newDelivery = await clientProfile.GetWebhookDelivery(user.StoreId, hook.Id, newDeliveryId);
  Assert.NotNull(newDelivery);
+ Assert.NotNull(newDelivery.SentTimestamp);
+ Assert.True(newDelivery.Timestamp - newDelivery.SentTimestamp < TimeSpan.FromSeconds(5.0));
  Assert.Equal(404, newDelivery.HttpCode);
  var req = await clientProfile.GetWebhookDeliveryRequest(user.StoreId, hook.Id, newDeliveryId);
  Assert.Equal(delivery.Id, req.OriginalDeliveryId);

BTCPayServer/Controllers/GreenField/StoreWebhooksController.cs

@@ -171,6 +171,7 @@ private Client.Models.WebhookDeliveryData FromModel(Data.WebhookDeliveryData dat
  {
  Id = data.Id,
  Timestamp = data.Timestamp,
+ SentTimestamp = b.SentTimestamp,
  Status = b.Status,
  ErrorMessage = b.ErrorMessage,
  HttpCode = b.HttpCode

BTCPayServer/Data/WebhookDataExtensions.cs

@@ -31,6 +31,9 @@ public class WebhookDeliveryBlob
  public int? HttpCode { get; set; }
  public string ErrorMessage { get; set; }
  public byte[] Request { get; set; }
+ [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+ public DateTimeOffset? SentTimestamp { get; set; }
+
  public T ReadRequestAs<T>()
  {
  return JsonConvert.DeserializeObject<T>(UTF8Encoding.UTF8.GetString(Request), HostedServices.WebhookNotificationManager.DefaultSerializerSettings);

BTCPayServer/HostedServices/WebhookNotificationManager.cs

@@ -331,6 +331,7 @@ private async Task<DeliveryResult> SendDelivery(WebhookDeliveryRequest ctx)
  request.Content = content;
  var deliveryBlob = ctx.Delivery.Blob is null ? new WebhookDeliveryBlob() : ctx.Delivery.GetBlob();
  deliveryBlob.Request = bytes;
+ deliveryBlob.SentTimestamp = DateTimeOffset.UtcNow;
  try
  {
  using var response = await httpClient.SendAsync(request, CancellationToken);

BTCPayServer/wwwroot/swagger/v1/swagger.template.webhooks.json

@@ -488,7 +488,16 @@
  },
  "timestamp": {
  "nullable": false,
- "description": "Timestamp of when the delivery got broadcasted",
+ "description": "Timestamp of when the delivery got created.",
+ "allOf": [
+ {
+ "$ref": "#/components/schemas/UnixTimestamp"
+ }
+ ]
+ },
+ "sentTimestamp": {
+ "nullable": true,
+ "description": "Timestamp of when the delivery got broadcasted. (Deliveries are queued to ensure orderly delivery, if the server is slow to respond, queued deliveries may be broadcasted late)",
  "allOf": [
  {
  "$ref": "#/components/schemas/UnixTimestamp"