Devnet-5: bug fixes for 7702

evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCodeOperation.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright contributors to Besu.
+ *
+ * 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.evm.operation;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.worldstate.DelegateCodeHelper;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * ExtCode* operations treat EOAs with delegated code differently than other operations. This
+ * abstract class contains common methods for this behaviour.
+ */
+abstract class AbstractExtCodeOperation extends AbstractOperation {
+  /**
+   * Instantiates a new Abstract operation.
+   *
+   * @param opcode the opcode
+   * @param name the name
+   * @param stackItemsConsumed the stack items consumed
+   * @param stackItemsProduced the stack items produced
+   * @param gasCalculator the gas calculator
+   */
+  protected AbstractExtCodeOperation(
+      final int opcode,
+      final String name,
+      final int stackItemsConsumed,
+      final int stackItemsProduced,
+      final GasCalculator gasCalculator) {
+    super(opcode, name, stackItemsConsumed, stackItemsProduced, gasCalculator);
+  }
+
+  /**
+   * Returns the code for standard accounts or a special designator for EOAs with delegated code
+   *
+   * @param account The account
+   * @return the code or the special 7702 designator
+   */
+  protected static Bytes getCode(final Account account) {
+    if (account == null) {
+      return Bytes.EMPTY;
+    }
+
+    return account.hasDelegatedCode()
+        ? DelegateCodeHelper.getDelegatedCodeForRead()
+        : account.getCode();
+  }
+
+  /**
+   * Returns the code hash for standard accounts or a special designator for EOAs with delegated
+   * code
+   *
+   * @param account The account
+   * @return the code hash or the hash of the special 7702 designator
+   */
+  protected static Hash getCodeHash(final Account account) {
+    if (account.hasDelegatedCode()) {
+      return Hash.hash(DelegateCodeHelper.getDelegatedCodeForRead());
+    }
+
+    return account.getCodeHash();
+  }
+}

evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java

@@ -25,12 +25,11 @@
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 import org.hyperledger.besu.evm.internal.Words;
-import org.hyperledger.besu.evm.worldstate.DelegateCodeHelper;
 
 import org.apache.tuweni.bytes.Bytes;
 
 /** The Ext code copy operation. */
-public class ExtCodeCopyOperation extends AbstractOperation {
+public class ExtCodeCopyOperation extends AbstractExtCodeOperation {
 
   /** This is the "code" legacy contracts see when copying code from an EOF contract. */
   public static final Bytes EOF_REPLACEMENT_CODE = Bytes.fromHexString("0xef00");
@@ -108,14 +107,4 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
 
     return new OperationResult(cost, null);
   }
-
-  private static Bytes getCode(final Account account) {
-    if (account == null) {
-      return Bytes.EMPTY;
-    }
-
-    return account.hasDelegatedCode()
-        ? DelegateCodeHelper.getDelegatedCodeForRead()
-        : account.getCode();
-  }
 }

evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java

@@ -25,12 +25,11 @@
 import org.hyperledger.besu.evm.internal.OverflowException;
 import org.hyperledger.besu.evm.internal.UnderflowException;
 import org.hyperledger.besu.evm.internal.Words;
-import org.hyperledger.besu.evm.worldstate.DelegateCodeHelper;
 
 import org.apache.tuweni.bytes.Bytes;
 
 /** The Ext code hash operation. */
-public class ExtCodeHashOperation extends AbstractOperation {
+public class ExtCodeHashOperation extends AbstractExtCodeOperation {
 
   // // 0x9dbf3648db8210552e9c4f75c6a1c3057c0ca432043bd648be15fe7be05646f5
   static final Hash EOF_REPLACEMENT_HASH = Hash.hash(ExtCodeCopyOperation.EOF_REPLACEMENT_CODE);
@@ -93,7 +92,7 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
             && code.get(1) == 0) {
           frame.pushStackItem(EOF_REPLACEMENT_HASH);
         } else {
-          frame.pushStackItem(account.getCodeHash());
+          frame.pushStackItem(getCodeHash(account));
         }
       }
       return new OperationResult(cost, null);
@@ -104,12 +103,4 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
       return new OperationResult(cost(true), ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
     }
   }
-
-  private static Bytes getCode(final Account account) {
-    if (!account.hasDelegatedCode()) {
-      return account.getCode();
-    }
-
-    return DelegateCodeHelper.getDelegatedCodeForRead();
-  }
 }

evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java

@@ -24,12 +24,11 @@
 import org.hyperledger.besu.evm.internal.OverflowException;
 import org.hyperledger.besu.evm.internal.UnderflowException;
 import org.hyperledger.besu.evm.internal.Words;
-import org.hyperledger.besu.evm.worldstate.DelegateCodeHelper;
 
 import org.apache.tuweni.bytes.Bytes;
 
 /** The Ext code size operation. */
-public class ExtCodeSizeOperation extends AbstractOperation {
+public class ExtCodeSizeOperation extends AbstractExtCodeOperation {
 
   static final Bytes EOF_SIZE = Bytes.of(2);
 
@@ -103,14 +102,4 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
       return new OperationResult(cost(true), ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
     }
   }
-
-  private static Bytes getCode(final Account account) {
-    if (account == null) {
-      return Bytes.EMPTY;
-    }
-
-    return account.hasDelegatedCode()
-        ? DelegateCodeHelper.getDelegatedCodeForRead()
-        : account.getCode();
-  }
 }