message frame buider will create AuthorizedCodeService by itsef if it…

… isn't set Signed-off-by: Daniel Lehrner <[email protected]>
hyperledger · Jul 16, 2024 · 9c610ec · 9c610ec
1 parent 017319f
commit 9c610ec
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 37 deletions.
diff --git a/...re/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java b/...re/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java
@@ -26,7 +26,6 @@
 import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.evm.frame.MessageFrame;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
@@ -125,8 +124,7 @@ public MessageFrame.Builder createMessageFrameBuilder() {
         .apparentValue(messageFrame.getApparentValue())
         .code(messageFrame.getCode())
         .isStatic(messageFrame.isStatic())
-        .completer(frame -> {})
-        .authorizedCodeService(new AuthorizedCodeService());
+        .completer(frame -> {});
   }
 
   public void cleanUp() throws IOException {

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SystemCallProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SystemCallProcessor.java
@@ -25,7 +25,6 @@
 import org.hyperledger.besu.evm.operation.BlockHashOperation;
 import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Deque;
@@ -137,7 +136,6 @@ private MessageFrame createCallFrame(
             maybeContract
                 .map(c -> processor.getCodeFromEVM(c.getCodeHash(), c.getCode()))
                 .orElse(CodeV0.EMPTY_CODE))
-        .authorizedCodeService(new AuthorizedCodeService())
         .build();
   }
 }
diff --git a/...core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java b/...core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java
@@ -32,7 +32,6 @@
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Deque;
@@ -148,7 +147,6 @@ public TransactionProcessingResult processTransaction(
                 .contract(privateContractAddress)
                 .inputData(initCodeBytes.slice(code.getSize()))
                 .code(code)
-                .authorizedCodeService(new AuthorizedCodeService())
                 .build();
       } else {
         final Address to = transaction.getTo().get();
@@ -164,7 +162,6 @@ public TransactionProcessingResult processTransaction(
                     maybeContract
                         .map(c -> messageCallProcessor.getCodeFromEVM(c.getCodeHash(), c.getCode()))
                         .orElse(CodeV0.EMPTY_CODE))
-                .authorizedCodeService(new AuthorizedCodeService())
                 .build();
       }
 

diff --git a/...ore/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java b/...ore/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java
@@ -24,7 +24,6 @@
 import org.hyperledger.besu.evm.Code;
 import org.hyperledger.besu.evm.code.CodeV0;
 import org.hyperledger.besu.evm.frame.MessageFrame;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayList;
@@ -181,7 +180,6 @@ public MessageFrame build() {
                 blockHashLookup.orElseGet(
                     () -> new CachingBlockHashLookup(localBlockHeader, localBlockchain)))
             .maxStackSize(maxStackSize)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
     stackItems.forEach(frame::pushStackItem);
     return frame;

diff --git a/...reum/evmtool/src/main/java/org/hyperledger/besu/evmtool/benchmarks/BenchmarkExecutor.java b/...reum/evmtool/src/main/java/org/hyperledger/besu/evmtool/benchmarks/BenchmarkExecutor.java
@@ -35,7 +35,6 @@
 import org.hyperledger.besu.evm.gascalculator.PragueGasCalculator;
 import org.hyperledger.besu.evm.gascalculator.ShanghaiGasCalculator;
 import org.hyperledger.besu.evm.precompile.PrecompiledContract;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 
 import java.io.PrintStream;
 import java.util.Locale;
@@ -71,7 +70,6 @@ public abstract class BenchmarkExecutor {
           .originator(Address.ZERO)
           .initialGas(100_000L)
           .worldUpdater(new SimpleWorld())
-          .authorizedCodeService(new AuthorizedCodeService())
           .build();
 
   /**

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java b/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java
@@ -38,7 +38,6 @@
 import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
 import org.hyperledger.besu.evm.processor.MessageCallProcessor;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.math.BigInteger;
@@ -745,7 +744,6 @@ public Bytes execute() {
             .accessListWarmStorage(accessListWarmStorage)
             .versionedHashes(versionedHashes)
             .completer(c -> {})
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
 
     final Deque<MessageFrame> messageFrameStack = initialMessageFrame.getMessageFrameStack();

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/frame/MessageFrame.java b/evm/src/main/java/org/hyperledger/besu/evm/frame/MessageFrame.java
@@ -1676,7 +1676,6 @@ private void validate() {
       checkState(apparentValue != null, "Missing message frame apparent value");
       checkState(code != null, "Missing message frame code");
       checkState(completer != null, "Missing message frame completer");
-      checkState(authorizedCodeService != null, "Missing authorized account service");
     }
 
     /**
@@ -1690,6 +1689,11 @@ public MessageFrame build() {
       WorldUpdater updater;
       boolean newStatic;
       TxValues newTxValues;
+
+      if (authorizedCodeService == null) {
+        authorizedCodeService = new AuthorizedCodeService();
+      }
+
       if (parentMessageFrame == null) {
         newTxValues =
             new TxValues(

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV0Test.java b/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV0Test.java
@@ -30,7 +30,6 @@
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.evm.operation.JumpOperation;
 import org.hyperledger.besu.evm.operation.Operation.OperationResult;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import javax.annotation.Nonnull;
@@ -91,7 +90,6 @@ private MessageFrame createJumpFrame(final CodeV0 getsCached) {
             .completer(f -> {})
             .miningBeneficiary(Address.ZERO)
             .blockHashLookup(l -> Hash.EMPTY)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
 
     frame.setPC(CURRENT_PC);

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/frame/MessageFrameTest.java b/evm/src/test/java/org/hyperledger/besu/evm/frame/MessageFrameTest.java
@@ -22,7 +22,6 @@
 import org.hyperledger.besu.evm.code.CodeV0;
 import org.hyperledger.besu.evm.toy.ToyBlockValues;
 import org.hyperledger.besu.evm.toy.ToyWorld;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
@@ -59,8 +58,7 @@ void setUp() {
             .value(Wei.ZERO)
             .apparentValue(Wei.ZERO)
             .code(CodeV0.EMPTY_CODE)
-            .completer(messageFrame -> {})
-            .authorizedCodeService(new AuthorizedCodeService());
+            .completer(messageFrame -> {});
   }
 
   @Test

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operation/AbstractCreateOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operation/AbstractCreateOperationTest.java
@@ -40,7 +40,6 @@
 import org.hyperledger.besu.evm.internal.Words;
 import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Deque;
@@ -176,7 +175,6 @@ private void executeOperation(final Bytes contract, final EVM evm) {
             .originator(Address.ZERO)
             .initialGas(100000L)
             .worldUpdater(worldUpdater)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
     final Deque<MessageFrame> messageFrameStack = messageFrame.getMessageFrameStack();
     messageFrame.pushStackItem(Bytes.ofUnsignedLong(contract.size()));

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/Create2OperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/Create2OperationTest.java
@@ -40,7 +40,6 @@
 import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
 import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Deque;
@@ -164,7 +163,6 @@ public void setUp(final String sender, final String salt, final String code) {
             .originator(Address.ZERO)
             .initialGas(100_000L)
             .worldUpdater(worldUpdater)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
     messageFrame.pushStackItem(UInt256.fromHexString(salt));
     messageFrame.pushStackItem(memoryLength);
@@ -277,7 +275,6 @@ private MessageFrame testMemoryFrame(final UInt256 memoryOffset, final UInt256 m
             .originator(Address.ZERO)
             .initialGas(100000L)
             .worldUpdater(worldUpdater)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
     messageFrame.pushStackItem(Bytes.EMPTY);
     messageFrame.pushStackItem(memoryLength);

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/CreateOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/CreateOperationTest.java
@@ -38,7 +38,6 @@
 import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
 import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Deque;
@@ -272,7 +271,6 @@ private MessageFrame testMemoryFrame(
             .originator(Address.ZERO)
             .initialGas(100000L)
             .worldUpdater(worldUpdater)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
     messageFrame.pushStackItem(memoryLength);
     messageFrame.pushStackItem(memoryOffset);

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/EofCreateOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/EofCreateOperationTest.java
@@ -39,7 +39,6 @@
 import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
 import org.hyperledger.besu.evm.processor.MessageCallProcessor;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.List;
@@ -155,7 +154,6 @@ private MessageFrame testMemoryFrame(final Code code, final Bytes initData) {
         .originator(Address.ZERO)
         .initialGas(100000L)
         .worldUpdater(worldUpdater)
-        .authorizedCodeService(new AuthorizedCodeService())
         .build();
   }
 }
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/SelfDestructOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/SelfDestructOperationTest.java
@@ -33,7 +33,6 @@
 import org.hyperledger.besu.evm.internal.Words;
 import org.hyperledger.besu.evm.operation.Operation;
 import org.hyperledger.besu.evm.operation.SelfDestructOperation;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -92,7 +91,6 @@ void checkContractDeletionCommon(
             .originator(Address.ZERO)
             .initialGas(100_000L)
             .worldUpdater(worldUpdater)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
     messageFrame.pushStackItem(Bytes.fromHexString(beneficiary));
     if (newContract) {

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/Benchmarks.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/Benchmarks.java
@@ -31,7 +31,6 @@
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
 import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 
 import java.math.BigInteger;
 import java.util.Map;
@@ -73,7 +72,6 @@ public class Benchmarks {
           .originator(Address.ZERO)
           .initialGas(100_000L)
           .worldUpdater(new SimpleWorld())
-          .authorizedCodeService(new AuthorizedCodeService())
           .build();
 
   private static void benchSecp256k1Recover() {

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestMessageFrameBuilder.java b/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestMessageFrameBuilder.java
@@ -26,7 +26,6 @@
 import org.hyperledger.besu.evm.internal.Words;
 import org.hyperledger.besu.evm.operation.BlockHashOperation.BlockHashLookup;
 import org.hyperledger.besu.evm.toy.ToyWorld;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayList;
@@ -171,7 +170,6 @@ public MessageFrame build() {
             .blockHashLookup(blockHashLookup.orElse(number -> Hash.hash(Words.longBytes(number))))
             .maxStackSize(maxStackSize)
             .isStatic(isStatic)
-            .authorizedCodeService(new AuthorizedCodeService())
             .build();
     frame.setPC(pc);
     frame.setSection(section);

diff --git a/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToyCommand.java b/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToyCommand.java
@@ -28,7 +28,6 @@
 import org.hyperledger.besu.evm.processor.MessageCallProcessor;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
 import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
-import org.hyperledger.besu.evm.worldstate.AuthorizedCodeService;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.io.PrintStream;
@@ -192,7 +191,6 @@ public void run() {
               .completer(c -> {})
               .miningBeneficiary(Address.ZERO)
               .blockHashLookup(n -> null)
-              .authorizedCodeService(new AuthorizedCodeService())
               .build();
 
       final MessageCallProcessor mcp = new MessageCallProcessor(evm, precompileContractRegistry);