diff --git a/Cargo.lock b/Cargo.lock index 8e463524d3b..850f50e8548 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -947,14 +947,14 @@ dependencies = [ [[package]] name = "boojum" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#2771569baab9a59690d88cee6ba9b295c8a1e4c4" +source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#84754b066959c8fdfb77edf730fc13ed87404907" dependencies = [ "arrayvec 0.7.3", "bincode", "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", "const_format", - "convert_case 0.4.0", - "crossbeam 0.7.3", + "convert_case 0.6.0", + "crossbeam 0.8.2", "crypto-bigint 0.5.3", "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum.git?branch=main)", "derivative", @@ -969,8 +969,8 @@ dependencies = [ "rand 0.8.5", "rayon", "serde", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", - "sha3 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", + "sha3 0.10.6", "smallvec", "unroll", ] @@ -1193,12 +1193,10 @@ dependencies = [ [[package]] name = "circuit_definitions" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#1934433af48520ac70dc3080b0d1feba877a07c5" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#43aeb53d7d9c909508a98f9fc140edff0e9d2357" dependencies = [ "crossbeam 0.8.2", "derivative", - "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper)", - "rescue_poseidon 0.4.1 (git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2)", "serde", "snark_wrapper", "zk_evm 1.4.0", @@ -1752,7 +1750,7 @@ dependencies = [ [[package]] name = "cs_derive" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#3a21c8dee43c77604350fdf33c1615e25bf1dacd" +source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51" dependencies = [ "proc-macro-error", "proc-macro2 1.0.66", @@ -2082,7 +2080,7 @@ dependencies = [ "regex", "serde", "serde_json", - "sha3 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha3 0.10.8", "thiserror", "uint", ] @@ -2663,7 +2661,7 @@ dependencies = [ "rsa", "serde", "serde_json", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", "thiserror", "time", "tokio", @@ -3532,7 +3530,7 @@ dependencies = [ "cfg-if 1.0.0", "ecdsa", "elliptic-curve", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", ] [[package]] @@ -4681,7 +4679,7 @@ checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", ] [[package]] @@ -5365,12 +5363,11 @@ dependencies = [ [[package]] name = "rescue_poseidon" version = "0.4.1" -source = "git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2#09b96e7e82dadac151d8d681f017cb6a16961801" +source = "git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2#c4a788471710bdb7aa0f59e8756b45ef93cdd2b2" dependencies = [ "addchain", "arrayvec 0.7.3", "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", - "boojum", "byteorder", "derivative", "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper)", @@ -5995,8 +5992,7 @@ dependencies = [ [[package]] name = "sha2" version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +source = "git+https://github.com/RustCrypto/hashes.git?rev=1731ced4a116d61ba9dc6ee6d0f38fb8102e357a#1731ced4a116d61ba9dc6ee6d0f38fb8102e357a" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -6005,8 +6001,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" -source = "git+https://github.com/RustCrypto/hashes.git?rev=1731ced4a116d61ba9dc6ee6d0f38fb8102e357a#1731ced4a116d61ba9dc6ee6d0f38fb8102e357a" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -6028,8 +6025,7 @@ dependencies = [ [[package]] name = "sha3" version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +source = "git+https://github.com/RustCrypto/hashes.git?rev=7a187e934c1f6c68e4b4e5cf37541b7a0d64d303#7a187e934c1f6c68e4b4e5cf37541b7a0d64d303" dependencies = [ "digest 0.10.7", "keccak", @@ -6037,8 +6033,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" -source = "git+https://github.com/RustCrypto/hashes.git?rev=7a187e934c1f6c68e4b4e5cf37541b7a0d64d303#7a187e934c1f6c68e4b4e5cf37541b7a0d64d303" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.7", "keccak", @@ -6268,7 +6265,7 @@ dependencies = [ "serde", "serde_json", "sha-1 0.10.1", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", "smallvec", "sqlformat", "sqlx-rt", @@ -6294,7 +6291,7 @@ dependencies = [ "quote 1.0.33", "serde", "serde_json", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", "sqlx-core", "sqlx-rt", "syn 1.0.109", @@ -6445,7 +6442,7 @@ dependencies = [ [[package]] name = "sync_vm" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#3a21c8dee43c77604350fdf33c1615e25bf1dacd" +source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#dad50e7eb7462a3819af8d5209d6ca243395bf51" dependencies = [ "arrayvec 0.7.3", "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3)", @@ -6461,8 +6458,8 @@ dependencies = [ "rand 0.4.6", "rescue_poseidon 0.4.1 (git+https://github.com/matter-labs/rescue-poseidon)", "serde", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", - "sha3 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", + "sha3 0.10.6", "smallvec", "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3)", "zkevm_opcode_defs 1.3.2", @@ -7685,8 +7682,8 @@ dependencies = [ "num 0.4.0", "serde", "serde_json", - "sha2 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=1731ced4a116d61ba9dc6ee6d0f38fb8102e357a)", - "sha3 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=7a187e934c1f6c68e4b4e5cf37541b7a0d64d303)", + "sha2 0.10.6", + "sha3 0.10.6", "static_assertions", "zkevm_opcode_defs 1.3.1", ] @@ -7709,7 +7706,7 @@ dependencies = [ [[package]] name = "zk_evm" version = "1.3.3" -source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fe8215a7047d24430ad470cf15a19bedb4d6ba0b" +source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fbee20f5bac7d6ca3e22ae69b2077c510a07de4e" dependencies = [ "anyhow", "lazy_static", @@ -7724,7 +7721,7 @@ dependencies = [ [[package]] name = "zk_evm" version = "1.4.0" -source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.4.0#e33a5ded1b53e35d261fdb46e6d16f2c900b217f" +source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.4.0#dd76fc5badf2c05278a21b38015a7798fe2fe358" dependencies = [ "anyhow", "lazy_static", @@ -7759,7 +7756,7 @@ dependencies = [ "nom", "num-bigint 0.4.3", "num-traits", - "sha3 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha3 0.10.8", "smallvec", "structopt", "thiserror", @@ -7794,21 +7791,21 @@ dependencies = [ "bitflags 1.3.2", "ethereum-types 0.14.1", "lazy_static", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.8", ] [[package]] name = "zkevm_opcode_defs" version = "1.3.2" -source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#c7ab62f4c60b27dfc690c3ab3efb5fff1ded1a25" +source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#dffacadeccdfdbff4bc124d44c595c4a6eae5013" dependencies = [ "bitflags 2.3.2", - "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "blake2 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e)", "ethereum-types 0.14.1", "k256", "lazy_static", - "sha2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", - "sha3 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.10.6", + "sha3 0.10.6", ] [[package]] @@ -7841,7 +7838,7 @@ dependencies = [ [[package]] name = "zkevm_test_harness" version = "1.4.0" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#1934433af48520ac70dc3080b0d1feba877a07c5" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#43aeb53d7d9c909508a98f9fc140edff0e9d2357" dependencies = [ "bincode", "circuit_definitions", @@ -7852,11 +7849,9 @@ dependencies = [ "hex", "rand 0.4.6", "rayon", - "rescue_poseidon 0.4.1 (git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2)", "serde", "serde_json", "smallvec", - "snark_wrapper", "structopt", "test-log", "tracing",