From 06d4b4e6c3a7ffaf7a2dc045cba8d720308b7f46 Mon Sep 17 00:00:00 2001 From: gabrielbosio Date: Thu, 3 Oct 2024 14:37:03 -0300 Subject: [PATCH] Point bridge repo to aligned branch --- batcher/Cargo.lock | 218 +++++++++++++-------------- batcher/aligned-batcher/Cargo.toml | 2 +- operator/mina/lib/Cargo.lock | 4 +- operator/mina/lib/Cargo.toml | 2 +- operator/mina_account/lib/Cargo.lock | 4 +- operator/mina_account/lib/Cargo.toml | 2 +- 6 files changed, 113 insertions(+), 119 deletions(-) diff --git a/batcher/Cargo.lock b/batcher/Cargo.lock index 6cb078aaa..9d7b63f0f 100644 --- a/batcher/Cargo.lock +++ b/batcher/Cargo.lock @@ -162,7 +162,7 @@ dependencies = [ [[package]] name = "aligned-sdk" version = "0.1.0" -source = "git+https://github.com/lambdaclass/aligned_layer.git?branch=mina#3426bb47115f90606f223c97d695693a7777b61b" +source = "git+https://github.com/lambdaclass/aligned_layer.git?branch=use_two_vks#56ac3a2e0a2d8accbc5466d6491ca082b45723cc" dependencies = [ "ciborium", "ethers 2.0.14 (git+https://github.com/yetanotherco/ethers-rs.git?tag=v2.0.15-fix-reconnections)", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.34" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8158b4878c67837e5413721cc44298e6a2d88d39203175ea025e51892a16ba4c" +checksum = "abf770dad29577cd3580f3dd09005799224a912b8cdfdd6dc04d030d42b3df4e" dependencies = [ "num_enum 0.7.3", "strum 0.26.3", @@ -227,7 +227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-rlp", "alloy-serde", "c-kzg", @@ -244,11 +244,11 @@ dependencies = [ "alloy-json-abi", "alloy-network", "alloy-network-primitives", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-provider", "alloy-pubsub", "alloy-rpc-types-eth", - "alloy-sol-types 0.8.5", + "alloy-sol-types 0.8.3", "alloy-transport", "futures", "futures-util", @@ -257,27 +257,26 @@ dependencies = [ [[package]] name = "alloy-core" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce854562e7cafd5049189d0268d6e5cba05fe6c9cb7c6f8126a79b94800629c" +checksum = "88b095eb0533144b4497e84a9cc3e44a5c2e3754a3983c0376a55a2f9183a53e" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-primitives 0.8.5", - "alloy-rlp", - "alloy-sol-types 0.8.5", + "alloy-primitives 0.8.3", + "alloy-sol-types 0.8.3", ] [[package]] name = "alloy-dyn-abi" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b499852e1d0e9b8c6db0f24c48998e647c0d5762a01090f955106a7700e4611" +checksum = "4004925bff5ba0a11739ae84dbb6601a981ea692f3bd45b626935ee90a6b8471" dependencies = [ "alloy-json-abi", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-sol-type-parser", - "alloy-sol-types 0.8.5", + "alloy-sol-types 0.8.3", "const-hex", "itoa", "serde", @@ -291,7 +290,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" dependencies = [ - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-rlp", "serde", ] @@ -302,7 +301,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37d319bb544ca6caeab58c39cea8921c55d924d4f68f2c60f24f914673f9a74a" dependencies = [ - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-rlp", "k256", "serde", @@ -316,7 +315,7 @@ checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" dependencies = [ "alloy-eip2930", "alloy-eip7702", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-rlp", "alloy-serde", "c-kzg", @@ -332,18 +331,18 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a7a18afb0b318616b6b2b0e2e7ac5529d32a966c673b48091c9919e284e6aca" dependencies = [ - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-serde", "serde", ] [[package]] name = "alloy-json-abi" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a438d4486b5d525df3b3004188f9d5cd1d65cd30ecc41e5a3ccef6f6342e8af9" +checksum = "9996daf962fd0a90d3c93b388033228865953b92de7bb1959b891d78750a4091" dependencies = [ - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-sol-type-parser", "serde", "serde_json", @@ -355,8 +354,8 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab" dependencies = [ - "alloy-primitives 0.8.5", - "alloy-sol-types 0.8.5", + "alloy-primitives 0.8.3", + "alloy-sol-types 0.8.3", "serde", "serde_json", "thiserror", @@ -373,11 +372,11 @@ dependencies = [ "alloy-eips", "alloy-json-rpc", "alloy-network-primitives", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-rpc-types-eth", "alloy-serde", "alloy-signer", - "alloy-sol-types 0.8.5", + "alloy-sol-types 0.8.3", "async-trait", "auto_impl", "futures-utils-wasm", @@ -391,7 +390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3" dependencies = [ "alloy-eips", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-serde", "serde", ] @@ -420,28 +419,23 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260d3ff3bff0bb84599f032a2f2c6828180b0ea0cd41fdaf44f39cef3ba41861" +checksum = "411aff151f2a73124ee473708e82ed51b2535f68928b6a1caa8bc1246ae6f7cd" dependencies = [ "alloy-rlp", "bytes", "cfg-if", "const-hex", "derive_more 1.0.0", - "hashbrown 0.14.5", "hex-literal", - "indexmap 2.5.0", "itoa", "k256", "keccak-asm", - "paste", "proptest", "rand", "ruint", - "rustc-hash 2.0.0", "serde", - "sha3 0.10.8", "tiny-keccak", ] @@ -457,7 +451,7 @@ dependencies = [ "alloy-json-rpc", "alloy-network", "alloy-network-primitives", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-eth", @@ -489,7 +483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d05f63677e210d758cd5d6d1ce10f20c980c3560ccfbe79ba1997791862a04f" dependencies = [ "alloy-json-rpc", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-transport", "bimap", "futures", @@ -530,7 +524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5" dependencies = [ "alloy-json-rpc", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-pubsub", "alloy-transport", "alloy-transport-http", @@ -568,7 +562,7 @@ checksum = "1464c4dd646e1bdfde86ae65ce5ba168dbb29180b478011fe87117ae46b1629b" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-rlp", "derive_more 1.0.0", ] @@ -582,10 +576,10 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-network-primitives", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-rlp", "alloy-serde", - "alloy-sol-types 0.8.5", + "alloy-sol-types 0.8.3", "cfg-if", "derive_more 1.0.0", "hashbrown 0.14.5", @@ -600,7 +594,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa" dependencies = [ - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "serde", "serde_json", ] @@ -611,7 +605,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0" dependencies = [ - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "async-trait", "auto_impl", "elliptic-curve 0.13.8", @@ -627,7 +621,7 @@ checksum = "9fabe917ab1778e760b4701628d1cae8e028ee9d52ac6307de4e1e9286ab6b5f" dependencies = [ "alloy-consensus", "alloy-network", - "alloy-primitives 0.8.5", + "alloy-primitives 0.8.3", "alloy-signer", "async-trait", "elliptic-curve 0.13.8", @@ -653,12 +647,12 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e7f6e8fe5b443f82b3f1e15abfa191128f71569148428e49449d01f6f49e8b" +checksum = "0458ccb02a564228fcd76efb8eb5a520521a8347becde37b402afec9a1b83859" dependencies = [ - "alloy-sol-macro-expander 0.8.5", - "alloy-sol-macro-input 0.8.5", + "alloy-sol-macro-expander 0.8.3", + "alloy-sol-macro-input 0.8.3", "proc-macro-error2", "proc-macro2", "quote", @@ -685,12 +679,12 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b96ce28d2fde09abb6135f410c41fad670a3a770b6776869bd852f1df102e6f" +checksum = "2bc65475025fc1e84bf86fc840f04f63fcccdcf3cf12053c99918e4054dfbc69" dependencies = [ "alloy-json-abi", - "alloy-sol-macro-input 0.8.5", + "alloy-sol-macro-input 0.8.3", "const-hex", "heck 0.5.0", "indexmap 2.5.0", @@ -698,7 +692,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.77", - "syn-solidity 0.8.5", + "syn-solidity 0.8.3", "tiny-keccak", ] @@ -719,9 +713,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906746396a8296537745711630d9185746c0b50c033d5e9d18b0a6eba3d53f90" +checksum = "6ed10f0715a0b69fde3236ff3b9ae5f6f7c97db5a387747100070d3016b9266b" dependencies = [ "alloy-json-abi", "const-hex", @@ -731,14 +725,14 @@ dependencies = [ "quote", "serde_json", "syn 2.0.77", - "syn-solidity 0.8.5", + "syn-solidity 0.8.3", ] [[package]] name = "alloy-sol-type-parser" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc85178909a49c8827ffccfc9103a7ce1767ae66a801b69bdc326913870bf8e6" +checksum = "3edae8ea1de519ccba896b6834dec874230f72fe695ff3c9c118e90ec7cff783" dependencies = [ "serde", "winnow", @@ -758,13 +752,13 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a533ce22525969661b25dfe296c112d35eb6861f188fd284f8bd4bb3842ae" +checksum = "1eb88e4da0a1b697ed6a9f811fdba223cf4d5c21410804fd1707836af73a462b" dependencies = [ "alloy-json-abi", - "alloy-primitives 0.8.5", - "alloy-sol-macro 0.8.5", + "alloy-primitives 0.8.3", + "alloy-sol-macro 0.8.3", "const-hex", "serde", ] @@ -1251,9 +1245,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", @@ -1299,9 +1293,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-config" @@ -1631,9 +1625,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.7" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" +checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" dependencies = [ "base64-simd", "bytes", @@ -1714,9 +1708,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", @@ -1727,7 +1721,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", "tracing", @@ -2159,9 +2153,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.22" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", @@ -2248,9 +2242,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.18" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -2258,9 +2252,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.18" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -2270,9 +2264,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3622,9 +3616,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide", @@ -4425,9 +4419,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -4438,6 +4432,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", + "tower 0.4.13", "tower-service", "tracing", ] @@ -4695,9 +4690,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.4" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa 0.16.9", @@ -4830,9 +4825,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libgit2-sys" @@ -5178,12 +5173,12 @@ dependencies = [ [[package]] name = "mina_bridge_core" version = "0.1.0" -source = "git+https://github.com/lambdaclass/mina_bridge.git?branch=devnet_flag#28a19228688a7b8d1a991b1df778c7c76d5ec658" +source = "git+https://github.com/lambdaclass/mina_bridge.git?branch=aligned#b923855167a95b069fdb7f031006f7a09c59b060" dependencies = [ - "aligned-sdk 0.1.0 (git+https://github.com/lambdaclass/aligned_layer.git?branch=mina)", + "aligned-sdk 0.1.0 (git+https://github.com/lambdaclass/aligned_layer.git?branch=use_two_vks)", "alloy", "alloy-contract", - "alloy-sol-types 0.8.5", + "alloy-sol-types 0.8.3", "ark-ec 0.3.0", "ark-ff 0.3.0", "ark-poly 0.3.0", @@ -6068,7 +6063,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.6", + "redox_syscall 0.5.4", "smallvec", "windows-targets 0.52.6", ] @@ -6301,9 +6296,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "poly-commitment" @@ -6331,9 +6326,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "postcard" @@ -6395,9 +6390,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" +checksum = "560bcab673ff7f6ca9e270c17bf3affd8a05e3bd9207f123b0d45076fd8197e8" dependencies = [ "autocfg", "equivalent", @@ -6608,7 +6603,6 @@ dependencies = [ "libc", "rand_chacha", "rand_core", - "serde", ] [[package]] @@ -6703,9 +6697,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.6" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -7503,9 +7497,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -7614,9 +7608,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.8" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -8415,9 +8409,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab661c8148c2261222a4d641ad5477fd4bea79406a99056096a0b41b35617a5" +checksum = "4b95156f8b577cb59dc0b1df15c6f29a10afc5f8a7ac9786b0b5c68c19149278" dependencies = [ "paste", "proc-macro2", @@ -8541,18 +8535,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -8797,9 +8791,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap 2.5.0", "serde", @@ -9660,9 +9654,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] diff --git a/batcher/aligned-batcher/Cargo.toml b/batcher/aligned-batcher/Cargo.toml index 693d32810..f2eff0f15 100644 --- a/batcher/aligned-batcher/Cargo.toml +++ b/batcher/aligned-batcher/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] tokio-tungstenite = "0.21.0" -mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge.git", branch = "devnet_flag" } +mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge.git", branch = "aligned" } futures-util = "0.3.30" tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "macros"] } log = "0.4.21" diff --git a/operator/mina/lib/Cargo.lock b/operator/mina/lib/Cargo.lock index 4c83781b0..001b0204a 100644 --- a/operator/mina/lib/Cargo.lock +++ b/operator/mina/lib/Cargo.lock @@ -73,7 +73,7 @@ dependencies = [ [[package]] name = "aligned-sdk" version = "0.1.0" -source = "git+https://github.com/lambdaclass/aligned_layer.git?branch=mina#3426bb47115f90606f223c97d695693a7777b61b" +source = "git+https://github.com/lambdaclass/aligned_layer.git?branch=use_two_vks#56ac3a2e0a2d8accbc5466d6491ca082b45723cc" dependencies = [ "ciborium", "ethers", @@ -3655,7 +3655,7 @@ dependencies = [ [[package]] name = "mina_bridge_core" version = "0.1.0" -source = "git+https://github.com/lambdaclass/mina_bridge?branch=devnet_flag#28a19228688a7b8d1a991b1df778c7c76d5ec658" +source = "git+https://github.com/lambdaclass/mina_bridge?branch=aligned#b923855167a95b069fdb7f031006f7a09c59b060" dependencies = [ "aligned-sdk", "alloy", diff --git a/operator/mina/lib/Cargo.toml b/operator/mina/lib/Cargo.toml index 6828ad1bd..6c1ee9c43 100644 --- a/operator/mina/lib/Cargo.toml +++ b/operator/mina/lib/Cargo.toml @@ -29,7 +29,7 @@ bs58 = "0.5.1" lazy_static = "1.5.0" blake2 = "0.10.6" once_cell = "1.19.0" -mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge", branch = "devnet_flag" } +mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge", branch = "aligned" } bincode = "1.3.3" [patch.crates-io] diff --git a/operator/mina_account/lib/Cargo.lock b/operator/mina_account/lib/Cargo.lock index 0805f2fe9..4c28ba3d5 100644 --- a/operator/mina_account/lib/Cargo.lock +++ b/operator/mina_account/lib/Cargo.lock @@ -73,7 +73,7 @@ dependencies = [ [[package]] name = "aligned-sdk" version = "0.1.0" -source = "git+https://github.com/lambdaclass/aligned_layer.git?branch=mina#3426bb47115f90606f223c97d695693a7777b61b" +source = "git+https://github.com/lambdaclass/aligned_layer.git?branch=use_two_vks#56ac3a2e0a2d8accbc5466d6491ca082b45723cc" dependencies = [ "ciborium", "ethers", @@ -3657,7 +3657,7 @@ dependencies = [ [[package]] name = "mina_bridge_core" version = "0.1.0" -source = "git+https://github.com/lambdaclass/mina_bridge?branch=devnet_flag#28a19228688a7b8d1a991b1df778c7c76d5ec658" +source = "git+https://github.com/lambdaclass/mina_bridge?branch=aligned#b923855167a95b069fdb7f031006f7a09c59b060" dependencies = [ "aligned-sdk", "alloy", diff --git a/operator/mina_account/lib/Cargo.toml b/operator/mina_account/lib/Cargo.toml index 07278fb3f..46208a9de 100644 --- a/operator/mina_account/lib/Cargo.toml +++ b/operator/mina_account/lib/Cargo.toml @@ -27,7 +27,7 @@ lazy_static = "1.5.0" blake2 = "0.10.6" once_cell = "1.19.0" sha3 = "0.10.8" -mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge", branch = "devnet_flag" } +mina_bridge_core = { git = "https://github.com/lambdaclass/mina_bridge", branch = "aligned" } bincode = "1.3.3" alloy = { version = "0.3.3", features = ["full"] }