use messagepack for RocksDbCacheClient.GetState (#48)

* dotnet format

* rework GetState

* update changelog

* update changelog

Co-authored-by: Harry <[email protected]>

Author: devhawk

CHANGELOG.md

@@ -13,19 +13,24 @@ will not have contiguous patch numbers. Initial major and minor releases will be
 in this file without a patch number. Patch version will be included for bug fixes, but
 may not exactly match a publicly released version.
 
-## [3.0.10] - 2021-10-11
+## [3.0.12] - 2021-10-12
 
 Thanks to @merl111 for his contribution (#41) in this release
 
 ### Added
 
 * static function to create a dummy block for testing (#41) 
-* StateServiceStore (#45) 
+* StateServiceStore (#45, #46, #48)
 
 ### Changes
 
-* Update Neo dependency to 3.0.3
 * Persistence Refactoring (#44)
+* Update dependencies (#47)
+  * MessagePack to 2.3.85
+  * Neo to 3.0.3
+  * OneOf to 3.0.201
+  * rocksdb to 6.22.1.20635
+  * System.IO.Abstractions to 13.2.47
 
 ## [3.0.3] - 2021-08-06
 

src/bctklib/ContractParameterParser.cs

@@ -177,7 +177,7 @@ internal ContractParameter ParseStringParameter(string value)
             if (value.StartsWith("file://"))
             {
                 var file = fileSystem.NormalizePath(value[7..]);
-                file = fileSystem.Path.IsPathFullyQualified(file) 
+                file = fileSystem.Path.IsPathFullyQualified(file)
                     ? file
                     : fileSystem.Path.GetFullPath(file, fileSystem.Directory.GetCurrentDirectory());
 

src/bctklib/persistence/CheckpointStorageProvider.cs

@@ -36,7 +36,7 @@ public void Dispose()
         public IStore GetStore(string? storeName)
         {
             if (storeName == null) return defaultStore.Value;
-            return ImmutableInterlocked.GetOrAdd(ref stores, storeName, 
+            return ImmutableInterlocked.GetOrAdd(ref stores, storeName,
                 key => new MemoryTrackingStore(GetStorageProviderStore(key)));
         }
 
@@ -47,7 +47,7 @@ IReadOnlyStore GetStorageProviderStore(string? path)
             {
                 roStore = storageProvider?.GetStore(path);
             }
-            catch {}
+            catch { }
 
             return roStore ?? NullStore.Instance;
         }

src/bctklib/persistence/MemoryTrackingStore.cs

@@ -48,7 +48,7 @@ static void AtomicUpdate(ref TrackingMap trackingMap, byte[]? key, OneOf<byte[]?
         {
             key = key == null ? Array.Empty<byte>() : key.AsSpan().ToArray();
             var _value = value.Match<OneOf<ReadOnlyMemory<byte>, None>>(
-                v => v == null ? default(ReadOnlyMemory<byte>) : v.AsSpan().ToArray(), 
+                v => v == null ? default(ReadOnlyMemory<byte>) : v.AsSpan().ToArray(),
                 n => n);
 
             var priorCollection = Volatile.Read(ref trackingMap);

src/bctklib/persistence/ReadOnlyMemoryComparer.cs

@@ -3,7 +3,7 @@
 
 namespace Neo.BlockchainToolkit.Persistence
 {
-    class ReadOnlyMemoryComparer : IEqualityComparer<ReadOnlyMemory<byte>>, IComparer<ReadOnlyMemory<byte>> 
+    class ReadOnlyMemoryComparer : IEqualityComparer<ReadOnlyMemory<byte>>, IComparer<ReadOnlyMemory<byte>>
     {
         public static ReadOnlyMemoryComparer Default { get; } = new ReadOnlyMemoryComparer(false);
         public static ReadOnlyMemoryComparer Reverse { get; } = new ReadOnlyMemoryComparer(true);

src/bctklib/persistence/RocksDbStorageProvider.cs

@@ -38,8 +38,8 @@ public void Dispose()
 
         public IStore GetStore(string? path)
         {
-            return TryGetStore(path, out var store) 
-                ? store 
+            return TryGetStore(path, out var store)
+                ? store
                 : throw new InvalidOperationException("invalid store path");
         }
 

src/bctklib/persistence/StateServiceStore.RocksDbCacheClient.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Buffers;
 using System.Buffers.Binary;
-using System.Diagnostics;
 using System.IO;
 using System.Text;
+using MessagePack;
+using MessagePack.Formatters;
 using Neo.IO.Json;
 using Neo.Network.RPC;
 using Neo.Network.RPC.Models;
@@ -75,45 +76,32 @@ public UInt256 GetBlockHash(uint index)
                 return UInt256.Parse(json.AsString());
             }
 
+            static readonly IMessagePackFormatter<byte[]?> byteArrayFormatter = 
+                MessagePackSerializerOptions.Standard.Resolver.GetFormatter<byte[]?>();
+
             public byte[]? GetState(UInt256 rootHash, UInt160 scriptHash, ReadOnlyMemory<byte> key)
             {
                 var familyName = $"{nameof(GetState)}{rootHash}{scriptHash}";
                 var family = db.GetOrCreateColumnFamily(familyName);
-                var value = db.Get(key.Span, family);
+                var cachedState = db.Get(key.Span, family);
 
-                JObject jsonValue;
-                if (value != null)
+                if (cachedState != null)
                 {
-                    jsonValue = JObject.Parse(value);
+                    var reader = new MessagePackReader(cachedState);
+                    return byteArrayFormatter.Deserialize(ref reader, MessagePackSerializerOptions.Standard);
                 }
                 else
                 {
-                    try
-                    {
-                        jsonValue = rpcClient.RpcSend("getstate",
-                            rootHash.ToString(),
-                            scriptHash.ToString(),
-                            Convert.ToBase64String(key.Span));
-                    }
-                    catch (RpcException ex)
-                    {
-                        if (ex.HResult == RpcClientExtensions.COR_E_KEYNOTFOUND)
-                        {
-                            jsonValue = JObject.Null;
-                        }
-                        else
-                        {
-                            throw;
-                        }
-                    }
-                    var jsonBytes = jsonValue == null
-                        ? Neo.Utility.StrictUTF8.GetBytes("null")
-                        : jsonValue.ToByteArray(false);
-                    db.Put(key.Span, jsonBytes, family);
-                }
+                    var state = rpcClient.GetState(rootHash, scriptHash, key.Span);
+
+                    var buffer = new ArrayBufferWriter<byte>();
+                    var writer = new MessagePackWriter(buffer);
+                    writer.Write(state);
+                    writer.Flush();
+                    db.Put(key.Span, buffer.WrittenSpan, family);
 
-                return jsonValue == null || jsonValue == JObject.Null ? null 
-                    : Convert.FromBase64String(jsonValue.AsString());
+                    return state;
+                }
             }
 
             public RpcStateRoot GetStateRoot(uint index)

src/bctklib/smart-contract/TestApplicationEngine.cs

@@ -82,17 +82,17 @@ public static Transaction CreateTestTransaction(UInt160 signerAccount, WitnessSc
             Witnesses = Array.Empty<Witness>(),
         };
 
-        public TestApplicationEngine(DataCache snapshot, ProtocolSettings settings) 
+        public TestApplicationEngine(DataCache snapshot, ProtocolSettings settings)
             : this(TriggerType.Application, null, snapshot, null, settings, ApplicationEngine.TestModeGas, null)
         {
         }
 
-        public TestApplicationEngine(DataCache snapshot, ProtocolSettings settings, UInt160 signer, WitnessScope witnessScope = WitnessScope.CalledByEntry) 
+        public TestApplicationEngine(DataCache snapshot, ProtocolSettings settings, UInt160 signer, WitnessScope witnessScope = WitnessScope.CalledByEntry)
             : this(TriggerType.Application, CreateTestTransaction(signer, witnessScope), snapshot, null, settings, ApplicationEngine.TestModeGas, null)
         {
         }
 
-        public TestApplicationEngine(DataCache snapshot, ProtocolSettings settings, Transaction transaction) 
+        public TestApplicationEngine(DataCache snapshot, ProtocolSettings settings, Transaction transaction)
             : this(TriggerType.Application, transaction, snapshot, null, settings, ApplicationEngine.TestModeGas, null)
         {
         }

src/bctklib/smart-contract/TraceApplicationEngine.cs

@@ -34,7 +34,7 @@ public override void Dispose()
 
         private string GetContractName(UInt160 scriptId)
         {
-            return ImmutableInterlocked.GetOrAdd(ref contractNameMap, scriptId, 
+            return ImmutableInterlocked.GetOrAdd(ref contractNameMap, scriptId,
                 k => NativeContract.ContractManagement.GetContract(Snapshot, k)?.Manifest.Name ?? string.Empty);
         }