Move MaxValidUntilBlockIncrement & MaxTraceableBlocks to protocol

neo-project · Nov 3, 2020 · 9db6700 · 9db6700
1 parent 5800cf2
commit 9db6700
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/neo/Network/P2P/Payloads/Transaction.cs b/src/neo/Network/P2P/Payloads/Transaction.cs
@@ -19,7 +19,6 @@ namespace Neo.Network.P2P.Payloads
     public class Transaction : IEquatable<Transaction>, IInventory, IInteroperable
     {
         public const int MaxTransactionSize = 102400;
-        public const uint MaxValidUntilBlockIncrement = 2102400;
         /// <summary>
         /// Maximum number of attributes that can be contained within a transaction
         /// </summary>
@@ -283,7 +282,7 @@ bool IInventory.Verify(StoreView snapshot)
 
         public virtual VerifyResult VerifyStateDependent(StoreView snapshot, TransactionVerificationContext context)
         {
-            if (ValidUntilBlock <= snapshot.Height || ValidUntilBlock > snapshot.Height + MaxValidUntilBlockIncrement)
+            if (ValidUntilBlock <= snapshot.Height || ValidUntilBlock > snapshot.Height + ProtocolSettings.Default.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
@@ -15,6 +15,8 @@ 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;
 
@@ -94,6 +96,8 @@ 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);
+            this.MaxTraceableBlocks = section.GetValue("MaxTraceableBlocks", 2_102_400u);
         }
     }
 }
diff --git a/src/neo/SmartContract/ApplicationEngine.Blockchain.cs b/src/neo/SmartContract/ApplicationEngine.Blockchain.cs
@@ -8,8 +8,6 @@ namespace Neo.SmartContract
 {
     partial class ApplicationEngine
     {
-        public const uint MaxTraceableBlocks = Transaction.MaxValidUntilBlockIncrement;
-
         public static readonly InteropDescriptor System_Blockchain_GetHeight = Register("System.Blockchain.GetHeight", nameof(GetBlockchainHeight), 0_00000400, CallFlags.AllowStates, true);
         public static readonly InteropDescriptor System_Blockchain_GetBlock = Register("System.Blockchain.GetBlock", nameof(GetBlock), 0_02500000, CallFlags.AllowStates, true);
         public static readonly InteropDescriptor System_Blockchain_GetTransaction = Register("System.Blockchain.GetTransaction", nameof(GetTransaction), 0_01000000, CallFlags.AllowStates, true);
@@ -97,7 +95,7 @@ protected internal ContractState GetContract(UInt160 hash)
         private static bool IsTraceableBlock(StoreView snapshot, uint index)
         {
             if (index > snapshot.Height) return false;
-            return index + MaxTraceableBlocks > snapshot.Height;
+            return index + ProtocolSettings.Default.MaxTraceableBlocks > snapshot.Height;
         }
     }
 }
diff --git 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 + Transaction.MaxValidUntilBlockIncrement,
+                    ValidUntilBlock = snapshot.Height + ProtocolSettings.Default.MaxValidUntilBlockIncrement,
                     Signers = GetSigners(account, cosigners),
                     Attributes = attributes,
                 };

diff --git a/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs b/tests/neo.UnitTests/SmartContract/UT_Syscalls.cs
@@ -71,7 +71,7 @@ public void System_Blockchain_GetBlock()
                 // Not traceable block
 
                 var height = snapshot.BlockHashIndex.GetAndChange();
-                height.Index = block.Index + Transaction.MaxValidUntilBlockIncrement;
+                height.Index = block.Index + ProtocolSettings.Default.MaxTraceableBlocks;
 
                 var blocks = snapshot.Blocks;
                 var txs = snapshot.Transactions;