Merge branch 'release/70' into merge/70/into/main

planetarium · Nov 7, 2023 · ed3357d · ed3357d
2 parents 29721b8 + f43535a
commit ed3357d
Show file tree

Hide file tree

Showing 62 changed files with 1,086 additions and 668 deletions.
diff --git a/.github/workflows/deploy_gh_pages.yaml b/.github/workflows/deploy_gh_pages.yaml
@@ -50,12 +50,20 @@ jobs:
             -G "https://9c-dx.s3.ap-northeast-2.amazonaws.com/empty-genesis-block-20230511" &
           sleep 60s
           graphql-inspector introspect http://localhost:30000/graphql --write schema.graphql
-      - name: Build
+      - name: Build GraphQL Document
         run: |
           yarn global add spectaql
-          spectaql ./spectaql-config.yaml
+          spectaql --target-dir public/graphql ./spectaql-config.yaml
+      - name: Build CLI Document
+        run: |
+          mkdir -p public/cli
+          dotnet run --project NineChronicles.Headless.Executable -- \
+            docs \
+            public/cli
+      - name: Copy Landing Page to deploy
+        run: cp Docs/resources/landing.html public/index.html
       - name: Copy GraphQL Schema to deploy
-        run: cp schema.graphql doc
+        run: cp schema.graphql public/schema.graphql
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:

diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml
@@ -29,6 +29,8 @@ jobs:
         docker:
           - repo: planetariumhq/ninechronicles-headless
             dockerfile: Dockerfile
+          - repo: planetariumhq/access-control-center
+            dockerfile: Dockerfile.ACC
     if: github.ref_type == 'branch'
     runs-on: ubuntu-latest
     steps:

diff --git a/Dockerfile.ACC b/Dockerfile.ACC
@@ -0,0 +1,37 @@
+# Use the SDK image to build the app
+FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env
+WORKDIR /app
+ARG COMMIT
+
+# Copy csproj and restore as distinct layers
+COPY ./Lib9c/Lib9c/Lib9c.csproj ./Lib9c/
+COPY ./NineChronicles.Headless/NineChronicles.Headless.csproj ./NineChronicles.Headless/
+COPY ./NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj ./NineChronicles.Headless.AccessControlCenter/
+RUN dotnet restore Lib9c
+RUN dotnet restore NineChronicles.Headless
+RUN dotnet restore NineChronicles.Headless.AccessControlCenter
+
+# Copy everything else and build
+COPY . ./
+RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj \
+    -c Release \
+    -r linux-x64 \
+    -o out \
+    --self-contained \
+    --version-suffix $COMMIT
+
+# Build runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
+WORKDIR /app
+RUN apt-get update && apt-get install -y libc6-dev
+COPY --from=build-env /app/out .
+
+# Install native deps & utilities for production
+RUN apt-get update \
+    && apt-get install -y --allow-unauthenticated \
+        libc6-dev jq curl \
+     && rm -rf /var/lib/apt/lists/*
+
+VOLUME /data
+
+ENTRYPOINT ["dotnet", "NineChronicles.Headless.AccessControlCenter.dll"]
diff --git a/Dockerfile.ACC.amd64 b/Dockerfile.ACC.amd64
@@ -0,0 +1,37 @@
+# Use the SDK image to build the app
+FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env
+WORKDIR /app
+ARG COMMIT
+
+# Copy csproj and restore as distinct layers
+COPY ./Lib9c/Lib9c/Lib9c.csproj ./Lib9c/
+COPY ./NineChronicles.Headless/NineChronicles.Headless.csproj ./NineChronicles.Headless/
+COPY ./NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj ./NineChronicles.Headless.AccessControlCenter/
+RUN dotnet restore Lib9c
+RUN dotnet restore NineChronicles.Headless
+RUN dotnet restore NineChronicles.Headless.AccessControlCenter
+
+# Copy everything else and build
+COPY . ./
+RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj \
+    -c Release \
+    -r linux-x64 \
+    -o out \
+    --self-contained \
+    --version-suffix $COMMIT
+
+# Build runtime image
+FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim
+WORKDIR /app
+RUN apt-get update && apt-get install -y libc6-dev
+COPY --from=build-env /app/out .
+
+# Install native deps & utilities for production
+RUN apt-get update \
+    && apt-get install -y --allow-unauthenticated \
+        libc6-dev jq curl \
+     && rm -rf /var/lib/apt/lists/*
+
+VOLUME /data
+
+ENTRYPOINT ["dotnet", "NineChronicles.Headless.AccessControlCenter.dll"]
diff --git a/Dockerfile.ACC.arm64v8 b/Dockerfile.ACC.arm64v8
@@ -0,0 +1,37 @@
+# Use the SDK image to build the app
+FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env
+WORKDIR /app
+ARG COMMIT
+
+# Copy csproj and restore as distinct layers
+COPY ./Lib9c/Lib9c/Lib9c.csproj ./Lib9c/
+COPY ./NineChronicles.Headless/NineChronicles.Headless.csproj ./NineChronicles.Headless/
+COPY ./NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj ./NineChronicles.Headless.AccessControlCenter/
+RUN dotnet restore Lib9c
+RUN dotnet restore NineChronicles.Headless
+RUN dotnet restore NineChronicles.Headless.AccessControlCenter
+
+# Copy everything else and build
+COPY . ./
+RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj \
+    -c Release \
+    -r linux-arm64 \
+    -o out \
+    --self-contained \
+    --version-suffix $COMMIT
+
+# Build runtime image
+FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm64v8
+WORKDIR /app
+RUN apt-get update && apt-get install -y libc6-dev
+COPY --from=build-env /app/out .
+
+# Install native deps & utilities for production
+RUN apt-get update \
+    && apt-get install -y --allow-unauthenticated \
+        libc6-dev jq curl \
+     && rm -rf /var/lib/apt/lists/*
+
+VOLUME /data
+
+ENTRYPOINT ["dotnet", "NineChronicles.Headless.AccessControlCenter.dll"]
diff --git a/Docs/resources/landing.html b/Docs/resources/landing.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>NineChronicles Headless</title>
+        <meta charset="UTF-8"/>
+        <script src="https://cdn.tailwindcss.com"></script>
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    </head>
+    <body>
+        <div class="flex min-h-screen min-w-screen justify-center items-center">
+            <div class="flex flex-col justify-center items-center gap-5">
+                <p class="bg-gray-700 p-5 text-white text-4xl font-extrabold">NineChronicles.Headless</p>
+                <span>A headless node to validate, network, operate NineChronicles chain.</span>
+                <hr class="w-full" />
+                <div class="flex flex-row justify-center items-center gap-2">
+                    <a href="https://github.com/planetarium/NineChronicles.Headless"><i class="fa fa-github"></i> Repository</a>
+                    <span>|</span>
+                    <a href="https://planetarium.github.io/NineChronicles.Headless/graphql">GraphQL Docs</a>
+                    <span>|</span>
+                    <a href="https://planetarium.github.io/NineChronicles.Headless/cli">CLI Docs</a>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/Lib9c b/Lib9c
diff --git a/Libplanet.Extensions.ForkableActionEvaluator.Tests/ForkableActionEvaluatorTest.cs b/Libplanet.Extensions.ForkableActionEvaluator.Tests/ForkableActionEvaluatorTest.cs
@@ -5,11 +5,8 @@
 using Libplanet.Types.Blocks;
 using Libplanet.Common;
 using Libplanet.Crypto;
-using Libplanet.Extensions.ActionEvaluatorCommonComponents;
 using Libplanet.Types.Tx;
-using ActionEvaluation = Libplanet.Extensions.ActionEvaluatorCommonComponents.ActionEvaluation;
 using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException;
-using Random = Libplanet.Extensions.ActionEvaluatorCommonComponents.Random;
 
 namespace Libplanet.Extensions.ForkableActionEvaluator.Tests;
 
@@ -24,11 +21,11 @@ public void ForkEvaluation()
             ((101L, long.MaxValue), new PostActionEvaluator()),
         });
 
-        Assert.Equal((Text)"PRE", Assert.Single(evaluator.Evaluate(new MockBlock(0))).Action);
-        Assert.Equal((Text)"PRE", Assert.Single(evaluator.Evaluate(new MockBlock(99))).Action);
-        Assert.Equal((Text)"PRE", Assert.Single(evaluator.Evaluate(new MockBlock(100))).Action);
-        Assert.Equal((Text)"POST", Assert.Single(evaluator.Evaluate(new MockBlock(101))).Action);
-        Assert.Equal((Text)"POST", Assert.Single(evaluator.Evaluate(new MockBlock(long.MaxValue))).Action);
+        Assert.Equal((Text)"PRE", Assert.Single(evaluator.Evaluate(new MockBlock(0), null)).Action);
+        Assert.Equal((Text)"PRE", Assert.Single(evaluator.Evaluate(new MockBlock(99), null)).Action);
+        Assert.Equal((Text)"PRE", Assert.Single(evaluator.Evaluate(new MockBlock(100), null)).Action);
+        Assert.Equal((Text)"POST", Assert.Single(evaluator.Evaluate(new MockBlock(101), null)).Action);
+        Assert.Equal((Text)"POST", Assert.Single(evaluator.Evaluate(new MockBlock(long.MaxValue), null)).Action);
     }
 
     [Fact]
@@ -64,53 +61,47 @@ public void CheckPairs()
 class PostActionEvaluator : IActionEvaluator
 {
     public IActionLoader ActionLoader => throw new NotSupportedException();
-    public IReadOnlyList<IActionEvaluation> Evaluate(IPreEvaluationBlock block)
+    public IReadOnlyList<ICommittedActionEvaluation> Evaluate(IPreEvaluationBlock block, HashDigest<SHA256>? baseStateroothash)
     {
-        return new IActionEvaluation[]
+        return new ICommittedActionEvaluation[]
         {
-            new ActionEvaluation(
+            new CommittedActionEvaluation(
                 (Text)"POST",
-                new ActionContext(
-                    null,
+                new CommittedActionContext(
                     default,
                     null,
                     default,
                     0,
                     0,
                     false,
-                    new AccountStateDelta(),
-                    new Random(0),
-                    null,
+                    default,
+                    0,
                     false),
-                new AccountStateDelta(),
-                null)
+                default)
         };
     }
 }
 
 class PreActionEvaluator : IActionEvaluator
 {
     public IActionLoader ActionLoader => throw new NotSupportedException();
-    public IReadOnlyList<IActionEvaluation> Evaluate(IPreEvaluationBlock block)
+    public IReadOnlyList<ICommittedActionEvaluation> Evaluate(IPreEvaluationBlock block, HashDigest<SHA256>? baseStateRootHash)
     {
-        return new IActionEvaluation[]
+        return new ICommittedActionEvaluation[]
         {
-            new ActionEvaluation(
+            new CommittedActionEvaluation(
                 (Text)"PRE",
-                new ActionContext(
-                    null,
+                new CommittedActionContext(
                     default,
                     null,
                     default,
                     0,
                     0,
                     false,
-                    new AccountStateDelta(),
-                    new Random(0),
-                    null,
+                    default,
+                    0,
                     false),
-                new AccountStateDelta(),
-                null)
+                default)
         };
     }
 }

diff --git a/Libplanet.Extensions.ForkableActionEvaluator/ForkableActionEvaluator.cs b/Libplanet.Extensions.ForkableActionEvaluator/ForkableActionEvaluator.cs
@@ -1,5 +1,7 @@
+using System.Security.Cryptography;
 using Libplanet.Action;
 using Libplanet.Action.Loader;
+using Libplanet.Common;
 using Libplanet.Types.Blocks;
 
 namespace Libplanet.Extensions.ForkableActionEvaluator;
@@ -15,9 +17,10 @@ public ForkableActionEvaluator(IEnumerable<((long StartIndex, long EndIndex) Ran
 
     public IActionLoader ActionLoader => throw new NotSupportedException();
 
-    public IReadOnlyList<IActionEvaluation> Evaluate(IPreEvaluationBlock block)
+    public IReadOnlyList<ICommittedActionEvaluation> Evaluate(
+        IPreEvaluationBlock block, HashDigest<SHA256>? baseStateRootHash)
     {
         var actionEvaluator = _router.GetEvaluator(block.Index);
-        return actionEvaluator.Evaluate(block);
+        return actionEvaluator.Evaluate(block, baseStateRootHash);
     }
 }
diff --git a/Libplanet.Headless.Tests/Hosting/LibplanetNodeServiceTest.cs b/Libplanet.Headless.Tests/Hosting/LibplanetNodeServiceTest.cs
@@ -25,13 +25,14 @@ public void Constructor()
         {
             var policy = new BlockPolicy();
             var stagePolicy = new VolatileStagePolicy();
+            var stateStore = new TrieStateStore(new MemoryKeyValueStore());
             var blockChainStates = new BlockChainStates(
                 new MemoryStore(),
-                new TrieStateStore(new MemoryKeyValueStore()));
+                stateStore);
             var actionLoader = new SingleActionLoader(typeof(DummyAction));
             var actionEvaluator = new ActionEvaluator(
                 _ => policy.BlockAction,
-                blockChainStates,
+                stateStore,
                 actionLoader);
             var genesisBlock = BlockChain.ProposeGenesisBlock(actionEvaluator);
             var service = new LibplanetNodeService(

diff --git a/Libplanet.Headless/Hosting/LibplanetNodeService.cs b/Libplanet.Headless/Hosting/LibplanetNodeService.cs
@@ -98,8 +98,7 @@ public LibplanetNodeService(
             (Store, StateStore) = LoadStore(
                 Properties.StorePath,
                 Properties.StoreType,
-                Properties.StoreStatesCacheSize,
-                Properties.NoReduceStore);
+                Properties.StoreStatesCacheSize);
 
             var chainIds = Store.ListChainIds().ToList();
             Log.Debug($"Number of chain ids: {chainIds.Count()}");
@@ -122,10 +121,10 @@ IActionEvaluator BuildActionEvaluator(IActionEvaluatorConfiguration actionEvalua
                 return actionEvaluatorConfiguration switch
                 {
                     RemoteActionEvaluatorConfiguration remoteActionEvaluatorConfiguration => new RemoteActionEvaluator(
-                        new Uri(remoteActionEvaluatorConfiguration.StateServiceEndpoint), blockChainStates),
+                        new Uri(remoteActionEvaluatorConfiguration.StateServiceEndpoint)),
                     DefaultActionEvaluatorConfiguration _ => new ActionEvaluator(
                         _ => blockPolicy.BlockAction,
-                        blockChainStates: blockChainStates,
+                        stateStore: StateStore,
                         actionTypeLoader: actionLoader
                     ),
                     ForkableActionEvaluatorConfiguration forkableActionEvaluatorConfiguration => new
@@ -303,7 +302,7 @@ public override async Task StopAsync(CancellationToken cancellationToken)
             }
         }
 
-        protected (IStore, IStateStore) LoadStore(string path, string type, int statesCacheSize, bool noReduceStore = false)
+        protected (IStore, IStateStore) LoadStore(string path, string type, int statesCacheSize)
         {
             IStore store = null;
             if (type == "rocksdb")
@@ -344,10 +343,6 @@ public override async Task StopAsync(CancellationToken cancellationToken)
             }
 
             store ??= new DefaultStore(path, flush: false);
-            if (!noReduceStore)
-            {
-                store = new ReducedStore(store);
-            }
 
             IKeyValueStore stateKeyValueStore = new RocksDBKeyValueStore(Path.Combine(path, "states"));
             IStateStore stateStore = new TrieStateStore(stateKeyValueStore);