fix: ReplayCommand.RemoteTx to evaluate with BPV

OnedgeLee · Jun 14, 2024 · 9ae42c0 · 9ae42c0
1 parent a4be33a
commit 9ae42c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.Queries.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.Queries.cs
@@ -50,6 +50,7 @@ query GetBlockData($hash: ID!)
                         stateRootHash
                     }
                     stateRootHash
+                    protocolVersion
                 }
             }}
         }
@@ -90,6 +91,7 @@ private sealed class BlockType
         public string? PreEvaluationHash { get; set; }
         public BlockType? PreviousBlock { get; set; }
         public string? StateRootHash { get; set; }
+        public int? ProtocolVersion { get; set; }
     }
 
     private sealed class TransactionQueryType

diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs
@@ -388,7 +388,12 @@ public int RemoteTx(
             var previousBlockHashStateRootHash = block?.PreviousBlock?.StateRootHash;
             var preEvaluationHashValue = block?.PreEvaluationHash;
             var minerValue = block?.Miner;
-            if (previousBlockHashValue is null || preEvaluationHashValue is null || minerValue is null || previousBlockHashStateRootHash is null)
+            var protocolVersion = block?.ProtocolVersion;
+            if (previousBlockHashValue is null
+                || preEvaluationHashValue is null
+                || minerValue is null
+                || previousBlockHashStateRootHash is null
+                || protocolVersion is null)
             {
                 throw new CommandExitedException("Failed to get block from query", -1);
             }
@@ -428,7 +433,7 @@ public int RemoteTx(
             var actionEvaluations = EvaluateActions(
                 preEvaluationHash: HashDigest<SHA256>.FromString(preEvaluationHashValue),
                 blockIndex: transactionResult.BlockIndex ?? 0,
-                blockProtocolVersion: 0,
+                blockProtocolVersion: (int)protocolVersion,
                 txid: transaction.Id,
                 previousStates: previousStates,
                 miner: miner,