Merge pull request #2240 from greymistcube/bump/libplanet-to-3.3.1

⬆️ Bump libplanet to 3.3.1
planetarium · Sep 8, 2023 · 83e5f84 · 83e5f84
2 parents 1b19cc8 + 4aa125d
commit 83e5f84
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 496 deletions.
diff --git a/Lib9c b/Lib9c
diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs
@@ -255,7 +255,7 @@ public void PruneState(StoreType storeType)
             _command.PruneStates(storeType, _storePath);
             IStore outputStore = storeType.CreateStore(_storePath);
             var outputStateKeyValueStore = new RocksDBKeyValueStore(statesPath);
-            var outputStateStore = new TrieStateStore(outputStateKeyValueStore, true);
+            var outputStateStore = new TrieStateStore(outputStateKeyValueStore);
             int outputStatesCount = outputStateKeyValueStore.ListKeys().Count();
             outputStore.Dispose();
             outputStateStore.Dispose();

diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs
diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.cs
@@ -100,8 +100,8 @@ public int Tx(
                 }
 
                 // Evaluate tx.
-                IAccountState previousBlockStates = blockChain.GetBlockState(previousBlock.Hash);
-                IAccount previousStates = AccountStateDelta.Create(previousBlockStates);
+                IAccountState previousBlockStates = blockChain.GetAccountState(previousBlock.Hash);
+                IAccount previousStates = new Account(previousBlockStates);
                 var actions = tx.Actions.Select(a => ToAction(a));
                 var actionEvaluations = EvaluateActions(
                     preEvaluationHash: targetBlock.PreEvaluationHash,
@@ -398,8 +398,7 @@ public int RemoteTx(
                 cacheDirectory ?? Path.Join(Path.GetTempPath(), "ncd-replay-remote-tx-cache"));
 
             var previousBlockHash = BlockHash.FromString(previousBlockHashValue);
-            var previousStates =
-                AccountStateDelta.Create(blockChainStates.GetBlockState(previousBlockHash));
+            var previousStates = new Account(blockChainStates.GetAccountState(previousBlockHash));
 
             var actions = transaction.Actions
                 .Select(ToAction)

diff --git a/NineChronicles.Headless.Tests/Common/MockState.cs b/NineChronicles.Headless.Tests/Common/MockState.cs
@@ -6,6 +6,7 @@
 using Bencodex.Types;
 using Libplanet.Action.State;
 using Libplanet.Crypto;
+using Libplanet.Store.Trie;
 using Libplanet.Types.Assets;
 using Libplanet.Types.Consensus;
 
@@ -85,6 +86,8 @@ private MockState(
 
         public ValidatorSet ValidatorSet => _validatorSet;
 
+        public ITrie Trie => throw new NotSupportedException();
+
         public IValue? GetState(Address address) => _states.TryGetValue(address, out IValue? value)
             ? value
             : null;

diff --git a/NineChronicles.Headless.Tests/GraphQLTestUtils.cs b/NineChronicles.Headless.Tests/GraphQLTestUtils.cs
@@ -92,7 +92,7 @@ public static StandaloneContext CreateStandaloneContext()
                 stateStore,
                 genesisBlock,
                 actionEvaluator);
-            var currencyFactory = new CurrencyFactory(blockchain.GetBlockState);
+            var currencyFactory = new CurrencyFactory(() => blockchain.GetAccountState(blockchain.Tip.Hash));
             var fungibleAssetValueFactory = new FungibleAssetValueFactory(currencyFactory);
             return new StandaloneContext
             {
@@ -133,7 +133,7 @@ PrivateKey minerPrivateKey
                 actionEvaluator);
             var ncg = new GoldCurrencyState((Dictionary)blockchain.GetState(Addresses.GoldCurrency))
                 .Currency;
-            var currencyFactory = new CurrencyFactory(blockchain.GetBlockState, ncg);
+            var currencyFactory = new CurrencyFactory(() => blockchain.GetAccountState(blockchain.Tip.Hash), ncg);
             var fungibleAssetValueFactory = new FungibleAssetValueFactory(currencyFactory);
             return new StandaloneContext
             {

diff --git a/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs
@@ -343,7 +343,7 @@ public async Task TransactionResultIsSuccess()
 
         private Task<ExecutionResult> ExecuteAsync(string query)
         {
-            var currencyFactory = new CurrencyFactory(_blockChain.GetBlockState);
+            var currencyFactory = new CurrencyFactory(() => _blockChain.GetAccountState(_blockChain.Tip.Hash));
             var fungibleAssetValueFactory = new FungibleAssetValueFactory(currencyFactory);
             return GraphQLTestUtils.ExecuteQueryAsync<TransactionHeadlessQuery>(query, standaloneContext: new StandaloneContext
             {

diff --git a/NineChronicles.Headless/BlockChainService.cs b/NineChronicles.Headless/BlockChainService.cs
@@ -125,7 +125,7 @@ public UnaryResult<byte[]> GetState(byte[] addressBytes, byte[] blockHashBytes)
         public async UnaryResult<Dictionary<byte[], byte[]>> GetAvatarStates(IEnumerable<byte[]> addressBytesList, byte[] blockHashBytes)
         {
             var hash = new BlockHash(blockHashBytes);
-            var accountState = _blockChain.GetBlockState(hash);
+            var accountState = _blockChain.GetAccountState(hash);
             var result = new ConcurrentDictionary<byte[], byte[]>();
             var addresses = addressBytesList.Select(a => new Address(a)).ToList();
             var rawAvatarStates = accountState.GetRawAvatarStates(addresses);

diff --git a/NineChronicles.Headless/GraphTypes/StandaloneQuery.cs b/NineChronicles.Headless/GraphTypes/StandaloneQuery.cs
@@ -52,7 +52,7 @@ public StandaloneQuery(StandaloneContext standaloneContext, IConfiguration confi
                     }
 
                     return new StateContext(
-                        chain.GetBlockState(blockHash),
+                        chain.GetAccountState(blockHash),
                         blockHash switch
                         {
                             BlockHash bh => chain[bh].Index,

diff --git a/NineChronicles.Headless/NineChroniclesNodeService.cs b/NineChronicles.Headless/NineChroniclesNodeService.cs
@@ -278,7 +278,8 @@ internal void ConfigureContext(StandaloneContext standaloneContext)
             standaloneContext.Store = Store;
             standaloneContext.Swarm = Swarm;
             standaloneContext.CurrencyFactory =
-                new CurrencyFactory(standaloneContext.BlockChain.GetBlockState);
+                new CurrencyFactory(
+                    () => standaloneContext.BlockChain.GetAccountState(standaloneContext.BlockChain.Tip.Hash));
             standaloneContext.FungibleAssetValueFactory =
                 new FungibleAssetValueFactory(standaloneContext.CurrencyFactory);
             BootstrapEnded.WaitAsync().ContinueWith((task) =>
+3 −0		.Lib9c.Tests/Action/MockState.cs
+3 −0		.Lib9c.Tests/Action/MockStateDelta.cs
+16 −1		.Lib9c.Tests/Action/Scenario/AuraScenarioTest.cs
+8 −2		.Lib9c.Tests/Model/Stake/ContractTest.cs
+3 −3		.Lib9c.Tests/Model/Stake/StakeStateV2Test.cs
+1 −1		.Libplanet
+3 −0		.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDelta.cs
+1 −1		.Libplanet.Extensions.RemoteActionEvaluator/RemoteActionEvaluator.cs
+1 −1		.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs
+4 −1		.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockState.cs
+17 −0		.gitallowed
+3 −0		Lib9c.MessagePack/AccountStateDelta.cs
+3 −0		Lib9c/Action/ActionBaseExtensions.cs
+1 −0		Lib9c/GameConfig.cs
+3 −1		Lib9c/Model/Stake/Contract.cs
+1 −0		Lib9c/Model/State/AvatarState.cs