Merge pull request #2491 from planetarium/main-merge-150

Main merge 150
planetarium · Jun 27, 2024 · e8faa14 · e8faa14
2 parents a11565e + 26404cb
commit e8faa14
Show file tree

Hide file tree

Showing 22 changed files with 227 additions and 139 deletions.
diff --git a/Lib9c b/Lib9c
diff --git a/Libplanet.Headless.Tests/Hosting/LibplanetNodeServiceTest.cs b/Libplanet.Headless.Tests/Hosting/LibplanetNodeServiceTest.cs
@@ -30,11 +30,7 @@ public void Constructor()
                 new MemoryStore(),
                 stateStore);
             var actionLoader = new SingleActionLoader(typeof(DummyAction));
-            var actionEvaluator = new ActionEvaluator(
-                _ => policy.BlockAction,
-                stateStore,
-                actionLoader);
-            var genesisBlock = BlockChain.ProposeGenesisBlock(actionEvaluator);
+            var genesisBlock = BlockChain.ProposeGenesisBlock();
             var service = new LibplanetNodeService(
                 new LibplanetNodeServiceProperties()
                 {

diff --git a/NineChronicles.Headless.Executable.Tests/Commands/AccountCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/AccountCommandTest.cs
@@ -58,6 +58,7 @@ public void Balance(StoreType storeType)
                 stateStore,
                 genesisBlock,
                 actionEvaluator);
+            GenesisHelper.AppendEmptyBlock(chain);
             Guid chainId = chain.Id;
             store.Dispose();
             stateStore.Dispose();

diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs
@@ -57,11 +57,7 @@ public ChainCommandTest()
         [InlineData(StoreType.RocksDb)]
         public void Tip(StoreType storeType)
         {
-            var actionEvaluator = new ActionEvaluator(
-                _ => new BlockPolicy().BlockAction,
-                new TrieStateStore(new MemoryKeyValueStore()),
-                new NCActionLoader());
-            Block genesisBlock = BlockChain.ProposeGenesisBlock(actionEvaluator);
+            Block genesisBlock = BlockChain.ProposeGenesisBlock();
             IStore store = storeType.CreateStore(_storePath);
             Guid chainId = Guid.NewGuid();
             store.SetCanonicalChainId(chainId);
@@ -96,7 +92,6 @@ public void Inspect(StoreType storeType)
                 stateStore,
                 new NCActionLoader());
             Block genesisBlock = BlockChain.ProposeGenesisBlock(
-                actionEvaluator,
                 transactions: new IAction[]
                     {
                         new Initialize(
@@ -157,7 +152,6 @@ public void Truncate(StoreType storeType)
                 stateStore,
                 new NCActionLoader());
             Block genesisBlock = BlockChain.ProposeGenesisBlock(
-                actionEvaluator,
                 transactions: new IAction[]
                     {
                         new Initialize(

diff --git a/NineChronicles.Headless.Executable.Tests/Commands/GenesisHelper.cs b/NineChronicles.Headless.Executable.Tests/Commands/GenesisHelper.cs
@@ -5,13 +5,16 @@
 using System.Linq;
 using System.Numerics;
 using System.Text.Json;
+using Libplanet.Blockchain;
 using Libplanet.Common;
 using Libplanet.Crypto;
 using Libplanet.Types.Blocks;
+using Libplanet.Types.Consensus;
 using Nekoyume;
 using Nekoyume.Action;
 using Nekoyume.Model;
 using Nekoyume.Model.State;
+using static Humanizer.In;
 using Lib9cUtils = Lib9c.DevExtensions.Utils;
 
 namespace NineChronicles.Headless.Executable.Tests.Commands
@@ -96,6 +99,21 @@ public static Block MineGenesisBlock(
             return genesisBlock;
         }
 
+        public static void AppendEmptyBlock(BlockChain blockChain)
+        {
+            var lastHeight = blockChain.Tip.Index;
+            var block = blockChain.ProposeBlock(ValidatorKey, blockChain.GetBlockCommit(lastHeight));
+            var blockCommit = new BlockCommit(
+                block.Index,
+                0,
+                block.Hash,
+                new[]
+                {
+                    new VoteMetadata(block.Index, 0, block.Hash, block.Timestamp, ValidatorKey.PublicKey, VoteFlag.PreCommit).Sign(ValidatorKey),
+                }.ToImmutableArray());
+            blockChain.Append(block, blockCommit);
+        }
+
         [Serializable]
         private struct AuthorizedMinerConfig
         {

diff --git a/NineChronicles.Headless.Executable.Tests/ProgramTest.cs b/NineChronicles.Headless.Executable.Tests/ProgramTest.cs
@@ -3,13 +3,22 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Grpc.Core;
+using Libplanet.Action;
+using Libplanet.Action.Loader;
+using Libplanet.Blockchain;
+using Libplanet.Blockchain.Policies;
+using Libplanet.Common;
 using Libplanet.Crypto;
 using Libplanet.Net;
+using Libplanet.Store;
+using Libplanet.Store.Trie;
+using Libplanet.Types.Blocks;
 using MagicOnion.Client;
+using Nekoyume.Action.Loader;
+using Nekoyume.Blockchain.Policy;
 using Nekoyume.Shared.Services;
 using Xunit;
 
@@ -22,14 +31,23 @@ public class ProgramTest
         private readonly string _storePath;
         private readonly ushort _rpcPort;
         private readonly ushort _graphqlPort;
+        private readonly string _genesisBlockHash;
+        private readonly byte[] _genesisEncoded;
 
         public ProgramTest()
         {
             var privateKey = new PrivateKey();
             _apvString = AppProtocolVersion.Sign(privateKey, 1000).Token;
 
-            _genesisBlockPath = "https://release.nine-chronicles.com/genesis-block-9c-main";
             _storePath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+            Directory.CreateDirectory(_storePath);
+            _genesisBlockPath = Path.Combine(_storePath, "./genesis");
+            var genesis = BlockChain.ProposeGenesisBlock();
+
+            Bencodex.Codec codec = new Bencodex.Codec();
+            _genesisBlockHash = ByteUtil.Hex(genesis.Hash.ByteArray);
+            _genesisEncoded = codec.Encode(BlockMarshaler.MarshalBlock(genesis));
+            File.WriteAllBytes(_genesisBlockPath, _genesisEncoded);
 
             _rpcPort = 41234;
             _graphqlPort = 41238;
@@ -72,7 +90,7 @@ public async Task Run()
                 var response = await client.PostAsync($"http://localhost:{_graphqlPort}/graphql", content);
                 var responseString = await response.Content.ReadAsStringAsync();
                 Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-                Assert.Contains("\"data\":{\"chainQuery\":{\"blockQuery\":{\"block\":{\"hash\":\"4582250d0da33b06779a8475d283d5dd210c683b9b999d74d03fac4f58fa6bce\"}}}}", responseString);
+                Assert.Contains($"\"data\":{{\"chainQuery\":{{\"blockQuery\":{{\"block\":{{\"hash\":\"{_genesisBlockHash}\"}}}}}}}}", responseString);
 
                 var channel = new Channel(
                     $"localhost:{_rpcPort}",
@@ -87,7 +105,7 @@ public async Task Run()
 
                 var service = MagicOnionClient.Create<IBlockChainService>(channel, Array.Empty<IClientFilter>())
                     .WithCancellationToken(channel.ShutdownToken);
-                Assert.Equal(11085612, (await service.GetTip()).Length);
+                Assert.Equal(_genesisEncoded.Length, (await service.GetTip()).Length);
             }
             finally
             {

diff --git a/NineChronicles.Headless.Executable.Tests/Store/StoreExtensionsTest.cs b/NineChronicles.Headless.Executable.Tests/Store/StoreExtensionsTest.cs
@@ -28,11 +28,7 @@ public StoreExtensionsTest()
         public void GetGenesisBlock(StoreType storeType)
         {
             IStore store = storeType.CreateStore(_storePath);
-            IActionEvaluator actionEvaluator = new ActionEvaluator(
-                _ => new BlockPolicy().BlockAction,
-                new TrieStateStore(new MemoryKeyValueStore()),
-                new NCActionLoader());
-            Block genesisBlock = BlockChain.ProposeGenesisBlock(actionEvaluator);
+            Block genesisBlock = BlockChain.ProposeGenesisBlock();
             Guid chainId = Guid.NewGuid();
             store.SetCanonicalChainId(chainId);
             store.PutBlock(genesisBlock);

diff --git a/NineChronicles.Headless.Executable/Commands/ChainCommand.cs b/NineChronicles.Headless.Executable/Commands/ChainCommand.cs
@@ -37,9 +37,11 @@ public class ChainCommand : CoconaLiteConsoleAppBase
 
         public enum SnapshotType
         {
+#pragma warning disable SA1602 // Enumeration items should be documented
             Full,
             Partition,
             All
+#pragma warning restore SA1602 // Enumeration items should be documented
         }
 
         public ChainCommand(IConsole console)
@@ -118,7 +120,9 @@ public void Inspect(
             IStagePolicy stagePolicy = new VolatileStagePolicy();
             IBlockPolicy blockPolicy = new BlockPolicySource().GetPolicy();
             IStore store = storeType.CreateStore(storePath);
-            var stateStore = new TrieStateStore(new DefaultKeyValueStore(null));
+            var statesPath = Path.Combine(storePath, "states");
+            IKeyValueStore stateKeyValueStore = new RocksDBKeyValueStore(statesPath);
+            var stateStore = new TrieStateStore(stateKeyValueStore);
             if (!(store.GetCanonicalChainId() is { } chainId))
             {
                 throw new CommandExitedException($"There is no canonical chain: {storePath}", -1);
@@ -215,6 +219,7 @@ public void Inspect(
             }
 
             store.Dispose();
+            stateStore.Dispose();
         }
 
         [Command(Description = "Truncate the chain from the tip by the input value (in blocks)")]

diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.Queries.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.Queries.cs
@@ -50,6 +50,7 @@ query GetBlockData($hash: ID!)
                         stateRootHash
                     }
                     stateRootHash
+                    protocolVersion
                 }
             }}
         }
@@ -90,6 +91,7 @@ private sealed class BlockType
         public string? PreEvaluationHash { get; set; }
         public BlockType? PreviousBlock { get; set; }
         public string? StateRootHash { get; set; }
+        public int? ProtocolVersion { get; set; }
     }
 
     private sealed class TransactionQueryType

diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs
@@ -249,6 +249,7 @@ public int Blocks(
                 var currentBlockIndex = startIndex.Value;
                 while (currentBlockIndex <= endIndex)
                 {
+                    var previousBlock = blockChain[currentBlockIndex];
                     var block = blockChain[currentBlockIndex++];
                     if (verbose)
                     {
@@ -270,7 +271,8 @@ public int Blocks(
 
                         try
                         {
-                            var rootHash = blockChain.DetermineBlockStateRootHash(block,
+                            var rootHash = blockChain.DetermineNextBlockStateRootHash(
+                                previousBlock,
                                 out IReadOnlyList<ICommittedActionEvaluation> actionEvaluations);
 
                             if (verbose)
@@ -301,7 +303,8 @@ public int Blocks(
                             outputSw?.WriteLine(msg);
 
                             var actionEvaluator = GetActionEvaluator(stateStore);
-                            var actionEvaluations = blockChain.DetermineBlockStateRootHash(block,
+                            var actionEvaluations = blockChain.DetermineNextBlockStateRootHash(
+                                previousBlock,
                                 out IReadOnlyList<ICommittedActionEvaluation> failedActionEvaluations);
                             LoggingActionEvaluations(failedActionEvaluations, outputSw);
 
@@ -385,7 +388,12 @@ public int RemoteTx(
             var previousBlockHashStateRootHash = block?.PreviousBlock?.StateRootHash;
             var preEvaluationHashValue = block?.PreEvaluationHash;
             var minerValue = block?.Miner;
-            if (previousBlockHashValue is null || preEvaluationHashValue is null || minerValue is null || previousBlockHashStateRootHash is null)
+            var protocolVersion = block?.ProtocolVersion;
+            if (previousBlockHashValue is null
+                || preEvaluationHashValue is null
+                || minerValue is null
+                || previousBlockHashStateRootHash is null
+                || protocolVersion is null)
             {
                 throw new CommandExitedException("Failed to get block from query", -1);
             }
@@ -425,7 +433,7 @@ public int RemoteTx(
             var actionEvaluations = EvaluateActions(
                 preEvaluationHash: HashDigest<SHA256>.FromString(preEvaluationHashValue),
                 blockIndex: transactionResult.BlockIndex ?? 0,
-                blockProtocolVersion: 0,
+                blockProtocolVersion: (int)protocolVersion,
                 txid: transaction.Id,
                 previousStates: previousStates,
                 miner: miner,

diff --git a/NineChronicles.Headless.Executable/Commands/StateCommand.cs b/NineChronicles.Headless.Executable/Commands/StateCommand.cs
@@ -134,14 +134,17 @@ IStateStore stateStore
                     block.Index,
                     block.Hash
                 );
-                HashDigest<SHA256> stateRootHash = block.Index < 1
-                    ? BlockChain.DetermineGenesisStateRootHash(
-                        actionEvaluator,
-                        preEvalBlock,
-                        out _)
-                    : chain.DetermineBlockStateRootHash(
-                        preEvalBlock,
-                        out _);
+                HashDigest<SHA256>? refSrh = block.ProtocolVersion < BlockMetadata.SlothProtocolVersion
+                    ? store.GetStateRootHash(block.PreviousHash)
+                    : store.GetStateRootHash(block.Hash);
+                refSrh = refSrh is { } prevSrh
+                    ? prevSrh
+                    : MerkleTrie.EmptyRootHash;
+
+                IReadOnlyList<ICommittedActionEvaluation> evals = actionEvaluator.Evaluate(block, refSrh);
+                HashDigest<SHA256> stateRootHash = evals.Count > 0
+                    ? evals[evals.Count - 1].OutputState
+                    : (HashDigest<SHA256>)refSrh;
                 DateTimeOffset now = DateTimeOffset.Now;
                 if (invalidStateRootHashBlock is null && !stateRootHash.Equals(block.StateRootHash))
                 {

diff --git a/NineChronicles.Headless.Executable/Store/AnonymousStore.cs b/NineChronicles.Headless.Executable/Store/AnonymousStore.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography;
+using Libplanet.Common;
 using Libplanet.Crypto;
 using Libplanet.Store;
 using Libplanet.Types.Blocks;
@@ -47,6 +49,9 @@ public class AnonymousStore : IStore
     public Action<BlockCommit> PutBlockCommit { get; set; }
     public Action<BlockHash> DeleteBlockCommit { get; set; }
     public Func<IEnumerable<BlockHash>> GetBlockCommitHashes { get; set; }
+    public Func<BlockHash, HashDigest<SHA256>?> GetNextStateRootHash { get; set; }
+    public Action<BlockHash, HashDigest<SHA256>> PutNextStateRootHash { get; set; }
+    public Action<BlockHash> DeleteNextStateRootHash { get; set; }
 #pragma warning restore CS8618
 
     void IDisposable.Dispose()
@@ -237,4 +242,19 @@ IEnumerable<BlockHash> IStore.GetBlockCommitHashes()
     {
         return GetBlockCommitHashes();
     }
+
+    HashDigest<SHA256>? IStore.GetNextStateRootHash(BlockHash blockHash)
+    {
+        return GetNextStateRootHash(blockHash);
+    }
+
+    void IStore.PutNextStateRootHash(BlockHash blockHash, HashDigest<SHA256> nextStateRootHash)
+    {
+        PutNextStateRootHash(blockHash, nextStateRootHash);
+    }
+
+    void IStore.DeleteNextStateRootHash(BlockHash blockHash)
+    {
+        DeleteNextStateRootHash(blockHash);
+    }
 }