Feat/multi transaction with create tests (#1615)

amkCha · web-flow · commit 058889406292 · 2025-01-15T13:51:24.000Z
diff --git a/tracer/arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/createTests/failure/CreateInducedFailureTest.java b/tracer/arithmetization/src/test/java/net/consensys/linea/zktracer/instructionprocessing/createTests/failure/CreateInducedFailureTest.java
@@ -14,6 +14,7 @@
  */
 package net.consensys.linea.zktracer.instructionprocessing.createTests.failure;
 
+import static net.consensys.linea.testing.ToyTransaction.ToyTransactionBuilder;
 import static net.consensys.linea.zktracer.instructionprocessing.createTests.trivial.RootLevel.salt01;
 import static net.consensys.linea.zktracer.instructionprocessing.utilities.MonoOpCodeSmcs.keyPair;
 import static net.consensys.linea.zktracer.instructionprocessing.utilities.MonoOpCodeSmcs.userAccount;
@@ -27,6 +28,7 @@
 import net.consensys.linea.testing.BytecodeCompiler;
 import net.consensys.linea.testing.ToyAccount;
 import net.consensys.linea.testing.ToyExecutionEnvironmentV2;
+import net.consensys.linea.testing.ToyMultiTransaction;
 import net.consensys.linea.testing.ToyTransaction;
 import org.apache.tuweni.bytes.Bytes;
 import org.hyperledger.besu.datatypes.Address;
@@ -41,26 +43,27 @@
  *
  * <p>- we start with an account {@link #entryPoint};
  *
- * <p>- in {@link #transactionDeployingDelegateCaller} we call {@link #entryPoint} with empty call
- * data which leads to the deployment of {@link #delegateCaller};
+ * <p>- in {@link #transactionBuilderDeployingDelegateCaller} we call {@link #entryPoint} with empty
+ * call data which leads to the deployment of {@link #delegateCaller};
  *
- * <p>- in {@link #transactionLeadingDelegateCallerToCreateAnAccount} we call {@link #entryPoint}
- * with nonempty call data which leads it calling {@link #delegateCaller} which leads to it doing a
- * <b>DELEGATECALL</b> to {@link #simpleCreator} thus deploying a new account with {@link
- * #delegateCaller}'s nonce =1;
+ * <p>- in {@link #transactionBuilderLeadingDelegateCallerToCreateAnAccount} we call {@link
+ * #entryPoint} with nonempty call data which leads it calling {@link #delegateCaller} which leads
+ * to it doing a <b>DELEGATECALL</b> to {@link #simpleCreator} thus deploying a new account with
+ * {@link #delegateCaller}'s nonce =1;
  *
- * <p>- in {@link #transactionLeadingDelegateCallerToSelfDestruct} we call {@link #entryPoint} with
- * nonempty call data which leads it calling {@link #delegateCaller} which leads to it doing a
- * <b>DELEGATECALL</b> to {@link #simpleSelfDestructor} self destructing;
+ * <p>- in {@link #transactionBuilderLeadingDelegateCallerToSelfDestruct} we call {@link
+ * #entryPoint} with nonempty call data which leads it calling {@link #delegateCaller} which leads
+ * to it doing a <b>DELEGATECALL</b> to {@link #simpleSelfDestructor} self destructing;
  *
- * <p>- in {@link #transactionDeployingDelegateCallerAgain} we call {@link #entryPoint} with empty
- * call data again which leads to the deployment of {@link #delegateCaller} <i>again</i>;
+ * <p>- in {@link #transactionBuilderDeployingDelegateCallerAgain} we call {@link #entryPoint} with
+ * empty call data again which leads to the deployment of {@link #delegateCaller} <i>again</i>;
  *
- * <p>- in {@link #transactionLeadingDelegateCallerToAttemptCreateAgainThusRaisingFailureConditionF}
- * we call {@link #entryPoint} with nonempty call data which leads it calling {@link
- * #delegateCaller} which leads to it doing a <b>DELEGATECALL</b> to {@link #simpleCreator} thus
- * <i>attempting</i> to redeploy at the same address where it did the first deployment; indeed
- * {@link #delegateCaller}'s nonce is again =1; deploying a new account at nonce 1;
+ * <p>- in {@link
+ * #transactionBuilderLeadingDelegateCallerToAttemptCreateAgainThusRaisingFailureConditionF} we call
+ * {@link #entryPoint} with nonempty call data which leads it calling {@link #delegateCaller} which
+ * leads to it doing a <b>DELEGATECALL</b> to {@link #simpleCreator} thus <i>attempting</i> to
+ * redeploy at the same address where it did the first deployment; indeed {@link #delegateCaller}'s
+ * nonce is again =1; deploying a new account at nonce 1;
  */
 @ExtendWith(UnitTestWatcher.class)
 public class CreateInducedFailureTest {
@@ -201,67 +204,60 @@ public class CreateInducedFailureTest {
           .address(targetAddress)
           .build();
 
-  final Transaction transactionDeployingDelegateCaller =
+  final ToyTransactionBuilder transactionBuilderDeployingDelegateCaller =
       ToyTransaction.builder()
-          .sender(userAccount)
           .to(entryPoint)
           .keyPair(keyPair)
           .value(Wei.of(0xffff))
           .gasLimit(1_000_000L)
-          .gasPrice(Wei.of(8))
-          .build();
+          .gasPrice(Wei.of(8));
 
-  final Transaction transactionLeadingDelegateCallerToCreateAnAccount =
+  final ToyTransactionBuilder transactionBuilderLeadingDelegateCallerToCreateAnAccount =
       ToyTransaction.builder()
-          .sender(userAccount.raiseNonceBy(1))
           .to(entryPoint)
           .keyPair(keyPair)
           .value(Wei.of(0xeeee))
           .gasLimit(1_000_000L)
           .gasPrice(Wei.of(8))
-          .payload(leftPaddedAddress1)
-          .build();
+          .payload(leftPaddedAddress1);
 
-  final Transaction transactionLeadingDelegateCallerToSelfDestruct =
+  final ToyTransactionBuilder transactionBuilderLeadingDelegateCallerToSelfDestruct =
       ToyTransaction.builder()
-          .sender(userAccount.raiseNonceBy(2))
           .to(entryPoint)
           .keyPair(keyPair)
           .value(Wei.of(0xdddd))
           .gasLimit(1_000_000L)
           .gasPrice(Wei.of(8))
-          .payload(leftPaddedAddress2)
-          .build();
+          .payload(leftPaddedAddress2);
 
-  final Transaction transactionDeployingDelegateCallerAgain =
+  final ToyTransactionBuilder transactionBuilderDeployingDelegateCallerAgain =
       ToyTransaction.builder()
-          .sender(userAccount.raiseNonceBy(3))
           .to(entryPoint)
           .keyPair(keyPair)
           .value(Wei.of(0xcccc))
           .gasLimit(1_000_000L)
-          .gasPrice(Wei.of(8))
-          .build();
+          .gasPrice(Wei.of(8));
 
-  final Transaction
-      transactionLeadingDelegateCallerToAttemptCreateAgainThusRaisingFailureConditionF =
+  final ToyTransactionBuilder
+      transactionBuilderLeadingDelegateCallerToAttemptCreateAgainThusRaisingFailureConditionF =
           ToyTransaction.builder()
-              .sender(userAccount.raiseNonceBy(4))
               .to(entryPoint)
               .keyPair(keyPair)
               .value(Wei.of(0xbbbb))
               .gasLimit(1_000_000L)
               .gasPrice(Wei.of(8))
-              .payload(leftPaddedAddress1)
-              .build();
+              .payload(leftPaddedAddress1);
+
+  final ToyTransactionBuilder[] toyTransactionBuilders = {
+    transactionBuilderDeployingDelegateCaller,
+    transactionBuilderLeadingDelegateCallerToCreateAnAccount,
+    transactionBuilderLeadingDelegateCallerToSelfDestruct,
+    transactionBuilderDeployingDelegateCallerAgain,
+    transactionBuilderLeadingDelegateCallerToAttemptCreateAgainThusRaisingFailureConditionF
+  };
 
   final List<Transaction> transactions =
-      List.of(
-          transactionDeployingDelegateCaller,
-          transactionLeadingDelegateCallerToCreateAnAccount,
-          transactionLeadingDelegateCallerToSelfDestruct,
-          transactionDeployingDelegateCallerAgain,
-          transactionLeadingDelegateCallerToAttemptCreateAgainThusRaisingFailureConditionF);
+      ToyMultiTransaction.builder().build(toyTransactionBuilders, userAccount);
 
   final List<ToyAccount> accounts =
       List.of(userAccount, entryPoint, simpleSelfDestructor, simpleCreator);
diff --git a/tracer/testing/src/main/java/net/consensys/linea/testing/GeneralStateReferenceTestTools.java b/tracer/testing/src/main/java/net/consensys/linea/testing/GeneralStateReferenceTestTools.java
@@ -126,6 +126,7 @@ public static void executeTest(
 
       transactionProcessingResultValidator.accept(transaction, result);
       zkTracerValidator.accept(tracer);
+      worldStateUpdater.commit();
     }
 
     tracer.traceEndBlock(blockHeader, blockBody);
@@ -139,7 +140,6 @@ public static void executeTest(
     if (coinbase != null && coinbase.isEmpty() && shouldClearEmptyAccounts(spec.getFork())) {
       worldStateUpdater.deleteAccount(coinbase.getAddress());
     }
-    worldStateUpdater.commit();
     worldState.persist(blockHeader);
 
     // Check the world state root hash.
diff --git a/tracer/testing/src/main/java/net/consensys/linea/testing/ToyAccount.java b/tracer/testing/src/main/java/net/consensys/linea/testing/ToyAccount.java
@@ -202,9 +202,4 @@ public ReferenceTestWorldState.AccountMock toAccountMock() {
     return new ReferenceTestWorldState.AccountMock(
         Long.toHexString(nonce), balance.toHexString(), accountMockStorage, code.toHexString());
   }
-
-  public ToyAccount raiseNonceBy(long k) {
-    long updatedNonce = this.getNonce() + k;
-    return new ToyAccount(this.parent, this.getAddress(), updatedNonce, this.balance, this.balance);
-  }
 }
diff --git a/tracer/testing/src/main/java/net/consensys/linea/testing/ToyMultiTransaction.java b/tracer/testing/src/main/java/net/consensys/linea/testing/ToyMultiTransaction.java
@@ -0,0 +1,47 @@
+/*
+ * 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.testing;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Builder;
+import net.consensys.linea.testing.ToyTransaction.ToyTransactionBuilder;
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+@Builder
+public class ToyMultiTransaction {
+
+  /** Customizations applied to the Lombok generated builder. */
+  public static class ToyMultiTransactionBuilder {
+
+    /**
+     * Builder method returning an instance of {@link List<Transaction>}.
+     *
+     * @return an instance of {@link List<Transaction>}
+     */
+    public List<Transaction> build(
+        ToyTransactionBuilder[] toyTxBuilders, ToyAccount senderAccount) {
+      long senderAccountNonce = senderAccount.getNonce();
+      List<Transaction> results = new ArrayList<>();
+      for (ToyTransactionBuilder toyTxBuilder : toyTxBuilders) {
+        results.add(toyTxBuilder.nonce(senderAccountNonce).build());
+        senderAccountNonce++;
+      }
+      return results;
+    }
+  }
+}
diff --git a/tracer/testing/src/main/java/net/consensys/linea/testing/ToyTransaction.java b/tracer/testing/src/main/java/net/consensys/linea/testing/ToyTransaction.java
@@ -23,10 +23,7 @@
 import lombok.Builder;
 import org.apache.tuweni.bytes.Bytes;
 import org.hyperledger.besu.crypto.KeyPair;
-import org.hyperledger.besu.datatypes.AccessListEntry;
-import org.hyperledger.besu.datatypes.Address;
-import org.hyperledger.besu.datatypes.TransactionType;
-import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.datatypes.*;
 import org.hyperledger.besu.ethereum.core.Transaction;
 
 @Builder

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ public static void executeTest(`
`126`	`126`
`127`	`127`	`transactionProcessingResultValidator.accept(transaction, result);`
`128`	`128`	`zkTracerValidator.accept(tracer);`
	`129`	`+ worldStateUpdater.commit();`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`tracer.traceEndBlock(blockHeader, blockBody);`
`@@ -139,7 +140,6 @@ public static void executeTest(`
`139`	`140`	`if (coinbase != null && coinbase.isEmpty() && shouldClearEmptyAccounts(spec.getFork())) {`
`140`	`141`	`worldStateUpdater.deleteAccount(coinbase.getAddress());`
`141`	`142`	`}`
`142`		`- worldStateUpdater.commit();`
`143`	`143`	`worldState.persist(blockHeader);`
`144`	`144`
`145`	`145`	`// Check the world state root hash.`
Original file line number	Diff line number	Diff line change
`@@ -202,9 +202,4 @@ public ReferenceTestWorldState.AccountMock toAccountMock() {`
`202`	`202`	`return new ReferenceTestWorldState.AccountMock(`
`203`	`203`	`Long.toHexString(nonce), balance.toHexString(), accountMockStorage, code.toHexString());`
`204`	`204`	`}`
`205`		`-`
`206`		`- public ToyAccount raiseNonceBy(long k) {`
`207`		`- long updatedNonce = this.getNonce() + k;`
`208`		`- return new ToyAccount(this.parent, this.getAddress(), updatedNonce, this.balance, this.balance);`
`209`		`- }`
`210`	`205`	`}`