Smart Contract listing endpoints and GraphQl duration metrics

backend/.gitignore

@@ -447,3 +447,5 @@ $RECYCLE.BIN/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+/Logs

backend/Application/Aggregates/Contract/BackgroundServices/ContractJobsBackgroundService.cs

@@ -1,6 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Application.Aggregates.Contract.Jobs;
+using Application.Observability;
 using Application.Configurations;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
@@ -33,6 +34,8 @@ IOptions<FeatureFlagOptions> featureFlagsOptions
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
+        using var _ = TraceContext.StartActivity(nameof(ContractJobsBackgroundService));
+
         if (!_featureFlags.ConcordiumNodeImportEnabled)
         {
             _logger.Information("Import data from Concordium node is disabled. This controller will not run!");
@@ -73,4 +76,4 @@ private async Task RunJob(IContractJob job, CancellationToken token)
             throw;
         }
     }
-}
+}

backend/Application/Aggregates/Contract/BackgroundServices/ContractNodeImportBackgroundService.cs

@@ -4,6 +4,7 @@
 using Application.Aggregates.Contract.Jobs;
 using Application.Aggregates.Contract.Observability;
 using Application.Api.GraphQL.EfCore;
+using Application.Observability;
 using Application.Configurations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
@@ -46,6 +47,8 @@ public ContractNodeImportBackgroundService(
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
+        using var _ = TraceContext.StartActivity(nameof(ContractNodeImportBackgroundService));
+
         if (!_featureFlags.ConcordiumNodeImportEnabled)
         {
             _logger.Information("Import data from Concordium node is disabled. This controller will not run!");

backend/Application/Aggregates/Contract/Configurations/ContractEntityTypeConfigurations.cs

@@ -1,3 +1,4 @@
+using Application.Aggregates.Contract.Entities;
 using Application.Api.GraphQL.EfCore.Converters.EfCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -11,9 +12,6 @@ public void Configure(EntityTypeBuilder<Entities.Contract> builder)
         builder.ToTable("graphql_contracts");
         builder.HasKey(x => new
         {
-            x.BlockHeight, 
-            x.TransactionIndex,
-            x.EventIndex,
             x.ContractAddressIndex,
             x.ContractAddressSubIndex
         });
@@ -34,7 +32,14 @@ public void Configure(EntityTypeBuilder<Entities.Contract> builder)
             .HasConversion<AccountAddressConverter>();
         builder.Property(x => x.Source)
             .HasColumnName("source");
+        builder.Property(x => x.BlockSlotTime)
+            .HasColumnName("block_slot_time");
         builder.Property(x => x.CreatedAt)
-            .HasColumnName("created_at");        
+            .HasColumnName("created_at");
+
+        builder
+            .HasMany<ContractEvent>(sm => sm.ContractEvents)
+            .WithOne()
+            .HasForeignKey(sme => new { sme.ContractAddressIndex, sme.ContractAddressSubIndex });
     }
 }

backend/Application/Aggregates/Contract/Configurations/ContractEventEntityTypeConfigurations.cs

@@ -36,7 +36,9 @@ public void Configure(EntityTypeBuilder<ContractEvent> builder)
             .HasConversion<TransactionResultEventToJsonConverter>();
         builder.Property(x => x.Source)
             .HasColumnName("source");
+        builder.Property(x => x.BlockSlotTime)
+            .HasColumnName("block_slot_time");        
         builder.Property(x => x.CreatedAt)
-            .HasColumnName("created_at");        
+            .HasColumnName("created_at");
     }
 }

backend/Application/Aggregates/Contract/Configurations/ModuleReferenceContractLinkEventEntityTypeConfigurations.cs

@@ -16,7 +16,8 @@ public void Configure(EntityTypeBuilder<ModuleReferenceContractLinkEvent> builde
             x.EventIndex,
             x.ModuleReference,
             x.ContractAddressIndex,
-            x.ContractAddressSubIndex
+            x.ContractAddressSubIndex,
+            x.LinkAction
         });
         builder.Property(x => x.BlockHeight)
             .HasColumnName("block_height");
@@ -36,6 +37,8 @@ public void Configure(EntityTypeBuilder<ModuleReferenceContractLinkEvent> builde
             .HasColumnName("source");
         builder.Property(x => x.LinkAction)
             .HasColumnName("link_action");
+        builder.Property(x => x.BlockSlotTime)
+            .HasColumnName("block_slot_time");        
         builder.Property(x => x.CreatedAt)
             .HasColumnName("created_at");        
     }

backend/Application/Aggregates/Contract/Configurations/ModuleReferenceEventEntityTypeConfigurations.cs

@@ -11,9 +11,6 @@ public void Configure(EntityTypeBuilder<ModuleReferenceEvent> builder)
         builder.ToTable("graphql_module_reference_events");
         builder.HasKey(x => new
         {
-            x.BlockHeight,
-            x.TransactionIndex,
-            x.EventIndex,
             x.ModuleReference
         });
         builder.Property(x => x.BlockHeight)
@@ -28,6 +25,8 @@ public void Configure(EntityTypeBuilder<ModuleReferenceEvent> builder)
             .HasColumnName("module_reference");
         builder.Property(x => x.Source)
             .HasColumnName("source");
+        builder.Property(x => x.BlockSlotTime)
+            .HasColumnName("block_slot_time");        
         builder.Property(x => x.CreatedAt)
             .HasColumnName("created_at");        
     }

backend/Application/Aggregates/Contract/ContractAggregate.cs

@@ -5,6 +5,7 @@
 using Application.Aggregates.Contract.Observability;
 using Application.Aggregates.Contract.Types;
 using Application.Api.GraphQL.Transactions;
+using Application.Observability;
 using Concordium.Sdk.Types;
 using AccountAddress = Application.Api.GraphQL.Accounts.AccountAddress;
 using ContractAddress = Application.Api.GraphQL.ContractAddress;
@@ -19,6 +20,8 @@ internal sealed class ContractAggregate
     private readonly IContractRepositoryFactory _repositoryFactory;
     private readonly ContractAggregateOptions _options;
     private readonly ILogger _logger;
+    private const string NodeImportJobActivity = "NodeImportJobActivity";
+    private const string NodeImportJobLoopActivity = "NodeImportJobLoopActivity";
 
     public ContractAggregate(
         IContractRepositoryFactory repositoryFactory,
@@ -32,6 +35,8 @@ ContractAggregateOptions options
 
     internal async Task NodeImportJob(IContractNodeClient client, CancellationToken token = default)
     {
+        using var _ = TraceContext.StartActivity(NodeImportJobActivity);
+
         var retryCount = 0;
         while (!token.IsCancellationRequested)
         {
@@ -102,6 +107,7 @@ await StoreEvent(
                     transactionResultEvent,
                     AccountAddress.From(details.Sender),
                     blockInfo.BlockHeight,
+                    blockInfo.BlockSlotTime,
                     transactionHash,
                     blockItemSummary.Index,
                     eventIndex
@@ -144,6 +150,7 @@ internal static async Task StoreEvent(
         TransactionResultEvent transactionResultEvent,
         AccountAddress sender,
         ulong blockHeight, 
+        DateTimeOffset blockSlotTime,
         string transactionHash,
         ulong transactionIndex,
         uint eventIndex
@@ -159,7 +166,8 @@ await repository.AddAsync(new Entities.Contract(
                     eventIndex,
                     contractInitialized.ContractAddress,
                     sender,
-                    source
+                    source,
+                    blockSlotTime
                 ));
                 await repository
                     .AddAsync(new ContractEvent(
@@ -169,7 +177,8 @@ await repository
                         eventIndex,
                         contractInitialized.ContractAddress,
                         contractInitialized,
-                        source
+                        source,
+                        blockSlotTime
                     ));
                 await repository
                     .AddAsync(new ModuleReferenceContractLinkEvent(
@@ -180,7 +189,8 @@ await repository
                         contractInitialized.ModuleRef,
                         contractInitialized.ContractAddress,
                         source,
-                        ModuleReferenceContractLinkEvent.ModuleReferenceContractLinkAction.Added
+                        ModuleReferenceContractLinkEvent.ModuleReferenceContractLinkAction.Added,
+                        blockSlotTime
                     ));
                 break;
             case ContractInterrupted contractInterrupted:
@@ -192,7 +202,8 @@ await repository
                         eventIndex,
                         contractInterrupted.ContractAddress,
                         contractInterrupted,
-                        source
+                        source,
+                        blockSlotTime
                     ));
                 break;
             case ContractResumed contractResumed:
@@ -204,7 +215,8 @@ await repository
                         eventIndex,
                         contractResumed.ContractAddress,
                         contractResumed,
-                        source
+                        source,
+                        blockSlotTime
                     ));
                 break;
             case ContractUpdated contractUpdated:
@@ -216,8 +228,27 @@ await repository
                         eventIndex,
                         contractUpdated.ContractAddress,
                         contractUpdated,
-                        source
-                    ));
+                        source,
+                        blockSlotTime
+                        ));
+                if (contractUpdated.Instigator is ContractAddress contractInstigator && contractUpdated.Amount != 0)
+                {
+                    await repository
+                        .AddAsync(new ContractEvent(
+                            blockHeight,
+                            transactionHash,
+                            transactionIndex,
+                            eventIndex,
+                            contractInstigator,
+                            new Transferred(
+                                contractUpdated.Amount,
+                                contractInstigator,
+                                contractUpdated.ContractAddress
+                            ),
+                            source,
+                            blockSlotTime
+                        ));
+                }
                 break;
             case ContractUpgraded contractUpgraded:
                 await repository
@@ -228,7 +259,8 @@ await repository
                         eventIndex,
                         contractUpgraded.ContractAddress,
                         contractUpgraded,
-                        source
+                        source,
+                        blockSlotTime
                     ));
                 await repository
                     .AddAsync(new ModuleReferenceContractLinkEvent(
@@ -239,7 +271,8 @@ await repository
                         contractUpgraded.To,
                         contractUpgraded.ContractAddress,
                         source,
-                        ModuleReferenceContractLinkEvent.ModuleReferenceContractLinkAction.Added
+                        ModuleReferenceContractLinkEvent.ModuleReferenceContractLinkAction.Added,
+                        blockSlotTime
                     ));
                 await repository
                     .AddAsync(new ModuleReferenceContractLinkEvent(
@@ -250,25 +283,39 @@ await repository
                         contractUpgraded.From,
                         contractUpgraded.ContractAddress,
                         source,
-                        ModuleReferenceContractLinkEvent.ModuleReferenceContractLinkAction.Removed
+                        ModuleReferenceContractLinkEvent.ModuleReferenceContractLinkAction.Removed,
+                        blockSlotTime
                     ));
                 break;
             case Transferred transferred:
-                if (transferred.From is not ContractAddress contractAddress ||
-                    transferred.To is not AccountAddress)
+                if (transferred.From is ContractAddress contractAddressFrom)
                 {
-                    break;
+                    await repository
+                        .AddAsync(new ContractEvent(
+                            blockHeight,
+                            transactionHash,
+                            transactionIndex,
+                            eventIndex,
+                            contractAddressFrom,
+                            transferred,
+                            source,
+                            blockSlotTime
+                        ));
+                }
+                if (transferred.To is ContractAddress contractAddressTo)
+                {
+                    await repository
+                        .AddAsync(new ContractEvent(
+                            blockHeight,
+                            transactionHash,
+                            transactionIndex,
+                            eventIndex,
+                            contractAddressTo,
+                            transferred,
+                            source,
+                            blockSlotTime
+                        ));
                 }
-                await repository
-                    .AddAsync(new ContractEvent(
-                        blockHeight,
-                        transactionHash,
-                        transactionIndex,
-                        eventIndex,
-                        contractAddress,
-                        transferred,
-                        source
-                    ));
                 break;
             case ContractModuleDeployed contractModuleDeployed:
                 await repository
@@ -278,7 +325,8 @@ await repository
                         transactionIndex,
                         eventIndex,
                         contractModuleDeployed.ModuleRef,
-                        source
+                        source,
+                        blockSlotTime
                     ));
                 break;
         }
@@ -294,6 +342,7 @@ private async Task NodeImportRange(IContractNodeClient client, ulong fromBlockHe
     {
         for (var height = fromBlockHeight; height <= toBlockHeight; height++)
         {
+            using var __ = TraceContext.StartActivity(NodeImportJobLoopActivity);
             using var durationMetric = new ContractMetrics.DurationMetric(ImportSource.NodeImport);
             try
             {

backend/Application/Aggregates/Contract/ContractRepository.cs

@@ -67,6 +67,7 @@ public async Task<IList<TransactionResultEventDto>> FromBlockHeightRangeGetContr
         const string sql = @"
 SELECT
     gb.block_height as BlockHeight,
+    gb.block_slot_time as BlockSlotTime,
     gt.transaction_type as TransactionType,
     gt.sender as TransactionSender,
     gt.transaction_hash as TransactionHash,
@@ -81,7 +82,7 @@ graphql_transaction_events te
     graphql_blocks gb ON gt.block_id = gb.id
 WHERE
         gb.block_height >= @FromHeight AND gb.block_height <= @ToHeight
-  AND te.event->>'tag' IN ('1', '16', '18', '17', '34', '35', '36');
+  AND te.event->>'tag' IN ('1', '16', '17', '18', '34', '35', '36');
 ";
         var queryAsync = await _context.Database.GetDbConnection()
             .QueryAsync<TransactionResultEventDto>(sql, new { FromHeight = (long)heightFrom, ToHeight = (long)heightTo });

backend/Application/Aggregates/Contract/Dto/TransactionResultEventDto.cs

@@ -9,6 +9,7 @@ namespace Application.Aggregates.Contract.Dto;
 public class TransactionResultEventDto
 {
     public int BlockHeight { get; init; }
+    public DateTimeOffset BlockSlotTime { get; init; }
     public TransactionTypeUnion TransactionType { get; init; }
     public AccountAddress? TransactionSender { get; init; }
     public string TransactionHash { get; init; }