Skip to content

Commit

Permalink
Merge branch 'arith-dev' into arijit-bogdan/account-first-last
Browse files Browse the repository at this point in the history
  • Loading branch information
@arijitdutta67
arijitdutta67 committed Sep 19, 2024
2 parents d111681 + 00673be commit 0d359f7
Show file tree
Hide file tree
Showing 16 changed files with 313 additions and 284 deletions.
1 change: 1 addition & 0 deletions arithmetization/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ dependencies {
implementation "${besuArtifactGroup}:plugin-api"
implementation "${besuArtifactGroup}:besu-datatypes"
implementation "${besuArtifactGroup}.internal:api:${besuVersion}"
implementation "${besuArtifactGroup}.internal:clique:${besuVersion}"
implementation "${besuArtifactGroup}.internal:core:${besuVersion}"
implementation "${besuArtifactGroup}.internal:rlp:${besuVersion}"
implementation "${besuArtifactGroup}.internal:algorithms:${besuVersion}"
Expand Down
4 changes: 2 additions & 2 deletions ...ization/src/main/java/net/consensys/linea/blockcapture/snapshots/BlockHeaderSnapshot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

import org.apache.tuweni.bytes.Bytes;
import org.apache.tuweni.bytes.Bytes32;
import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.datatypes.Quantity;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.core.BlockHeader;
import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
import org.hyperledger.besu.ethereum.core.Difficulty;
import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
import org.hyperledger.besu.evm.log.LogsBloomFilter;

public record BlockHeaderSnapshot(
Expand Down Expand Up @@ -85,7 +85,7 @@ public BlockHeader toBlockHeader() {
.mixHash(Hash.fromHexString(this.mixHashOrPrevRandao))
.prevRandao(Bytes32.fromHexString(this.mixHashOrPrevRandao))
.nonce(this.nonce)
.blockHeaderFunctions(new MainnetBlockHeaderFunctions());
.blockHeaderFunctions(new CliqueBlockHeaderFunctions());

this.baseFee.ifPresent(baseFee -> builder.baseFee(Wei.fromHexString(baseFee)));

Expand Down
1 change: 1 addition & 0 deletions arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ public List<Module> getModulesToCount() {
exp,
ext,
euc,
gas,
logData,
logInfo,
mmu,
Expand Down
52 changes: 26 additions & 26 deletions arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1090Tests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,156 +37,156 @@ void issue_1090_block_1507291() {
@Tag("nightly")
@Test
void issue_1090_block_1809818() {
replay(LINEA_MAINNET, "1809818-1809818.json.gz", false);
replay(LINEA_MAINNET, "1809818-1809818.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1812784() {
replay(LINEA_MAINNET, "1812784-1812784.json.gz", false);
replay(LINEA_MAINNET, "1812784-1812784.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1814860() {
replay(LINEA_MAINNET, "1814860-1814860.json.gz", false);
replay(LINEA_MAINNET, "1814860-1814860.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1714851() {
replay(LINEA_MAINNET, "1714851-1714851.json.gz", false);
replay(LINEA_MAINNET, "1714851-1714851.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1505729() {
replay(LINEA_MAINNET, "1505729-1505729.json.gz", false);
replay(LINEA_MAINNET, "1505729-1505729.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1511808() {
replay(LINEA_MAINNET, "1511808-1511808.json.gz", false);
replay(LINEA_MAINNET, "1511808-1511808.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1400040() {
replay(LINEA_MAINNET, "1400040-1400040.json.gz", false);
replay(LINEA_MAINNET, "1400040-1400040.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1409462() {
replay(LINEA_MAINNET, "1409462-1409462.json.gz", false);
replay(LINEA_MAINNET, "1409462-1409462.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1410650() {
replay(LINEA_MAINNET, "1410650-1410650.json.gz", false);
replay(LINEA_MAINNET, "1410650-1410650.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1204298() {
replay(LINEA_MAINNET, "1204298-1204298.json.gz", false);
replay(LINEA_MAINNET, "1204298-1204298.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1213822() {
replay(LINEA_MAINNET, "1213822-1213822.json.gz", false);
replay(LINEA_MAINNET, "1213822-1213822.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1214117() {
replay(LINEA_MAINNET, "1214117-1214117.json.gz", false);
replay(LINEA_MAINNET, "1214117-1214117.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1214259() {
replay(LINEA_MAINNET, "1214259-1214259.json.gz", false);
replay(LINEA_MAINNET, "1214259-1214259.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1214280() {
replay(LINEA_MAINNET, "1214280-1214280.json.gz", false);
replay(LINEA_MAINNET, "1214280-1214280.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1214528() {
replay(LINEA_MAINNET, "1214528-1214528.json.gz", false);
replay(LINEA_MAINNET, "1214528-1214528.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1100579() {
replay(LINEA_MAINNET, "1100579-1100579.json.gz", false);
replay(LINEA_MAINNET, "1100579-1100579.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1104982() {
replay(LINEA_MAINNET, "1104982-1104982.json.gz", false);
replay(LINEA_MAINNET, "1104982-1104982.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1105022() {
replay(LINEA_MAINNET, "1105022-1105022.json.gz", false);
replay(LINEA_MAINNET, "1105022-1105022.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1105029() {
replay(LINEA_MAINNET, "1105029-1105029.json.gz", false);
replay(LINEA_MAINNET, "1105029-1105029.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1105038() {
replay(LINEA_MAINNET, "1105038-1105038.json.gz", false);
replay(LINEA_MAINNET, "1105038-1105038.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1106506() {
replay(LINEA_MAINNET, "1106506-1106506.json.gz", false);
replay(LINEA_MAINNET, "1106506-1106506.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1106648() {
replay(LINEA_MAINNET, "1106648-1106648.json.gz", false);
replay(LINEA_MAINNET, "1106648-1106648.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1107867() {
replay(LINEA_MAINNET, "1107867-1107867.json.gz", false);
replay(LINEA_MAINNET, "1107867-1107867.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1002387() {
replay(LINEA_MAINNET, "1002387-1002387.json.gz", false);
replay(LINEA_MAINNET, "1002387-1002387.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1003970() {
replay(LINEA_MAINNET, "1003970-1003970.json.gz", false);
replay(LINEA_MAINNET, "1003970-1003970.json.gz");
}

@Tag("nightly")
@Test
void issue_1090_block_1010069() {
replay(LINEA_MAINNET, "1010069-1010069.json.gz", false);
replay(LINEA_MAINNET, "1010069-1010069.json.gz");
}
}
2 changes: 1 addition & 1 deletion arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1109Tests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ public class Issue1109Tests {

@Test
void issue_1090_block_6690_6699() {
replay(LINEA_MAINNET, "6690-6699.json.gz", false);
replay(LINEA_MAINNET, "6690-6699.json.gz");
}
}
40 changes: 20 additions & 20 deletions arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1126Tests.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright Consensys Software Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License", false); you may not use this file except in compliance with
* 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
Expand Down Expand Up @@ -45,12 +45,12 @@ void test_3108622_3108633() {

@Test
void test_3175608_3175636() {
replay(LINEA_MAINNET, "3175608-3175636.json.gz", false);
replay(LINEA_MAINNET, "3175608-3175636.json.gz");
}

@Test
void test_3432730_3432768() {
replay(LINEA_MAINNET, "3432730-3432768.json.gz");
replay(LINEA_MAINNET, "3432730-3432768.json.gz", false);
}

@Test
Expand All @@ -60,102 +60,102 @@ void test_4392225_4392280() {

@Test
void test_4477086_4477226() {
replay(LINEA_MAINNET, "4477086-4477226.json.gz", false);
replay(LINEA_MAINNET, "4477086-4477226.json.gz");
}

@Disabled
@Test
void test_3290673_3290679() {
replay(LINEA_MAINNET, "3290673-3290679.json.gz", false);
replay(LINEA_MAINNET, "3290673-3290679.json.gz");
}

@Disabled
@Test
void test_3290746_3290752() {
replay(LINEA_MAINNET, "3290746-3290752.json.gz", false);
replay(LINEA_MAINNET, "3290746-3290752.json.gz");
}

@Disabled
@Test
void test_3315684_3315690() {
replay(LINEA_MAINNET, "3315684-3315690.json.gz", false);
replay(LINEA_MAINNET, "3315684-3315690.json.gz");
}

@Disabled
@Test
void test_3374278_3374284() {
replay(LINEA_MAINNET, "3374278-3374284.json.gz", false);
replay(LINEA_MAINNET, "3374278-3374284.json.gz");
}

@Disabled
@Test
void test_3385404_3385411() {
replay(LINEA_MAINNET, "3385404-3385411.json.gz", false);
replay(LINEA_MAINNET, "3385404-3385411.json.gz");
}

@Disabled
@Test
void test_3410170_3410240() {
replay(LINEA_MAINNET, "3410170-3410240.json.gz", false);
replay(LINEA_MAINNET, "3410170-3410240.json.gz");
}

@Disabled
@Test
void test_3423488_3423521() {
replay(LINEA_MAINNET, "3423488-3423521.json.gz", false);
replay(LINEA_MAINNET, "3423488-3423521.json.gz");
}

@Disabled
@Test
void test_3424829_3424864() {
replay(LINEA_MAINNET, "3424829-3424864.json.gz", false);
replay(LINEA_MAINNET, "3424829-3424864.json.gz");
}

@Disabled
@Test
void test_3429701_3429735() {
replay(LINEA_MAINNET, "3429701-3429735.json.gz", false);
replay(LINEA_MAINNET, "3429701-3429735.json.gz");
}

@Disabled
@Test
void test_3431193_3431232() {
replay(LINEA_MAINNET, "3431193-3431232.json.gz", false);
replay(LINEA_MAINNET, "3431193-3431232.json.gz");
}

@Disabled
@Test
void test_3431567_3431601() {
replay(LINEA_MAINNET, "3431567-3431601.json.gz", false);
replay(LINEA_MAINNET, "3431567-3431601.json.gz");
}

@Disabled
@Test
void test_4323962_4324012() {
replay(LINEA_MAINNET, "4323962-4324012.json.gz", false);
replay(LINEA_MAINNET, "4323962-4324012.json.gz");
}

@Disabled
@Test
void test_4343434_4343473() {
replay(LINEA_MAINNET, "4343434-4343473.json.gz", false);
replay(LINEA_MAINNET, "4343434-4343473.json.gz");
}

@Disabled
@Test
void test_4519246_4519309() {
replay(LINEA_MAINNET, "4519246-4519309.json.gz", false);
replay(LINEA_MAINNET, "4519246-4519309.json.gz");
}

@Disabled
@Test
void test_4556007_4556115() {
replay(LINEA_MAINNET, "4556007-4556115.json.gz", false);
replay(LINEA_MAINNET, "4556007-4556115.json.gz");
}

@Disabled
@Test
void test_4583379_4583463() {
replay(LINEA_MAINNET, "4583379-4583463.json.gz", false);
replay(LINEA_MAINNET, "4583379-4583463.json.gz");
}
}
2 changes: 1 addition & 1 deletion arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1216Tests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ public class Issue1216Tests {
@Tag("replay")
@Test
void issue_1216_sepolia_block_2392659() {
replay(LINEA_SEPOLIA, "2392659.json.gz", false);
replay(LINEA_SEPOLIA, "2392659.json.gz");
}
}
Loading

0 comments on commit 0d359f7

Please sign in to comment.