Merge pull request #2135 from greymistcube/bump/libplanet-to-3.3.0

⬆️ Bump libplanet to 3.3.1
planetarium · Sep 8, 2023 · 6a5fd2f · 6a5fd2f
2 parents f62cad2 + c78374a
commit 6a5fd2f
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 4 deletions.
diff --git a/.Lib9c.Tests/Action/MockState.cs b/.Lib9c.Tests/Action/MockState.cs
@@ -10,6 +10,7 @@ namespace Lib9c.Tests.Action
     using Bencodex.Types;
     using Libplanet.Action.State;
     using Libplanet.Crypto;
+    using Libplanet.Store.Trie;
     using Libplanet.Types.Assets;
     using Libplanet.Types.Consensus;
 
@@ -79,6 +80,8 @@ private MockState(
 
         public static MockState Empty => _empty;
 
+        public ITrie Trie => throw new NotSupportedException();
+
         public IImmutableDictionary<Address, IValue> States => _states;
 
         public IImmutableDictionary<(Address, Currency), BigInteger> Fungibles => _fungibles;

diff --git a/.Lib9c.Tests/Action/MockStateDelta.cs b/.Lib9c.Tests/Action/MockStateDelta.cs
@@ -12,6 +12,7 @@ namespace Lib9c.Tests.Action
     using Libplanet.Action;
     using Libplanet.Action.State;
     using Libplanet.Crypto;
+    using Libplanet.Store.Trie;
     using Libplanet.Types.Assets;
     using Libplanet.Types.Consensus;
 
@@ -41,6 +42,8 @@ private MockStateDelta(IAccountState baseState, IAccountDelta delta)
             TotalUpdatedFungibles = ImmutableDictionary<(Address, Currency), BigInteger>.Empty;
         }
 
+        public ITrie Trie => throw new NotSupportedException();
+
         /// <inheritdoc/>
         public IAccountDelta Delta { get; private set; }
 

diff --git a/.Libplanet b/.Libplanet
diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDelta.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDelta.cs
@@ -5,6 +5,7 @@
 using Libplanet.Action;
 using Libplanet.Action.State;
 using Libplanet.Crypto;
+using Libplanet.Store.Trie;
 using Libplanet.Types.Assets;
 using Libplanet.Types.Consensus;
 
@@ -118,6 +119,8 @@ public AccountStateDelta(byte[] bytes)
     {
     }
 
+    public ITrie Trie => throw new NotSupportedException();
+
     public IAccountDelta Delta => _delta;
 
     public IValue? GetState(Address address) =>

diff --git a/.Libplanet.Extensions.RemoteActionEvaluator/RemoteActionEvaluator.cs b/.Libplanet.Extensions.RemoteActionEvaluator/RemoteActionEvaluator.cs
@@ -49,7 +49,7 @@ public IReadOnlyList<IActionEvaluation> Evaluate(IPreEvaluationBlock block)
             else
             {
                 actionEvaluations[i].InputContext.PreviousState.BaseState =
-                    _blockChainStates.GetBlockState(block.PreviousHash);
+                    _blockChainStates.GetAccountState(block.PreviousHash);
             }
 
             actionEvaluations[i].OutputState.BaseState =

diff --git a/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs b/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs
@@ -39,7 +39,7 @@ public ValidatorSet GetValidatorSet(BlockHash? offset)
             return new RemoteBlockState(_explorerEndpoint, offset).GetValidatorSet();
         }
 
-        public IBlockState GetBlockState(BlockHash? offset)
+        public IAccountState GetAccountState(BlockHash? offset)
         {
             return new RemoteBlockState(_explorerEndpoint, offset);
         }

diff --git a/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockState.cs b/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockState.cs
@@ -9,10 +9,11 @@
 using Libplanet.Types.Blocks;
 using Libplanet.Types.Consensus;
 using Libplanet.Crypto;
+using Libplanet.Store.Trie;
 
 namespace Libplanet.Extensions.RemoteBlockChainStates;
 
-public class RemoteBlockState : IBlockState
+public class RemoteBlockState : IAccountState
 {
     private readonly Uri _explorerEndpoint;
     private readonly GraphQLHttpClient _graphQlHttpClient;
@@ -164,6 +165,8 @@ public ValidatorSet GetValidatorSet()
             .ToList());
     }
 
+    public ITrie Trie => throw new NotSupportedException();
+
     public BlockHash? BlockHash { get; }
 
     private class GetStatesResponseType

diff --git a/Lib9c.MessagePack/AccountStateDelta.cs b/Lib9c.MessagePack/AccountStateDelta.cs
@@ -8,6 +8,7 @@
 using Libplanet.Action;
 using Libplanet.Action.State;
 using Libplanet.Crypto;
+using Libplanet.Store.Trie;
 using Libplanet.Types.Assets;
 using Libplanet.Types.Consensus;
 
@@ -63,6 +64,8 @@ public AccountStateDelta(byte[] bytes)
         {
         }
 
+        public ITrie Trie => throw new NotSupportedException();
+
         public IAccountDelta Delta => _delta;
 
         public IValue? GetState(Address address) =>

diff --git a/Lib9c/Action/ActionBaseExtensions.cs b/Lib9c/Action/ActionBaseExtensions.cs
@@ -8,6 +8,7 @@
 using Libplanet.Action.State;
 using Libplanet.Common;
 using Libplanet.Crypto;
+using Libplanet.Store.Trie;
 using Libplanet.Types.Assets;
 using Libplanet.Types.Blocks;
 using Libplanet.Types.Consensus;
@@ -88,6 +89,8 @@ public AddressTraceStateDelta(AddressTraceDelta delta)
                 _delta = delta;
             }
 
+            public ITrie Trie => throw new NotSupportedException();
+
             public IAccountDelta Delta => _delta;
 
             public IImmutableSet<Address> UpdatedAddresses => _delta.UpdatedAddresses;