Merge pull request #2160 from greymistcube/bump/libplanet-to-3.4.0

⬆️ Bump libplanet to 3.4.0

.Lib9c.Benchmarks/Program.cs

@@ -128,15 +128,7 @@ static void Main(string[] args)
                     block.Transactions.Count()
                 );
 
-                chain.DetermineBlockStateRootHash(block, out IReadOnlyList<IActionEvaluation> blockEvals);
-                SetStates(
-                    chain.Id,
-                    store,
-                    stateStore,
-                    block,
-                    blockEvals.ToArray(),
-                    buildStateReferences: true
-                );
+                chain.DetermineBlockStateRootHash(block, out IReadOnlyList<ICommittedActionEvaluation> blockEvals);
                 txs += block.Transactions.LongCount();
                 actions += block.Transactions.Sum(tx =>
                     tx.Actions is { } customActions ? customActions.LongCount() : 0);

.Lib9c.Tests/Action/ActionEvaluationTest.cs

@@ -99,9 +99,9 @@ public void Serialize_With_MessagePack(Type actionType)
                 action,
                 _signer,
                 1234,
-                _states,
+                _states.Trie.Hash,
                 null,
-                _states,
+                _states.Trie.Hash,
                 0,
                 new Dictionary<string, IValue>()
             );
@@ -110,9 +110,8 @@ public void Serialize_With_MessagePack(Type actionType)
             var deserialized = MessagePackSerializer.Deserialize<NCActionEvaluation>(b);
             Assert.Equal(evaluation.Signer, deserialized.Signer);
             Assert.Equal(evaluation.BlockIndex, deserialized.BlockIndex);
-            var dict = (Dictionary)deserialized.OutputState.GetState(default)!;
-            Assert.Equal("value", (Text)dict["key"]);
-            Assert.Equal(_currency * 10000, deserialized.OutputState.GetBalance(_signer, _currency));
+            Assert.Equal(_states.Trie.Hash, deserialized.OutputState);
+            Assert.Equal(_states.Trie.Hash, deserialized.PreviousState);
             if (actionType == typeof(RewardGold))
             {
                 Assert.Null(deserialized.Action);

.Lib9c.Tests/Action/MockStateDelta.cs

@@ -42,7 +42,7 @@ private MockStateDelta(IAccountState baseState, IAccountDelta delta)
             TotalUpdatedFungibles = ImmutableDictionary<(Address, Currency), BigInteger>.Empty;
         }
 
-        public ITrie Trie => throw new NotSupportedException();
+        public ITrie Trie => new MerkleTrie(new MemoryKeyValueStore());
 
         /// <inheritdoc/>
         public IAccountDelta Delta { get; private set; }

.Lib9c.Tests/Action/Snapshot/TransferAsset0SnapshotTest.cs

@@ -7,6 +7,7 @@ namespace Lib9c.Tests.Action.Snapshot
     using Libplanet.Action.State;
     using Libplanet.Common;
     using Libplanet.Crypto;
+    using Libplanet.Store.Trie;
     using Libplanet.Types.Assets;
     using Nekoyume.Action;
     using Nekoyume.Helper;
@@ -66,6 +67,7 @@ public Task TransferCrystal()
                 .Verify(outputState)
                 .IgnoreMembersWithType<IImmutableSet<(Address, Currency)>>()
                 .IgnoreMembersWithType<IImmutableDictionary<(Address, Currency), BigInteger>>()
+                .IgnoreMembersWithType<ITrie>()
                 .UseTypeName((Text)GetActionTypeId<TransferAsset0>())
                 .UseMethodName($"{nameof(TransferCrystal)}.summary");
             var fungibles = Verifier
@@ -106,6 +108,7 @@ public Task TransferWithMemo()
                 .Verify(outputState)
                 .IgnoreMembersWithType<IImmutableSet<(Address, Currency)>>()
                 .IgnoreMembersWithType<IImmutableDictionary<(Address, Currency), BigInteger>>()
+                .IgnoreMembersWithType<ITrie>()
                 .UseTypeName((Text)GetActionTypeId<TransferAsset0>())
                 .UseMethodName($"{nameof(TransferWithMemo)}.summary");
             var fungibles = Verifier

.Lib9c.Tools/SubCommand/Market.cs

@@ -102,7 +102,7 @@ public void Query(
                     .Reverse()
                     .Where(tx => includeFails ||
                         !(chain.GetTxExecution(block.Hash, tx.Id) is { } e) ||
-                        e is TxSuccess)
+                        !e.Fail)
                     .SelectMany(tx => tx.Actions is { } actions
                         ? actions.Reverse().Select(a => (tx, (ActionBase)actionLoader.LoadAction(block.Index, a)))
                         : Enumerable.Empty<(Transaction, ActionBase)>());

.Lib9c.Tools/SubCommand/State.cs

@@ -115,7 +115,7 @@ IStateStore stateStore
                     block.Index,
                     block.Hash
                 );
-                IReadOnlyList<IActionEvaluation> delta;
+
                 var actionLoader = TypedActionLoader.Create(
                     typeof(ActionBase).Assembly, typeof(ActionBase));
                 var actionEvaluator = new ActionEvaluator(
@@ -126,30 +126,16 @@ IStateStore stateStore
                     ? 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);

.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs

@@ -1,5 +1,7 @@
+using System.Security.Cryptography;
 using Bencodex.Types;
 using Libplanet.Action.State;
+using Libplanet.Common;
 using Libplanet.Crypto;
 using Libplanet.Types.Assets;
 using Libplanet.Types.Blocks;
@@ -39,9 +41,15 @@ public ValidatorSet GetValidatorSet(BlockHash? offset)
             return new RemoteBlockState(_explorerEndpoint, offset).GetValidatorSet();
         }
 
-        public IAccountState GetAccountState(BlockHash? offset)
+        public IAccountState GetAccountState(BlockHash? offset) =>
+            throw new NotImplementedException();
+
+        public IAccountState GetBlockState(BlockHash? offset)
         {
             return new RemoteBlockState(_explorerEndpoint, offset);
         }
+
+        public IAccountState GetAccountState(HashDigest<SHA256>? hash) =>
+            throw new NotImplementedException();
     }
 }

Lib9c.MessagePack/Action/NCActionEvaluation.cs

@@ -1,11 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography;
 using Bencodex.Types;
 using Lib9c.Formatters;
 using Lib9c.Renderers;
 using Libplanet.Crypto;
-using Libplanet.Action.State;
+using Libplanet.Common;
 using MessagePack;
 
 namespace Nekoyume.Action
@@ -27,16 +28,16 @@ public struct NCActionEvaluation
         public long BlockIndex { get; set; }
 
         [Key(3)]
-        [MessagePackFormatter(typeof(AccountStateDeltaFormatter))]
-        public IAccount OutputState { get; set; }
+        [MessagePackFormatter(typeof(HashDigestFormatter))]
+        public HashDigest<SHA256> OutputState { get; set; }
 
         [Key(4)]
         [MessagePackFormatter(typeof(ExceptionFormatter<Exception>))]
         public Exception? Exception { get; set; }
 
         [Key(5)]
-        [MessagePackFormatter(typeof(AccountStateDeltaFormatter))]
-        public IAccount PreviousState { get; set; }
+        [MessagePackFormatter(typeof(HashDigestFormatter))]
+        public HashDigest<SHA256> PreviousState { get; set; }
 
         [Key(6)]
         public int RandomSeed { get; set; }
@@ -50,9 +51,9 @@ public NCActionEvaluation(
             ActionBase? action,
             Address signer,
             long blockIndex,
-            IAccount outputStates,
+            HashDigest<SHA256> outputStates,
             Exception? exception,
-            IAccount previousStates,
+            HashDigest<SHA256> previousStates,
             int randomSeed,
             Dictionary<string, IValue> extra
         )

Lib9c.MessagePack/Formatters/HashDigestFormatter.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Buffers;
+using System.Security.Cryptography;
+using Libplanet.Common;
+using MessagePack;
+using MessagePack.Formatters;
+
+namespace Lib9c.Formatters
+{
+    public class HashDigestFormatter : IMessagePackFormatter<HashDigest<SHA256>>
+    {
+        public void Serialize(
+            ref MessagePackWriter writer,
+            HashDigest<SHA256> value,
+            MessagePackSerializerOptions options)
+        {
+            writer.Write(value.ToByteArray());
+        }
+
+        public HashDigest<SHA256> Deserialize(
+            ref MessagePackReader reader,
+            MessagePackSerializerOptions options)
+        {
+            options.Security.DepthStep(ref reader);
+
+            var bytes = reader.ReadBytes()?.ToArray();
+            if (bytes is null)
+            {
+                throw new InvalidOperationException();
+            }
+
+            return new HashDigest<SHA256>(bytes);
+        }
+    }
+}

Lib9c.Renderers/ActionEvaluation.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography;
 using Bencodex.Types;
-using Libplanet.Action.State;
+using Libplanet.Common;
 using Libplanet.Crypto;
 using Libplanet.Types.Tx;
 using Nekoyume.Action;
@@ -19,11 +20,11 @@ public struct ActionEvaluation<T>
 
         public TxId? TxId { get; set; }
 
-        public IAccount OutputState { get; set; }
+        public HashDigest<SHA256> OutputState { get; set; }
 
         public Exception? Exception { get; set; }
 
-        public IAccount PreviousState { get; set; }
+        public HashDigest<SHA256> PreviousState { get; set; }
 
         public int RandomSeed { get; set; }
 

Lib9c.Renderers/Renderers/ActionRenderer.cs

@@ -1,13 +1,13 @@
 using System;
-using Libplanet.Crypto;
+using System.Security.Cryptography;
 using Libplanet.Action;
 using Libplanet.Action.Loader;
 using Libplanet.Blockchain.Renderers;
 using Libplanet.Types.Blocks;
-using Libplanet.Action.State;
 using Nekoyume.Action;
 using Serilog;
 using Bencodex.Types;
+using Libplanet.Common;
 using Nekoyume.Action.Loader;
 #if UNITY_EDITOR || UNITY_STANDALONE
 using UniRx;
@@ -33,7 +33,7 @@ public ActionRenderer()
             _actionLoader = new NCActionLoader();
         }
 
-        public void RenderAction(IValue action, IActionContext context, IAccount nextStates) =>
+        public void RenderAction(IValue action, ICommittedActionContext context, HashDigest<SHA256> nextState) =>
             ActionRenderSubject.OnNext(new ActionEvaluation<ActionBase>
             {
                 Action = context.BlockAction
@@ -42,16 +42,12 @@ public void RenderAction(IValue action, IActionContext context, IAccount nextSta
                 Signer = context.Signer,
                 BlockIndex = context.BlockIndex,
                 TxId = context.TxId,
-                OutputState = nextStates,
+                OutputState = nextState,
                 PreviousState = context.PreviousState,
                 RandomSeed = context.Random.Seed
             });
 
-        public void RenderActionError(
-            IValue action,
-            IActionContext context,
-            Exception exception
-        )
+        public void RenderActionError(IValue action, ICommittedActionContext context, Exception exception)
         {
             Log.Error(exception, "{action} execution failed.", action);
             ActionRenderSubject.OnNext(new ActionEvaluation<ActionBase>
@@ -96,22 +92,5 @@ public IObservable<ActionEvaluation<T>> EveryRender<T>() where T : ActionBase =>
                     RandomSeed = eval.RandomSeed,
                     Extra = eval.Extra,
                 });
-
-        public IObservable<ActionEvaluation<ActionBase>> EveryRender(Address updatedAddress) =>
-            ActionRenderSubject
-                .AsObservable()
-                .Where(eval => eval.OutputState.Delta.UpdatedAddresses.Contains(updatedAddress))
-                .Select(eval => new ActionEvaluation<ActionBase>
-                {
-                    Action = eval.Action,
-                    Signer = eval.Signer,
-                    BlockIndex = eval.BlockIndex,
-                    TxId = eval.TxId,
-                    OutputState = eval.OutputState,
-                    Exception = eval.Exception,
-                    PreviousState = eval.PreviousState,
-                    RandomSeed = eval.RandomSeed,
-                    Extra = eval.Extra,
-                });
     }
 }

Lib9c/Action/Stake.cs

@@ -49,7 +49,7 @@ public override IAccount Execute(IActionContext context)
         {
             var started = DateTimeOffset.UtcNow;
             context.UseGas(1);
-            var states = context.PreviousState;
+            IAccount states = context.PreviousState;
 
             // NOTE: Restrict staking if there is a monster collection until now.
             if (states.GetAgentState(context.Signer) is { } agentState &&