Revert "Bonsai code storage by hash (#5889)"

besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java

@@ -17,7 +17,6 @@
 package org.hyperledger.besu.cli.options.stable;
 
 import static org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration.DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD;
-import static org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration.Unstable.DEFAULT_BONSAI_CODE_USING_CODE_HASH_ENABLED;
 import static org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration.Unstable.DEFAULT_BONSAI_LIMIT_TRIE_LOGS_ENABLED;
 import static org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration.Unstable.DEFAULT_BONSAI_TRIE_LOG_PRUNING_WINDOW_SIZE;
 import static org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration.Unstable.MINIMUM_BONSAI_TRIE_LOG_RETENTION_LIMIT;
@@ -86,14 +85,6 @@ public static class Unstable {
         description =
             "The max number of blocks to load and prune trie logs for at startup. (default: ${DEFAULT-VALUE})")
     private int bonsaiTrieLogPruningWindowSize = DEFAULT_BONSAI_TRIE_LOG_PRUNING_WINDOW_SIZE;
-
-    @CommandLine.Option(
-        hidden = true,
-        names = {"--Xbonsai-code-using-code-hash-enabled"},
-        arity = "1",
-        description =
-            "Enables code storage using code hash instead of by account hash. (default: ${DEFAULT-VALUE})")
-    private boolean bonsaiCodeUsingCodeHashEnabled = DEFAULT_BONSAI_CODE_USING_CODE_HASH_ENABLED;
   }
   /**
    * Create data storage options.
@@ -147,8 +138,6 @@ static DataStorageOptions fromConfig(final DataStorageConfiguration domainObject
         domainObject.getUnstable().getBonsaiLimitTrieLogsEnabled();
     dataStorageOptions.unstableOptions.bonsaiTrieLogPruningWindowSize =
         domainObject.getUnstable().getBonsaiTrieLogPruningWindowSize();
-    dataStorageOptions.unstableOptions.bonsaiCodeUsingCodeHashEnabled =
-        domainObject.getUnstable().getBonsaiCodeStoredByCodeHashEnabled();
 
     return dataStorageOptions;
   }
@@ -162,7 +151,6 @@ public DataStorageConfiguration toDomainObject() {
             ImmutableDataStorageConfiguration.Unstable.builder()
                 .bonsaiLimitTrieLogsEnabled(unstableOptions.bonsaiLimitTrieLogsEnabled)
                 .bonsaiTrieLogPruningWindowSize(unstableOptions.bonsaiTrieLogPruningWindowSize)
-                .bonsaiCodeStoredByCodeHashEnabled(unstableOptions.bonsaiCodeUsingCodeHashEnabled)
                 .build())
         .build();
   }

besu/src/test/java/org/hyperledger/besu/cli/options/stable/DataStorageOptionsTest.java

@@ -88,28 +88,6 @@ public void bonsaiTrieLogRetentionLimitShouldBeAboveMinimum() {
         "511");
   }
 
-  @Test
-  public void bonsaiCodeUsingCodeHashEnabledCanBeEnabled() {
-    internalTestSuccess(
-        dataStorageConfiguration ->
-            assertThat(
-                    dataStorageConfiguration.getUnstable().getBonsaiCodeStoredByCodeHashEnabled())
-                .isEqualTo(true),
-        "--Xbonsai-code-using-code-hash-enabled",
-        "true");
-  }
-
-  @Test
-  public void bonsaiCodeUsingCodeHashEnabledCanBeDisabled() {
-    internalTestSuccess(
-        dataStorageConfiguration ->
-            assertThat(
-                    dataStorageConfiguration.getUnstable().getBonsaiCodeStoredByCodeHashEnabled())
-                .isEqualTo(false),
-        "--Xbonsai-code-using-code-hash-enabled",
-        "false");
-  }
-
   @Override
   protected DataStorageConfiguration createDefaultDomainObject() {
     return DataStorageConfiguration.DEFAULT_CONFIG;

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/storage/BonsaiSnapshotWorldStateKeyValueStorage.java

@@ -79,7 +79,7 @@ public Optional<Bytes> getAccount(final Hash accountHash) {
   }
 
   @Override
-  public Optional<Bytes> getCode(final Hash codeHash, final Hash accountHash) {
+  public Optional<Bytes> getCode(final Bytes32 codeHash, final Hash accountHash) {
     return isClosedGet() ? Optional.empty() : super.getCode(codeHash, accountHash);
   }
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/storage/BonsaiWorldStateKeyValueStorage.java

@@ -110,7 +110,7 @@ public FlatDbMode getFlatDbMode() {
   }
 
   @Override
-  public Optional<Bytes> getCode(final Hash codeHash, final Hash accountHash) {
+  public Optional<Bytes> getCode(final Bytes32 codeHash, final Hash accountHash) {
     if (codeHash.equals(Hash.EMPTY)) {
       return Optional.of(Bytes.EMPTY);
     } else {
@@ -323,7 +323,7 @@ public FlatDbStrategy getFlatDbStrategy() {
   }
 
   public interface BonsaiUpdater extends WorldStateStorage.Updater {
-    BonsaiUpdater removeCode(final Hash accountHash, final Hash codeHash);
+    BonsaiUpdater removeCode(final Hash accountHash);
 
     BonsaiUpdater removeAccountInfoState(final Hash accountHash);
 
@@ -356,14 +356,14 @@ public Updater(
     }
 
     @Override
-    public BonsaiUpdater removeCode(final Hash accountHash, final Hash codeHash) {
-      flatDbStrategy.removeFlatCode(composedWorldStateTransaction, accountHash, codeHash);
+    public BonsaiUpdater removeCode(final Hash accountHash) {
+      flatDbStrategy.removeFlatCode(composedWorldStateTransaction, accountHash);
       return this;
     }
 
     @Override
-    public BonsaiUpdater putCode(final Hash accountHash, final Hash codeHash, final Bytes code) {
-      if (code.isEmpty()) {
+    public BonsaiUpdater putCode(final Hash accountHash, final Bytes32 codeHash, final Bytes code) {
+      if (code.size() == 0) {
         // Don't save empty values
         return this;
       }
@@ -379,7 +379,7 @@ public BonsaiUpdater removeAccountInfoState(final Hash accountHash) {
 
     @Override
     public BonsaiUpdater putAccountInfoState(final Hash accountHash, final Bytes accountValue) {
-      if (accountValue.isEmpty()) {
+      if (accountValue.size() == 0) {
         // Don't save empty values
         return this;
       }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/storage/flat/FlatDbStrategy.java

@@ -53,12 +53,9 @@
 
   protected final Counter getStorageValueCounter;
   protected final Counter getStorageValueFlatDatabaseCounter;
-  protected final CodeStorageStrategy codeStorageStrategy;
 
-  public FlatDbStrategy(
-      final MetricsSystem metricsSystem, final CodeStorageStrategy codeStorageStrategy) {
+  public FlatDbStrategy(final MetricsSystem metricsSystem) {
     this.metricsSystem = metricsSystem;
-    this.codeStorageStrategy = codeStorageStrategy;
 
     getAccountCounter =
         metricsSystem.createCounter(
@@ -110,11 +107,14 @@
    * Retrieves the code data for the given code hash and account hash.
    */
   public Optional<Bytes> getFlatCode(
-      final Hash codeHash, final Hash accountHash, final SegmentedKeyValueStorage storage) {
+      final Bytes32 codeHash, final Hash accountHash, final SegmentedKeyValueStorage storage) {
     if (codeHash.equals(Hash.EMPTY)) {
       return Optional.of(Bytes.EMPTY);
     } else {
-      return codeStorageStrategy.getFlatCode(codeHash, accountHash, storage);
+      return storage
+          .get(CODE_STORAGE, accountHash.toArrayUnsafe())
+          .map(Bytes::wrap)
+          .filter(b -> Hash.hash(b).equals(codeHash));
     }
   }
 
@@ -162,10 +162,8 @@
    * Removes code for the given account hash.
    */
   public void removeFlatCode(
-      final SegmentedKeyValueStorageTransaction transaction,
-      final Hash accountHash,
-      final Hash codeHash) {
-    codeStorageStrategy.removeFlatCode(transaction, accountHash, codeHash);
+      final SegmentedKeyValueStorageTransaction transaction, final Hash accountHash) {
+    transaction.remove(CODE_STORAGE, accountHash.toArrayUnsafe());
   }
 
   /*
@@ -174,9 +172,9 @@
   public void putFlatCode(
       final SegmentedKeyValueStorageTransaction transaction,
       final Hash accountHash,
-      final Hash codeHash,
+      final Bytes32 codeHash,
       final Bytes code) {
-    codeStorageStrategy.putFlatCode(transaction, accountHash, codeHash, code);
+    transaction.put(CODE_STORAGE, accountHash.toArrayUnsafe(), code.toArrayUnsafe());
   }
 
   public void clearAll(final SegmentedKeyValueStorage storage) {