DBFTPlugin: adopt new Conflicts attribute storage scheme

Upgrade neo-modules to use neo-project/neo#2913. Signed-off-by: Anna Shaleva <[email protected]>
AnnaShaleva · Sep 19, 2023 · 9257cee · 9257cee
1 parent 63e3ec3
commit 9257cee
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs b/src/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs
@@ -127,7 +127,7 @@ private void OnPrepareRequestReceived(ExtensiblePayload payload, PrepareRequest
             {
                 if (mempoolVerified.TryGetValue(hash, out Transaction tx))
                 {
-                    if (NativeContract.Ledger.ContainsConflictHash(context.Snapshot, hash, tx.Signers.Select(s => s.Account)))
+                    if (NativeContract.Ledger.ContainsConflictHash(context.Snapshot, hash, tx.Signers.Select(s => s.Account), neoSystem.Settings.MaxTraceableBlocks))
                     {
                         Log($"Invalid request: transaction has on-chain conflict", LogLevel.Warning);
                         return;
@@ -140,7 +140,7 @@ private void OnPrepareRequestReceived(ExtensiblePayload payload, PrepareRequest
                 {
                     if (neoSystem.MemPool.TryGetValue(hash, out tx))
                     {
-                        if (NativeContract.Ledger.ContainsConflictHash(context.Snapshot, hash, tx.Signers.Select(s => s.Account)))
+                        if (NativeContract.Ledger.ContainsConflictHash(context.Snapshot, hash, tx.Signers.Select(s => s.Account), neoSystem.Settings.MaxTraceableBlocks))
                         {
                             Log($"Invalid request: transaction has on-chain conflict", LogLevel.Warning);
                             return;