3s consensus - With consensus time included into consensus intervals.

benchmarks/Neo.Benchmarks/config.json

@@ -27,8 +27,8 @@
   "ProtocolConfiguration": {
     "Network": 860833102,
     "AddressVersion": 53,
-    "MillisecondsPerBlock": 15000,
-    "MaxTransactionsPerBlock": 512,
+    "MillisecondsPerBlock": 3000,
+    "MaxTransactionsPerBlock": 256,
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
     "Hardforks": {

docs/config.json.md

@@ -42,10 +42,10 @@ This README provides an explanation for each field in the JSON configuration fil
 - **AddressVersion**: Version byte used in Neo address generation. Default is `53`.
 
 ### MillisecondsPerBlock
-- **MillisecondsPerBlock**: Time interval between blocks in milliseconds. Default is `15000` (15 seconds).
+- **MillisecondsPerBlock**: Time interval between blocks in milliseconds. Default is `3000` (3 seconds).
 
 ### MaxTransactionsPerBlock
-- **MaxTransactionsPerBlock**: Maximum number of transactions allowed per block. Default is `512`.
+- **MaxTransactionsPerBlock**: Maximum number of transactions allowed per block. Default is `256`.
 
 ### MemoryPoolMaxTransactions
 - **MemoryPoolMaxTransactions**: Maximum number of transactions that can be held in the memory pool. Default is `50000`.

src/Neo.CLI/config.fs.testnet.json

@@ -30,8 +30,8 @@
   "ProtocolConfiguration": {
     "Network": 91466898,
     "AddressVersion": 53,
-    "MillisecondsPerBlock": 15000,
-    "MaxTransactionsPerBlock": 512,
+    "MillisecondsPerBlock": 3000,
+    "MaxTransactionsPerBlock": 256,
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 17280,
     "InitialGasDistribution": 5200000000000000,

src/Neo.CLI/config.testnet.json

@@ -30,8 +30,8 @@
   "ProtocolConfiguration": {
     "Network": 894710606,
     "AddressVersion": 53,
-    "MillisecondsPerBlock": 15000,
-    "MaxTransactionsPerBlock": 5000,
+    "MillisecondsPerBlock": 3000,
+    "MaxTransactionsPerBlock": 256,
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
     "Hardforks": {

src/Neo/ProtocolSettings.cs

@@ -69,7 +69,7 @@ public record ProtocolSettings
         /// <summary>
         /// The maximum increment of the <see cref="Transaction.ValidUntilBlock"/> field.
         /// </summary>
-        public uint MaxValidUntilBlockIncrement => 86400000 / MillisecondsPerBlock;
+        public uint MaxValidUntilBlockIncrement => 86400000 / MillisecondsPerBlock; //TODO keep the same??
 
         /// <summary>
         /// Indicates the maximum number of transactions that can be contained in a block.
@@ -113,8 +113,8 @@ public record ProtocolSettings
             StandbyCommittee = Array.Empty<ECPoint>(),
             ValidatorsCount = 0,
             SeedList = Array.Empty<string>(),
-            MillisecondsPerBlock = 15000,
-            MaxTransactionsPerBlock = 512,
+            MillisecondsPerBlock = 3000,
+            MaxTransactionsPerBlock = 256,
             MemoryPoolMaxTransactions = 50_000,
             MaxTraceableBlocks = 2_102_400,
             InitialGasDistribution = 52_000_000_00000000,

src/Neo/SmartContract/Native/NeoToken.cs

@@ -193,7 +193,10 @@ internal override ContractTask InitializeAsync(ApplicationEngine engine, Hardfor
                 engine.SnapshotCache.Add(CreateStorageKey(Prefix_Committee), new StorageItem(cachedCommittee));
                 engine.SnapshotCache.Add(_votersCount, new StorageItem(System.Array.Empty<byte>()));
                 engine.SnapshotCache.Add(CreateStorageKey(Prefix_GasPerBlock).AddBigEndian(0u), new StorageItem(5 * GAS.Factor));
+                // TODO - Add hardfork otherwise storage will be different
+                // After HARD FORK
                 engine.SnapshotCache.Add(_registerPrice, new StorageItem(1000 * GAS.Factor));
+
                 return Mint(engine, Contract.GetBFTAddress(engine.ProtocolSettings.StandbyValidators), TotalAmount, false);
             }
             return ContractTask.CompletedTask;

src/Plugins/DBFTPlugin/Consensus/ConsensusService.Check.cs

@@ -46,8 +46,8 @@ private bool CheckPrepareResponse()
                 }
 
                 // Timeout extension due to prepare response sent
-                // around 2*15/M=30.0/5 ~ 40% block time (for M=5)
-                ExtendTimerByFactor(2);
+                // around 4*3/M=12.0/5 ~ 80% block time (for M=5)
+                ExtendTimerByFactor(4);
 
                 Log($"Sending {nameof(PrepareResponse)}");
                 localNode.Tell(new LocalNode.SendDirectly { Inventory = context.MakePrepareResponse() });

src/Plugins/DBFTPlugin/Consensus/ConsensusService.OnMessage.cs

@@ -95,8 +95,11 @@ private void OnPrepareRequestReceived(ExtensiblePayload payload, PrepareRequest
             }
 
             // Timeout extension: prepare request has been received with success
-            // around 2*15/M=30.0/5 ~ 40% block time (for M=5)
-            ExtendTimerByFactor(2);
+            // around 4*3/M=12.0/5 ~ 80% block time (for M=5)
+            ExtendTimerByFactor(4);
+
+            onPrepareReceivedTime = TimeProvider.Current.UtcNow;
+            onPrepareBlockIndex = message.BlockIndex;
 
             context.Block.Header.Timestamp = message.Timestamp;
             context.Block.Header.Nonce = message.Nonce;
@@ -171,8 +174,8 @@ private void OnPrepareResponseReceived(ExtensiblePayload payload, PrepareRespons
                 return;
 
             // Timeout extension: prepare response has been received with success
-            // around 2*15/M=30.0/5 ~ 40% block time (for M=5)
-            ExtendTimerByFactor(2);
+            // around 4*3/M=12.0/5 ~ 80% block time (for M=5)
+            ExtendTimerByFactor(4);
 
             Log($"{nameof(OnPrepareResponseReceived)}: height={message.BlockIndex} view={message.ViewNumber} index={message.ValidatorIndex}");
             context.PreparationPayloads[message.ValidatorIndex] = payload;
@@ -210,8 +213,8 @@ private void OnCommitReceived(ExtensiblePayload payload, Commit commit)
             if (commit.ViewNumber == context.ViewNumber)
             {
                 // Timeout extension: commit has been received with success
-                // around 4*15s/M=60.0s/5=12.0s ~ 80% block time (for M=5)
-                ExtendTimerByFactor(4);
+                // around 6*3s/M=18.0s/5=12.0s ~ 120% block time (for M=5)
+                ExtendTimerByFactor(6);
 
                 Log($"{nameof(OnCommitReceived)}: height={commit.BlockIndex} view={commit.ViewNumber} index={commit.ValidatorIndex} nc={context.CountCommitted} nf={context.CountFailed}");
 

src/Plugins/DBFTPlugin/Consensus/ConsensusService.cs

@@ -36,6 +36,8 @@ private class Timer { public uint Height; public byte ViewNumber; }
         private readonly IActorRef blockchain;
         private ICancelable timer_token;
         private DateTime block_received_time;
+        private DateTime onPrepareReceivedTime;
+        private uint onPrepareBlockIndex;
         private uint block_received_index;
         private bool started = false;
 
@@ -95,9 +97,11 @@ private void InitializeConsensus(byte viewNumber)
                 else
                 {
                     TimeSpan span = neoSystem.Settings.TimePerBlock;
-                    if (block_received_index + 1 == context.Block.Index)
+
+                    if (block_received_index + 1 == context.Block.Index && onPrepareBlockIndex + 1 == context.Block.Index)
                     {
-                        var diff = TimeProvider.Current.UtcNow - block_received_time;
+                        // Include the consensus time into the consensus intervals.
+                        var diff = TimeProvider.Current.UtcNow - onPrepareReceivedTime;
                         if (diff >= span)
                             span = TimeSpan.Zero;
                         else

src/Plugins/StateService/Verification/VerificationContext.cs

@@ -27,7 +27,7 @@ namespace Neo.Plugins.StateService.Verification
 {
     class VerificationContext
     {
-        private const uint MaxValidUntilBlockIncrement = 100;
+        private const uint MaxValidUntilBlockIncrement = 100; // Change to 500!??
         private StateRoot root;
         private ExtensiblePayload rootPayload;
         private ExtensiblePayload votePayload;

tests/Neo.Network.RPC.Tests/RpcTestCases.json

@@ -3148,7 +3148,7 @@
         "protocol": {
           "network": 0,
           "validatorscount": 0,
-          "msperblock": 15000,
+          "msperblock": 3000,
           "maxvaliduntilblockincrement": 1,
           "maxtraceableblocks": 1,
           "addressversion": 0,

tests/Neo.Plugins.OracleService.Tests/config.json

@@ -30,8 +30,8 @@
   "ProtocolConfiguration": {
     "Network": 5195086,
     "AddressVersion": 53,
-    "MillisecondsPerBlock": 15000,
-    "MaxTransactionsPerBlock": 512,
+    "MillisecondsPerBlock": 3000,
+    "MaxTransactionsPerBlock": 256,
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
     "Hardforks": {

tests/Neo.UnitTests/SmartContract/Native/UT_NeoToken.cs

@@ -744,7 +744,7 @@ public void TestEconomicParameter()
 
             (BigInteger, bool) result = Check_GetGasPerBlock(clonedCache, persistingBlock);
             result.Item2.Should().BeTrue();
-            result.Item1.Should().Be(5 * NativeContract.GAS.Factor);
+            result.Item1.Should().Be(5 * NativeContract.GAS.Factor); // Test should occur with all hardfork enable TODO
 
             persistingBlock = new Block { Header = new Header { Index = 10 } };
             (VM.Types.Boolean, bool) result1 = Check_SetGasPerBlock(clonedCache, 10 * NativeContract.GAS.Factor, persistingBlock);

tests/Neo.UnitTests/UT_ProtocolSettings.cs

@@ -46,7 +46,7 @@ public void TestGetMemoryPoolMaxTransactions()
         [TestMethod]
         public void TestGetMillisecondsPerBlock()
         {
-            TestProtocolSettings.Default.MillisecondsPerBlock.Should().Be(15000);
+            TestProtocolSettings.Default.MillisecondsPerBlock.Should().Be(3000);
         }
 
         [TestMethod]
@@ -131,8 +131,8 @@ internal static string CreateHFSettings(string hf)
   ""ProtocolConfiguration"": {
     ""Network"": 860833102,
     ""AddressVersion"": 53,
-    ""MillisecondsPerBlock"": 15000,
-    ""MaxTransactionsPerBlock"": 512,
+    ""MillisecondsPerBlock"": 3000,
+    ""MaxTransactionsPerBlock"": 256,
     ""MemoryPoolMaxTransactions"": 50000,
     ""MaxTraceableBlocks"": 2102400,
     ""Hardforks"": {

tests/Neo.UnitTests/test.config.json

@@ -25,8 +25,8 @@
   "ProtocolConfiguration": {
     "Network": 860833102,
     "AddressVersion": 53,
-    "MillisecondsPerBlock": 15000,
-    "MaxTransactionsPerBlock": 512,
+    "MillisecondsPerBlock": 3000,
+    "MaxTransactionsPerBlock": 256,
     "MemoryPoolMaxTransactions": 50000,
     "MaxTraceableBlocks": 2102400,
     "Hardforks": {},