diff --git a/CHANGES.md b/CHANGES.md index 887f2a4fa48..87911e35a0e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,11 @@ Version 5.4.1 To be released. +- Ported changes from [Libplanet 5.3.2] release. [[#3973]] + +[#3973]: https://github.com/planetarium/libplanet/pull/3973 +[Libplanet 5.3.2]: https://www.nuget.org/packages/Libplanet/5.3.2 + Version 5.4.0 ------------- diff --git a/src/Libplanet/Blockchain/BlockChain.Validate.cs b/src/Libplanet/Blockchain/BlockChain.Validate.cs index e6b1a712580..2100f58eef6 100644 --- a/src/Libplanet/Blockchain/BlockChain.Validate.cs +++ b/src/Libplanet/Blockchain/BlockChain.Validate.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Numerics; using System.Security.Cryptography; -using Bencodex.Types; using Libplanet.Action; using Libplanet.Action.State; using Libplanet.Common; @@ -196,17 +195,6 @@ internal Dictionary ValidateBlockNonces( return nonceDeltas; } - internal void ValidateBlockLoadActions(Block block) - { - foreach (Transaction tx in block.Transactions) - { - foreach (IValue rawAction in tx.Actions) - { - _ = ActionEvaluator.ActionLoader.LoadAction(block.Index, rawAction); - } - } - } - internal void ValidateBlock(Block block) { if (block.Index <= 0) diff --git a/src/Libplanet/Blockchain/BlockChain.cs b/src/Libplanet/Blockchain/BlockChain.cs index 856403dd71e..fa1fe6ce24f 100644 --- a/src/Libplanet/Blockchain/BlockChain.cs +++ b/src/Libplanet/Blockchain/BlockChain.cs @@ -813,8 +813,6 @@ internal void Append( .ToDictionary(signer => signer, signer => Store.GetTxNonce(Id, signer)), block); - ValidateBlockLoadActions(block); - if (Policy.ValidateNextBlock(this, block) is { } bpve) { throw bpve; diff --git a/test/Libplanet.Tests/Blockchain/BlockChainTest.Append.cs b/test/Libplanet.Tests/Blockchain/BlockChainTest.Append.cs index abe128a4533..77495c89058 100644 --- a/test/Libplanet.Tests/Blockchain/BlockChainTest.Append.cs +++ b/test/Libplanet.Tests/Blockchain/BlockChainTest.Append.cs @@ -651,56 +651,6 @@ void AssertTxIdSetEqual( _blockChain.StagePolicy.Iterate(_blockChain, filtered: false).Select(tx => tx.Id)); } - [SkippableFact] - public void CannotAppendBlockWithInvalidActions() - { - var txSigner = new PrivateKey(); - var unsignedInvalidTx = new UnsignedTx( - new TxInvoice( - _blockChain.Genesis.Hash, - DateTimeOffset.UtcNow, - new TxActionList((IValue)List.Empty.Add(new Text("Foo")))), // Invalid action - new TxSigningMetadata(txSigner.PublicKey, 1)); - var invalidTx = new Transaction( - unsignedInvalidTx, unsignedInvalidTx.CreateSignature(txSigner)); - var txs = new[] - { - Transaction.Create( - nonce: 0, - privateKey: txSigner, - genesisHash: _blockChain.Genesis.Hash, - actions: Array.Empty().ToPlainValues()), - invalidTx, - Transaction.Create( - nonce: 2, - privateKey: txSigner, - genesisHash: _blockChain.Genesis.Hash, - actions: Array.Empty().ToPlainValues()), - }.OrderBy(tx => tx.Id); - var evs = Array.Empty(); - - var metadata = new BlockMetadata( - index: 1L, - timestamp: DateTimeOffset.UtcNow, - publicKey: _fx.Proposer.PublicKey, - previousHash: _blockChain.Genesis.Hash, - txHash: BlockContent.DeriveTxHash(txs), - lastCommit: null, - evidenceHash: null); - var preEval = new PreEvaluationBlock( - preEvaluationBlockHeader: new PreEvaluationBlockHeader( - metadata, metadata.DerivePreEvaluationHash()), - transactions: txs, - evidence: evs); - var block = preEval.Sign( - _fx.Proposer, - (HashDigest)_blockChain.GetNextStateRootHash(_blockChain.Tip.Hash)); - - Assert.Throws( - () => _blockChain.Append(block, TestUtils.CreateBlockCommit(block))); - Assert.Equal(0, _blockChain.Tip.Index); - } - [SkippableFact] public void DoesNotMigrateStateWithoutAction() {