diff --git a/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java index 1e53652b25d..4f910268797 100644 --- a/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java +++ b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java @@ -194,7 +194,7 @@ private void setSyncTarget() { mock(EthPeer.class), new org.hyperledger.besu.ethereum.core.BlockHeader( null, null, null, null, null, null, null, null, 1, 1, 1, 1, null, null, null, 1, null, - null, null)); + null, null, null)); } private void clearSyncTarget() { diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java index 12d8afd673e..87ac3fca17c 100644 --- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java +++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java @@ -57,6 +57,7 @@ import org.hyperledger.besu.ethereum.core.BlockHeader; import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import org.hyperledger.besu.ethereum.core.BlockWithReceipts; +import org.hyperledger.besu.ethereum.core.Deposit; import org.hyperledger.besu.ethereum.core.Difficulty; import org.hyperledger.besu.ethereum.core.MiningParameters; import org.hyperledger.besu.ethereum.core.Transaction; @@ -115,6 +116,7 @@ public class MergeCoordinatorTest implements MergeGenesisConfigHelper { private static final KeyPair KEYS1 = new KeyPair(PRIVATE_KEY1, SIGNATURE_ALGORITHM.get().createPublicKey(PRIVATE_KEY1)); private static final Optional> EMPTY_WITHDRAWALS = Optional.empty(); + private static final Optional> EMPTY_DEPOSITS = Optional.empty(); private static final long REPETITION_MIN_DURATION = 100; @Mock MergeContext mergeContext; @@ -225,7 +227,8 @@ public void coinbaseShouldMatchSuggestedFeeRecipient() { System.currentTimeMillis() / 1000, Bytes32.ZERO, suggestedFeeRecipient, - EMPTY_WITHDRAWALS); + EMPTY_WITHDRAWALS, + EMPTY_DEPOSITS); ArgumentCaptor blockWithReceipts = ArgumentCaptor.forClass(BlockWithReceipts.class); @@ -263,7 +266,8 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid() .doThrow(new MerkleTrieException("missing leaf")) .doCallRealMethod() .when(beingSpiedOn) - .createBlock(any(), any(Bytes32.class), anyLong(), eq(Optional.empty())); + .createBlock( + any(), any(Bytes32.class), anyLong(), eq(Optional.empty()), eq(Optional.empty())); return beingSpiedOn; }; @@ -299,6 +303,7 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid() System.currentTimeMillis() / 1000, Bytes32.random(), suggestedFeeRecipient, + Optional.empty(), Optional.empty()); verify(willThrow, never()).addBadBlock(any(), any()); @@ -343,6 +348,7 @@ public void shouldContinueBuildingBlocksUntilFinalizeIsCalled() System.currentTimeMillis() / 1000, Bytes32.ZERO, suggestedFeeRecipient, + Optional.empty(), Optional.empty()); blockCreationTask.get(); @@ -394,6 +400,7 @@ public void blockCreationRepetitionShouldTakeNotLessThanRepetitionMinDuration() System.currentTimeMillis() / 1000, Bytes32.ZERO, suggestedFeeRecipient, + Optional.empty(), Optional.empty()); blockCreationTask.get(); @@ -439,6 +446,7 @@ public void shouldRetryBlockCreationOnRecoverableError() System.currentTimeMillis() / 1000, Bytes32.ZERO, suggestedFeeRecipient, + Optional.empty(), Optional.empty()); blockCreationTask.get(); @@ -473,6 +481,7 @@ public void shouldStopRetryBlockCreationIfTimeExpired() throws InterruptedExcept System.currentTimeMillis() / 1000, Bytes32.ZERO, suggestedFeeRecipient, + Optional.empty(), Optional.empty()); try { @@ -515,6 +524,7 @@ public void shouldStopInProgressBlockCreationIfFinalizedIsCalled() System.currentTimeMillis() / 1000, Bytes32.ZERO, suggestedFeeRecipient, + Optional.empty(), Optional.empty()); waitForBlockCreationInProgress.await(); @@ -561,6 +571,7 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload timestamp, Bytes32.ZERO, suggestedFeeRecipient, + Optional.empty(), Optional.empty()); final CompletableFuture task1 = blockCreationTask; @@ -571,6 +582,7 @@ public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayload timestamp, Bytes32.ZERO, suggestedFeeRecipient, + Optional.empty(), Optional.empty()); assertThat(payloadId1).isEqualTo(payloadId2); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java index 2cb295e24a1..043a87d92ce 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java @@ -163,6 +163,7 @@ private Object createFakeBlock(final Long height) { 0, null, null, + null, null), new BlockBody( List.of( @@ -202,6 +203,7 @@ private Object createEmptyBlock(final Long height) { 0, null, null, + null, null), new BlockBody(List.of(), List.of()))); } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java index 615bf3edefe..9bc25fae642 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java @@ -114,6 +114,8 @@ public class EthGetTransactionReceiptTest { Optional.of(PoWHasher.ETHASH_LIGHT), null, Optional.empty(), + null, + Optional.empty(), true); private final ProtocolSpec statusTransactionTypeSpec = new ProtocolSpec( @@ -142,6 +144,8 @@ public class EthGetTransactionReceiptTest { Optional.of(PoWHasher.ETHASH_LIGHT), null, Optional.empty(), + null, + Optional.empty(), true); @SuppressWarnings("unchecked") diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java index 09dd87042e6..fa43a48c87c 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java @@ -255,6 +255,7 @@ public void shouldReturnValidWithoutFinalizedWithPayload() { payloadParams.getTimestamp(), payloadParams.getPrevRandao(), Address.ECREC, + Optional.empty(), Optional.empty())) .thenReturn(mockPayloadId); @@ -441,7 +442,7 @@ public void shouldIgnoreUpdateToOldHeadAndNotPreparePayload() { var forkchoiceRes = (EngineUpdateForkchoiceResult) resp.getResult(); - verify(mergeCoordinator, never()).preparePayload(any(), any(), any(), any(), any()); + verify(mergeCoordinator, never()).preparePayload(any(), any(), any(), any(), any(), any()); assertThat(forkchoiceRes.getPayloadStatus().getStatus()).isEqualTo(VALID); assertThat(forkchoiceRes.getPayloadStatus().getError()).isNull(); @@ -528,6 +529,7 @@ public void shouldReturnValidIfWithdrawalsIsNull_WhenWithdrawalsProhibited() { payloadParams.getTimestamp(), payloadParams.getPrevRandao(), Address.ECREC, + Optional.empty(), Optional.empty())) .thenReturn(mockPayloadId); @@ -606,7 +608,8 @@ public void shouldReturnValidIfWithdrawalsIsNotNull_WhenWithdrawalsAllowed() { Optional.of( withdrawals.stream() .map(WithdrawalParameter::toWithdrawal) - .collect(Collectors.toList())))) + .collect(Collectors.toList())), + Optional.empty())) .thenReturn(mockPayloadId); assertSuccessWithPayloadForForkchoiceResult( @@ -645,6 +648,7 @@ public void shouldReturnValidIfTimestampScheduleIsEmpty() { payloadParams.getTimestamp(), payloadParams.getPrevRandao(), Address.ECREC, + Optional.empty(), Optional.empty())) .thenReturn(mockPayloadId); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java index 748e3b2331b..923892829d8 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java @@ -85,7 +85,8 @@ public AbstractEngineGetPayloadTest(final MethodFactory methodFactory) { new BlockBody( Collections.emptyList(), Collections.emptyList(), - Optional.of(Collections.emptyList()))); + Optional.of(Collections.emptyList()), + Optional.empty())); protected static final BlockWithReceipts mockBlockWithReceiptsAndWithdrawals = new BlockWithReceipts(mockBlockWithWithdrawals, Collections.emptyList()); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java index 1c054da2a78..0180d0269c7 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java @@ -251,6 +251,7 @@ private BlockHeader createBlockHeader(final Hash blockHash, final long blockNumb 0, null, null, + null, new BlockHeaderFunctions() { @Override public Hash hash(final BlockHeader header) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java index 03493d7f05e..8f202199681 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java @@ -177,6 +177,7 @@ public void shouldReturnWithdrawalNullWhenBlockIsPreShanghai() { new BlockBody( List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), + Optional.empty(), Optional.empty()); when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(preShanghaiBlockBody)); when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(preShanghaiBlockBody2)); @@ -207,13 +208,15 @@ public void shouldReturnWithdrawalsWhenBlockIsPostShanghai() { new TransactionTestFixture().createTransaction(sig.generateKeyPair()), new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal))); + Optional.of(List.of(withdrawal)), + Optional.empty()); final BlockBody shanghaiBlockBody2 = new BlockBody( List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal2))); + Optional.of(List.of(withdrawal2)), + Optional.empty()); when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody)); when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2)); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java index 5711d05d27f..66821f9f49a 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java @@ -176,6 +176,7 @@ public void shouldReturnNullForWithdrawalsWhenBlockIsPreShanghai() { new BlockBody( List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), + Optional.empty(), Optional.empty()); when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130)); when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(preShanghaiBlockBody)); @@ -210,13 +211,15 @@ public void shouldReturnWithdrawalsWhenBlockIsPostShanghai() { new TransactionTestFixture().createTransaction(sig.generateKeyPair()), new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal))); + Optional.of(List.of(withdrawal)), + Optional.empty()); final BlockBody shanghaiBlockBody2 = new BlockBody( List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal2))); + Optional.of(List.of(withdrawal2)), + Optional.empty()); when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130)); when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody)); when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2)); @@ -246,7 +249,8 @@ public void shouldNotContainTrailingNullForBlocksPastTheCurrentHead() { new TransactionTestFixture().createTransaction(sig.generateKeyPair()), new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal))); + Optional.of(List.of(withdrawal)), + Optional.empty()); when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(123)); when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody)); when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1)); @@ -269,17 +273,20 @@ public void shouldReturnUpUntilHeadWhenStartBlockPlusCountEqualsHeadNumber() { new BlockBody( List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal))); + Optional.of(List.of(withdrawal)), + Optional.empty()); final BlockBody shanghaiBlockBody2 = new BlockBody( List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal))); + Optional.of(List.of(withdrawal)), + Optional.empty()); final BlockBody shanghaiBlockBody3 = new BlockBody( List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())), Collections.emptyList(), - Optional.of(List.of(withdrawal))); + Optional.of(List.of(withdrawal)), + Optional.empty()); when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(125)); when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody)); when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2)); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java index 571de4070fc..801c1d7bd8a 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java @@ -112,6 +112,7 @@ public void setup() { 0, null, null, + null, new MainnetBlockHeaderFunctions()); testHash = fakeHeader.getHash(); final BlockBody fakeBody = new BlockBody(Collections.emptyList(), Collections.emptyList()); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/GoQuorumPrivateTxBloomBlockchainQueriesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/GoQuorumPrivateTxBloomBlockchainQueriesTest.java index 8371644b9ce..8656d171185 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/GoQuorumPrivateTxBloomBlockchainQueriesTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/GoQuorumPrivateTxBloomBlockchainQueriesTest.java @@ -94,6 +94,7 @@ public void setup() { 0, null, null, + null, new MainnetBlockHeaderFunctions(), Optional.of(testLogsBloomFilter)); testHash = fakeHeader.getHash(); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/GoQuorumPrivateTransactionLogBloomCacherTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/GoQuorumPrivateTransactionLogBloomCacherTest.java index 199dd527f32..58ddc1ebe5e 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/GoQuorumPrivateTransactionLogBloomCacherTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/GoQuorumPrivateTransactionLogBloomCacherTest.java @@ -170,6 +170,7 @@ private BlockHeader createBlock(final long number) { 0, null, null, + null, new MainnetBlockHeaderFunctions(), Optional.of(testLogsBloomFilter)); return fakeHeader; diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java index 3d017bf8651..59845d52f51 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java @@ -102,6 +102,7 @@ public void setup() throws IOException { 0, null, null, + null, new MainnetBlockHeaderFunctions()); testHash = fakeHeader.getHash(); when(blockchain.getBlockHeader(anyLong())).thenReturn(Optional.of(fakeHeader)); @@ -268,6 +269,7 @@ private BlockHeader createBlock(final long number, final Optional messag 0, null, null, + null, new MainnetBlockHeaderFunctions()); testHash = fakeHeader.getHash(); when(blockchain.getBlockHeader(number)).thenReturn(Optional.of(fakeHeader)); diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java index a4dfb2af538..e8379275f17 100644 --- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java +++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java @@ -70,7 +70,13 @@ void withProcessorAndEmptyWithdrawals_NoWithdrawalsAreProcessed() { final AbstractBlockCreator blockCreator = blockCreatorWithWithdrawalsProcessor(); final BlockCreationResult blockCreationResult = blockCreator.createBlock( - Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1L, false); + Optional.empty(), + Optional.empty(), + Optional.empty(), + Optional.empty(), + Optional.empty(), + 1L, + false); verify(withdrawalsProcessor, never()).processWithdrawals(any(), any()); assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty(); assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty(); @@ -81,7 +87,13 @@ void withNoProcessorAndEmptyWithdrawals_NoWithdrawalsAreNotProcessed() { final AbstractBlockCreator blockCreator = blockCreatorWithoutWithdrawalsProcessor(); final BlockCreationResult blockCreationResult = blockCreator.createBlock( - Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1L, false); + Optional.empty(), + Optional.empty(), + Optional.empty(), + Optional.empty(), + Optional.empty(), + 1L, + false); verify(withdrawalsProcessor, never()).processWithdrawals(any(), any()); assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty(); assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty(); @@ -98,6 +110,7 @@ void withProcessorAndWithdrawals_WithdrawalsAreProcessed() { Optional.empty(), Optional.of(withdrawals), Optional.empty(), + Optional.empty(), 1L, false); @@ -119,6 +132,7 @@ void withNoProcessorAndWithdrawals_WithdrawalsAreNotProcessed() { Optional.empty(), Optional.of(withdrawals), Optional.empty(), + Optional.empty(), 1L, false); verify(withdrawalsProcessor, never()).processWithdrawals(any(), any()); diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java index f86b54d5ca9..b38a56cb88c 100644 --- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java @@ -74,7 +74,7 @@ public void assertBodyIdentifierUsesWithdrawalsToGenerateBodyIdentifiers() { final BlockBody emptyBodyBlock = BlockBody.empty(); // Block with no tx, no ommers, 1 withdrawal final BlockBody bodyBlockWithWithdrawal = - new BlockBody(emptyList(), emptyList(), Optional.of(List.of(withdrawal))); + new BlockBody(emptyList(), emptyList(), Optional.of(List.of(withdrawal)), Optional.empty()); assertThat( new GetBodiesFromPeerTask.BodyIdentifier(emptyBodyBlock) diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java index f338246513e..a282e8b1604 100644 --- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java @@ -330,6 +330,7 @@ public TestBlockHeader( Bytes.fromHexStringLenient(nonce).toLong(), null, null, + null, new MainnetBlockHeaderFunctions()); } } diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ChainForTestCreator.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ChainForTestCreator.java index fd8ee733ac5..de9d0522786 100644 --- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ChainForTestCreator.java +++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ChainForTestCreator.java @@ -58,6 +58,7 @@ public static BlockHeader prepareHeader(final long number, final Optional