[StateService] Verification

src/OracleService/OracleService.cs

@@ -168,7 +168,7 @@ public JObject SubmitOracleResponse(JArray _params)
  return new JObject();
  }
 
- private static async Task SendContentAsync(string url, string content)
+ private static async Task SendContentAsync(Uri url, string content)
  {
  try
  {

src/OracleService/Settings.cs

@@ -16,7 +16,7 @@ public HttpsSettings(IConfigurationSection section)
 
  class Settings
  {
- public string[] Nodes { get; }
+ public Uri[] Nodes { get; }
  public TimeSpan MaxTaskTimeout { get; }
  public bool AllowPrivateHost { get; }
  public string[] AllowedContentTypes { get; }
@@ -26,7 +26,7 @@ class Settings
 
  private Settings(IConfigurationSection section)
  {
- Nodes = section.GetSection("Nodes").GetChildren().Select(p => p.Get<string>()).ToArray();
+ Nodes = section.GetSection("Nodes").GetChildren().Select(p => new Uri(p.Get<string>(), UriKind.Absolute)).ToArray();
  MaxTaskTimeout = TimeSpan.FromMilliseconds(section.GetValue("MaxTaskTimeout", 432000000));
  AllowPrivateHost = section.GetValue("AllowPrivateHost", false);
  AllowedContentTypes = section.GetSection("AllowedContentTypes").GetChildren().Select(p => p.Get<string>()).ToArray();

src/RpcClient/RpcClient.cs

@@ -23,9 +23,9 @@ namespace Neo.Network.RPC
  public class RpcClient : IDisposable
  {
  private readonly HttpClient httpClient;
- private readonly string baseAddress;
+ private readonly Uri baseAddress;
 
- public RpcClient(string url, string rpcUser = default, string rpcPass = default)
+ public RpcClient(Uri url, string rpcUser = default, string rpcPass = default)
  {
  httpClient = new HttpClient();
  baseAddress = url;
@@ -36,7 +36,7 @@ public RpcClient(string url, string rpcUser = default, string rpcPass = default)
  }
  }
 
- public RpcClient(HttpClient client, string url)
+ public RpcClient(HttpClient client, Uri url)
  {
  httpClient = client;
  baseAddress = url;

src/StateService/Settings.cs

@@ -1,18 +1,22 @@
 using Microsoft.Extensions.Configuration;
+using System;
+using System.Linq;
 
 namespace Neo.Plugins.StateService
 {
  internal class Settings
  {
  public string Path { get; }
  public bool FullState { get; }
+ public Uri[] VerifierUrls { get; }
 
  public static Settings Default { get; private set; }
 
  private Settings(IConfigurationSection section)
  {
  Path = string.Format(section.GetValue("Path", "Data_MPT_{0}"), ProtocolSettings.Default.Magic.ToString("X8"));
  FullState = section.GetValue("FullState", false);
+ VerifierUrls = section.GetSection("VerifierUrls").GetChildren().Select(p => new Uri(p.Get<string>(), UriKind.Absolute)).ToArray();
  }
 
  public static void Load(IConfigurationSection section)

src/StateService/StatePlugin.cs

@@ -6,6 +6,7 @@
 using Neo.Persistence;
 using Neo.Plugins.MPT;
 using Neo.Plugins.StateService.Storage;
+using Neo.Plugins.StateService.Verification;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
 using System;
@@ -22,27 +23,59 @@ public class StatePlugin : Plugin, IPersistencePlugin
  public override string Name => "StateService";
  public override string Description => "Enables MPT for the node";
 
- private IActorRef store;
+ internal IActorRef Store;
+ internal IActorRef Verifier;
 
  protected override void Configure()
  {
  Settings.Load(GetConfiguration());
+ RpcServerPlugin.RegisterMethods(this);
  }
 
  protected override void OnPluginsLoaded()
  {
- store = System.ActorSystem.ActorOf(StateStore.Props(System, Settings.Default.Path));
+ Store = System.ActorSystem.ActorOf(StateStore.Props(System, this, Settings.Default.Path));
  }
 
  public override void Dispose()
  {
  base.Dispose();
- System.EnsureStoped(store);
+ System.EnsureStoped(Store);
+ if (Verifier != null) System.EnsureStoped(Verifier);
  }
 
  void IPersistencePlugin.OnPersist(Block block, DataCache snapshot, IReadOnlyList<ApplicationExecuted> applicationExecutedList)
  {
- StateStore.Singleton.UpdateLocalStateRoot(block.Index, snapshot.GetChangeSet().Where(p => p.State != TrackState.None).ToList());
+ StateStore.Singleton.UpdateLocalStateRoot(block.Index, snapshot.GetChangeSet().Where(p => p.State != TrackState.None).Where(p => p.Key.Id != NativeContract.Ledger.Id).ToList());
+ }
+
+ [RpcMethod]
+ public JObject VoteStateRoot(JArray _params)
+ {
+ if (_params.Count < 3) throw new RpcException(-100, "Invalid params");
+ uint height = uint.Parse(_params[0].AsString());
+ int validator_index = int.Parse(_params[1].AsString());
+ byte[] sig = Convert.FromBase64String(_params[2].AsString());
+ if (Verifier is null) throw new RpcException(-100, "Verifier not started");
+ Verifier.Tell(new Vote(height, validator_index, sig));
+ return true;
+ }
+
+ [ConsoleCommand("start states", Category = "StateService", Description = "Start as a state verifier if wallet is open")]
+ private void OnStartVerifyingState()
+ {
+ if (Verifier != null)
+ {
+ Console.WriteLine("Already started!");
+ return;
+ }
+ var wallet = GetService<IWalletProvider>().GetWallet();
+ if (wallet is null)
+ {
+ Console.WriteLine("Please open wallet first!");
+ return;
+ }
+ Verifier = System.ActorSystem.ActorOf(VerificationService.Props(System, wallet));
  }
 
  [ConsoleCommand("state root", Category = "StateService", Description = "Get state root by index")]

src/StateService/StateService.csproj

@@ -1,21 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <PackageId>Neo.Plugins.StateService</PackageId>
- <RootNamespace>Neo.Plugins</RootNamespace>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- </PropertyGroup>
-
- <ItemGroup>
- <None Update="StateService\config.json">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
- </None>
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="Neo.ConsoleService" Version="1.0.0" />
- <ProjectReference Include="..\RpcServer\RpcServer.csproj" />
- </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <PackageId>Neo.Plugins.StateService</PackageId>
+ <RootNamespace>Neo.Plugins</RootNamespace>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <None Update="StateService\config.json">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+ </None>
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Neo.ConsoleService" Version="1.0.0" />
+ <ProjectReference Include="..\RpcClient\RpcClient.csproj" />
+ <ProjectReference Include="..\RpcServer\RpcServer.csproj" />
+ </ItemGroup>
+
+</Project>

src/StateService/StateService/config.json

@@ -1,6 +1,8 @@
 {
  "PluginConfiguration": {
  "Path": "Data_MPT_{0}",
- "FullState": false
+ "FullState": false,
+ "VerifierUrls": []
  }
 }
+

src/StateService/Storage/StateSnapshot.cs

@@ -28,18 +28,18 @@ public void AddLocalStateRoot(StateRoot state_root)
  snapshot.Put(Keys.CurrentLocalRootIndex, BitConverter.GetBytes(state_root.Index));
  }
 
- public uint CurrentLocalRootIndex()
+ public uint? CurrentLocalRootIndex()
  {
  var bytes = snapshot.TryGet(Keys.CurrentLocalRootIndex);
- if (bytes is null) return uint.MaxValue;
+ if (bytes is null) return null;
  return BitConverter.ToUInt32(bytes);
  }
 
  public UInt256 CurrentLocalRootHash()
  {
  var index = CurrentLocalRootIndex();
- if (index == uint.MaxValue) return null;
- return GetStateRoot(index)?.RootHash;
+ if (index is null) return null;
+ return GetStateRoot((uint)index)?.RootHash;
  }
 
  public void AddValidatedStateRoot(StateRoot state_root)
@@ -50,25 +50,26 @@ public void AddValidatedStateRoot(StateRoot state_root)
  snapshot.Put(Keys.CurrentValidatedRootIndex, BitConverter.GetBytes(state_root.Index));
  }
 
- public uint CurrentValidatedRootIndex()
+ public uint? CurrentValidatedRootIndex()
  {
  var bytes = snapshot.TryGet(Keys.CurrentValidatedRootIndex);
- if (bytes is null) return uint.MaxValue;
+ if (bytes is null) return null;
  return BitConverter.ToUInt32(bytes);
  }
 
  public UInt256 CurrentValidatedRootHash()
  {
  var index = CurrentLocalRootIndex();
- if (index == uint.MaxValue) return null;
- var state_root = GetStateRoot(index);
+ if (index is null) return null;
+ var state_root = GetStateRoot((uint)index);
  if (state_root is null || state_root.Witness is null)
  throw new InvalidOperationException(nameof(CurrentValidatedRootHash) + " could not get validated state root");
  return state_root.RootHash;
  }
 
  public void Commit()
  {
+ Trie.Commit();
  snapshot.Commit();
  }
 

src/StateService/Storage/StateStore.cs

@@ -4,6 +4,7 @@
 using Neo.Network.P2P.Payloads;
 using Neo.Persistence;
 using Neo.Plugins.MPT;
+using Neo.Plugins.StateService.Verification;
 using Neo.SmartContract;
 using System;
 using System.Collections.Generic;
@@ -14,13 +15,14 @@ namespace Neo.Plugins.StateService.Storage
  class StateStore : UntypedActor
  {
  private readonly NeoSystem core;
+ private readonly StatePlugin system;
  private readonly IStore store;
  private const int MaxCacheCount = 100;
  private readonly Dictionary<uint, StateRoot> cache = new Dictionary<uint, StateRoot>();
  private StateSnapshot currentSnapshot;
  public UInt256 CurrentLocalRootHash => currentSnapshot.CurrentLocalRootHash();
- public uint LocalRootIndex => currentSnapshot.CurrentLocalRootIndex();
- public uint ValidatedRootIndex => currentSnapshot.CurrentValidatedRootIndex();
+ public uint? LocalRootIndex => currentSnapshot.CurrentLocalRootIndex();
+ public uint? ValidatedRootIndex => currentSnapshot.CurrentValidatedRootIndex();
 
  private static StateStore singleton;
  public static StateStore Singleton
@@ -32,10 +34,11 @@ public static StateStore Singleton
  }
  }
 
- public StateStore(NeoSystem core, string path)
+ public StateStore(NeoSystem core, StatePlugin system, string path)
  {
  if (singleton != null) throw new InvalidOperationException(nameof(StateStore));
  this.core = core;
+ this.system = system;
  this.store = core.LoadStore(path);
  singleton = this;
  core.ActorSystem.EventStream.Subscribe(Self, typeof(Blockchain.RelayResult));
@@ -63,6 +66,9 @@ protected override void OnReceive(object message)
  {
  switch (message)
  {
+ case StateRoot state_root:
+ OnNewStateRoot(state_root);
+ break;
  case Blockchain.RelayResult rr:
  if (rr.Result == VerifyResult.Succeed && rr.Inventory is ExtensiblePayload payload && payload.Category == StatePlugin.StatePayloadCategory)
  OnStatePayload(payload);
@@ -91,7 +97,8 @@ private void OnStatePayload(ExtensiblePayload payload)
  private bool OnNewStateRoot(StateRoot state_root)
  {
  if (state_root?.Witness is null) return false;
- if (state_root.Index <= ValidatedRootIndex) return false;
+ if (ValidatedRootIndex != null && state_root.Index <= ValidatedRootIndex) return false;
+ if (LocalRootIndex is null) throw new InvalidOperationException(nameof(StateStore) + " could not get local root index");
  if (LocalRootIndex < state_root.Index && state_root.Index < LocalRootIndex + MaxCacheCount)
  {
  cache.Add(state_root.Index, state_root);
@@ -106,7 +113,7 @@ private bool OnNewStateRoot(StateRoot state_root)
  state_snapshot.AddValidatedStateRoot(state_root);
  state_snapshot.Commit();
  UpdateCurrentSnapshot();
- //Tell validation service
+ system.Verifier?.Tell(new VerificationService.ValidatedRootPersisted { Index = state_root.Index });
  return true;
  }
 
@@ -138,6 +145,7 @@ public void UpdateLocalStateRoot(uint height, List<DataCache.Trackable> change_s
  state_snapshot.AddLocalStateRoot(state_root);
  state_snapshot.Commit();
  UpdateCurrentSnapshot();
+ system.Verifier?.Tell(new VerificationService.BlockPersisted { Index = height });
  CheckValidatedStateRoot(height);
  }
 
@@ -146,7 +154,7 @@ private void CheckValidatedStateRoot(uint index)
  if (cache.TryGetValue(index, out StateRoot state_root))
  {
  cache.Remove(index);
- OnNewStateRoot(state_root);
+ Self.Tell(state_root);
  }
  }
 
@@ -160,9 +168,9 @@ protected override void PostStop()
  base.PostStop();
  }
 
- public static Props Props(NeoSystem core, string path)
+ public static Props Props(NeoSystem core, StatePlugin system, string path)
  {
- return Akka.Actor.Props.Create(() => new StateStore(core, path));
+ return Akka.Actor.Props.Create(() => new StateStore(core, system, path));
  }
  }
 }