Upgrade dependencies and target frameworks (neo-project#147)

* Upgrade dependencies and target frameworks * Update .travis.yml * IStorage (neo-project#148) * Fix UT (neo-project#149) * Update RpcNep5Tracker/RpcNep5Tracker.cs Co-Authored-By: Erik Zhang <[email protected]> * Update RpcNep5Tracker/RpcNep5Tracker.cs Co-Authored-By: Erik Zhang <[email protected]> * Update RpcNep5Tracker/RpcNep5Tracker.cs Co-Authored-By: Erik Zhang <[email protected]>
chenzhitong · Oct 13, 2020 · 83bba5a · 83bba5a
1 parent 1a951bb
commit 83bba5a
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,10 @@ language: csharp
 
 os:
  - linux
- - osx
 
 dist: bionic
-osx_image: xcode9.1
-
 mono: none
-dotnet: 2.1.300
+dotnet: 3.0.100
 
 script:	
  - dotnet restore
diff --git a/ApplicationLogs/ApplicationLogs.csproj b/ApplicationLogs/ApplicationLogs.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>3.0.0-preview1</Version>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
 
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-preview1" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00804" />
   </ItemGroup>
 
 </Project>
diff --git a/ApplicationLogs/LogReader.cs b/ApplicationLogs/LogReader.cs
@@ -3,12 +3,12 @@
 using Neo.IO.Json;
 using Neo.Ledger;
 using Neo.Network.RPC;
+using Neo.Persistence;
 using Neo.VM;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Snapshot = Neo.Persistence.Snapshot;
 
 namespace Neo.Plugins
 {
@@ -45,7 +45,7 @@ public void PostProcess(HttpContext context, string method, JArray _params, JObj
         {
         }
 
-        public void OnPersist(Snapshot snapshot, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
+        public void OnPersist(StoreView snapshot, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
         {
             WriteBatch writeBatch = new WriteBatch();
 
@@ -83,7 +83,7 @@ public void OnPersist(Snapshot snapshot, IReadOnlyList<Blockchain.ApplicationExe
             db.Write(WriteOptions.Default, writeBatch);
         }
 
-        public void OnCommit(Snapshot snapshot)
+        public void OnCommit(StoreView snapshot)
         {
         }
 

diff --git a/CoreMetrics/CoreMetrics.cs b/CoreMetrics/CoreMetrics.cs
@@ -2,7 +2,6 @@
 using Neo.IO.Json;
 using Neo.Ledger;
 using Neo.Network.P2P.Payloads;
-using Neo.Persistence;
 
 namespace Neo.Plugins
 {
@@ -18,9 +17,8 @@ public JObject OnProcess(HttpContext context, string method, JArray _params)
             {
                 case "getmetricblocktimestamp":
                     {
-
                         uint nBlocks = (uint)_params[0].AsNumber();
-                        uint lastHeight = _params.Count >= 2 ? lastHeight = (uint)_params[1].AsNumber() : 0;
+                        uint lastHeight = _params.Count >= 2 ? (uint)_params[1].AsNumber() : 0;
                         return GetBlocksTime(nBlocks, lastHeight);
                     }
                 default:
@@ -60,18 +58,18 @@ private JObject GetBlocksTime(uint nBlocks, uint lastHeight)
                 JObject json = new JObject();
                 return json["error"] = "Requested number of blocks timestamps " + nBlocks + " exceeds quantity of known blocks " + Blockchain.Singleton.Height;
             }
-            
+
             if (nBlocks == 0)
             {
                 JObject json = new JObject();
                 return json["error"] = "Requested number of block times can not be = 0";
             }
-            
+
             JArray array = new JArray();
             uint heightToBegin = lastHeight > 0 ? lastHeight - nBlocks : (Blockchain.Singleton.Height - 1) - nBlocks;
             for (uint i = heightToBegin; i <= heightToBegin + nBlocks; i++)
             {
-                Header header = Blockchain.Singleton.Store.GetHeader(i);
+                Header header = Blockchain.Singleton.GetHeader(i);
                 if (header == null) break;
 
                 JObject json = new JObject();

diff --git a/CoreMetrics/CoreMetrics.csproj b/CoreMetrics/CoreMetrics.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <Version>3.0.0-preview1</Version>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-preview1" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00804" />
   </ItemGroup>
 
 </Project>
diff --git a/ImportBlocks/ImportBlocks.cs b/ImportBlocks/ImportBlocks.cs
@@ -2,7 +2,6 @@
 using Neo.IO;
 using Neo.Ledger;
 using Neo.Network.P2P.Payloads;
-using Neo.Persistence;
 using System;
 using System.IO;
 
@@ -82,7 +81,7 @@ private void WriteBlocks(uint start, uint count, string path, bool writeStart)
                 fs.Seek(0, SeekOrigin.End);
                 for (uint i = start; i <= end; i++)
                 {
-                    Block block = Blockchain.Singleton.Store.GetBlock(i);
+                    Block block = Blockchain.Singleton.GetBlock(i);
                     byte[] array = block.ToArray();
                     fs.Write(BitConverter.GetBytes(array.Length), 0, sizeof(int));
                     fs.Write(array, 0, array.Length);

diff --git a/ImportBlocks/ImportBlocks.csproj b/ImportBlocks/ImportBlocks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>3.0.0-preview1</Version>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
 
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-preview1" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00804" />
   </ItemGroup>
 
 </Project>
diff --git a/RpcNep5Tracker/DbCache.cs b/RpcNep5Tracker/DbCache.cs
@@ -0,0 +1,56 @@
+using Neo.IO;
+using Neo.IO.Caching;
+using Neo.IO.Data.LevelDB;
+using System;
+using System.Collections.Generic;
+
+namespace Neo.Plugins
+{
+    public class DbCache<TKey, TValue> : DataCache<TKey, TValue>
+        where TKey : IEquatable<TKey>, ISerializable, new()
+        where TValue : class, ICloneable<TValue>, ISerializable, new()
+    {
+        private readonly DB db;
+        private readonly ReadOptions options;
+        private readonly WriteBatch batch;
+        private readonly byte prefix;
+
+        public DbCache(DB db, ReadOptions options, WriteBatch batch, byte prefix)
+        {
+            this.db = db;
+            this.options = options ?? ReadOptions.Default;
+            this.batch = batch;
+            this.prefix = prefix;
+        }
+
+        protected override void AddInternal(TKey key, TValue value)
+        {
+            batch?.Put(prefix, key, value);
+        }
+
+        protected override void DeleteInternal(TKey key)
+        {
+            batch?.Delete(prefix, key);
+        }
+
+        protected override IEnumerable<(TKey, TValue)> FindInternal(byte[] key_prefix)
+        {
+            return db.Find(options, SliceBuilder.Begin(prefix).Add(key_prefix), (k, v) => (k.ToArray().AsSerializable<TKey>(1), v.ToArray().AsSerializable<TValue>()));
+        }
+
+        protected override TValue GetInternal(TKey key)
+        {
+            return db.Get<TValue>(options, prefix, key);
+        }
+
+        protected override TValue TryGetInternal(TKey key)
+        {
+            return db.TryGet<TValue>(options, prefix, key);
+        }
+
+        protected override void UpdateInternal(TKey key, TValue value)
+        {
+            batch?.Put(prefix, key, value);
+        }
+    }
+}
diff --git a/RpcNep5Tracker/RpcNep5Tracker.cs b/RpcNep5Tracker/RpcNep5Tracker.cs
@@ -6,7 +6,6 @@
 using Neo.Network.P2P.Payloads;
 using Neo.Network.RPC;
 using Neo.Persistence;
-using Neo.Persistence.LevelDB;
 using Neo.SmartContract;
 using Neo.VM;
 using Neo.Wallets;
@@ -15,8 +14,6 @@
 using System.IO;
 using System.Linq;
 using System.Numerics;
-using System.Text;
-using Snapshot = Neo.Persistence.Snapshot;
 
 namespace Neo.Plugins
 {
@@ -63,11 +60,11 @@ private void ResetBatch()
             }
         }
 
-        private void RecordTransferHistory(Snapshot snapshot, UInt160 scriptHash, UInt160 from, UInt160 to, BigInteger amount, UInt256 txHash, ref ushort transferIndex)
+        private void RecordTransferHistory(StoreView snapshot, UInt160 scriptHash, UInt160 from, UInt160 to, BigInteger amount, UInt256 txHash, ref ushort transferIndex)
         {
             if (!_shouldTrackHistory) return;
 
-            Header header = snapshot.GetHeader(snapshot.Height);
+            Header header = snapshot.GetHeader(snapshot.CurrentBlockHash);
 
             if (_recordNullAddressHistory || from != UInt160.Zero)
             {
@@ -95,14 +92,14 @@ private void RecordTransferHistory(Snapshot snapshot, UInt160 scriptHash, UInt16
             transferIndex++;
         }
 
-        private void HandleNotification(Snapshot snapshot, Transaction transaction, UInt160 scriptHash,
+        private void HandleNotification(StoreView snapshot, Transaction transaction, UInt160 scriptHash,
             VM.Types.Array stateItems,
             Dictionary<Nep5BalanceKey, Nep5Balance> nep5BalancesChanged, ref ushort transferIndex)
         {
             if (stateItems.Count == 0) return;
             // Event name should be encoded as a byte array.
             if (!(stateItems[0] is VM.Types.ByteArray)) return;
-            var eventName = Encoding.UTF8.GetString(stateItems[0].GetByteArray());
+            var eventName = stateItems[0].GetString();
             if (eventName != "Transfer") return;
             if (stateItems.Count < 4) return;
 
@@ -113,9 +110,9 @@ private void HandleNotification(Snapshot snapshot, Transaction transaction, UInt
             var amountItem = stateItems[3];
             if (!(amountItem is VM.Types.ByteArray || amountItem is VM.Types.Integer))
                 return;
-            byte[] fromBytes = stateItems[1]?.GetByteArray();
+            byte[] fromBytes = stateItems[1]?.GetSpan().ToArray();
             if (fromBytes?.Length != 20) fromBytes = null;
-            byte[] toBytes = stateItems[2]?.GetByteArray();
+            byte[] toBytes = stateItems[2]?.GetSpan().ToArray();
             if (toBytes?.Length != 20) toBytes = null;
             if (fromBytes == null && toBytes == null) return;
             var from = new UInt160(fromBytes);
@@ -135,7 +132,7 @@ private void HandleNotification(Snapshot snapshot, Transaction transaction, UInt
             RecordTransferHistory(snapshot, scriptHash, from, to, amountItem.GetBigInteger(), transaction.Hash, ref transferIndex);
         }
 
-        public void OnPersist(Snapshot snapshot, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
+        public void OnPersist(StoreView snapshot, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
         {
             // Start freshly with a new DBCache for each block.
             ResetBatch();
@@ -183,7 +180,7 @@ public void OnPersist(Snapshot snapshot, IReadOnlyList<Blockchain.ApplicationExe
             }
         }
 
-        public void OnCommit(Snapshot snapshot)
+        public void OnCommit(StoreView snapshot)
         {
             _balances.Commit();
             if (_shouldTrackHistory)
@@ -222,12 +219,12 @@ private void AddTransfers(byte dbPrefix, UInt160 userScriptHash, ulong startTime
                 if (++resultCount > _maxResults) break;
                 JObject transfer = new JObject();
                 transfer["timestamp"] = transferPair.Key.TimestampMS;
-                transfer["asset_hash"] = transferPair.Key.AssetScriptHash.ToArray().Reverse().ToHexString();
+                transfer["asset_hash"] = transferPair.Key.AssetScriptHash.ToString();
                 transfer["transfer_address"] = transferPair.Value.UserScriptHash.ToAddress();
                 transfer["amount"] = transferPair.Value.Amount.ToString();
                 transfer["block_index"] = transferPair.Value.BlockIndex;
                 transfer["transfer_notify_index"] = transferPair.Key.BlockXferNotificationIndex;
-                transfer["tx_hash"] = transferPair.Value.TxHash.ToArray().Reverse().ToHexString();
+                transfer["tx_hash"] = transferPair.Value.TxHash.ToString();
                 parentJArray.Add(transfer);
             }
         }
@@ -268,12 +265,12 @@ private JObject GetNep5Balances(JArray _params)
             json["address"] = userScriptHash.ToAddress();
             var dbCache = new DbCache<Nep5BalanceKey, Nep5Balance>(_db, null, null, Nep5BalancePrefix);
             byte[] prefix = userScriptHash.ToArray();
-            foreach (var storageKeyValuePair in dbCache.Find(prefix))
+            foreach (var (key, value) in dbCache.Find(prefix))
             {
                 JObject balance = new JObject();
-                balance["asset_hash"] = storageKeyValuePair.Key.AssetScriptHash.ToArray().Reverse().ToHexString();
-                balance["amount"] = storageKeyValuePair.Value.Balance.ToString();
-                balance["last_updated_block"] = storageKeyValuePair.Value.LastUpdatedBlock;
+                balance["asset_hash"] = key.AssetScriptHash.ToString();
+                balance["amount"] = value.Balance.ToString();
+                balance["last_updated_block"] = value.LastUpdatedBlock;
                 balances.Add(balance);
             }
             return json;

diff --git a/RpcNep5Tracker/RpcNep5Tracker.csproj b/RpcNep5Tracker/RpcNep5Tracker.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>3.0.0-preview1</Version>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Update="RpcNep5Tracker\config.json">
@@ -12,6 +11,6 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-preview1" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00804" />
   </ItemGroup>
 </Project>
diff --git a/RpcSecurity/RpcSecurity.csproj b/RpcSecurity/RpcSecurity.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>3.0.0-preview1</Version>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
 
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-preview1" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00804" />
   </ItemGroup>
 
 </Project>
diff --git a/RpcWallet/RpcWallet.cs b/RpcWallet/RpcWallet.cs
@@ -169,7 +169,7 @@ private JObject GetUnclaimedGas()
         {
             CheckWallet();
             BigInteger gas = BigInteger.Zero;
-            using (Snapshot snapshot = Blockchain.Singleton.GetSnapshot())
+            using (SnapshotView snapshot = Blockchain.Singleton.GetSnapshot())
                 foreach (UInt160 account in Wallet.GetAccounts().Select(p => p.ScriptHash))
                 {
                     gas += NativeContract.NEO.UnclaimedGas(snapshot, account, snapshot.Height + 1);

diff --git a/RpcWallet/RpcWallet.csproj b/RpcWallet/RpcWallet.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>3.0.0-preview1</Version>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
 
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-preview1" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00804" />
   </ItemGroup>
 
 </Project>