Skip to content

Commit

Permalink
Revert "chore: pin halo2 dependencies"
Browse files Browse the repository at this point in the history 
This reverts commit 2d3a933.
  • Loading branch information
@jonathanpwang
jonathanpwang committed Sep 17, 2023
1 parent 2d3a933 commit 3cd2963
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions axiom-eth/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ serde_with = { version = "2.2", optional = true }

# halo2
ff = "0.12"
halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib.git", tag = "v0.3.0-ce", default-features = false }
zkevm-keccak = { git = "https://github.com/axiom-crypto/halo2-lib.git", tag = "v0.3.0-ce", default-features = false }
halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "community-edition", default-features = false }
zkevm-keccak = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "community-edition", default-features = false }
# macro
any_circuit_derive = { path = "../any_circuit_derive", optional = true }

Expand All @@ -39,8 +39,8 @@ rand = "0.8"
rand_chacha = "0.3.1"

# aggregation
snark-verifier = { git = "https://github.com/axiom-crypto/snark-verifier.git", tag = "v0.1.1-ce", default-features = false, features = ["loader_halo2"], optional = true }
snark-verifier-sdk = { git = "https://github.com/axiom-crypto/snark-verifier.git", tag = "v0.1.1-ce", default-features = false, features = ["loader_halo2"], optional = true }
snark-verifier = { git = "https://github.com/axiom-crypto/snark-verifier.git", branch = "community-edition", default-features = false, features = ["loader_halo2"], optional = true }
snark-verifier-sdk = { git = "https://github.com/axiom-crypto/snark-verifier.git", branch = "community-edition", default-features = false, features = ["loader_halo2"], optional = true }

# generating circuit inputs from blockchain
ethers-providers = { version = "=2.0.6", optional = true }
Expand Down
12 changes: 6 additions & 6 deletions axiom-eth/configs/storage/mainnet_10.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"break_points": {
"gate": [
[
524226,
524226,
524228,
524227,
524228,
524228,
524228,
524227,
524226,
524228,
524228,
524228,
524227,
524228,
524227,
524228,
Expand All @@ -41,7 +41,7 @@
524228,
524228,
524226,
524228,
524226,
524228,
524228,
524228,
Expand All @@ -51,7 +51,7 @@
[]
],
"rlc": [
524227
524228
]
}
}
46 changes: 23 additions & 23 deletions axiom-eth/data/storage/mainnet_10_evm.yul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ mstore(0x6a0, mod(calldataload(0x680), f_q))
mstore(0x6c0, mod(calldataload(0x6a0), f_q))
mstore(0x6e0, mod(calldataload(0x6c0), f_q))
mstore(0x700, mod(calldataload(0x6e0), f_q))
mstore(0x0, 4591491521805392815346274673037664864030165697148055395091376699132994988724)
mstore(0x0, 3070330598423483684997578132342042775302428088284443187127165829370988263872)

{
let x := calldataload(0x700)
Expand Down Expand Up @@ -1716,80 +1716,80 @@ mstore(0x6560, mload(0x6480))
mstore(0x65a0, mload(0x6500))
mstore(0x65c0, mload(0x6520))
success := and(eq(staticcall(gas(), 0x6, 0x6560, 0x80, 0x6560, 0x40), 1), success)
mstore(0x65e0, 0x24b62e6fd13d683074a6ae331d8d84812644fe3c6505cbf226cd06f35c7ff3ce)
mstore(0x6600, 0x1172e42b5ee18922659397c436f052ac97945366e1e0ecb3cf46b25c5d962337)
mstore(0x65e0, 0x052fef9c6915b7fb3db3f21b29b01aeb9ee6532165bf6fcbd235f7be282d74ed)
mstore(0x6600, 0x2d6f4fffe3096d9bf5e63b02a1d25e23d53fa855763d0cb68f5cf9f95a133868)
mstore(0x6620, mload(0x5be0))
success := and(eq(staticcall(gas(), 0x7, 0x65e0, 0x60, 0x65e0, 0x40), 1), success)
mstore(0x6640, mload(0x6560))
mstore(0x6660, mload(0x6580))
mstore(0x6680, mload(0x65e0))
mstore(0x66a0, mload(0x6600))
success := and(eq(staticcall(gas(), 0x6, 0x6640, 0x80, 0x6640, 0x40), 1), success)
mstore(0x66c0, 0x15af954e902761d952747e14cd0f27ca54b19b8de8099ff15a25f615c06f8e3a)
mstore(0x66e0, 0x0e9051d2b5dcad80d43c382cb9b821bf820962d05154f9c0e992b9163274b23c)
mstore(0x66c0, 0x18ab8615a39222924f8bfe2bf3b88612fb692de0efa6e24f90c2ddc05661b634)
mstore(0x66e0, 0x2b7033475410a3db82d02c345da2b6f1246c3cf96ba28ac7d657a1ca08a68262)
mstore(0x6700, mload(0x5c00))
success := and(eq(staticcall(gas(), 0x7, 0x66c0, 0x60, 0x66c0, 0x40), 1), success)
mstore(0x6720, mload(0x6640))
mstore(0x6740, mload(0x6660))
mstore(0x6760, mload(0x66c0))
mstore(0x6780, mload(0x66e0))
success := and(eq(staticcall(gas(), 0x6, 0x6720, 0x80, 0x6720, 0x40), 1), success)
mstore(0x67a0, 0x147e5676b98588e9c0111af9cc399de5f3c2ba3db868cc15cbd1352bfe131243)
mstore(0x67c0, 0x002f5f9ba5e961a2a4561d1691ef60767c26f7a8678a2bb07dbedc6704428a9c)
mstore(0x67a0, 0x259b90135dc570023ee29da41add0c2e2911e5fd5e7847293c43286256d85c82)
mstore(0x67c0, 0x233538fa1b5e4d2135c173543cd83005995bb2b638f7784a9faebfe1aa002297)
mstore(0x67e0, mload(0x5c20))
success := and(eq(staticcall(gas(), 0x7, 0x67a0, 0x60, 0x67a0, 0x40), 1), success)
mstore(0x6800, mload(0x6720))
mstore(0x6820, mload(0x6740))
mstore(0x6840, mload(0x67a0))
mstore(0x6860, mload(0x67c0))
success := and(eq(staticcall(gas(), 0x6, 0x6800, 0x80, 0x6800, 0x40), 1), success)
mstore(0x6880, 0x205e18c2fb6b6faebcf979673871837bfe46f5053b6e0c3cf52544f3ab859ed6)
mstore(0x68a0, 0x05a0492cd423736bc97c1089160cdb34b110b5cd5819509d7d5a285822c5713d)
mstore(0x6880, 0x25cc6cabf373c5cc3cd17f2058ab5f36ba95744bd0a0a83fa6009a3c90bb503f)
mstore(0x68a0, 0x1ff986851274b80031fa7d31fa9fba16a5004556e8598dab4b49c0c5dcdf6aef)
mstore(0x68c0, mload(0x5c40))
success := and(eq(staticcall(gas(), 0x7, 0x6880, 0x60, 0x6880, 0x40), 1), success)
mstore(0x68e0, mload(0x6800))
mstore(0x6900, mload(0x6820))
mstore(0x6920, mload(0x6880))
mstore(0x6940, mload(0x68a0))
success := and(eq(staticcall(gas(), 0x6, 0x68e0, 0x80, 0x68e0, 0x40), 1), success)
mstore(0x6960, 0x0574515d7c94b70e59e401c2a6769d7a92c94a9b76334094f5fd91dc6ba54203)
mstore(0x6980, 0x2451e9bf2856ba726083d3028826e0f7a8f8c04b20edfdf0139f69d46cfe4f68)
mstore(0x6960, 0x05c1c4db8c04629723402ae5f05825228810a792dd3fea746683b0d0104ec490)
mstore(0x6980, 0x2b7fe37ad98c0fa894e68e047c33e33327d6c3aa2b9c1c0911f4513d281bebfa)
mstore(0x69a0, mload(0x5c60))
success := and(eq(staticcall(gas(), 0x7, 0x6960, 0x60, 0x6960, 0x40), 1), success)
mstore(0x69c0, mload(0x68e0))
mstore(0x69e0, mload(0x6900))
mstore(0x6a00, mload(0x6960))
mstore(0x6a20, mload(0x6980))
success := and(eq(staticcall(gas(), 0x6, 0x69c0, 0x80, 0x69c0, 0x40), 1), success)
mstore(0x6a40, 0x02094af65db5934cb9e3609292d17c0537741aa7c0457622ca47a551940b9544)
mstore(0x6a60, 0x1a17639f151a4ad10bda312dacd0ca6d017e7c445267e3644cbe15e3178e49fd)
mstore(0x6a40, 0x0dfdf63a8514b1155d732148b7f0ff487a5bd48fafc3203597d55c8f608fc615)
mstore(0x6a60, 0x05f8827b24a83d5ab29f2189037355a22fef5fb2a246f9783dfaff1691dca957)
mstore(0x6a80, mload(0x5c80))
success := and(eq(staticcall(gas(), 0x7, 0x6a40, 0x60, 0x6a40, 0x40), 1), success)
mstore(0x6aa0, mload(0x69c0))
mstore(0x6ac0, mload(0x69e0))
mstore(0x6ae0, mload(0x6a40))
mstore(0x6b00, mload(0x6a60))
success := and(eq(staticcall(gas(), 0x6, 0x6aa0, 0x80, 0x6aa0, 0x40), 1), success)
mstore(0x6b20, 0x2bef5e6594dff7c7b46ce7d19c66ccda72a0b2e9914d5bfe5e31788c91ffd228)
mstore(0x6b40, 0x03a26df4afb7aa0abe0c0c4d749c3a75df46d5f3560c6daa37677311674e2096)
mstore(0x6b20, 0x1fac4291d7aa01f5a48c51802981a94695af4ba420f4ae84b09a9e93f43d78a1)
mstore(0x6b40, 0x27fc59f3644ad31b19991dd181eff24eb0c777ac5ca29dd97e408483c20f3a64)
mstore(0x6b60, mload(0x5ca0))
success := and(eq(staticcall(gas(), 0x7, 0x6b20, 0x60, 0x6b20, 0x40), 1), success)
mstore(0x6b80, mload(0x6aa0))
mstore(0x6ba0, mload(0x6ac0))
mstore(0x6bc0, mload(0x6b20))
mstore(0x6be0, mload(0x6b40))
success := and(eq(staticcall(gas(), 0x6, 0x6b80, 0x80, 0x6b80, 0x40), 1), success)
mstore(0x6c00, 0x02cba71d113de7cd77cb981817a2545b485b6fd7da64ec3ee36ebe096b2f8ca7)
mstore(0x6c20, 0x2eb11d8a3a9988d64d71ce841570fadfc24710ac58e3870c316ead1588f371e5)
mstore(0x6c00, 0x2ef56aa248b578d21a0bc79c35bfa32fc9393563715aaed6c38371f5081c66fc)
mstore(0x6c20, 0x15a7b64da6f594573f55bc7f733510aba338cbacd75152f82452460fc5e475ba)
mstore(0x6c40, mload(0x5cc0))
success := and(eq(staticcall(gas(), 0x7, 0x6c00, 0x60, 0x6c00, 0x40), 1), success)
mstore(0x6c60, mload(0x6b80))
mstore(0x6c80, mload(0x6ba0))
mstore(0x6ca0, mload(0x6c00))
mstore(0x6cc0, mload(0x6c20))
success := and(eq(staticcall(gas(), 0x6, 0x6c60, 0x80, 0x6c60, 0x40), 1), success)
mstore(0x6ce0, 0x1f7066ae11269dd4d0519fb18293c0750f9f29630d07938422ff82b84296c46b)
mstore(0x6d00, 0x2d6868ebce7b805a44f13088ff923a11f46afeb07bef7f835c3232dd21ec22b4)
mstore(0x6ce0, 0x171d03d85f31d499df4757cc276cd9941a36d4b7841672b9199bb70c9b434143)
mstore(0x6d00, 0x136d1d20f5b04044a94d1c3a6f6c77e296af0cac540bc9b4ae20f951a7b9bfa1)
mstore(0x6d20, mload(0x5ce0))
success := and(eq(staticcall(gas(), 0x7, 0x6ce0, 0x60, 0x6ce0, 0x40), 1), success)
mstore(0x6d40, mload(0x6c60))
Expand Down Expand Up @@ -1934,10 +1934,10 @@ mstore(0x7ae0, 0x198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c
mstore(0x7b40, 0x12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa)
mstore(0x7b60, mload(0x7a20))
mstore(0x7b80, mload(0x7a40))
mstore(0x7ba0, 0x138d5863615c12d3bd7d3fd007776d281a337f9d7f6dce23532100bb4bb5839d)
mstore(0x7bc0, 0x0a3bb881671ee4e9238366e87f6598f0de356372ed3dc870766ec8ac005211e4)
mstore(0x7be0, 0x19c9d7d9c6e7ad2d9a0d5847ebdd2687c668939a202553ded2760d3eb8dbf559)
mstore(0x7c00, 0x198adb441818c42721c88c532ed13a5da1ebb78b85574d0b7326d8e6f4c1e25a)
mstore(0x7ba0, 0x186282957db913abd99f91db59fe69922e95040603ef44c0bd7aa3adeef8f5ac)
mstore(0x7bc0, 0x17944351223333f260ddc3b4af45191b856689eda9eab5cbcddbbe570ce860d2)
mstore(0x7be0, 0x06d971ff4a7467c3ec596ed6efc674572e32fd6f52b721f97e35b0b3d3546753)
mstore(0x7c00, 0x06ecdb9f9567f59ed2eee36e1e1d58797fd13cc97fafc2910f5e8a12f202fa9a)
success := and(eq(staticcall(gas(), 0x8, 0x7aa0, 0x180, 0x7aa0, 0x20), 1), success)
success := and(eq(mload(0x7aa0), 1), success)

Expand Down
4 changes: 2 additions & 2 deletions axiom-eth/src/bin/storage_proof.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ fn main() {
args.network,
srs_readonly,
args.readonly,
args.config_path.unwrap_or_else(|| PathBuf::from("configs/storage")),
args.data_path.unwrap_or_else(|| PathBuf::from("data/storage")),
args.config_path.unwrap_or_else(|| PathBuf::from("configs")),
args.data_path.unwrap_or_else(|| PathBuf::from("data")),
);
let task: StorageTask = serde_json::from_reader(File::open(args.json_path).unwrap()).unwrap();

Expand Down

0 comments on commit 3cd2963

Please sign in to comment.