From 410abfba0d81b07e986b902c4dc2e735d2183c71 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Thu, 19 Dec 2024 12:35:32 -0300 Subject: [PATCH 1/2] feat: Upgrade binprot-rs dependency to one with support for `Result` --- core/Cargo.toml | 4 ++-- mina-p2p-messages/Cargo.toml | 4 ++-- p2p/Cargo.toml | 4 ++-- tools/bootstrap-sandbox/Cargo.toml | 2 +- tools/fuzzing/Cargo.toml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index f1b24df803..36138f2b37 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -12,8 +12,8 @@ serde_json = "1.0" slab = { version = "0.4.7", features = ["serde"] } tracing = { version = "0.1", features = ["std"] } sha2 = "0.10.6" -binprot = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } -binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } +binprot = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } +binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } rand = "0.8.0" redux = { workspace = true } tokio = { version = "1.26", features = ["sync"] } diff --git a/mina-p2p-messages/Cargo.toml b/mina-p2p-messages/Cargo.toml index a9aba883fc..7c330f4e93 100644 --- a/mina-p2p-messages/Cargo.toml +++ b/mina-p2p-messages/Cargo.toml @@ -11,8 +11,8 @@ serde = { version = "1.0.142", features = ["derive"] } serde_json = { version = "1.0.83" } serde_bytes = "0.11" hex = "0.4.3" -binprot = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } -binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } +binprot = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } +binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } thiserror = "1.0.32" derive_more = "0.99.17" bs58 = { version = "0.4", features = ["check"] } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index fb7d8ec6c4..6f612e8fa7 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -16,8 +16,8 @@ rand = { version = "0.8", features = [ "small_rng" ] } bytes = "*" bs58 = "0.4.0" base64 = "0.22" -binprot = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } -binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } +binprot = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } +binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } anyhow = "1.0.70" smallvec = "1.10.0" cfg-if = "1.0.0" diff --git a/tools/bootstrap-sandbox/Cargo.toml b/tools/bootstrap-sandbox/Cargo.toml index 16d2f59ee1..7eb5d53863 100644 --- a/tools/bootstrap-sandbox/Cargo.toml +++ b/tools/bootstrap-sandbox/Cargo.toml @@ -17,7 +17,7 @@ base64 = { version = "0.21.7" } tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] } -binprot = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } +binprot = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } ledger = { path = "../../ledger", package = "mina-tree" } libp2p-rpc-behaviour = { path = "../../p2p/libp2p-rpc-behaviour" } mina-transport = { path = "../transport" } diff --git a/tools/fuzzing/Cargo.toml b/tools/fuzzing/Cargo.toml index 937931df41..89100e43c8 100644 --- a/tools/fuzzing/Cargo.toml +++ b/tools/fuzzing/Cargo.toml @@ -34,8 +34,8 @@ num-bigint = "0.4.0" tuple-map = "0.4.0" itertools = "0.11.0" #binprot = "0.1.7" -binprot = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } -binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "2b5a909" } +binprot = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } +binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "400b52c" } clap = "4.5.20" From fcad6053fd659b264c67a88d9fa196183ae9ee2b Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Thu, 19 Dec 2024 12:35:44 -0300 Subject: [PATCH 2/2] chore: Update Cargo.lock --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e57e64caac..7bc9ada637 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -720,7 +720,7 @@ dependencies = [ [[package]] name = "binprot" version = "0.1.8" -source = "git+https://github.com/openmina/binprot-rs?rev=2b5a909#2b5a9099a1c5640559d04e39899da301aebc8023" +source = "git+https://github.com/openmina/binprot-rs?rev=400b52c#400b52c204d7a820ba60202dbd4cf8c3dfb7903b" dependencies = [ "binprot_derive", "byteorder", @@ -730,7 +730,7 @@ dependencies = [ [[package]] name = "binprot_derive" version = "0.1.7" -source = "git+https://github.com/openmina/binprot-rs?rev=2b5a909#2b5a9099a1c5640559d04e39899da301aebc8023" +source = "git+https://github.com/openmina/binprot-rs?rev=400b52c#400b52c204d7a820ba60202dbd4cf8c3dfb7903b" dependencies = [ "quote", "syn 1.0.109",