From cdbe8c0fc56dfd8455735b4b2608249241a890b2 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Tue, 7 Jan 2025 16:03:01 -0800 Subject: [PATCH] patch: use serde patch --- Cargo.lock | 50 +++++++++++++++++++++++++++++++++----------------- Cargo.toml | 1 + 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1318a2d619..babfa0165b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -427,7 +427,7 @@ dependencies = [ "rand", "sha2 0.10.8", "tendermint", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tracing", "zeroize", @@ -464,7 +464,7 @@ dependencies = [ "humantime", "prost 0.12.6", "tendermint", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "tendermint-rpc", "thiserror", "tokio", @@ -2275,7 +2275,7 @@ dependencies = [ "prost 0.12.6", "serde", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "tonic", ] @@ -2339,7 +2339,7 @@ dependencies = [ "tendermint-light-client", "tendermint-light-client-detector", "tendermint-light-client-verifier", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "tendermint-rpc", "tendermint-testgen", "test-log", @@ -2432,7 +2432,7 @@ dependencies = [ "subtle-encoding", "tendermint", "tendermint-light-client-verifier", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "tendermint-rpc", "tendermint-testgen", "test-log", @@ -2539,7 +2539,7 @@ dependencies = [ "sha2 0.10.8", "subtle-encoding", "tendermint", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "time", "tracing", ] @@ -2566,7 +2566,7 @@ dependencies = [ "sha2 0.10.8", "subtle-encoding", "tendermint", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "time", ] @@ -2598,7 +2598,7 @@ dependencies = [ "subtle-encoding", "tendermint", "tendermint-light-client-verifier", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "time", "tracing", "uint", @@ -2629,7 +2629,7 @@ dependencies = [ "sha2 0.10.8", "subtle-encoding", "tendermint", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "time", ] @@ -2684,7 +2684,7 @@ dependencies = [ "subtle-encoding", "tendermint", "tendermint-light-client-verifier", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "time", "tracing", "uint", @@ -2708,7 +2708,7 @@ dependencies = [ "serde_json", "subtle-encoding", "tendermint", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "time", ] @@ -2726,7 +2726,7 @@ dependencies = [ "serde_json", "subtle-encoding", "tendermint", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "time", ] @@ -4995,8 +4995,7 @@ dependencies = [ [[package]] name = "tendermint" version = "0.34.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15ab8f0a25d0d2ad49ac615da054d6a76aa6603ff95f7d18bafdd34450a1a04b" +source = "git+https://github.com/astriaorg/tendermint-rs.git?branch=joroshiba/patch-serde#769c6a683d00813a4815e3a02da0cec197414f9a" dependencies = [ "bytes", "digest 0.10.7", @@ -5018,7 +5017,7 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto", + "tendermint-proto 0.34.1 (git+https://github.com/astriaorg/tendermint-rs.git?branch=joroshiba/patch-serde)", "time", "zeroize", ] @@ -5079,7 +5078,7 @@ dependencies = [ "static_assertions", "tendermint", "tendermint-light-client", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "tendermint-rpc", "time", "tracing", @@ -5116,6 +5115,23 @@ dependencies = [ "time", ] +[[package]] +name = "tendermint-proto" +version = "0.34.1" +source = "git+https://github.com/astriaorg/tendermint-rs.git?branch=joroshiba/patch-serde#769c6a683d00813a4815e3a02da0cec197414f9a" +dependencies = [ + "bytes", + "flex-error", + "num-derive", + "num-traits", + "prost 0.12.6", + "prost-types", + "serde", + "serde_bytes", + "subtle-encoding", + "time", +] + [[package]] name = "tendermint-rpc" version = "0.34.1" @@ -5140,7 +5156,7 @@ dependencies = [ "subtle-encoding", "tendermint", "tendermint-config", - "tendermint-proto", + "tendermint-proto 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "time", "tokio", diff --git a/Cargo.toml b/Cargo.toml index c651008bfc..c70f249d8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ exclude = [ overflow-checks = true [patch.crates-io] +tendermint = { git = "https://github.com/astriaorg/tendermint-rs.git", branch = "joroshiba/patch-serde" } # tendermint = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" } # tendermint-rpc = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" } # tendermint-proto = { git = "https://github.com/informalsystems/tendermint-rs.git", branch = "main" }