Cherry-pick from migrate/iaccount-to-itrie

planetarium · Sep 26, 2023 · c94ea14 · c94ea14
1 parent 97d53a8
commit c94ea14
Show file tree

Hide file tree

Showing 16 changed files with 114 additions and 315 deletions.
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()}");
@@ -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);

diff --git a/Libplanet.Headless/ReducedStore.cs b/Libplanet.Headless/ReducedStore.cs
diff --git a/NineChronicles.Headless.Executable/Commands/MarketCommand.cs b/NineChronicles.Headless.Executable/Commands/MarketCommand.cs
@@ -108,8 +108,8 @@ public void Query(
                 IEnumerable<(Transaction, ActionBase)> actions = block.Transactions
                     .Reverse()
                     .Where(tx => includeFails ||
-                                 !(chain.GetTxExecution(block.Hash, tx.Id) is { } e) ||
-                                 e is TxSuccess)
+                        !(chain.GetTxExecution(block.Hash, tx.Id) is { } e) ||
+                        !e.Fail)
                     .SelectMany(tx => tx.Actions is { } ca
                         ? ca.Reverse().Select(a => (tx, ToAction(a)))
                         : Enumerable.Empty<(Transaction, ActionBase)>());

diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs
@@ -101,7 +101,7 @@ public int Tx(
 
                 // Evaluate tx.
                 IAccountState previousBlockStates = blockChain.GetAccountState(previousBlock.Hash);
-                IAccount previousStates = new Account(previousBlockStates);
+                IAccount previousStates = AccountStateDelta.Create(previousBlockStates);
                 var actions = tx.Actions.Select(a => ToAction(a));
                 var actionEvaluations = EvaluateActions(
                     preEvaluationHash: targetBlock.PreEvaluationHash,
@@ -271,7 +271,7 @@ public int Blocks(
                         try
                         {
                             var rootHash = blockChain.DetermineBlockStateRootHash(block,
-                                out IReadOnlyList<IActionEvaluation> actionEvaluations);
+                                out IReadOnlyList<ICommittedActionEvaluation> actionEvaluations);
 
                             if (verbose)
                             {
@@ -301,8 +301,9 @@ public int Blocks(
                             outputSw?.WriteLine(msg);
 
                             var actionEvaluator = GetActionEvaluator(blockChain);
-                            var actionEvaluations = actionEvaluator.Evaluate(block);
-                            LoggingActionEvaluations(actionEvaluations, outputSw);
+                            var actionEvaluations = blockChain.DetermineBlockStateRootHash(block,
+                                out IReadOnlyList<ICommittedActionEvaluation> failedActionEvaluations);
+                            LoggingActionEvaluations(failedActionEvaluations, outputSw);
 
                             msg = $"- block #{block.Index} evaluating failed with ";
                             _console.Out.Write(msg);
@@ -398,7 +399,8 @@ public int RemoteTx(
                 cacheDirectory ?? Path.Join(Path.GetTempPath(), "ncd-replay-remote-tx-cache"));
 
             var previousBlockHash = BlockHash.FromString(previousBlockHashValue);
-            var previousStates = new Account(blockChainStates.GetAccountState(previousBlockHash));
+            var previousStates =
+                AccountStateDelta.Create(blockChainStates.GetAccountState(previousBlockHash));
 
             var actions = transaction.Actions
                 .Select(ToAction)
@@ -558,7 +560,7 @@ private void LoggingAboutIncompleteBlockStatesException(
         }
 
         private void LoggingActionEvaluations(
-            IReadOnlyList<IActionEvaluation> actionEvaluations,
+            IReadOnlyList<ICommittedActionEvaluation> actionEvaluations,
             TextWriter? textWriter)
         {
             var count = actionEvaluations.Count;

diff --git a/NineChronicles.Headless.Executable/Commands/StateCommand.cs b/NineChronicles.Headless.Executable/Commands/StateCommand.cs
@@ -132,31 +132,20 @@ IStateStore stateStore
                     block.Index,
                     block.Hash
                 );
-                IReadOnlyList<IActionEvaluation> delta;
                 HashDigest<SHA256> stateRootHash = block.Index < 1
                     ? BlockChain.DetermineGenesisStateRootHash(
                         actionEvaluator,
                         preEvalBlock,
-                        out delta)
+                        out _)
                     : chain.DetermineBlockStateRootHash(
                         preEvalBlock,
-                        out delta);
+                        out _);
                 DateTimeOffset now = DateTimeOffset.Now;
                 if (invalidStateRootHashBlock is null && !stateRootHash.Equals(block.StateRootHash))
                 {
-                    string blockDump = DumpBencodexToFile(
-                        block.MarshalBlock(),
-                        $"block_{block.Index}_{block.Hash}"
-                    );
-                    string deltaDump = DumpBencodexToFile(
-                        new Dictionary(
-                            GetTotalDelta(delta, ToStateKey, ToFungibleAssetKey, ToTotalSupplyKey, ValidatorSetKey)),
-                        $"delta_{block.Index}_{block.Hash}"
-                    );
                     string message =
                         $"Unexpected state root hash for block #{block.Index} {block.Hash}.\n" +
-                        $"  Expected: {block.StateRootHash}\n  Actual:   {stateRootHash}\n" +
-                        $"  Block file: {blockDump}\n  Evaluated delta file: {deltaDump}\n";
+                        $"  Expected: {block.StateRootHash}\n  Actual:   {stateRootHash}\n";
                     if (!bypassStateRootHashCheck)
                     {
                         throw new CommandExitedException(message, 1);

diff --git a/NineChronicles.Headless.Executable/Program.cs b/NineChronicles.Headless.Executable/Program.cs
@@ -506,6 +506,7 @@ IActionLoader MakeSingleActionLoader()
                         standaloneContext.NineChroniclesNodeService!.ActionRenderer,
                         standaloneContext.NineChroniclesNodeService!.ExceptionRenderer,
                         standaloneContext.NineChroniclesNodeService!.NodeStatusRenderer,
+                        standaloneContext.NineChroniclesNodeService!.BlockChain,
                         IPAddress.Loopback.ToString(),
                         rpcProperties.RpcListenPort,
                         context,

diff --git a/NineChronicles.Headless.Tests/Common/MockState.cs b/NineChronicles.Headless.Tests/Common/MockState.cs
@@ -86,7 +86,10 @@ private MockState(
 
         public ValidatorSet ValidatorSet => _validatorSet;
 
-        public ITrie Trie => throw new NotSupportedException();
+        public ITrie Trie
+        {
+            get => new MerkleTrie(new MemoryKeyValueStore());
+        }
 
         public IValue? GetState(Address address) => _states.TryGetValue(address, out IValue? value)
             ? value

diff --git a/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs b/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs
@@ -115,6 +115,7 @@ public GraphQLTestBase(ITestOutputHelper output)
                 ncService.ActionRenderer,
                 ncService.ExceptionRenderer,
                 ncService.NodeStatusRenderer,
+                ncService.BlockChain,
                 "",
                 0,
                 new RpcContext(),