style: update name of prec limits to avoid confusion with old geth na…

…me (#506)

* style: update name of prec limits to avoid confusion with old geth name

* style: update module name

* style: update name in .toml files

* style: remove NB

acceptance-tests/src/test/resources/moduleLimits.toml

@@ -54,13 +54,13 @@ BLOCK_L1SIZE   = 1000000
 #
 # Precompiles limits
 #
-PRECOMPILE_ECRECOVER = 10000
-PRECOMPILE_SHA2      = 10000
-PRECOMPILE_RIPEMD    = 10000
+PRECOMPILE_ECRECOVER_EFFECTIVE_CALL = 10000
+PRECOMPILE_SHA2_BLOCKS      = 10000
+PRECOMPILE_RIPEMD_BLOCKS    = 10000
 PRECOMPILE_IDENTITY  = 10000
-PRECOMPILE_MODEXP    = 10000
-PRECOMPILE_ECADD     = 10000
-PRECOMPILE_ECMUL     = 10000
-PRECOMPILE_ECPAIRING = 10000
-PRECOMPILE_ECPAIRING_WEIGHTED = 10000
-PRECOMPILE_BLAKE2F   = 512
+PRECOMPILE_MODEXP_EFFECTIVE_CALL    = 10000
+PRECOMPILE_ECADD_EFFECTIVE_CALL     = 10000
+PRECOMPILE_ECMUL_EFFECTIVE_CALL     = 10000
+PRECOMPILE_ECPAIRING_EFFECTIVE_CALL = 10000
+PRECOMPILE_ECPAIRING_MILLER_LOOP = 10000
+PRECOMPILE_BLAKE2F_ROUNDS   = 512

acceptance-tests/src/test/resources/noModuleLimits.toml

@@ -54,13 +54,13 @@ BLOCK_L1SIZE   = 1000000
 #
 # Precompiles limits
 #
-PRECOMPILE_ECRECOVER = 10000
-PRECOMPILE_SHA2      = 10000
-PRECOMPILE_RIPEMD    = 10000
+PRECOMPILE_ECRECOVER_EFFECTIVE_CALL = 10000
+PRECOMPILE_SHA2_BLOCKS      = 10000
+PRECOMPILE_RIPEMD_BLOCKS    = 10000
 PRECOMPILE_IDENTITY  = 10000
-PRECOMPILE_MODEXP    = 10000
-PRECOMPILE_ECADD     = 10000
-PRECOMPILE_ECMUL     = 10000
-PRECOMPILE_ECPAIRING = 10000
-PRECOMPILE_ECPAIRING_WEIGHTED = 10000
-PRECOMPILE_BLAKE2F   = 512
+PRECOMPILE_MODEXP_EFFECTIVE_CALL    = 10000
+PRECOMPILE_ECADD_EFFECTIVE_CALL     = 10000
+PRECOMPILE_ECMUL_EFFECTIVE_CALL     = 10000
+PRECOMPILE_ECPAIRING_EFFECTIVE_CALL = 10000
+PRECOMPILE_ECPAIRING_MILLER_LOOP = 10000
+PRECOMPILE_BLAKE2F_ROUNDS   = 512

acceptance-tests/src/test/resources/txOverflowModuleLimits.toml

@@ -55,13 +55,13 @@ BLOCK_L1SIZE   = 1000000
 #
 # Precompiles limits
 #
-PRECOMPILE_ECRECOVER = 10000
-PRECOMPILE_SHA2      = 10000
-PRECOMPILE_RIPEMD    = 10000
+PRECOMPILE_ECRECOVER_EFFECTIVE_CALL = 10000
+PRECOMPILE_SHA2_BLOCKS      = 10000
+PRECOMPILE_RIPEMD_BLOCKS    = 10000
 PRECOMPILE_IDENTITY  = 10000
-PRECOMPILE_MODEXP    = 10000
-PRECOMPILE_ECADD     = 10000
-PRECOMPILE_ECMUL     = 10000
-PRECOMPILE_ECPAIRING = 10000
-PRECOMPILE_ECPAIRING_WEIGHTED = 10000
-PRECOMPILE_BLAKE2F   = 512
+PRECOMPILE_MODEXP_EFFECTIVE_CALL    = 10000
+PRECOMPILE_ECADD_EFFECTIVE_CALL     = 10000
+PRECOMPILE_ECMUL_EFFECTIVE_CALL     = 10000
+PRECOMPILE_ECPAIRING_EFFECTIVE_CALL = 10000
+PRECOMPILE_ECPAIRING_MILLER_LOOP = 10000
+PRECOMPILE_BLAKE2F_ROUNDS   = 512

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

@@ -43,15 +43,15 @@
 import net.consensys.linea.zktracer.module.limits.Keccak;
 import net.consensys.linea.zktracer.module.limits.L2Block;
 import net.consensys.linea.zktracer.module.limits.L2L1Logs;
-import net.consensys.linea.zktracer.module.limits.precompiles.Blake2f;
-import net.consensys.linea.zktracer.module.limits.precompiles.EcAdd;
-import net.consensys.linea.zktracer.module.limits.precompiles.EcMul;
-import net.consensys.linea.zktracer.module.limits.precompiles.EcPairingCall;
-import net.consensys.linea.zktracer.module.limits.precompiles.EcPairingWeightedCall;
-import net.consensys.linea.zktracer.module.limits.precompiles.EcRecover;
-import net.consensys.linea.zktracer.module.limits.precompiles.Modexp;
-import net.consensys.linea.zktracer.module.limits.precompiles.Rip160;
-import net.consensys.linea.zktracer.module.limits.precompiles.Sha256;
+import net.consensys.linea.zktracer.module.limits.precompiles.Blake2fRounds;
+import net.consensys.linea.zktracer.module.limits.precompiles.EcAddEffectiveCall;
+import net.consensys.linea.zktracer.module.limits.precompiles.EcMulEffectiveCall;
+import net.consensys.linea.zktracer.module.limits.precompiles.EcPairingCallEffectiveCall;
+import net.consensys.linea.zktracer.module.limits.precompiles.EcPairingMillerLoop;
+import net.consensys.linea.zktracer.module.limits.precompiles.EcRecoverEffectiveCall;
+import net.consensys.linea.zktracer.module.limits.precompiles.ModexpEffectiveCall;
+import net.consensys.linea.zktracer.module.limits.precompiles.Rip160Blocks;
+import net.consensys.linea.zktracer.module.limits.precompiles.Sha256Blocks;
 import net.consensys.linea.zktracer.module.logData.LogData;
 import net.consensys.linea.zktracer.module.logInfo.LogInfo;
 import net.consensys.linea.zktracer.module.mmu.Mmu;
@@ -181,7 +181,7 @@ public void addTraceSection(TraceSection section) {
   private final RomLex romLex;
   private final TxnData txnData;
   private final Trm trm = new Trm();
-  private final Modexp modexp;
+  private final ModexpEffectiveCall modexp;
   private final Stp stp = new Stp(this, wcp, mod);
   private final L2Block l2Block = new L2Block();
 
@@ -199,20 +199,20 @@ public Hub() {
     this.txnData = new TxnData(this, this.romLex, this.wcp);
     this.ecData = new EcData(this, this.wcp, this.ext);
 
-    final EcRecover ecRec = new EcRecover(this);
-    this.modexp = new Modexp(this);
-    final EcPairingCall ecpairingCall = new EcPairingCall(this);
+    final EcRecoverEffectiveCall ecRec = new EcRecoverEffectiveCall(this);
+    this.modexp = new ModexpEffectiveCall(this);
+    final EcPairingCallEffectiveCall ecpairingCall = new EcPairingCallEffectiveCall(this);
     this.precompileLimitModules =
         List.of(
-            new Sha256(this),
+            new Sha256Blocks(this),
             ecRec,
-            new Rip160(this),
+            new Rip160Blocks(this),
             this.modexp,
-            new EcAdd(this),
-            new EcMul(this),
+            new EcAddEffectiveCall(this),
+            new EcMulEffectiveCall(this),
             ecpairingCall,
-            new EcPairingWeightedCall(ecpairingCall),
-            new Blake2f(this),
+            new EcPairingMillerLoop(ecpairingCall),
+            new Blake2fRounds(this),
             // Block level limits
             this.l2Block,
             new Keccak(this, ecRec, this.l2Block),

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/Keccak.java

@@ -27,7 +27,7 @@
 import net.consensys.linea.zktracer.ColumnHeader;
 import net.consensys.linea.zktracer.module.Module;
 import net.consensys.linea.zktracer.module.hub.Hub;
-import net.consensys.linea.zktracer.module.limits.precompiles.EcRecover;
+import net.consensys.linea.zktracer.module.limits.precompiles.EcRecoverEffectiveCall;
 import net.consensys.linea.zktracer.opcode.OpCode;
 import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.internal.Words;
@@ -41,7 +41,7 @@ public class Keccak implements Module {
   private static final int PUBKEY_BYTES = 64;
 
   private final Hub hub;
-  private final EcRecover ecRec;
+  private final EcRecoverEffectiveCall ecRec;
   private final L2Block l2Block;
 
   private final Deque<List<Long>> deployedCodesizes = new ArrayDeque<>();

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/Blake2f.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/Blake2fRounds.java

@@ -29,13 +29,13 @@
 import org.hyperledger.besu.evm.internal.Words;
 
 @RequiredArgsConstructor
-public final class Blake2f implements Module {
+public final class Blake2fRounds implements Module {
   final Hub hub;
   private final Stack<Integer> counts = new Stack<>();
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_BLAKE2F";
+    return "PRECOMPILE_BLAKE2F_ROUNDS";
   }
 
   @Override

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcAdd.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcAddEffectiveCall.java

@@ -29,13 +29,13 @@
 import org.hyperledger.besu.evm.internal.Words;
 
 @RequiredArgsConstructor
-public final class EcAdd implements Module {
+public final class EcAddEffectiveCall implements Module {
   private final Hub hub;
   private final Stack<Integer> counts = new Stack<>();
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_ECADD";
+    return "PRECOMPILE_ECADD_EFFECTIVE_CALL";
   }
 
   private static final int PRECOMPILE_GAS_FEE = 150; // cf EIP-1108

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcMul.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcMulEffectiveCall.java

@@ -29,13 +29,13 @@
 import org.hyperledger.besu.evm.internal.Words;
 
 @RequiredArgsConstructor
-public final class EcMul implements Module {
+public final class EcMulEffectiveCall implements Module {
   private final Hub hub;
   private final Stack<Integer> counts = new Stack<>();
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_ECMUL";
+    return "PRECOMPILE_ECMUL_EFFECTIVE_CALL";
   }
 
   private static final int PRECOMPILE_GAS_FEE = 6000; // cf EIP-1108

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcPairingCall.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcPairingCallEffectiveCall.java

@@ -32,7 +32,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public final class EcPairingCall implements Module {
+public final class EcPairingCallEffectiveCall implements Module {
   private final Hub hub;
   @Getter private final Stack<EcPairingLimit> counts = new Stack<>();
   private static final int PRECOMPILE_BASE_GAS_FEE = 45000; // cf EIP-1108
@@ -41,7 +41,7 @@ public final class EcPairingCall implements Module {
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_ECPAIRING";
+    return "PRECOMPILE_ECPAIRING_EFFECTIVE_CALL";
   }
 
   @Override

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcPairingWeightedCall.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcPairingMillerLoop.java

@@ -21,16 +21,16 @@
 import net.consensys.linea.zktracer.ColumnHeader;
 import net.consensys.linea.zktracer.module.Module;
 
-public final class EcPairingWeightedCall implements Module {
-  private final EcPairingCall ecpairingCall;
+public final class EcPairingMillerLoop implements Module {
+  private final EcPairingCallEffectiveCall ecpairingCall;
 
-  public EcPairingWeightedCall(EcPairingCall ecpairingCall) {
+  public EcPairingMillerLoop(EcPairingCallEffectiveCall ecpairingCall) {
     this.ecpairingCall = ecpairingCall;
   }
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_ECPAIRING_WEIGHTED";
+    return "PRECOMPILE_ECPAIRING_MILLER_LOOP";
   }
 
   @Override

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcRecover.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/EcRecoverEffectiveCall.java

@@ -33,13 +33,13 @@
 import org.hyperledger.besu.evm.internal.Words;
 
 @RequiredArgsConstructor
-public final class EcRecover implements Module {
+public final class EcRecoverEffectiveCall implements Module {
   private final Hub hub;
   private final Stack<Integer> counts = new Stack<>();
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_ECRECOVER";
+    return "PRECOMPILE_ECRECOVER_EFFECTIVE_CALL";
   }
 
   private static final int ECRECOVER_GAS_FEE = 3000;

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/Modexp.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/ModexpEffectiveCall.java

@@ -35,15 +35,15 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public class Modexp implements Module {
+public class ModexpEffectiveCall implements Module {
   private final Hub hub;
   private final Stack<Integer> counts = new Stack<>();
   private static final BigInteger PROVER_MAX_INPUT_BIT_SIZE = BigInteger.valueOf(4096);
   private static final int EVM_WORD_SIZE = 32;
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_MODEXP";
+    return "PRECOMPILE_MODEXP_EFFECTIVE_CALL";
   }
 
   @Override

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/Rip160.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/Rip160Blocks.java

@@ -29,13 +29,13 @@
 import org.hyperledger.besu.evm.internal.Words;
 
 @RequiredArgsConstructor
-public final class Rip160 implements Module {
+public final class Rip160Blocks implements Module {
   private final Hub hub;
   private final Stack<Integer> counts = new Stack<>();
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_RIPEMD";
+    return "PRECOMPILE_RIPEMD_BLOCKS";
   }
 
   private static final int PRECOMPILE_BASE_GAS_FEE = 600;

arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/Sha256.java → arithmetization/src/main/java/net/consensys/linea/zktracer/module/limits/precompiles/Sha256Blocks.java

@@ -29,13 +29,13 @@
 import org.hyperledger.besu.evm.internal.Words;
 
 @RequiredArgsConstructor
-public final class Sha256 implements Module {
+public final class Sha256Blocks implements Module {
   private final Hub hub;
   private final Stack<Integer> counts = new Stack<>();
 
   @Override
   public String moduleKey() {
-    return "PRECOMPILE_SHA2";
+    return "PRECOMPILE_SHA2_BLOCKS";
   }
 
   private static final int PRECOMPILE_BASE_GAS_FEE = 60;

arithmetization/src/main/resources/spillings.toml

@@ -24,16 +24,16 @@ STP = 4
 TRM = 7
 WCP = 16
 
-PRECOMPILE_ECRECOVER = 0
-PRECOMPILE_SHA2      = 0
-PRECOMPILE_RIPEMD    = 0
+PRECOMPILE_ECRECOVER_EFFECTIVE_CALL = 0
+PRECOMPILE_SHA2_BLOCKS      = 0
+PRECOMPILE_RIPEMD_BLOCKS    = 0
 PRECOMPILE_IDENTITY  = 0
-PRECOMPILE_MODEXP    = 0
-PRECOMPILE_ECADD     = 0
-PRECOMPILE_ECMUL     = 0
-PRECOMPILE_ECPAIRING = 0
-PRECOMPILE_ECPAIRING_WEIGHTED = 0
-PRECOMPILE_BLAKE2F   = 0
+PRECOMPILE_MODEXP_EFFECTIVE_CALL    = 0
+PRECOMPILE_ECADD_EFFECTIVE_CALL     = 0
+PRECOMPILE_ECMUL_EFFECTIVE_CALL     = 0
+PRECOMPILE_ECPAIRING_EFFECTIVE_CALL = 0
+PRECOMPILE_ECPAIRING_MILLER_LOOP = 0
+PRECOMPILE_BLAKE2F_ROUNDS   = 0
 
 BLOCK_TX       = 0
 BLOCK_L2L1LOGS = 0