Moved Contract Call Event Before Contract Update (#105)

* Moved contract call before update event * Fix test * Updated versions
Concordium · Sep 20, 2023 · c558e70 · c558e70
1 parent 018ccaa
commit c558e70
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/backend/Application/Aggregates/Contract/ContractAggregate.cs b/backend/Application/Aggregates/Contract/ContractAggregate.cs
@@ -278,22 +278,8 @@ await repository
                     ));
                 break;
             case ContractUpdated contractUpdated:
-                await repository
-                    .AddAsync(new ContractEvent(
-                        blockHeight,
-                        transactionHash,
-                        transactionIndex,
-                        eventIndex,
-                        contractUpdated.ContractAddress,
-                        sender,
-                        contractUpdated,
-                        source,
-                        blockSlotTime
-                        ));
                 if (contractUpdated.Instigator is ContractAddress contractInstigator)
                 {
-                    // Possible a contract has called itself.
-                    eventIndex += 1;
                     await repository
                         .AddAsync(new ContractEvent(
                             blockHeight,
@@ -308,7 +294,21 @@ await repository
                             source,
                             blockSlotTime
                         ));
+                    // Possible a contract has called itself.
+                    eventIndex += 1;
                 }
+                await repository
+                    .AddAsync(new ContractEvent(
+                        blockHeight,
+                        transactionHash,
+                        transactionIndex,
+                        eventIndex,
+                        contractUpdated.ContractAddress,
+                        sender,
+                        contractUpdated,
+                        source,
+                        blockSlotTime
+                        ));
                 break;
             case ContractUpgraded contractUpgraded:
                 await repository

diff --git a/backend/Application/Application.csproj b/backend/Application/Application.csproj
@@ -4,9 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>disable</ImplicitUsings>
-        <Version>1.7.0</Version>
+        <Version>1.7.1</Version>
     </PropertyGroup>
-
     <ItemGroup>
       <PackageReference Include="ConcordiumNetSdk" Version="4.0.1" />
       <PackageReference Include="Dapper" Version="2.0.123" />

diff --git a/backend/Tests/Aggregates/Contract/ContractAggregateTests.cs b/backend/Tests/Aggregates/Contract/ContractAggregateTests.cs
@@ -129,13 +129,12 @@ await ContractAggregate.StoreEvent(
 
         // Assert
         contractEvents.Count.Should().Be(2);
-        var updateEvent = contractEvents[0];
-        updateEvent.Event.Should().BeOfType<ContractUpdated>();
-        updateEvent.ContractAddressIndex.Should().Be(from);
-
-        var transferEvent = contractEvents[1];
+        var transferEvent = contractEvents[0];
         transferEvent.Event.Should().BeOfType<ContractCall>();
         transferEvent.ContractAddressIndex.Should().Be(to);
+        var updateEvent = contractEvents[1];
+        updateEvent.Event.Should().BeOfType<ContractUpdated>();
+        updateEvent.ContractAddressIndex.Should().Be(from);
     }
 
     [Fact]

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "ccscan-frontend",
 	"description": "CCDScan frontend",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"engine": "16",
 	"type": "module",
 	"private": true,