Merge branch 'master' into standardize-exception

src/Neo.CLI/CLI/MainService.Blockchain.cs

@@ -82,7 +82,7 @@ private void OnShowBlockCommand(string indexOrHash)
                 ConsoleHelper.Info("", "       PrevHash: ", $"{block.PrevHash}");
                 ConsoleHelper.Info("", "  NextConsensus: ", $"{block.NextConsensus}");
                 ConsoleHelper.Info("", "   PrimaryIndex: ", $"{block.PrimaryIndex}");
-                ConsoleHelper.Info("", "  PrimaryPubKey: ", $"{NativeContract.NEO.GetCommittee(NeoSystem.GetSnapshot())[block.PrimaryIndex]}");
+                ConsoleHelper.Info("", "  PrimaryPubKey: ", $"{NativeContract.NEO.GetCommittee(NeoSystem.GetSnapshotCache())[block.PrimaryIndex]}");
                 ConsoleHelper.Info("", "        Version: ", $"{block.Version}");
                 ConsoleHelper.Info("", "           Size: ", $"{block.Size} Byte(s)");
                 ConsoleHelper.Info();

src/Neo.CLI/CLI/MainService.Network.cs

@@ -117,7 +117,7 @@ private void OnBroadcastInvCommand(InventoryType type, UInt256[] payload)
         [ConsoleCommand("broadcast transaction", Category = "Network Commands")]
         private void OnBroadcastTransactionCommand(UInt256 hash)
         {
-            if (NeoSystem.MemPool.TryGetValue(hash, out Transaction tx))
+            if (NeoSystem.MemPool.TryGetValue(hash, out var tx))
                 OnBroadcastCommand(MessageCommand.Transaction, tx);
         }
 

src/Neo.CLI/CLI/MainService.Wallet.cs

@@ -618,7 +618,7 @@ private void OnCancelCommand(UInt256 txid, UInt160? sender = null, UInt160[]? si
                 return;
             }
 
-            if (NeoSystem.MemPool.TryGetValue(txid, out Transaction conflictTx))
+            if (NeoSystem.MemPool.TryGetValue(txid, out var conflictTx))
             {
                 tx.NetworkFee = Math.Max(tx.NetworkFee, conflictTx.NetworkFee) + 1;
             }

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

@@ -33,7 +33,7 @@
     "MillisecondsPerBlock": 15000,
     "MaxTransactionsPerBlock": 512,
     "MemoryPoolMaxTransactions": 50000,
-    "MaxTraceableBlocks": 2102400,
+    "MaxTraceableBlocks": 17280,
     "InitialGasDistribution": 5200000000000000,
     "ValidatorsCount": 7,
     "Hardforks": {

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

@@ -33,7 +33,7 @@
     "MillisecondsPerBlock": 15000,
     "MaxTransactionsPerBlock": 512,
     "MemoryPoolMaxTransactions": 50000,
-    "MaxTraceableBlocks": 2102400,
+    "MaxTraceableBlocks": 17280,
     "InitialGasDistribution": 5200000000000000,
     "ValidatorsCount": 7,
     "StandbyCommittee": [

src/Neo.Extensions/Neo.Extensions.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.5.20" />
+    <PackageReference Include="Akka" Version="1.5.26" />
   </ItemGroup>
 
   <ItemGroup>

src/Neo/Ledger/MemoryPool.cs

@@ -159,7 +159,7 @@ public bool ContainsKey(UInt256 hash)
         /// <param name="hash">The hash of the <see cref="Transaction"/> to get.</param>
         /// <param name="tx">When this method returns, contains the <see cref="Transaction"/> associated with the specified hash, if the hash is found; otherwise, <see langword="null"/>.</param>
         /// <returns><see langword="true"/> if the <see cref="MemoryPool"/> contains a <see cref="Transaction"/> with the specified hash; otherwise, <see langword="false"/>.</returns>
-        public bool TryGetValue(UInt256 hash, [MaybeNullWhen(false)] out Transaction? tx)
+        public bool TryGetValue(UInt256 hash, [NotNullWhen(true)] out Transaction? tx)
         {
             _txRwLock.EnterReadLock();
             try

src/Neo/Neo.csproj

@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.5.20" />
+    <PackageReference Include="Akka" Version="1.5.26" />
     <PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
   </ItemGroup>
 
@@ -30,6 +30,7 @@
     <InternalsVisibleTo Include="Neo.SmartContract.Testing" />
     <InternalsVisibleTo Include="Neo.SmartContract.TestEngine" />
     <InternalsVisibleTo Include="Neo.Plugins.RpcServer.Tests" />
+    <InternalsVisibleTo Include="Neo.Plugins.OracleService.Tests" />
   </ItemGroup>
 
 </Project>

src/Plugins/DBFTPlugin/Consensus/ConsensusContext.MakePayload.cs

@@ -166,11 +166,20 @@ public ExtensiblePayload MakePrepareResponse()
             });
         }
 
+        // Related to issue https://github.com/neo-project/neo/issues/3431
+        // Ref. https://learn.microsoft.com/en-us/dotnet/api/system.security.cryptography.randomnumbergenerator?view=net-8.0
+        //
+        //The System.Random class relies on a seed value that can be predictable,
+        //especially if the seed is based on the system clock or other low-entropy sources.
+        //RandomNumberGenerator, however, uses sources of entropy provided by the operating
+        //system, which are designed to be unpredictable.
         private static ulong GetNonce()
         {
-            Random _random = new();
             Span<byte> buffer = stackalloc byte[8];
-            _random.NextBytes(buffer);
+            using (var rng = System.Security.Cryptography.RandomNumberGenerator.Create())
+            {
+                rng.GetBytes(buffer);
+            }
             return BinaryPrimitives.ReadUInt64LittleEndian(buffer);
         }
     }

src/Plugins/OracleService/OracleService.cs

@@ -234,7 +234,7 @@ public JObject SubmitOracleResponse(JArray _params)
 
             finishedCache.ContainsKey(requestId).False_Or(RpcError.OracleRequestFinished);
 
-            using (var snapshot = _system.GetSnapshot())
+            using (var snapshot = _system.GetSnapshotCache())
             {
                 uint height = NativeContract.Ledger.CurrentIndex(snapshot) + 1;
                 var oracles = NativeContract.RoleManagement.GetDesignatedByRole(snapshot, Role.Oracle, height);
@@ -326,7 +326,7 @@ private async void ProcessRequestsAsync()
         {
             while (!cancelSource.IsCancellationRequested)
             {
-                using (var snapshot = _system.GetSnapshot())
+                using (var snapshot = _system.GetSnapshotCache())
                 {
                     SyncPendingQueue(snapshot);
                     foreach (var (id, request) in NativeContract.Oracle.GetRequests(snapshot))

src/Plugins/RocksDBStore/RocksDBStore.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="rocksdb" Version="8.11.3.46984" />
+    <PackageReference Include="rocksdb" Version="9.4.0.50294" />
   </ItemGroup>
 
 </Project>

src/Plugins/RpcServer/RpcServer.Wallet.cs

@@ -97,7 +97,7 @@ protected virtual JToken GetWalletUnclaimedGas(JArray _params)
             CheckWallet();
             // Datoshi is the smallest unit of GAS, 1 GAS = 10^8 Datoshi
             BigInteger datoshi = BigInteger.Zero;
-            using (var snapshot = system.GetSnapshot())
+            using (var snapshot = system.GetSnapshotCache())
             {
                 uint height = NativeContract.Ledger.CurrentIndex(snapshot) + 1;
                 foreach (UInt160 account in wallet.GetAccounts().Select(p => p.ScriptHash))

src/Plugins/SQLiteWallet/SQLiteWallet.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
   </ItemGroup>
 
 </Project>

src/Plugins/TokensTracker/Trackers/NEP-11/Nep11Tracker.cs

@@ -283,7 +283,7 @@ public JToken GetNep11Properties(JArray _params)
 
             using ScriptBuilder sb = new();
             sb.EmitDynamicCall(nep11Hash, "properties", CallFlags.ReadOnly, tokenId);
-            using var snapshot = _neoSystem.GetSnapshot();
+            using var snapshot = _neoSystem.GetSnapshotCache();
 
             using var engine = ApplicationEngine.Run(sb.ToArray(), snapshot, settings: _neoSystem.Settings);
             JObject json = new();

tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj

@@ -10,9 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
 </Project>

tests/Neo.Cryptography.BLS12_381.Tests/Neo.Cryptography.BLS12_381.Tests.csproj

@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
 </Project>

tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>

tests/Neo.Extensions.Tests/Neo.Extensions.Tests.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>

tests/Neo.Json.UnitTests/Neo.Json.UnitTests.csproj

@@ -10,9 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
 </Project>

tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj

@@ -7,9 +7,9 @@
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>

tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj

@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit" Version="1.5.20" />
-    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.20" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Akka.TestKit" Version="1.5.26" />
+    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.5.26" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>

tests/Neo.Plugins.OracleService.Tests/TestBlockchain.cs

@@ -9,28 +9,45 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using Akka.Actor;
+using Neo.Ledger;
 using Neo.Persistence;
 using System;
 
 namespace Neo.Plugins.OracleService.Tests
 {
     public static class TestBlockchain
     {
-        public static readonly NeoSystem TheNeoSystem;
+        private static readonly NeoSystem s_theNeoSystem;
+        private static readonly MemoryStore s_store = new();
+
+        private class StoreProvider : IStoreProvider
+        {
+            public string Name => "TestProvider";
+
+            public IStore GetStore(string path) => s_store;
+        }
 
         static TestBlockchain()
         {
             Console.WriteLine("initialize NeoSystem");
-            TheNeoSystem = new NeoSystem(ProtocolSettings.Load("config.json"), new MemoryStoreProvider());
+            s_theNeoSystem = new NeoSystem(ProtocolSettings.Load("config.json"), new StoreProvider());
         }
 
         public static void InitializeMockNeoSystem()
         {
         }
 
-        internal static DataCache GetTestSnapshot()
+        internal static void ResetStore()
+        {
+            s_store.Reset();
+            s_theNeoSystem.Blockchain.Ask(new Blockchain.Initialize()).Wait();
+        }
+
+        internal static SnapshotCache GetTestSnapshotCache()
         {
-            return TheNeoSystem.GetSnapshotCache().CloneCache();
+            ResetStore();
+            return s_theNeoSystem.GetSnapshot();
         }
     }
 }

tests/Neo.Plugins.OracleService.Tests/UT_OracleService.cs

@@ -70,7 +70,7 @@ public void TestFilter()
         [TestMethod]
         public void TestCreateOracleResponseTx()
         {
-            var snapshot = TestBlockchain.GetTestSnapshot();
+            var snapshot = TestBlockchain.GetTestSnapshotCache();
 
             var executionFactor = NativeContract.Policy.GetExecFeeFactor(snapshot);
             Assert.AreEqual(executionFactor, (uint)30);
@@ -85,7 +85,7 @@ public void TestCreateOracleResponseTx()
                 Filter = "",
                 CallbackContract = UInt160.Zero,
                 CallbackMethod = "callback",
-                UserData = System.Array.Empty<byte>()
+                UserData = []
             };
             byte Prefix_Transaction = 11;
             snapshot.Add(NativeContract.Ledger.CreateStorageKey(Prefix_Transaction, request.OriginalTxid), new StorageItem(new TransactionState()

tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj

@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>

tests/Neo.Plugins.RpcServer.Tests/UT_RpcServer.Blockchain.cs

@@ -239,7 +239,7 @@ public void TestGetCandidates()
             var json = new JArray();
             var validators = NativeContract.NEO.GetNextBlockValidators(snapshot, _neoSystem.Settings.ValidatorsCount);
             snapshot.Commit();
-            var candidates = NativeContract.NEO.GetCandidates(_neoSystem.GetSnapshot());
+            var candidates = NativeContract.NEO.GetCandidates(_neoSystem.GetSnapshotCache());
 
             foreach (var candidate in candidates)
             {
@@ -266,7 +266,7 @@ public void TestGetCommittee()
         public void TestGetNativeContracts()
         {
             var result = _rpcServer.GetNativeContracts(new JArray());
-            var contracts = new JArray(NativeContract.Contracts.Select(p => NativeContract.ContractManagement.GetContract(_neoSystem.GetSnapshot(), p.Hash).ToJson()));
+            var contracts = new JArray(NativeContract.Contracts.Select(p => NativeContract.ContractManagement.GetContract(_neoSystem.GetSnapshotCache(), p.Hash).ToJson()));
             Assert.AreEqual(contracts.ToString(), result.ToString());
         }