From 1efec59b89e8ed5b45c71e902dfb1bdcf7005a03 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Tue, 19 Sep 2023 12:13:03 +0300 Subject: [PATCH] DBFTPlugin: adapt new Conflicts attribute storage scheme Upgrade neo-modules to use https://github.com/neo-project/neo/pull/2913. Signed-off-by: Anna Shaleva --- src/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs b/src/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs index cac84a8d4..4dc9f534d 100644 --- 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;