Merge pull request #2445 from s2quake/bump/lib9c-using-libplanet-4.2.0

Bump Lib9c using libplanet 4.2.0

NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj

@@ -21,6 +21,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\NineChronicles.Headless.Executable\NineChronicles.Headless.Executable.csproj" />
+        <ProjectReference Include="..\Lib9c\.Libplanet\Libplanet.Mocks\Libplanet.Mocks.csproj" />
     </ItemGroup>
 
 </Project>

NineChronicles.Headless.Executable/Commands/AccountCommand.cs

@@ -75,7 +75,11 @@ public void Balance(
                 _console.Error.WriteLine("Scanning block #{0} {1}...", digest.Index, digest.Hash);
                 _console.Error.Flush();
                 IEnumerable<Address> addrs = digest.TxIds
-                    .Select(txId => store.GetTransaction(new TxId(txId.ToArray())))
+                    .Select(txId =>
+                    {
+                        return store.GetTransaction(new TxId(txId.ToArray())) ??
+                            throw new InvalidOperationException($"Transaction #{txId} is not found in the store.");
+                    })
                     .SelectMany(tx => tx.Actions is { } ca
                         ? ca.Select(a => ToAction(a))
                             .SelectMany(a =>

NineChronicles.Headless.Executable/Commands/ChainCommand.cs

@@ -82,7 +82,7 @@ public void Tip(
 
             BlockHash tipHash = store.IndexBlockHash(chainId, -1)
                           ?? throw new CommandExitedException("The given chain seems empty.", -1);
-            Block tip = store.GetBlock(tipHash);
+            Block tip = GetBlock(store, tipHash);
             _console.Out.WriteLine(CoconaUtils.SerializeHumanReadable(tip.Header));
             store.Dispose();
         }
@@ -129,7 +129,7 @@ public void Inspect(
                 throw new CommandExitedException($"There is no genesis block: {storePath}", -1);
             }
 
-            Block genesisBlock = store.GetBlock(gHash);
+            Block genesisBlock = GetBlock(store, gHash);
             var blockChainStates = new BlockChainStates(store, stateStore);
             var actionEvaluator = new ActionEvaluator(
                 _ => blockPolicy.BlockAction,
@@ -163,8 +163,8 @@ public void Inspect(
             foreach (var item in
                 store.IterateIndexes(chain.Id, offset + 1 ?? 1, limit).Select((value, i) => new { i, value }))
             {
-                var block = store.GetBlock(item.value);
-                var previousBlock = store.GetBlock(
+                var block = GetBlock(store, item.value);
+                var previousBlock = GetBlock(store,
                     block.PreviousHash ?? block.Hash
                 );
 
@@ -270,7 +270,7 @@ public void Truncate(
                     -1);
             }
 
-            var tip = store.GetBlock(tipHash);
+            var tip = GetBlock(store, tipHash);
             var snapshotTipIndex = Math.Max(tipIndex - (blocksBefore + 1), 0);
             BlockHash snapshotTipHash;
 
@@ -286,7 +286,7 @@ public void Truncate(
                 }
 
                 snapshotTipHash = hash;
-            } while (!stateStore.GetStateRoot(store.GetBlock(snapshotTipHash).StateRootHash).Recorded);
+            } while (!stateStore.GetStateRoot(GetBlock(store, snapshotTipHash).StateRootHash).Recorded);
 
             var forkedId = Guid.NewGuid();
 
@@ -484,11 +484,11 @@ public void Snapshot(
                 );
                 var originalChain = new BlockChain(blockPolicy, stagePolicy, store, stateStore,
                     store.GetBlock(genesisHash), blockChainStates, actionEvaluator);
-                var tip = store.GetBlock(tipHash);
+                var tip = GetBlock(store, tipHash);
 
                 var potentialSnapshotTipIndex = tipIndex - blockBefore;
                 var potentialSnapshotTipHash = (BlockHash)store.IndexBlockHash(chainId, potentialSnapshotTipIndex)!;
-                var snapshotTip = store.GetBlock(potentialSnapshotTipHash);
+                var snapshotTip = GetBlock(store, potentialSnapshotTipHash);
 
                 _console.Out.WriteLine(
                     "Original Store Tip: #{0}\n1. LastCommit: {1}\n2. BlockCommit in Chain: {2}\n3. BlockCommit in Store: {3}",
@@ -520,24 +520,38 @@ public void Snapshot(
                         "There is no block commit associated with the potential snapshot tip: #{0}. Snapshot will automatically truncate 1 more block from the original chain tip.",
                         potentialSnapshotTipIndex);
                     blockBefore += 1;
-                    potentialSnapshotTipBlockCommit = store
-                        .GetBlock((BlockHash)store.IndexBlockHash(chainId, tip.Index - blockBefore + 1)!).LastCommit;
+                    potentialSnapshotTipBlockCommit =
+                        GetBlock(store, (BlockHash)store.IndexBlockHash(chainId, tip.Index - blockBefore + 1)!).LastCommit;
+                    if (potentialSnapshotTipBlockCommit == null)
+                    {
+                        throw new CommandExitedException(
+                            $"The block commit of the potential snapshot tip: #{potentialSnapshotTipIndex} doesn't exist.",
+                            -1);
+                    }
+
                     store.PutBlockCommit(tipBlockCommit);
                     store.PutChainBlockCommit(chainId, tipBlockCommit);
                     store.PutBlockCommit(potentialSnapshotTipBlockCommit);
                     store.PutChainBlockCommit(chainId, potentialSnapshotTipBlockCommit);
                 }
 
-                var blockCommitBlock = store.GetBlock(tipHash);
+                var blockCommitBlock = GetBlock(store, tipHash);
 
                 // Add last block commits to store from tip until --block-before + 5 or tip if too short for buffer
                 var blockCommitRange = blockBefore + 5 < tip.Index ? blockBefore + 5 : tip.Index - 1;
                 for (var i = 0; i < blockCommitRange; i++)
                 {
                     _console.Out.WriteLine("Adding block #{0}'s block commit to the store", blockCommitBlock.Index - 1);
+                    if (blockCommitBlock.LastCommit == null)
+                    {
+                        throw new CommandExitedException(
+                            $"The block commit of the block: #{blockCommitBlock.Index} doesn't exist.",
+                            -1);
+                    }
+
                     store.PutBlockCommit(blockCommitBlock.LastCommit);
                     store.PutChainBlockCommit(chainId, blockCommitBlock.LastCommit);
-                    blockCommitBlock = store.GetBlock((BlockHash)blockCommitBlock.PreviousHash!);
+                    blockCommitBlock = GetBlock(store, (BlockHash)blockCommitBlock.PreviousHash!);
                 }
 
                 var snapshotTipIndex = Math.Max(tipIndex - (blockBefore + 1), 0);
@@ -555,7 +569,7 @@ public void Snapshot(
                     }
 
                     snapshotTipHash = hash;
-                } while (!stateStore.GetStateRoot(store.GetBlock(snapshotTipHash).StateRootHash).Recorded);
+                } while (!stateStore.GetStateRoot(GetBlock(store, snapshotTipHash).StateRootHash).Recorded);
 
                 var forkedId = Guid.NewGuid();
                 Fork(chainId, forkedId, snapshotTipHash, tip, store);
@@ -745,6 +759,18 @@ public void Snapshot(
             }
         }
 
+        private static Block GetBlock(IStore store, BlockHash blockHash)
+        {
+            return store.GetBlock(blockHash) ??
+                throw new CommandExitedException($"The block of {blockHash} doesn't exist.", -1);
+        }
+
+        private static BlockCommit GetBlockCommit(IStore store, BlockHash blockHash)
+        {
+            return store.GetBlockCommit(blockHash) ??
+                throw new CommandExitedException($"The block commit of {blockHash} doesn't exist.", -1);
+        }
+
         private string GetPartitionBaseFileName(
             int currentMetadataBlockEpoch,
             int currentMetadataTxEpoch,
@@ -1025,15 +1051,15 @@ private void Fork(
             store.ForkBlockIndexes(src, dest, branchPointHash);
             if (store.GetBlockCommit(branchPointHash) is { })
             {
-                store.PutChainBlockCommit(dest, store.GetBlockCommit(branchPointHash));
+                store.PutChainBlockCommit(dest, GetBlockCommit(store, branchPointHash));
             }
             store.ForkTxNonces(src, dest);
 
             for (
                 Block block = tip;
                 block.PreviousHash is { } hash
                 && !block.Hash.Equals(branchPointHash);
-                block = store.GetBlock(hash))
+                block = GetBlock(store, hash))
             {
                 IEnumerable<(Address, int)> signers = block
                     .Transactions

NineChronicles.Headless.Executable/Commands/StateCommand.cs

@@ -121,7 +121,8 @@ IStateStore stateStore
                 }
 
                 Block block =
-                    store.GetBlock(blockHash);
+                    store.GetBlock(blockHash) ??
+                        throw new CommandExitedException($"The block of {blockHash} doesn't exist.", -1);
                 var preEvalBlock = new PreEvaluationBlock(
                     block,
                     block.Transactions

NineChronicles.Headless.Executable/Store/StoreExtensions.cs

@@ -18,7 +18,12 @@ public static Block GetGenesisBlock(this IStore store)
             }
 
             BlockHash genesisBlockHash = store.IterateIndexes(chainId.Value).First();
-            Block genesisBlock = store.GetBlock(genesisBlockHash);
+            Block? genesisBlock = store.GetBlock(genesisBlockHash);
+            if (genesisBlock == null)
+            {
+                throw new InvalidOperationException("The store doesn't have genesis block.");
+            }
+
             return genesisBlock;
         }
     }

NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs

@@ -4,6 +4,7 @@
 using Lib9c.Tests;
 using Libplanet.Action.State;
 using Libplanet.Crypto;
+using Libplanet.Mocks;
 using Nekoyume;
 using Nekoyume.Action;
 using Nekoyume.Model.Arena;
@@ -25,7 +26,7 @@ public class ArenaParticipantsWorkerTest
 
     public ArenaParticipantsWorkerTest()
     {
-        _world = new MockWorld(new MockWorldState());
+        _world = new World(MockWorldState.CreateModern());
         _sheets = TableSheetsImporter.ImportSheets();
     }