From 4548aee29ff28d3a9d91a4f186c93600d76d85bf Mon Sep 17 00:00:00 2001 From: Grzegorz Prusak Date: Tue, 12 Dec 2023 09:37:58 +0100 Subject: [PATCH 1/2] full hash --- node/Cargo.lock | 8 ++++---- node/Cargo.toml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/node/Cargo.lock b/node/Cargo.lock index 2c487e91..c3f31767 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -1312,7 +1312,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pairing_ce" version = "0.28.5" -source = "git+https://github.com/matter-labs/pairing.git?rev=f55393f#f55393fd366596eac792d78525d26e9c4d6ed1ca" +source = "git+https://github.com/matter-labs/pairing.git?rev=f55393fd366596eac792d78525d26e9c4d6ed1ca#f55393fd366596eac792d78525d26e9c4d6ed1ca" dependencies = [ "byteorder", "cfg-if", @@ -2319,7 +2319,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vise" version = "0.1.0" -source = "git+https://github.com/matter-labs/vise.git?rev=dd0513#dd05139b76ab0843443ab3ff730174942c825dae" +source = "git+https://github.com/matter-labs/vise.git?rev=dd05139b76ab0843443ab3ff730174942c825dae#dd05139b76ab0843443ab3ff730174942c825dae" dependencies = [ "elsa", "linkme", @@ -2331,7 +2331,7 @@ dependencies = [ [[package]] name = "vise-exporter" version = "0.1.0" -source = "git+https://github.com/matter-labs/vise.git?rev=dd0513#dd05139b76ab0843443ab3ff730174942c825dae" +source = "git+https://github.com/matter-labs/vise.git?rev=dd05139b76ab0843443ab3ff730174942c825dae#dd05139b76ab0843443ab3ff730174942c825dae" dependencies = [ "hyper", "once_cell", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "vise-macros" version = "0.1.0" -source = "git+https://github.com/matter-labs/vise.git?rev=dd0513#dd05139b76ab0843443ab3ff730174942c825dae" +source = "git+https://github.com/matter-labs/vise.git?rev=dd05139b76ab0843443ab3ff730174942c825dae#dd05139b76ab0843443ab3ff730174942c825dae" dependencies = [ "proc-macro2", "quote", diff --git a/node/Cargo.toml b/node/Cargo.toml index 7af57f62..484a559f 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -39,9 +39,9 @@ zksync_protobuf = { path = "libs/protobuf" } zksync_protobuf_build = { path = "libs/protobuf_build" } # Crates from Matter Labs. -pairing = { package = "pairing_ce", git = "https://github.com/matter-labs/pairing.git", rev = "f55393f" } -vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd0513" } -vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd0513" } +pairing = { package = "pairing_ce", git = "https://github.com/matter-labs/pairing.git", rev = "f55393fd366596eac792d78525d26e9c4d6ed1ca" } +vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" } +vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "dd05139b76ab0843443ab3ff730174942c825dae" } # Crates from third-parties. anyhow = "1" @@ -149,4 +149,4 @@ wildcard_dependencies = "warn" # Produces too many false positives. redundant_locals = "allow" -needless_pass_by_ref_mut = "allow" \ No newline at end of file +needless_pass_by_ref_mut = "allow" From c282f4d8ad57e81644b48bd8724eebb9966b73df Mon Sep 17 00:00:00 2001 From: Grzegorz Prusak Date: Tue, 12 Dec 2023 11:51:09 +0100 Subject: [PATCH 2/2] protobuf update due, because the old version failed with the new compiler --- .github/workflows/protobuf_conformance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/protobuf_conformance.yaml b/.github/workflows/protobuf_conformance.yaml index 02050686..fbc68def 100644 --- a/.github/workflows/protobuf_conformance.yaml +++ b/.github/workflows/protobuf_conformance.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 with: repository: "protocolbuffers/protobuf" - ref: "v24.4" + ref: "a47a7bdc8d023467f4f0586c393597af727e1d9e" path: "protobuf" - uses: mozilla-actions/sccache-action@v0.0.3 - name: build test