Merge main into zkbesu (#27)

* mark deleted slot during clear storage step (hyperledger#6305) * made directory structure of tests match source; fixed one typo (hyperledger#6337) * migrate controller tests to junit 5 (hyperledger#6338) * add new forkids for testnets, update forkid test to Junit5, no longer need named network specific trusted setups (hyperledger#6322) * Fix trielog shipping issue during self destruct (hyperledger#6340) * fix trielog shipping issue --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us> Signed-off-by: garyschulte <garyschulte@gmail.com>
Consensys · Jan 3, 2024 · 0f2e43c · 0f2e43c
1 parent 1d4b979
commit 0f2e43c
Show file tree

Hide file tree

Showing 23 changed files with 396 additions and 302 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -1796,7 +1796,7 @@ private void configureNativeLibs() {
       if (kzgTrustedSetupFile != null) {
         KZGPointEvalPrecompiledContract.init(kzgTrustedSetupFile);
       } else {
-        KZGPointEvalPrecompiledContract.init(network.name());
+        KZGPointEvalPrecompiledContract.init();
       }
     } else if (kzgTrustedSetupFile != null) {
       throw new ParameterException(

diff --git a/...src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java b/...src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java
@@ -61,7 +61,7 @@
 
 @Command(
     name = "generate-blockchain-config",
-    description = "Generates node keypairs and genesis file with RLP encoded extra data.",
+    description = "Generate node keypairs and genesis file with RLP encoded extra data.",
     mixinStandardHelpOptions = true,
     versionProvider = VersionProvider.class)
 class GenerateBlockchainConfig implements Runnable {

diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
diff --git a/besu/src/test/java/org/hyperledger/besu/RawForkIdTest.java b/besu/src/test/java/org/hyperledger/besu/RawForkIdTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+public class RawForkIdTest {
+  @Test
+  public void testFromRaw() {
+    final ForkId forkId = new ForkId(Bytes.ofUnsignedInt(0xfe3366e7L), 1735371L);
+    final List<List<Bytes>> forkIdAsBytesList = List.of(forkId.getForkIdAsBytesList());
+    assertThat(ForkId.fromRawForkId(forkIdAsBytesList).get()).isEqualTo(forkId);
+  }
+}
diff --git a/.../cli/operator/OperatorSubCommandTest.java → ...ands/operator/OperatorSubCommandTest.java b/.../cli/operator/OperatorSubCommandTest.java → ...ands/operator/OperatorSubCommandTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.cli.operator;
+package org.hyperledger.besu.cli.subcommands.operator;
 
 import static java.lang.String.format;
 import static java.lang.System.currentTimeMillis;
@@ -22,11 +22,10 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.contentOf;
-import static org.hyperledger.besu.cli.operator.OperatorSubCommandTest.Cmd.cmd;
+import static org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommandTest.Cmd.cmd;
 
 import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.CommandTestAbstract;
-import org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand;
 import org.hyperledger.besu.crypto.SECP256K1;
 import org.hyperledger.besu.crypto.SECP256R1;
 import org.hyperledger.besu.crypto.SECPPrivateKey;
@@ -72,7 +71,7 @@ public class OperatorSubCommandTest extends CommandTestAbstract {
           + System.lineSeparator()
           + "Commands:"
           + System.lineSeparator()
-          + "  generate-blockchain-config  Generates node keypairs and genesis file with RLP"
+          + "  generate-blockchain-config  Generate node keypairs and genesis file with RLP"
           + System.lineSeparator()
           + "                                encoded extra data."
           + System.lineSeparator()

diff --git a/...edger/besu/cli/rlp/RLPSubCommandTest.java → ...li/subcommands/rlp/RLPSubCommandTest.java b/...edger/besu/cli/rlp/RLPSubCommandTest.java → ...li/subcommands/rlp/RLPSubCommandTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.cli.rlp;
+package org.hyperledger.besu.cli.subcommands.rlp;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerBuilderTest.java
@@ -16,6 +16,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -58,21 +59,21 @@
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.math.BigInteger;
+import java.nio.file.Path;
 import java.time.Clock;
 import java.util.OptionalLong;
 
 import com.google.common.collect.Range;
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class BesuControllerBuilderTest {
 
   private BesuControllerBuilder besuControllerBuilder;
@@ -100,9 +101,9 @@ public class BesuControllerBuilderTest {
 
   BigInteger networkId = BigInteger.ONE;
 
-  @Rule public final TemporaryFolder tempDirRule = new TemporaryFolder();
+  @TempDir Path tempDir;
 
-  @Before
+  @BeforeEach
   public void setup() {
     when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString());
     when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString());
@@ -129,14 +130,18 @@ public void setup() {
 
     when(synchronizerConfiguration.getBlockPropagationRange()).thenReturn(Range.closed(1L, 2L));
 
-    when(storageProvider.createWorldStateStorage(DataStorageFormat.FOREST))
+    lenient()
+        .when(storageProvider.createWorldStateStorage(DataStorageFormat.FOREST))
         .thenReturn(worldStateStorage);
-    when(storageProvider.createWorldStatePreimageStorage()).thenReturn(worldStatePreimageStorage);
+    lenient()
+        .when(storageProvider.createWorldStatePreimageStorage())
+        .thenReturn(worldStatePreimageStorage);
 
-    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
-    when(worldStatePreimageStorage.updater())
+    lenient().when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+    lenient()
+        .when(worldStatePreimageStorage.updater())
         .thenReturn(mock(WorldStatePreimageStorage.Updater.class));
-    when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
+    lenient().when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
     besuControllerBuilder = spy(visitWithMockConfigs(new MainnetBesuControllerBuilder()));
   }
 
@@ -149,7 +154,7 @@ BesuControllerBuilder visitWithMockConfigs(final BesuControllerBuilder builder)
         .miningParameters(miningParameters)
         .metricsSystem(observableMetricsSystem)
         .privacyParameters(privacyParameters)
-        .dataDirectory(tempDirRule.getRoot().toPath())
+        .dataDirectory(tempDir)
         .clock(clock)
         .transactionPoolConfiguration(poolConfiguration)
         .nodeKey(nodeKey)

diff --git a/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerTest.java b/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerTest.java
@@ -37,13 +37,13 @@
 import java.util.OptionalLong;
 
 import com.google.common.io.Resources;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class BesuControllerTest {
 
   @Spy private GenesisConfigFile genesisConfigFile = GenesisConfigFile.mainnet();

diff --git a/...test/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilderTest.java b/...test/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilderTest.java
@@ -54,13 +54,13 @@
 import java.util.function.BiFunction;
 
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ConsensusScheduleBesuControllerBuilderTest {
   private @Mock BiFunction<
           NavigableSet<ForkSpec<ProtocolSchedule>>, Optional<BigInteger>, ProtocolSchedule>

diff --git a/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java
@@ -18,6 +18,7 @@
 import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -61,6 +62,7 @@
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.math.BigInteger;
+import java.nio.file.Path;
 import java.time.Clock;
 import java.util.Collections;
 import java.util.Optional;
@@ -70,16 +72,15 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MergeBesuControllerBuilderTest {
 
   private MergeBesuControllerBuilder besuControllerBuilder;
@@ -108,46 +109,54 @@ public class MergeBesuControllerBuilderTest {
       TransactionPoolConfiguration.DEFAULT;
   private final ObservableMetricsSystem observableMetricsSystem = new NoOpMetricsSystem();
 
-  @Rule public final TemporaryFolder tempDirRule = new TemporaryFolder();
+  @TempDir Path tempDir;
 
-  @Before
+  @BeforeEach
   public void setup() {
-    when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString());
-    when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString());
-    when(genesisConfigFile.getExtraData()).thenReturn(Bytes.EMPTY.toHexString());
-    when(genesisConfigFile.getMixHash()).thenReturn(Hash.ZERO.toHexString());
-    when(genesisConfigFile.getNonce()).thenReturn(Long.toHexString(1));
-    when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions);
-    when(genesisConfigFile.getConfigOptions()).thenReturn(genesisConfigOptions);
-    when(genesisConfigOptions.getCheckpointOptions()).thenReturn(checkpointConfigOptions);
+    lenient().when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString());
+    lenient().when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString());
+    lenient().when(genesisConfigFile.getExtraData()).thenReturn(Bytes.EMPTY.toHexString());
+    lenient().when(genesisConfigFile.getMixHash()).thenReturn(Hash.ZERO.toHexString());
+    lenient().when(genesisConfigFile.getNonce()).thenReturn(Long.toHexString(1));
+    lenient().when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions);
+    lenient().when(genesisConfigFile.getConfigOptions()).thenReturn(genesisConfigOptions);
+    lenient().when(genesisConfigOptions.getCheckpointOptions()).thenReturn(checkpointConfigOptions);
     when(genesisConfigOptions.getTerminalTotalDifficulty())
         .thenReturn((Optional.of(UInt256.valueOf(100L))));
     when(genesisConfigOptions.getThanosBlockNumber()).thenReturn(OptionalLong.empty());
     when(genesisConfigOptions.getTerminalBlockHash()).thenReturn(Optional.of(Hash.ZERO));
-    when(genesisConfigOptions.getTerminalBlockNumber()).thenReturn(OptionalLong.of(1L));
-    when(storageProvider.createBlockchainStorage(any(), any()))
+    lenient().when(genesisConfigOptions.getTerminalBlockNumber()).thenReturn(OptionalLong.of(1L));
+    lenient()
+        .when(storageProvider.createBlockchainStorage(any(), any()))
         .thenReturn(
             new KeyValueStoragePrefixedKeyBlockchainStorage(
                 new InMemoryKeyValueStorage(),
                 new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
                 new MainnetBlockHeaderFunctions()));
-    when(storageProvider.getStorageBySegmentIdentifier(any()))
+    lenient()
+        .when(storageProvider.getStorageBySegmentIdentifier(any()))
         .thenReturn(new InMemoryKeyValueStorage());
-    when(synchronizerConfiguration.getDownloaderParallelism()).thenReturn(1);
-    when(synchronizerConfiguration.getTransactionsParallelism()).thenReturn(1);
-    when(synchronizerConfiguration.getComputationParallelism()).thenReturn(1);
+    lenient().when(synchronizerConfiguration.getDownloaderParallelism()).thenReturn(1);
+    lenient().when(synchronizerConfiguration.getTransactionsParallelism()).thenReturn(1);
+    lenient().when(synchronizerConfiguration.getComputationParallelism()).thenReturn(1);
 
-    when(synchronizerConfiguration.getBlockPropagationRange()).thenReturn(Range.closed(1L, 2L));
+    lenient()
+        .when(synchronizerConfiguration.getBlockPropagationRange())
+        .thenReturn(Range.closed(1L, 2L));
 
-    when(storageProvider.createWorldStateStorage(DataStorageFormat.FOREST))
+    lenient()
+        .when(storageProvider.createWorldStateStorage(DataStorageFormat.FOREST))
         .thenReturn(worldStateStorage);
-    when(storageProvider.createWorldStatePreimageStorage()).thenReturn(worldStatePreimageStorage);
+    lenient()
+        .when(storageProvider.createWorldStatePreimageStorage())
+        .thenReturn(worldStatePreimageStorage);
 
-    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
-    when(worldStatePreimageStorage.updater())
+    lenient().when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+    lenient()
+        .when(worldStatePreimageStorage.updater())
         .thenReturn(mock(WorldStatePreimageStorage.Updater.class));
-    when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
-    when(miningParameters.getTargetGasLimit()).thenReturn(OptionalLong.empty());
+    lenient().when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
+    lenient().when(miningParameters.getTargetGasLimit()).thenReturn(OptionalLong.empty());
 
     besuControllerBuilder = visitWithMockConfigs(new MergeBesuControllerBuilder());
   }
@@ -162,7 +171,7 @@ MergeBesuControllerBuilder visitWithMockConfigs(final MergeBesuControllerBuilder
             .miningParameters(miningParameters)
             .metricsSystem(observableMetricsSystem)
             .privacyParameters(privacyParameters)
-            .dataDirectory(tempDirRule.getRoot().toPath())
+            .dataDirectory(tempDir)
             .clock(clock)
             .transactionPoolConfiguration(poolConfiguration)
             .nodeKey(nodeKey)