Merge pull request #2050 from planetarium/release/0.4.0

Release/0.4.0

.Lib9c.Benchmarks/Program.cs

@@ -5,16 +5,17 @@
 using System.Linq;
 using System.Security.Cryptography;
 using Bencodex.Types;
-using Libplanet;
 using Libplanet.Action;
-using Libplanet.Assets;
+using Libplanet.Action.State;
 using Libplanet.Blockchain;
 using Libplanet.Blockchain.Policies;
-using Libplanet.Blocks;
+using Libplanet.Common;
+using Libplanet.Crypto;
 using Libplanet.RocksDBStore;
-using Libplanet.State;
 using Libplanet.Store;
 using Libplanet.Store.Trie;
+using Libplanet.Types.Assets;
+using Libplanet.Types.Blocks;
 using Nekoyume.Action.Loader;
 using Nekoyume.Blockchain;
 using Nekoyume.Blockchain.Policy;
@@ -89,8 +90,7 @@ static void Main(string[] args)
             var actionEvaluator = new ActionEvaluator(
                 _ => policy.BlockAction,
                 new BlockChainStates(store, stateStore),
-                new NCActionLoader(),
-                null);
+                new NCActionLoader());
             var chain = new BlockChain(
                 policy,
                 stagePolicy,
@@ -152,7 +152,7 @@ static void Main(string[] args)
             Console.WriteLine("Total elapsed\t{0}", ended - started);
         }
 
-        // Copied from BlockChain<T>.SetStates().
+        // Copied from BlockChain.DetermineBlockStateRootHash().
         private static void SetStates(
             Guid chainId,
             IStore store,
@@ -162,18 +162,12 @@ private static void SetStates(
             bool buildStateReferences
         )
         {
-            IImmutableSet<Address> stateUpdatedAddresses = actionEvaluations
-                .SelectMany(a => a.OutputState.Delta.StateUpdatedAddresses)
-                .ToImmutableHashSet();
-            IImmutableSet<(Address, Currency)> updatedFungibleAssets = actionEvaluations
-                .SelectMany(a => a.OutputState.Delta.UpdatedFungibleAssets)
-                .ToImmutableHashSet();
+            IImmutableDictionary<KeyBytes, IValue> totalDelta = actionEvaluations.GetRawTotalDelta();
 
             if (!stateStore.ContainsStateRoot(block.StateRootHash))
             {
                 HashDigest<SHA256>? prevStateRootHash = store.GetStateRootHash(block.PreviousHash);
-                var totalDelta = GetTotalDelta(actionEvaluations, ToStateKey, ToFungibleAssetKey);
-                stateStore.Commit(prevStateRootHash, totalDelta);
+                ITrie stateRoot = stateStore.Commit(prevStateRootHash, totalDelta);
             }
         }
 

.Lib9c.DevExtensions.Tests/Action/Craft/UnlocakCraftActionTest.cs

@@ -3,9 +3,10 @@
 using Lib9c.Tests;
 using Lib9c.Tests.Action;
 using Lib9c.Tests.Util;
-using Libplanet;
 using Libplanet.Action;
-using Libplanet.State;
+using Libplanet.Action.State;
+using Libplanet.Crypto;
+using Libplanet.Types.Assets;
 using Nekoyume;
 using Nekoyume.Action;
 using Nekoyume.Model;

.Lib9c.DevExtensions.Tests/Action/Craft/UnlockRecipeTest.cs

@@ -5,8 +5,8 @@
 using Lib9c.Tests;
 using Lib9c.Tests.Action;
 using Lib9c.Tests.Util;
-using Libplanet;
-using Libplanet.State;
+using Libplanet.Crypto;
+using Libplanet.Action.State;
 using Nekoyume.Action;
 using Nekoyume.Model.Item;
 using Nekoyume.Model.State;

.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs

@@ -6,10 +6,9 @@
 using Bencodex.Types;
 using Lib9c.DevExtensions.Action;
 using Lib9c.Tests.Action;
-using Libplanet;
-using Libplanet.Assets;
+using Libplanet.Action.State;
 using Libplanet.Crypto;
-using Libplanet.State;
+using Libplanet.Types.Assets;
 using Nekoyume;
 using Nekoyume.Action;
 using Nekoyume.Model.Item;

.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs

@@ -1,10 +1,9 @@
 using System.Collections.Immutable;
 using Lib9c.DevExtensions.Action;
 using Lib9c.Tests.Action;
-using Libplanet;
-using Libplanet.Assets;
+using Libplanet.Action.State;
 using Libplanet.Crypto;
-using Libplanet.State;
+using Libplanet.Types.Assets;
 using Nekoyume.Action;
 using Nekoyume.Model.State;
 using Serilog;

.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs

@@ -4,9 +4,8 @@
 using System.Linq;
 using Lib9c.DevExtensions.Action;
 using Lib9c.Tests.Action;
-using Libplanet;
+using Libplanet.Action.State;
 using Libplanet.Crypto;
-using Libplanet.State;
 using Nekoyume;
 using Nekoyume.Action;
 using Nekoyume.Helper;

.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs

@@ -9,10 +9,9 @@
 using Lib9c.Tests;
 using Lib9c.Tests.Action;
 using Lib9c.Tests.Util;
-using Libplanet;
-using Libplanet.Assets;
+using Libplanet.Action.State;
 using Libplanet.Crypto;
-using Libplanet.State;
+using Libplanet.Types.Assets;
 using Nekoyume.Action;
 using Nekoyume.Helper;
 using Nekoyume.Model;
@@ -28,10 +27,12 @@ public class ManipulateStateTest
     {
         private static readonly Address AdminAddr = new PrivateKey().ToAddress();
 
+        // See also InitializeUtil.cs
         private static readonly Currency Ncg = Currency.Legacy(
             "NCG",
             2,
-            new[] { AdminAddr }.ToImmutableHashSet());
+            null
+        );
 
         private static readonly Currency Crystal = CrystalCalculator.CRYSTAL;
 

.Lib9c.DevExtensions.Tests/Action/Stage/ClearStageTest.cs

@@ -3,8 +3,8 @@
 using Lib9c.Tests;
 using Lib9c.Tests.Action;
 using Lib9c.Tests.Util;
-using Libplanet;
-using Libplanet.State;
+using Libplanet.Crypto;
+using Libplanet.Action.State;
 using Nekoyume.Action;
 using Xunit;
 

.Lib9c.DevExtensions.Tests/UtilsTest.cs

@@ -2,7 +2,7 @@
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
-using Libplanet;
+using Libplanet.Crypto;
 using Xunit;
 
 namespace Lib9c.DevExtensions.Tests

.Lib9c.Miner.Tests/CustomActionsDeserializableValidatorTest.cs

@@ -1,13 +1,12 @@
 using System.Collections.Immutable;
 using Bencodex.Types;
-using Libplanet;
 using Libplanet.Action;
 using Libplanet.Action.Loader;
-using Libplanet.Assets;
-using Libplanet.Blocks;
+using Libplanet.Action.State;
 using Libplanet.Crypto;
-using Libplanet.State;
-using Libplanet.Tx;
+using Libplanet.Types.Assets;
+using Libplanet.Types.Blocks;
+using Libplanet.Types.Tx;
 using Nekoyume.Blockchain;
 
 namespace Lib9c.Proposer.Tests;
@@ -64,7 +63,7 @@ private class MockTransaction : ITransaction
         public PublicKey PublicKey { get; init; }
         public BlockHash? GenesisHash { get; init; }
         public TxActionList Actions =>
-            new(SystemAction is { } sa ? new List(sa) : new List(CustomActions!));
+            new(SystemAction is { } sa ? new IValue[]{ sa } : CustomActions!);
 
         public FungibleAssetValue? MaxGasPrice => null;
 

.Lib9c.StateService.Shared/Lib9c.StateService.Shared.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

.Lib9c.StateService.Shared/RemoteEvaluationRequest.cs

@@ -0,0 +1,6 @@
+namespace Lib9c.StateService.Shared;
+
+public class RemoteEvaluationRequest
+{
+    public byte[] PreEvaluationBlock { get; set; }
+}

.Lib9c.StateService.Shared/RemoteEvaluationResponse.cs

@@ -0,0 +1,6 @@
+namespace Lib9c.StateService.Shared;
+
+public class RemoteEvaluationResponse
+{
+    public byte[][] Evaluations { get; set; }
+}

.Lib9c.StateService/Controllers/RemoteEvaluationController.cs

@@ -0,0 +1,52 @@
+using Bencodex;
+using Bencodex.Types;
+using Lib9c.StateService.Shared;
+using Libplanet.Action;
+using Libplanet.Action.State;
+using Libplanet.Extensions.ActionEvaluatorCommonComponents;
+using Microsoft.AspNetCore.Mvc;
+using Nekoyume.Action;
+using Nekoyume.Action.Loader;
+
+namespace Lib9c.StateService.Controllers;
+
+[ApiController]
+[Route("/evaluation")]
+public class RemoteEvaluationController : ControllerBase
+{
+    private readonly IBlockChainStates _blockChainStates;
+    private readonly ILogger<RemoteEvaluationController> _logger;
+    private readonly Codec _codec;
+
+    public RemoteEvaluationController(
+        IBlockChainStates blockChainStates,
+        ILogger<RemoteEvaluationController> logger,
+        Codec codec)
+    {
+        _blockChainStates = blockChainStates;
+        _logger = logger;
+        _codec = codec;
+    }
+
+    [HttpPost]
+    public ActionResult<RemoteEvaluationResponse> GetEvaluation([FromBody] RemoteEvaluationRequest request)
+    {
+        var decoded = _codec.Decode(request.PreEvaluationBlock);
+        if (decoded is not Dictionary dictionary)
+        {
+            return StatusCode(StatusCodes.Status400BadRequest);
+        }
+
+        var preEvaluationBlock = PreEvaluationBlockMarshaller.Unmarshal(dictionary);
+        var actionEvaluator =
+            new ActionEvaluator(
+                context => new RewardGold(),
+                _blockChainStates,
+                new NCActionLoader());
+        return Ok(new RemoteEvaluationResponse
+        {
+            Evaluations = actionEvaluator.Evaluate(preEvaluationBlock).Select(ActionEvaluationMarshaller.Serialize)
+                .ToArray(),
+        });
+    }
+}

.Lib9c.StateService/Lib9c.StateService.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\.Libplanet.Extensions.RemoteBlockChainStates\Libplanet.Extensions.RemoteBlockChainStates.csproj" />
+    <ProjectReference Include="..\.Libplanet.Extensions.ActionEvaluatorCommonComponents\Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj" />
+    <ProjectReference Include="..\.Lib9c.StateService.Shared\Lib9c.StateService.Shared.csproj" />
+    <ProjectReference Include="..\Lib9c\Lib9c.csproj" />
+  </ItemGroup>
+
+</Project>

.Lib9c.StateService/Program.cs

@@ -0,0 +1,40 @@
+using Bencodex;
+using Libplanet.Action.State;
+using Libplanet.Extensions.RemoteBlockChainStates;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Configuration.AddEnvironmentVariables();
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+builder.Services.AddSingleton<Codec>();
+
+builder.Services.AddSingleton<IBlockChainStates, RemoteBlockChainStates>(_ =>
+{
+    const string DefaultEndpoint = "http://localhost:31280/graphql/explorer";
+    var endpoint = builder.Configuration.GetValue<string>("RemoteBlockChainStatesEndpoint") ?? DefaultEndpoint;
+    return new RemoteBlockChainStates(new Uri(endpoint));
+});
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseHttpsRedirection();
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();

.Lib9c.StateService/Properties/launchSettings.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:25712",
+      "sslPort": 44330
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5157",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:7140;http://localhost:5157",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

.Lib9c.StateService/appsettings-schema.json

@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "description": "appsettings.json to configure application.",
+    "properties": {
+        "RemoteBlockChainStatesEndpoint": {
+            "type": "string",
+            "description": "The headless' Libplanet.Explorer GraphQL endpoint. (e.g., http://localhost/graphql/explorer)"
+        }
+    },
+    "required": ["RemoteBlockChainStatesEndpoint"]
+}

.Lib9c.StateService/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}