UInt256 long digits record

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

@@ -54,14 +54,10 @@ public static OperationResult staticOperation(final MessageFrame frame) {
     final Bytes value1 = frame.popStackItem();
     final Bytes value2 = frame.popStackItem();
 
-    if (value2.isZero()) {
-      resultBytes = Bytes.EMPTY;
-    } else {
-      UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
-      UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
-      UInt256 b2 = UInt256.fromBytesBE(value2.toArrayUnsafe());
-      resultBytes = Bytes.wrap(b0.addMod(b1, b2).toBytesBE());
-    }
+    UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
+    UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
+    UInt256 b2 = UInt256.fromBytesBE(value2.toArrayUnsafe());
+    resultBytes = Bytes.wrap(b0.addMod(b1, b2).toBytesBE());
 
     frame.pushStackItem(resultBytes);
     return addModSuccess;

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

@@ -53,11 +53,9 @@ public static OperationResult staticOperation(final MessageFrame frame) {
     final Bytes value0 = frame.popStackItem();
     final Bytes value1 = frame.popStackItem();
 
-    UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
-    UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
-
-    UInt256 result = b0.add(b1);
-    byte[] resultArray = result.toBytesBE();
+    byte[] b0 = value0.toArrayUnsafe();
+    byte[] b1 = value1.toArrayUnsafe();
+    byte[] resultArray = UInt256.add(b0, b1);
     frame.pushStackItem(Bytes.wrap(resultArray));
 
     return addSuccess;

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

@@ -20,7 +20,6 @@
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 
 /** The Mod operation. */
 public class ModOperationOptimized extends AbstractFixedCostOperation {
@@ -51,14 +50,11 @@ public Operation.OperationResult executeFixedCostOperation(
   public static OperationResult staticOperation(final MessageFrame frame) {
     final Bytes value0 = frame.popStackItem();
     final Bytes value1 = frame.popStackItem();
-    Bytes resultBytes;
-    if (value1.isZero()) {
-      resultBytes = (Bytes) Bytes32.ZERO;
-    } else {
-      UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
-      UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
-      resultBytes = Bytes.wrap(b0.mod(b1).toBytesBE());
-    }
+
+    UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
+    UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
+    Bytes resultBytes = Bytes.wrap(b0.mod(b1).toBytesBE());
+
     frame.pushStackItem(resultBytes);
     return modSuccess;
   }

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

@@ -52,15 +52,10 @@ public static OperationResult staticOperation(final MessageFrame frame) {
     final Bytes value1 = frame.popStackItem();
     final Bytes value2 = frame.popStackItem();
 
-    Bytes resultBytes;
-    if (value2.isZero()) {
-      resultBytes = Bytes.EMPTY;
-    } else {
-      UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
-      UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
-      UInt256 b2 = UInt256.fromBytesBE(value2.toArrayUnsafe());
-      resultBytes = Bytes.wrap(b0.mulMod(b1, b2).toBytesBE());
-    }
+    UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
+    UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
+    UInt256 b2 = UInt256.fromBytesBE(value2.toArrayUnsafe());
+    Bytes resultBytes = Bytes.wrap(b0.mulMod(b1, b2).toBytesBE());
 
     frame.pushStackItem(resultBytes);
     return mulModSuccess;

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

@@ -0,0 +1,62 @@
+/**
+ * Copyright ConsenSys AG.
+ *
+ * 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.evm.EVM;
+import org.hyperledger.besu.evm.UInt256;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Mul operation. */
+public class MulOperationOptimized extends AbstractFixedCostOperation {
+
+  /** The Mul operation success result. */
+  static final OperationResult mulSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new Mul operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MulOperation(final GasCalculator gasCalculator) {
+    super(0x02, "MUL", 2, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs mul operation
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    UInt256 u0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
+    UInt256 u1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
+    Bytes resultBytes = Bytes.wrap(u0.mul(u1).toBytesBE());
+
+    frame.pushStackItem(resultBytes);
+    return mulModSuccess;
+  }
+}

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

@@ -20,7 +20,6 @@
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 
 /** The SMod operation. */
 public class SModOperationOptimized extends AbstractFixedCostOperation {
@@ -52,16 +51,11 @@ public static OperationResult staticOperation(final MessageFrame frame) {
     final Bytes value0 = frame.popStackItem();
     final Bytes value1 = frame.popStackItem();
 
-    Bytes resultBytes;
-    if (value1.isZero()) {
-      resultBytes = (Bytes) Bytes32.ZERO;
-    } else {
-      UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
-      UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
-      resultBytes = Bytes.wrap(b0.signedMod(b1).toBytesBE());
-    }
-    frame.pushStackItem(resultBytes);
+    UInt256 b0 = UInt256.fromBytesBE(value0.toArrayUnsafe());
+    UInt256 b1 = UInt256.fromBytesBE(value1.toArrayUnsafe());
+    Bytes resultBytes = Bytes.wrap(b0.signedMod(b1).toBytesBE());
 
+    frame.pushStackItem(resultBytes);
     return smodSuccess;
   }
 }

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

@@ -0,0 +1,62 @@
+/*
+ * 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.evm.EVM;
+import org.hyperledger.besu.evm.UInt256;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Sub (Subtract) operation. */
+public class SubOperationOptimized extends AbstractFixedCostOperation {
+
+  /** The Sub operation success result. */
+  static final OperationResult subSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Sub operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SubOperationOptimized(final GasCalculator gasCalculator) {
+    super(0x03, "SUB", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Sub operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    byte[] b0 = value0.toArrayUnsafe();
+    byte[] b1 = value1.toArrayUnsafe();
+    Bytes resultBytes = Bytes.wrap(UInt256.sub(b0, b1));
+
+    frame.pushStackItem(resultBytes);
+    return subSuccess;
+  }
+}