CREATE tests

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/common/CommonFragmentValues.java

@@ -257,9 +257,6 @@ public long computeGasNext(short exceptions) {
 
     final long gasAfterDeductingCost = computeGasRemaining() - computeGasCost();
 
-    OpCode opCode = hub.opCode();
-    GasProjection gasUtility = Hub.GAS_PROJECTOR.of(hub.messageFrame(), opCode);
-
     return switch (hub.opCodeData().instructionFamily()) {
       case KEC, COPY, STACK_RAM, STORAGE, LOG, HALT -> gasAfterDeductingCost;
       case CREATE -> gasAfterDeductingCost;

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/imc/StpCall.java

@@ -59,16 +59,17 @@ public class StpCall implements TraceSubFragment {
   @EqualsAndHashCode.Include long gasPaidOutOfPocket;
   @EqualsAndHashCode.Include long stipend;
 
-  public StpCall(Hub hub, long memoryExpansionGas) {
-    this.memoryExpansionGas = memoryExpansionGas;
+  public StpCall(Hub hub, MessageFrame frame, long memoryExpansionGas) {
     this.opCode = hub.opCode();
-    this.gasActual = hub.messageFrame().getRemainingGas();
     checkArgument(this.opCode.isCall() || this.opCode.isCreate());
 
+    this.memoryExpansionGas = memoryExpansionGas;
+    this.gasActual = frame.getRemainingGas();
+
     if (this.opCode.isCall()) {
       this.stpCallForCalls(hub);
     } else {
-      this.stpCallForCreates(hub);
+      this.stpCallForCreates(frame);
     }
   }
 
@@ -114,8 +115,7 @@ private long gasPaidOutOfPocketForCalls() {
     }
   }
 
-  private void stpCallForCreates(Hub hub) {
-    MessageFrame frame = hub.messageFrame();
+  private void stpCallForCreates(MessageFrame frame) {
 
     this.gas = ZERO; // irrelevant
     this.value = EWord.of(frame.getStackItem(0));
@@ -132,7 +132,7 @@ private long computeGasPaidOutOfPocketForCreates() {
       return 0;
     } else {
       long gasMinusUpfrontCost = gasActual - upfrontGasCost;
-      return gasMinusUpfrontCost - (gasMinusUpfrontCost >> 6);
+      return gasMinusUpfrontCost - gasMinusUpfrontCost / 64;
     }
   }
 

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/section/CreateSection.java

@@ -130,7 +130,7 @@ public CreateSection(Hub hub, MessageFrame frame) {
       return;
     }
 
-    final StpCall stpCall = new StpCall(hub, mxpCall.getGasMxp());
+    final StpCall stpCall = new StpCall(hub, frame, mxpCall.getGasMxp());
     imcFragment.callStp(stpCall);
 
     checkArgument(stpCall.outOfGasException() == Exceptions.outOfGasException(exceptions));
@@ -206,6 +206,7 @@ public CreateSection(Hub hub, MessageFrame frame) {
     if (failedCreate) {
       finalContextFragment = ContextFragment.nonExecutionProvidesEmptyReturnData(hub);
       scenarioFragment.setScenario(CREATE_FAILURE_CONDITION_WONT_REVERT);
+      commonValues.payGasPaidOutOfPocket(hub);
       hub.failureConditionForCreates = true;
       return;
     }
@@ -220,13 +221,15 @@ public CreateSection(Hub hub, MessageFrame frame) {
     // Finally, non-exceptional, non-aborting, non-failing, non-emptyInitCode create
     ////////////////////////////////////////////////////////////////////////////////
 
+    // we charge for the gas paid out of pocket
+    commonValues.payGasPaidOutOfPocket(hub);
+
     // we capture revert information about the child context: CCSR and CCRS
     hub.defers().scheduleForContextReEntry(imcFragment, hub.currentFrame());
 
     // The current execution context pays (63/64)ths of it current gas to the child context
-    commonValues.payGasPaidOutOfPocket(hub);
-    hub.defers()
-        .scheduleForContextReEntry(this, callFrame); // To get the success bit of the CREATE(2)
+    // To get the success bit of the CREATE(2) operation
+    hub.defers().scheduleForContextReEntry(this, callFrame);
 
     requiresRomLex = true;
     hub.romLex().callRomLex(frame);
@@ -361,8 +364,8 @@ private void finishAbort(final Hub hub) {
         hub.factories().accountFragment();
     final AccountFragment creatorAccountFragment =
         accountFragmentFactory.make(
-            preOpcodeCreateeSnapshot,
-            preOpcodeCreateeSnapshot,
+            preOpcodeCreatorSnapshot,
+            preOpcodeCreatorSnapshot,
             DomSubStampsSubFragment.standardDomSubStamps(this.hubStamp(), 0));
 
     final ContextFragment updatedCurrentContextFragment =

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/section/call/CallSection.java

@@ -175,7 +175,7 @@ public CallSection(Hub hub, MessageFrame frame) {
       return;
     }
 
-    stpCall = new StpCall(hub, mxpCall.gasMxp);
+    stpCall = new StpCall(hub, frame, mxpCall.gasMxp);
     firstImcFragment.callStp(stpCall);
     checkArgument(
         stpCall.outOfGasException() == Exceptions.outOfGasException(exceptions),

arithmetization/src/main/java/net/consensys/linea/zktracer/module/rlpaddr/RlpAddr.java

@@ -109,7 +109,13 @@ public void callRlpAddrCreate2(MessageFrame frame, Bytes32 salt, Bytes32 hash) {
     final Address currentAddress = frame.getRecipientAddress();
     final Bytes32 rawCreate2Address = getCreate2RawAddress(currentAddress, salt, hash);
     final RlpAddrOperation operation =
-        new RlpAddrOperation(rawCreate2Address, OpCode.CREATE2, currentAddress, salt, hash);
+        new RlpAddrOperation(
+            rawCreate2Address,
+            OpCode.CREATE2,
+            currentAddress,
+            salt,
+            hash,
+            longToUnsignedBigInteger(frame.getWorldUpdater().get(currentAddress).getNonce()));
     operations.add(operation);
     hub.trm().callTrimming(rawCreate2Address);
   }
@@ -118,6 +124,8 @@ private void traceCreate2(int stamp, RlpAddrOperation chunk, Trace trace) {
     final Bytes rawAddressHi = chunk.rawHash().slice(0, LLARGE);
     final long depAddressHi = rawAddressHi.slice(12, 4).toLong();
     final Bytes depAddressLo = chunk.rawHash().slice(LLARGE, LLARGE);
+    final BigInteger nonce = chunk.nonce();
+    final Bytes nonceBytes = bigIntegerToBytes(nonce);
 
     for (int ct = 0; ct <= MAX_CT_CREATE2; ct++) {
       trace
@@ -130,10 +138,11 @@ private void traceCreate2(int stamp, RlpAddrOperation chunk, Trace trace) {
           .depAddrLo(depAddressLo)
           .addrHi(chunk.address().slice(0, 4).toLong())
           .addrLo(chunk.address().slice(4, LLARGE))
-          .saltHi(chunk.salt().orElseThrow().slice(0, LLARGE))
-          .saltLo(chunk.salt().orElseThrow().slice(LLARGE, LLARGE))
-          .kecHi(chunk.keccak().orElseThrow().slice(0, LLARGE))
-          .kecLo(chunk.keccak().orElseThrow().slice(LLARGE, LLARGE))
+          .saltHi(chunk.salt().slice(0, LLARGE))
+          .saltLo(chunk.salt().slice(LLARGE, LLARGE))
+          .kecHi(chunk.keccak().slice(0, LLARGE))
+          .kecLo(chunk.keccak().slice(LLARGE, LLARGE))
+          .nonce(nonceBytes)
           .lc(true)
           .index(UnsignedByte.of(ct))
           .counter(UnsignedByte.of(ct));
@@ -149,19 +158,19 @@ private void traceCreate2(int stamp, RlpAddrOperation chunk, Trace trace) {
             .nBytes(BYTES_LLARGE)
             .selectorKeccakRes(false);
         case 2 -> trace
-            .limb(chunk.salt().orElseThrow().slice(0, LLARGE))
+            .limb(chunk.salt().slice(0, LLARGE))
             .nBytes(BYTES_LLARGE)
             .selectorKeccakRes(false);
         case 3 -> trace
-            .limb(chunk.salt().orElseThrow().slice(LLARGE, LLARGE))
+            .limb(chunk.salt().slice(LLARGE, LLARGE))
             .nBytes(BYTES_LLARGE)
             .selectorKeccakRes(false);
         case 4 -> trace
-            .limb(chunk.keccak().orElseThrow().slice(0, LLARGE))
+            .limb(chunk.keccak().slice(0, LLARGE))
             .nBytes(BYTES_LLARGE)
             .selectorKeccakRes(false);
         case 5 -> trace
-            .limb(chunk.keccak().orElseThrow().slice(LLARGE, LLARGE))
+            .limb(chunk.keccak().slice(LLARGE, LLARGE))
             .nBytes(BYTES_LLARGE)
             .selectorKeccakRes(false);
       }
@@ -172,7 +181,7 @@ private void traceCreate2(int stamp, RlpAddrOperation chunk, Trace trace) {
   }
 
   private void traceCreate(int stamp, RlpAddrOperation chunk, Trace trace) {
-    final BigInteger nonce = chunk.nonce().orElseThrow();
+    final BigInteger nonce = chunk.nonce();
 
     Bytes nonceShifted = leftPadTo(bigIntegerToBytes(nonce), recipe1NbRows);
     Boolean tinyNonZeroNonce = true;

arithmetization/src/main/java/net/consensys/linea/zktracer/module/rlpaddr/RlpAddrOperation.java

@@ -37,20 +37,25 @@
 public final class RlpAddrOperation extends ModuleOperation {
   @EqualsAndHashCode.Include private final Bytes32 rawHash;
   private final OpCode opCode;
-  private final Optional<BigInteger> nonce;
+  @EqualsAndHashCode.Include private final BigInteger nonce;
   private final Address address;
-  private final Optional<Bytes32> salt;
-  private final Optional<Bytes32> keccak;
+  private final Bytes32 salt;
+  private final Bytes32 keccak;
 
   // CREATE operation
   public RlpAddrOperation(Bytes32 rawDepAddress, OpCode opCode, BigInteger nonce, Address address) {
-    this(rawDepAddress, opCode, Optional.of(nonce), address, Optional.empty(), Optional.empty());
+    this(rawDepAddress, opCode, nonce, address, Bytes32.ZERO, Bytes32.ZERO);
   }
 
   // CREATE2 operation
   public RlpAddrOperation(
-      Bytes32 rawHash, OpCode opCode, Address address, Bytes32 salt, Bytes32 kec) {
-    this(rawHash, opCode, Optional.empty(), address, Optional.of(salt), Optional.of(kec));
+      Bytes32 rawHash,
+      OpCode opCode,
+      Address address,
+      Bytes32 salt,
+      Bytes32 kec,
+      BigInteger nonce) {
+    this(rawHash, opCode, nonce, address, salt, kec);
   }
 
   @Override

arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/gas/projector/Create.java

@@ -52,12 +52,13 @@ public long largestOffset() {
   @Override
   public long gasPaidOutOfPocket() {
     long currentGas = frame.getRemainingGas();
-    long gasCost = this.staticGas() + this.memoryExpansion();
+    long upfrontGasCost = this.upfrontGasCost();
 
-    if (gasCost > currentGas) {
+    if (upfrontGasCost > currentGas) {
       return 0;
-    } else {
-      return currentGas - currentGas / 64;
     }
+
+    long gasMinusUpfront = currentGas - upfrontGasCost;
+    return gasMinusUpfront - gasMinusUpfront / 64;
   }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/gas/projector/Create2.java

@@ -57,13 +57,15 @@ public long linearPerWord() {
   @Override
   public long gasPaidOutOfPocket() {
     long currentGas = frame.getRemainingGas();
-    long gasCost = this.staticGas() + this.memoryExpansion() + this.linearPerWord();
+    long upfrontGasCost = this.upfrontGasCost();
 
-    if (gasCost > currentGas) {
+    if (upfrontGasCost > currentGas) {
       return 0;
-    } else {
-      return currentGas - currentGas / 64;
     }
+
+    final long gasMinusUpfrontGasCost = currentGas - upfrontGasCost;
+
+    return gasMinusUpfrontGasCost - gasMinusUpfrontGasCost / 64;
   }
 
   @Override

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/createTests/CreateType.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright Consensys Software Inc.
+ *
+ * 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 net.consensys.linea.zktracer.instructionprocessing.createTests;
+
+public enum CreateType {
+  CREATE,
+  CREATE2
+}

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/createTests/OffsetParameter.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright Consensys Software Inc.
+ *
+ * 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 net.consensys.linea.zktracer.instructionprocessing.createTests;
+
+public enum OffsetParameter {
+  ZERO,
+  THREE,
+  SIXTEEN,
+  SIXTEEN_BYTE_INT,
+  THIRTY_TWO_BYTE_INT,
+  MAX,
+}

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/createTests/SizeParameter.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright Consensys Software Inc.
+ *
+ * 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 net.consensys.linea.zktracer.instructionprocessing.createTests;
+
+public enum SizeParameter {
+  ZERO,
+  TWELVE, // - 3 - 1
+  THIRTEEN, // - 3 + 0
+  FOURTEEN, // - 3 + 1
+  THIRTY_TWO,
+  MSIZE,
+  MAX;
+
+  public boolean isAnyOf(SizeParameter... sizeParameters) {
+    for (SizeParameter sizeParameter : sizeParameters) {
+      if (this == sizeParameter) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public boolean willRaiseException() {
+    return this.isAnyOf(MAX);
+  }
+}

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/createTests/ValueParameter.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright Consensys Software Inc.
+ *
+ * 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 net.consensys.linea.zktracer.instructionprocessing.createTests;
+
+public enum ValueParameter {
+  ZERO,
+  ONE,
+  SELFBALANCE,
+  SELFBALANCE_PLUS_ONE,
+}

arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/createTests/WhenToTestParameter.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright Consensys Software Inc.
+ *
+ * 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 net.consensys.linea.zktracer.instructionprocessing.createTests;
+
+public enum WhenToTestParameter {
+  BEFORE,
+  AFTER,
+  BEFORE_AND_AFTER
+}