From 7c54fa2105635a29fbbad5d73a49c2661e9cdc63 Mon Sep 17 00:00:00 2001
From: Qiao Jin <jinqiao@onchain.com>
Date: Wed, 4 Nov 2020 15:53:20 +0800
Subject: [PATCH] Revert MaxValidUntilBlockIncrement

---
 src/neo/Network/P2P/Payloads/Transaction.cs | 3 ++-
 src/neo/ProtocolSettings.cs                 | 4 +---
 src/neo/Wallets/Wallet.cs                   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/neo/Network/P2P/Payloads/Transaction.cs b/src/neo/Network/P2P/Payloads/Transaction.cs
index 10b292065d..fabb005c9a 100644
--- a/src/neo/Network/P2P/Payloads/Transaction.cs
+++ b/src/neo/Network/P2P/Payloads/Transaction.cs
@@ -19,6 +19,7 @@ namespace Neo.Network.P2P.Payloads
     public class Transaction : IEquatable<Transaction>, IInventory, IInteroperable
     {
         public const int MaxTransactionSize = 102400;
+        public const uint MaxValidUntilBlockIncrement = 5760; // 24 hour
         /// <summary>
         /// Maximum number of attributes that can be contained within a transaction
         /// </summary>
@@ -282,7 +283,7 @@ bool IInventory.Verify(StoreView snapshot)
 
         public virtual VerifyResult VerifyStateDependent(StoreView snapshot, TransactionVerificationContext context)
         {
-            if (ValidUntilBlock <= snapshot.Height || ValidUntilBlock > snapshot.Height + ProtocolSettings.Default.MaxValidUntilBlockIncrement)
+            if (ValidUntilBlock <= snapshot.Height || ValidUntilBlock > snapshot.Height + MaxValidUntilBlockIncrement)
                 return VerifyResult.Expired;
             foreach (UInt160 hash in GetScriptHashesForVerifying(snapshot))
                 if (NativeContract.Policy.IsBlocked(snapshot, hash))
diff --git a/src/neo/ProtocolSettings.cs b/src/neo/ProtocolSettings.cs
index 8d1669e2dc..a2673a35c3 100644
--- a/src/neo/ProtocolSettings.cs
+++ b/src/neo/ProtocolSettings.cs
@@ -15,7 +15,6 @@ public class ProtocolSettings
         public string[] SeedList { get; }
         public uint MillisecondsPerBlock { get; }
         public int MemoryPoolMaxTransactions { get; }
-        public uint MaxValidUntilBlockIncrement { get; }
         public uint MaxTraceableBlocks { get; }
 
         static ProtocolSettings _default;
@@ -96,8 +95,7 @@ private ProtocolSettings(IConfigurationSection section)
                 };
             this.MillisecondsPerBlock = section.GetValue("MillisecondsPerBlock", 15000u);
             this.MemoryPoolMaxTransactions = Math.Max(1, section.GetValue("MemoryPoolMaxTransactions", 50_000));
-            this.MaxValidUntilBlockIncrement = section.GetValue("MaxValidUntilBlockIncrement", 5760u);  // 24 hour
-            this.MaxTraceableBlocks = section.GetValue("MaxTraceableBlocks", 2_102_400u);               // 365 days
+            this.MaxTraceableBlocks = section.GetValue("MaxTraceableBlocks", 2_102_400u);// 365 days
         }
     }
 }
diff --git a/src/neo/Wallets/Wallet.cs b/src/neo/Wallets/Wallet.cs
index 18974c1ade..603c6a50a6 100644
--- a/src/neo/Wallets/Wallet.cs
+++ b/src/neo/Wallets/Wallet.cs
@@ -341,7 +341,7 @@ private Transaction MakeTransaction(StoreView snapshot, byte[] script, Signer[]
                     Version = 0,
                     Nonce = (uint)rand.Next(),
                     Script = script,
-                    ValidUntilBlock = snapshot.Height + ProtocolSettings.Default.MaxValidUntilBlockIncrement,
+                    ValidUntilBlock = snapshot.Height + Transaction.MaxValidUntilBlockIncrement,
                     Signers = GetSigners(account, cosigners),
                     Attributes = attributes,
                 };