From 07fceae7417fa54f4f5c94d616a703b5a31bd6ea Mon Sep 17 00:00:00 2001 From: elizabeth Date: Wed, 11 Sep 2024 17:17:29 -0400 Subject: [PATCH 01/11] grpc height hack to fix ibc invalid proof error --- Cargo.lock | 25 +++++++++++++++++++++++++ Cargo.toml | 7 +++++++ charts/hermes/Chart.yaml | 2 +- charts/hermes/values.yaml | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6adada5225..4d6fbf714a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8738,3 +8738,28 @@ dependencies = [ "cc", "pkg-config", ] + +[[patch.unused]] +name = "cnidarium" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" + +[[patch.unused]] +name = "cnidarium-component" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" + +[[patch.unused]] +name = "penumbra-ibc" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" + +[[patch.unused]] +name = "penumbra-proto" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" + +[[patch.unused]] +name = "penumbra-tower-trace" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" diff --git a/Cargo.toml b/Cargo.toml index a05d327add..e708b3fa26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -108,3 +108,10 @@ tracing = "0.1" tryhard = "0.5.1" which = "4.4.0" wiremock = "0.5" + +[patch.'https://github.com/penumbra-zone/penumbra.git'] +penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } +penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } +penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } +cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } +cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } diff --git a/charts/hermes/Chart.yaml b/charts/hermes/Chart.yaml index 5f27586f67..74fedad51c 100644 --- a/charts/hermes/Chart.yaml +++ b/charts/hermes/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.4.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/hermes/values.yaml b/charts/hermes/values.yaml index 6da9886614..9f8862fcc4 100644 --- a/charts/hermes/values.yaml +++ b/charts/hermes/values.yaml @@ -3,7 +3,7 @@ global: replicaCount: 1 logLevel: debug -image: ghcr.io/penumbra-zone/hermes:main +image: ghcr.io/astriaorg/hermes:sha-903bac5 fullnameOverride: "" nameOverride: "" From b514fa1870f36b3a3f368e849bf347179d65059b Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 12 Sep 2024 12:30:18 -0400 Subject: [PATCH 02/11] change penumbra patch --- Cargo.lock | 406 ++++++++++++++++++++++++----------------------------- Cargo.toml | 10 +- 2 files changed, 190 insertions(+), 226 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d6fbf714a..bb85786d57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "ark-bls12-377" @@ -279,7 +279,7 @@ dependencies = [ "num-traits", "paste", "rayon", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -545,7 +545,7 @@ dependencies = [ "tendermint-rpc", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tracing", "tryhard", @@ -624,7 +624,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tonic-health", "tracing", @@ -656,7 +656,7 @@ dependencies = [ "hex", "http", "humantime", - "indexmap 2.4.0", + "indexmap 2.5.0", "insta", "itertools 0.12.1", "itoa", @@ -677,7 +677,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tracing", @@ -712,7 +712,7 @@ dependencies = [ "ed25519-consensus", "hex", "ibc-types", - "indexmap 2.4.0", + "indexmap 2.5.0", "insta", "pbjson", "pbjson-types", @@ -908,7 +908,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tracing", @@ -1023,18 +1023,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1061,7 +1061,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -1081,7 +1081,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1254,7 +1254,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1336,7 +1336,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.6", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -1349,7 +1349,7 @@ dependencies = [ "arrayvec 0.7.6", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -1400,10 +1400,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "syn_derive", ] @@ -1463,9 +1463,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -1533,9 +1533,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.13" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", @@ -1750,9 +1750,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -1760,9 +1760,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -1780,7 +1780,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1812,8 +1812,8 @@ dependencies = [ [[package]] name = "cnidarium" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "async-trait", @@ -1841,8 +1841,8 @@ dependencies = [ [[package]] name = "cnidarium-component" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "async-trait", @@ -2015,18 +2015,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -2041,9 +2041,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -2072,9 +2072,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -2187,9 +2187,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.74+curl-8.9.0" +version = "0.4.75+curl-8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" +checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" dependencies = [ "cc", "libc", @@ -2235,7 +2235,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2246,7 +2246,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2335,8 +2335,8 @@ dependencies = [ [[package]] name = "decaf377-fmd" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2349,8 +2349,8 @@ dependencies = [ [[package]] name = "decaf377-ka" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -2418,7 +2418,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2504,7 +2504,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2529,7 +2529,7 @@ checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2729,7 +2729,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2912,7 +2912,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.75", + "syn 2.0.77", "toml 0.8.19", "walkdir", ] @@ -2930,7 +2930,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "serde_json", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2956,7 +2956,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.75", + "syn 2.0.77", "tempfile", "thiserror", "tiny-keccak", @@ -3108,9 +3108,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastrlp" @@ -3150,9 +3150,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -3180,9 +3180,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -3319,7 +3319,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3444,9 +3444,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -3490,10 +3490,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tracing", ] @@ -4163,9 +4163,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4205,9 +4205,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -4227,9 +4227,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -4352,9 +4352,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" +checksum = "138572befc78a9793240645926f30161f8b4143d2be18d09e44ed9814bd7ee2c" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -4368,9 +4368,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" +checksum = "5c671353e4adf926799107bd7f5724a06b6bc0a333db442a0843c58640bdd0c1" dependencies = [ "futures-util", "http", @@ -4381,16 +4381,16 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tracing", "url", ] [[package]] name = "jsonrpsee-core" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" +checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4413,9 +4413,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" dependencies = [ "async-trait", "hyper", @@ -4433,9 +4433,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" +checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -4446,9 +4446,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" +checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" dependencies = [ "futures-util", "http", @@ -4462,16 +4462,16 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" +checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" dependencies = [ "anyhow", "beef", @@ -4483,9 +4483,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" +checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" dependencies = [ "http", "jsonrpsee-client-transport", @@ -4647,9 +4647,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.19" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -4734,7 +4734,7 @@ checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ "base64 0.21.7", "hyper", - "indexmap 2.4.0", + "indexmap 2.5.0", "ipnet", "metrics", "metrics-util", @@ -4831,7 +4831,7 @@ dependencies = [ "once_cell", "parking_lot", "quanta", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "smallvec", "tagptr", "thiserror", @@ -5001,10 +5001,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5216,7 +5216,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -5224,9 +5224,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -5333,7 +5333,7 @@ dependencies = [ "proc-macro2 1.0.86", "proc-macro2-diagnostics", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5380,8 +5380,8 @@ dependencies = [ [[package]] name = "penumbra-asset" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5418,8 +5418,8 @@ dependencies = [ [[package]] name = "penumbra-ibc" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5455,8 +5455,8 @@ dependencies = [ [[package]] name = "penumbra-keys" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "aes", "anyhow", @@ -5499,8 +5499,8 @@ dependencies = [ [[package]] name = "penumbra-num" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5535,8 +5535,8 @@ dependencies = [ [[package]] name = "penumbra-proto" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "async-trait", @@ -5564,8 +5564,8 @@ dependencies = [ [[package]] name = "penumbra-sct" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5600,8 +5600,8 @@ dependencies = [ [[package]] name = "penumbra-tct" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5628,8 +5628,8 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "futures", "hex", @@ -5641,7 +5641,7 @@ dependencies = [ "tendermint-proto", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tower-service", @@ -5650,8 +5650,8 @@ dependencies = [ [[package]] name = "penumbra-txhash" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "blake2b_simd 1.0.2", @@ -5670,9 +5670,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", @@ -5686,7 +5686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.4.0", + "indexmap 2.5.0", ] [[package]] @@ -5696,7 +5696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -5716,7 +5716,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5869,12 +5869,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5903,11 +5903,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -5959,7 +5959,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "version_check", "yansi", ] @@ -6007,7 +6007,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.75", + "syn 2.0.77", "tempfile", ] @@ -6021,7 +6021,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6059,9 +6059,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2 1.0.86", ] @@ -6192,9 +6192,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -6445,7 +6445,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rust-embed-utils", - "syn 2.0.75", + "syn 2.0.77", "walkdir", ] @@ -6495,9 +6495,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -6516,9 +6516,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -6665,7 +6665,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -6673,11 +6673,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6795,9 +6795,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -6813,20 +6813,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -6863,7 +6863,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6897,7 +6897,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -6914,7 +6914,7 @@ dependencies = [ "darling", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6923,7 +6923,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -7161,7 +7161,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7198,9 +7198,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -7216,7 +7216,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7265,7 +7265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -7447,7 +7447,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7519,9 +7519,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -7554,7 +7554,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7569,9 +7569,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -7619,9 +7619,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -7681,31 +7681,20 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.4.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -7781,7 +7770,7 @@ dependencies = [ "proc-macro2 1.0.86", "prost-build", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7812,7 +7801,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower-layer", "tower-service", "tracing", @@ -7847,7 +7836,7 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower", "tracing", ] @@ -7902,7 +7891,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8111,9 +8100,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -8254,7 +8243,7 @@ dependencies = [ "cfg-if", "git2", "regex", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "rustversion", "time", ] @@ -8333,7 +8322,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -8367,7 +8356,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8665,7 +8654,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -8706,7 +8695,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8726,7 +8715,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8738,28 +8727,3 @@ dependencies = [ "cc", "pkg-config", ] - -[[patch.unused]] -name = "cnidarium" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" - -[[patch.unused]] -name = "cnidarium-component" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" - -[[patch.unused]] -name = "penumbra-ibc" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" - -[[patch.unused]] -name = "penumbra-proto" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" - -[[patch.unused]] -name = "penumbra-tower-trace" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=636b9f12d6c5e7324e798236e4a514983f6a8c6d#636b9f12d6c5e7324e798236e4a514983f6a8c6d" diff --git a/Cargo.toml b/Cargo.toml index e708b3fa26..678b7dc9f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,8 +110,8 @@ which = "4.4.0" wiremock = "0.5" [patch.'https://github.com/penumbra-zone/penumbra.git'] -penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } -penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } -penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } -cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } -cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "636b9f12d6c5e7324e798236e4a514983f6a8c6d" } +penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } +penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } +penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } +cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } +cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } From 3e8c96332c32cb3444d2d12aa060673dfddb91a5 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 12 Sep 2024 12:43:28 -0400 Subject: [PATCH 03/11] empty From b3989f6c9b9e2e3e73aaf8028e0cc51d8f251184 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 12 Sep 2024 12:45:43 -0400 Subject: [PATCH 04/11] Cargo.lock same as main --- Cargo.lock | 635 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 380 insertions(+), 255 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb85786d57..e63fd11611 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "ark-bls12-377" @@ -279,7 +279,7 @@ dependencies = [ "num-traits", "paste", "rayon", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "zeroize", ] @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "astria-bridge-withdrawer" -version = "0.2.1" +version = "0.3.0" dependencies = [ "astria-bridge-contracts", "astria-build-info", @@ -528,11 +528,10 @@ dependencies = [ "ethers", "futures", "hex", - "http", + "http 0.2.12", "humantime", - "hyper", + "hyper 0.14.30", "ibc-types", - "metrics", "once_cell", "pin-project-lite", "prost", @@ -545,7 +544,7 @@ dependencies = [ "tendermint-rpc", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tracing", "tryhard", @@ -562,7 +561,7 @@ dependencies = [ [[package]] name = "astria-cli" -version = "0.3.1" +version = "0.4.1" dependencies = [ "astria-bridge-contracts", "astria-core", @@ -589,7 +588,7 @@ dependencies = [ [[package]] name = "astria-composer" -version = "0.8.2" +version = "0.8.3" dependencies = [ "astria-build-info", "astria-config", @@ -604,10 +603,9 @@ dependencies = [ "futures", "hex", "humantime", - "hyper", + "hyper 0.14.30", "insta", "itertools 0.12.1", - "metrics", "once_cell", "pin-project-lite", "prost", @@ -624,7 +622,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tonic-health", "tracing", @@ -634,7 +632,7 @@ dependencies = [ [[package]] name = "astria-conductor" -version = "0.20.0" +version = "0.20.1" dependencies = [ "astria-build-info", "astria-config", @@ -654,14 +652,13 @@ dependencies = [ "futures", "futures-bounded", "hex", - "http", + "http 0.2.12", "humantime", - "indexmap 2.5.0", + "indexmap 2.4.0", "insta", "itertools 0.12.1", "itoa", "jsonrpsee", - "metrics", "moka", "once_cell", "pbjson-types", @@ -677,7 +674,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tower", "tracing", @@ -712,7 +709,7 @@ dependencies = [ "ed25519-consensus", "hex", "ibc-types", - "indexmap 2.5.0", + "indexmap 2.4.0", "insta", "pbjson", "pbjson-types", @@ -792,7 +789,7 @@ dependencies = [ [[package]] name = "astria-sequencer" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "astria-build-info", @@ -811,7 +808,6 @@ dependencies = [ "ibc-types", "insta", "matchit", - "metrics", "penumbra-ibc", "penumbra-proto", "penumbra-tower-trace", @@ -839,11 +835,13 @@ name = "astria-sequencer-client" version = "0.1.0" dependencies = [ "astria-core", + "astria-eyre", "async-trait", "futures", "futures-util", "hex", "hex-literal", + "humantime", "prost", "regex", "serde", @@ -856,12 +854,13 @@ dependencies = [ "tokio-stream", "tokio-test", "tracing", + "tryhard", "wiremock", ] [[package]] name = "astria-sequencer-relayer" -version = "0.16.1" +version = "0.16.2" dependencies = [ "assert-json-diff", "astria-build-info", @@ -881,15 +880,14 @@ dependencies = [ "const_format", "futures", "hex", - "http", + "http 0.2.12", "humantime", "humantime-serde", - "hyper", + "hyper 0.14.30", "isahc", "itertools 0.12.1", "itoa", "k256", - "metrics", "once_cell", "pbjson-types", "pin-project-lite", @@ -908,7 +906,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tower", "tracing", @@ -945,6 +943,8 @@ dependencies = [ "base64 0.21.7", "base64-serde", "const_format", + "itertools 0.12.1", + "metrics 0.23.0", "metrics-exporter-prometheus", "opentelemetry", "opentelemetry-otlp", @@ -955,6 +955,7 @@ dependencies = [ "serde_json", "serde_with", "thiserror", + "tokio", "tracing", "tracing-opentelemetry", "tracing-subscriber 0.3.18", @@ -1023,18 +1024,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1061,7 +1062,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.1", + "rustc_version 0.4.0", ] [[package]] @@ -1073,6 +1074,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "auto_impl" version = "1.2.0" @@ -1081,7 +1088,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1101,9 +1108,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", "itoa", "matchit", "memchr", @@ -1131,8 +1138,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -1254,7 +1261,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1336,7 +1343,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.6", - "constant_time_eq 0.3.1", + "constant_time_eq 0.3.0", ] [[package]] @@ -1349,7 +1356,7 @@ dependencies = [ "arrayvec 0.7.6", "cc", "cfg-if", - "constant_time_eq 0.3.1", + "constant_time_eq 0.3.0", ] [[package]] @@ -1400,10 +1407,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "syn_derive", ] @@ -1463,9 +1470,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" [[package]] name = "byteorder" @@ -1533,9 +1540,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.18" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", @@ -1564,7 +1571,7 @@ checksum = "4f4c948ab3cd9562d256b752d874d573c836ec8b200bba87d1154bbf662d3a00" dependencies = [ "async-trait", "celestia-types", - "http", + "http 0.2.12", "jsonrpsee", "serde", "thiserror", @@ -1750,9 +1757,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -1760,9 +1767,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -1780,7 +1787,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1812,8 +1819,8 @@ dependencies = [ [[package]] name = "cnidarium" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "async-trait", @@ -1824,7 +1831,7 @@ dependencies = [ "ibc-types", "ics23", "jmt", - "metrics", + "metrics 0.22.3", "once_cell", "parking_lot", "pin-project", @@ -1841,8 +1848,8 @@ dependencies = [ [[package]] name = "cnidarium-component" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "async-trait", @@ -2015,18 +2022,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.33" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.33" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -2041,9 +2048,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -2072,9 +2079,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -2187,9 +2194,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.75+curl-8.10.0" +version = "0.4.74+curl-8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" dependencies = [ "cc", "libc", @@ -2235,7 +2242,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2246,7 +2253,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2335,8 +2342,8 @@ dependencies = [ [[package]] name = "decaf377-fmd" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2349,8 +2356,8 @@ dependencies = [ [[package]] name = "decaf377-ka" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -2418,7 +2425,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2504,7 +2511,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2529,7 +2536,7 @@ checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2729,7 +2736,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2912,7 +2919,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.77", + "syn 2.0.75", "toml 0.8.19", "walkdir", ] @@ -2930,7 +2937,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "serde_json", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2956,7 +2963,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.77", + "syn 2.0.75", "tempfile", "thiserror", "tiny-keccak", @@ -3007,7 +3014,7 @@ dependencies = [ "futures-timer", "futures-util", "hashers", - "http", + "http 0.2.12", "instant", "jsonwebtoken", "once_cell", @@ -3108,9 +3115,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fastrlp" @@ -3150,9 +3157,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", @@ -3180,9 +3187,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -3319,7 +3326,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -3444,9 +3451,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.15" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", @@ -3489,11 +3496,30 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.5.0", + "http 0.2.12", + "indexmap 2.4.0", + "slab", + "tokio", + "tokio-util 0.7.11", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.4.0", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tracing", ] @@ -3624,6 +3650,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -3631,7 +3668,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -3651,7 +3711,7 @@ dependencies = [ "async-channel", "base64 0.13.1", "futures-lite", - "http", + "http 0.2.12", "infer", "pin-project-lite", "rand 0.7.3", @@ -3700,9 +3760,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -3714,6 +3774,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -3721,8 +3802,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.30", "log", "rustls", "rustls-native-certs", @@ -3736,12 +3817,32 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.30", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -4163,9 +4264,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4205,9 +4306,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.40.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -4227,9 +4328,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -4262,7 +4363,7 @@ dependencies = [ "encoding_rs", "event-listener 2.5.3", "futures-lite", - "http", + "http 0.2.12", "log", "mime", "once_cell", @@ -4352,9 +4453,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138572befc78a9793240645926f30161f8b4143d2be18d09e44ed9814bd7ee2c" +checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -4368,12 +4469,12 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c671353e4adf926799107bd7f5724a06b6bc0a333db442a0843c58640bdd0c1" +checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" dependencies = [ "futures-util", - "http", + "http 0.2.12", "jsonrpsee-core", "pin-project", "rustls-native-certs", @@ -4381,16 +4482,16 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tracing", "url", ] [[package]] name = "jsonrpsee-core" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" +checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4398,7 +4499,7 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper", + "hyper 0.14.30", "jsonrpsee-types", "parking_lot", "rand 0.8.5", @@ -4413,12 +4514,12 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" +checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.30", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", @@ -4433,9 +4534,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" +checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -4446,13 +4547,13 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" +checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.30", "jsonrpsee-core", "jsonrpsee-types", "route-recognizer", @@ -4462,16 +4563,16 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tower", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" +checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" dependencies = [ "anyhow", "beef", @@ -4483,11 +4584,11 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" +checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ - "http", + "http 0.2.12", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -4647,9 +4748,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" dependencies = [ "cc", "libc", @@ -4726,33 +4827,46 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "metrics" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" +dependencies = [ + "ahash", + "portable-atomic", +] + [[package]] name = "metrics-exporter-prometheus" -version = "0.13.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" +checksum = "26eb45aff37b45cff885538e1dcbd6c2b462c04fe84ce0155ea469f325672c98" dependencies = [ - "base64 0.21.7", - "hyper", - "indexmap 2.5.0", + "base64 0.22.1", + "http-body-util", + "hyper 1.3.1", + "hyper-util", + "indexmap 2.4.0", "ipnet", - "metrics", + "metrics 0.23.0", "metrics-util", "quanta", "thiserror", "tokio", + "tracing", ] [[package]] name = "metrics-util" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" +checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "metrics", + "metrics 0.23.0", "num_cpus", "quanta", "sketches-ddsketch", @@ -4831,7 +4945,7 @@ dependencies = [ "once_cell", "parking_lot", "quanta", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "smallvec", "tagptr", "thiserror", @@ -5001,10 +5115,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -5103,7 +5217,7 @@ checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.12", "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -5216,7 +5330,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -5224,9 +5338,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -5333,7 +5447,7 @@ dependencies = [ "proc-macro2 1.0.86", "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -5380,8 +5494,8 @@ dependencies = [ [[package]] name = "penumbra-asset" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5418,8 +5532,8 @@ dependencies = [ [[package]] name = "penumbra-ibc" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5432,7 +5546,7 @@ dependencies = [ "ibc-proto", "ibc-types", "ics23", - "metrics", + "metrics 0.22.3", "num-traits", "once_cell", "pbjson-types", @@ -5455,8 +5569,8 @@ dependencies = [ [[package]] name = "penumbra-keys" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "aes", "anyhow", @@ -5499,8 +5613,8 @@ dependencies = [ [[package]] name = "penumbra-num" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5535,8 +5649,8 @@ dependencies = [ [[package]] name = "penumbra-proto" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "async-trait", @@ -5564,8 +5678,8 @@ dependencies = [ [[package]] name = "penumbra-sct" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5583,7 +5697,7 @@ dependencies = [ "decaf377-rdsa", "hex", "im", - "metrics", + "metrics 0.22.3", "once_cell", "pbjson-types", "penumbra-keys", @@ -5600,8 +5714,8 @@ dependencies = [ [[package]] name = "penumbra-tct" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5628,12 +5742,12 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "futures", "hex", - "http", + "http 0.2.12", "pin-project", "pin-project-lite", "sha2 0.10.8", @@ -5641,7 +5755,7 @@ dependencies = [ "tendermint-proto", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tower", "tower-service", @@ -5650,8 +5764,8 @@ dependencies = [ [[package]] name = "penumbra-txhash" -version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +version = "0.80.2" +source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" dependencies = [ "anyhow", "blake2b_simd 1.0.2", @@ -5670,9 +5784,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -5686,7 +5800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.4.0", ] [[package]] @@ -5696,7 +5810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.1", + "rustc_version 0.4.0", ] [[package]] @@ -5716,7 +5830,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -5869,12 +5983,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -5903,11 +6017,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.22.20", + "toml_edit 0.21.1", ] [[package]] @@ -5959,7 +6073,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "version_check", "yansi", ] @@ -6007,7 +6121,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.77", + "syn 2.0.75", "tempfile", ] @@ -6021,7 +6135,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -6059,9 +6173,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2 1.0.86", ] @@ -6192,9 +6306,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -6271,10 +6385,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-rustls", "ipnet", "js-sys", @@ -6445,7 +6559,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.75", "walkdir", ] @@ -6495,9 +6609,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver 1.0.23", ] @@ -6516,9 +6630,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.6.0", "errno", @@ -6665,7 +6779,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -6673,11 +6787,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6795,9 +6909,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] @@ -6813,20 +6927,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", "memchr", @@ -6863,7 +6977,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -6897,7 +7011,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.4.0", "serde", "serde_derive", "serde_json", @@ -6914,7 +7028,7 @@ dependencies = [ "darling", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -6923,7 +7037,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.4.0", "itoa", "ryu", "serde", @@ -7101,7 +7215,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", + "http 0.2.12", "httparse", "log", "rand 0.8.5", @@ -7161,7 +7275,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7198,9 +7312,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -7216,7 +7330,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7265,7 +7379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.1", + "fastrand 2.1.0", "once_cell", "rustix", "windows-sys 0.59.0", @@ -7447,7 +7561,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7519,9 +7633,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", @@ -7554,7 +7668,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7569,9 +7683,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -7619,9 +7733,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -7681,20 +7795,31 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", "winnow 0.5.40", ] +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.4.0", + "toml_datetime", + "winnow 0.5.40", +] + [[package]] name = "toml_edit" version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", @@ -7712,10 +7837,10 @@ dependencies = [ "axum", "base64 0.21.7", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-timeout", "percent-encoding", "pin-project", @@ -7744,10 +7869,10 @@ dependencies = [ "base64 0.21.7", "bytes", "flate2", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-timeout", "percent-encoding", "pin-project", @@ -7770,7 +7895,7 @@ dependencies = [ "proc-macro2 1.0.86", "prost-build", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7801,7 +7926,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tower-layer", "tower-service", "tracing", @@ -7836,7 +7961,7 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tower", "tracing", ] @@ -7851,8 +7976,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "http-range-header", "pin-project-lite", "tower-layer", @@ -7891,7 +8016,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -8036,7 +8161,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", "httparse", "log", "rand 0.8.5", @@ -8100,9 +8225,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -8243,7 +8368,7 @@ dependencies = [ "cfg-if", "git2", "regex", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "rustversion", "time", ] @@ -8322,7 +8447,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "wasm-bindgen-shared", ] @@ -8356,7 +8481,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8634,7 +8759,7 @@ dependencies = [ "futures", "futures-timer", "http-types", - "hyper", + "hyper 0.14.30", "log", "once_cell", "regex", @@ -8654,7 +8779,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -8695,7 +8820,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -8715,7 +8840,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] From 9f91b057b485889d9556260cd8338d61a309c8ca Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 12 Sep 2024 12:46:26 -0400 Subject: [PATCH 05/11] update --- Cargo.lock | 635 +++++++++++++++++++++-------------------------------- 1 file changed, 255 insertions(+), 380 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e63fd11611..bb85786d57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "ark-bls12-377" @@ -279,7 +279,7 @@ dependencies = [ "num-traits", "paste", "rayon", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -514,7 +514,7 @@ dependencies = [ [[package]] name = "astria-bridge-withdrawer" -version = "0.3.0" +version = "0.2.1" dependencies = [ "astria-bridge-contracts", "astria-build-info", @@ -528,10 +528,11 @@ dependencies = [ "ethers", "futures", "hex", - "http 0.2.12", + "http", "humantime", - "hyper 0.14.30", + "hyper", "ibc-types", + "metrics", "once_cell", "pin-project-lite", "prost", @@ -544,7 +545,7 @@ dependencies = [ "tendermint-rpc", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tracing", "tryhard", @@ -561,7 +562,7 @@ dependencies = [ [[package]] name = "astria-cli" -version = "0.4.1" +version = "0.3.1" dependencies = [ "astria-bridge-contracts", "astria-core", @@ -588,7 +589,7 @@ dependencies = [ [[package]] name = "astria-composer" -version = "0.8.3" +version = "0.8.2" dependencies = [ "astria-build-info", "astria-config", @@ -603,9 +604,10 @@ dependencies = [ "futures", "hex", "humantime", - "hyper 0.14.30", + "hyper", "insta", "itertools 0.12.1", + "metrics", "once_cell", "pin-project-lite", "prost", @@ -622,7 +624,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tonic-health", "tracing", @@ -632,7 +634,7 @@ dependencies = [ [[package]] name = "astria-conductor" -version = "0.20.1" +version = "0.20.0" dependencies = [ "astria-build-info", "astria-config", @@ -652,13 +654,14 @@ dependencies = [ "futures", "futures-bounded", "hex", - "http 0.2.12", + "http", "humantime", - "indexmap 2.4.0", + "indexmap 2.5.0", "insta", "itertools 0.12.1", "itoa", "jsonrpsee", + "metrics", "moka", "once_cell", "pbjson-types", @@ -674,7 +677,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tracing", @@ -709,7 +712,7 @@ dependencies = [ "ed25519-consensus", "hex", "ibc-types", - "indexmap 2.4.0", + "indexmap 2.5.0", "insta", "pbjson", "pbjson-types", @@ -789,7 +792,7 @@ dependencies = [ [[package]] name = "astria-sequencer" -version = "0.17.0" +version = "0.16.0" dependencies = [ "anyhow", "astria-build-info", @@ -808,6 +811,7 @@ dependencies = [ "ibc-types", "insta", "matchit", + "metrics", "penumbra-ibc", "penumbra-proto", "penumbra-tower-trace", @@ -835,13 +839,11 @@ name = "astria-sequencer-client" version = "0.1.0" dependencies = [ "astria-core", - "astria-eyre", "async-trait", "futures", "futures-util", "hex", "hex-literal", - "humantime", "prost", "regex", "serde", @@ -854,13 +856,12 @@ dependencies = [ "tokio-stream", "tokio-test", "tracing", - "tryhard", "wiremock", ] [[package]] name = "astria-sequencer-relayer" -version = "0.16.2" +version = "0.16.1" dependencies = [ "assert-json-diff", "astria-build-info", @@ -880,14 +881,15 @@ dependencies = [ "const_format", "futures", "hex", - "http 0.2.12", + "http", "humantime", "humantime-serde", - "hyper 0.14.30", + "hyper", "isahc", "itertools 0.12.1", "itoa", "k256", + "metrics", "once_cell", "pbjson-types", "pin-project-lite", @@ -906,7 +908,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tracing", @@ -943,8 +945,6 @@ dependencies = [ "base64 0.21.7", "base64-serde", "const_format", - "itertools 0.12.1", - "metrics 0.23.0", "metrics-exporter-prometheus", "opentelemetry", "opentelemetry-otlp", @@ -955,7 +955,6 @@ dependencies = [ "serde_json", "serde_with", "thiserror", - "tokio", "tracing", "tracing-opentelemetry", "tracing-subscriber 0.3.18", @@ -1024,18 +1023,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1062,7 +1061,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -1074,12 +1073,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "auto_impl" version = "1.2.0" @@ -1088,7 +1081,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1108,9 +1101,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "http", + "http-body", + "hyper", "itoa", "matchit", "memchr", @@ -1138,8 +1131,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "mime", "rustversion", "tower-layer", @@ -1261,7 +1254,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1343,7 +1336,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.6", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -1356,7 +1349,7 @@ dependencies = [ "arrayvec 0.7.6", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -1407,10 +1400,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "syn_derive", ] @@ -1470,9 +1463,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -1540,9 +1533,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.13" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" dependencies = [ "jobserver", "libc", @@ -1571,7 +1564,7 @@ checksum = "4f4c948ab3cd9562d256b752d874d573c836ec8b200bba87d1154bbf662d3a00" dependencies = [ "async-trait", "celestia-types", - "http 0.2.12", + "http", "jsonrpsee", "serde", "thiserror", @@ -1757,9 +1750,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -1767,9 +1760,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -1787,7 +1780,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1819,8 +1812,8 @@ dependencies = [ [[package]] name = "cnidarium" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "async-trait", @@ -1831,7 +1824,7 @@ dependencies = [ "ibc-types", "ics23", "jmt", - "metrics 0.22.3", + "metrics", "once_cell", "parking_lot", "pin-project", @@ -1848,8 +1841,8 @@ dependencies = [ [[package]] name = "cnidarium-component" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "async-trait", @@ -2022,18 +2015,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -2048,9 +2041,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -2079,9 +2072,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -2194,9 +2187,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.74+curl-8.9.0" +version = "0.4.75+curl-8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" +checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" dependencies = [ "cc", "libc", @@ -2242,7 +2235,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2253,7 +2246,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2342,8 +2335,8 @@ dependencies = [ [[package]] name = "decaf377-fmd" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2356,8 +2349,8 @@ dependencies = [ [[package]] name = "decaf377-ka" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -2425,7 +2418,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2511,7 +2504,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2536,7 +2529,7 @@ checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2736,7 +2729,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2919,7 +2912,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.75", + "syn 2.0.77", "toml 0.8.19", "walkdir", ] @@ -2937,7 +2930,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "serde_json", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2963,7 +2956,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.75", + "syn 2.0.77", "tempfile", "thiserror", "tiny-keccak", @@ -3014,7 +3007,7 @@ dependencies = [ "futures-timer", "futures-util", "hashers", - "http 0.2.12", + "http", "instant", "jsonwebtoken", "once_cell", @@ -3115,9 +3108,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastrlp" @@ -3157,9 +3150,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -3187,9 +3180,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -3326,7 +3319,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3451,9 +3444,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -3496,30 +3489,11 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.12", - "indexmap 2.4.0", - "slab", - "tokio", - "tokio-util 0.7.11", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.4.0", + "http", + "indexmap 2.5.0", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tracing", ] @@ -3650,17 +3624,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http-body" version = "0.4.6" @@ -3668,30 +3631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" -dependencies = [ - "bytes", - "http 1.1.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", + "http", "pin-project-lite", ] @@ -3711,7 +3651,7 @@ dependencies = [ "async-channel", "base64 0.13.1", "futures-lite", - "http 0.2.12", + "http", "infer", "pin-project-lite", "rand 0.7.3", @@ -3760,9 +3700,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -3774,27 +3714,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "h2 0.4.5", - "http 1.1.0", - "http-body 1.0.0", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -3802,8 +3721,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.12", - "hyper 0.14.30", + "http", + "hyper", "log", "rustls", "rustls-native-certs", @@ -3817,32 +3736,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.30", + "hyper", "pin-project-lite", "tokio", "tokio-io-timeout", ] -[[package]] -name = "hyper-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - [[package]] name = "iana-time-zone" version = "0.1.60" @@ -4264,9 +4163,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4306,9 +4205,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -4328,9 +4227,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -4363,7 +4262,7 @@ dependencies = [ "encoding_rs", "event-listener 2.5.3", "futures-lite", - "http 0.2.12", + "http", "log", "mime", "once_cell", @@ -4453,9 +4352,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" +checksum = "138572befc78a9793240645926f30161f8b4143d2be18d09e44ed9814bd7ee2c" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -4469,12 +4368,12 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" +checksum = "5c671353e4adf926799107bd7f5724a06b6bc0a333db442a0843c58640bdd0c1" dependencies = [ "futures-util", - "http 0.2.12", + "http", "jsonrpsee-core", "pin-project", "rustls-native-certs", @@ -4482,16 +4381,16 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tracing", "url", ] [[package]] name = "jsonrpsee-core" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" +checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4499,7 +4398,7 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper 0.14.30", + "hyper", "jsonrpsee-types", "parking_lot", "rand 0.8.5", @@ -4514,12 +4413,12 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" dependencies = [ "async-trait", - "hyper 0.14.30", + "hyper", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", @@ -4534,9 +4433,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" +checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -4547,13 +4446,13 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" +checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" dependencies = [ "futures-util", - "http 0.2.12", - "hyper 0.14.30", + "http", + "hyper", "jsonrpsee-core", "jsonrpsee-types", "route-recognizer", @@ -4563,16 +4462,16 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" +checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" dependencies = [ "anyhow", "beef", @@ -4584,11 +4483,11 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" +checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" dependencies = [ - "http 0.2.12", + "http", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -4748,9 +4647,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.19" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -4827,46 +4726,33 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "metrics" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" -dependencies = [ - "ahash", - "portable-atomic", -] - [[package]] name = "metrics-exporter-prometheus" -version = "0.15.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26eb45aff37b45cff885538e1dcbd6c2b462c04fe84ce0155ea469f325672c98" +checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ - "base64 0.22.1", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "indexmap 2.4.0", + "base64 0.21.7", + "hyper", + "indexmap 2.5.0", "ipnet", - "metrics 0.23.0", + "metrics", "metrics-util", "quanta", "thiserror", "tokio", - "tracing", ] [[package]] name = "metrics-util" -version = "0.17.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" +checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" dependencies = [ "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "metrics 0.23.0", + "metrics", "num_cpus", "quanta", "sketches-ddsketch", @@ -4945,7 +4831,7 @@ dependencies = [ "once_cell", "parking_lot", "quanta", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "smallvec", "tagptr", "thiserror", @@ -5115,10 +5001,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5217,7 +5103,7 @@ checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" dependencies = [ "async-trait", "futures-core", - "http 0.2.12", + "http", "opentelemetry", "opentelemetry-proto", "opentelemetry-semantic-conventions", @@ -5330,7 +5216,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -5338,9 +5224,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -5447,7 +5333,7 @@ dependencies = [ "proc-macro2 1.0.86", "proc-macro2-diagnostics", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5494,8 +5380,8 @@ dependencies = [ [[package]] name = "penumbra-asset" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5532,8 +5418,8 @@ dependencies = [ [[package]] name = "penumbra-ibc" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5546,7 +5432,7 @@ dependencies = [ "ibc-proto", "ibc-types", "ics23", - "metrics 0.22.3", + "metrics", "num-traits", "once_cell", "pbjson-types", @@ -5569,8 +5455,8 @@ dependencies = [ [[package]] name = "penumbra-keys" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "aes", "anyhow", @@ -5613,8 +5499,8 @@ dependencies = [ [[package]] name = "penumbra-num" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5649,8 +5535,8 @@ dependencies = [ [[package]] name = "penumbra-proto" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "async-trait", @@ -5678,8 +5564,8 @@ dependencies = [ [[package]] name = "penumbra-sct" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5697,7 +5583,7 @@ dependencies = [ "decaf377-rdsa", "hex", "im", - "metrics 0.22.3", + "metrics", "once_cell", "pbjson-types", "penumbra-keys", @@ -5714,8 +5600,8 @@ dependencies = [ [[package]] name = "penumbra-tct" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5742,12 +5628,12 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "futures", "hex", - "http 0.2.12", + "http", "pin-project", "pin-project-lite", "sha2 0.10.8", @@ -5755,7 +5641,7 @@ dependencies = [ "tendermint-proto", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tower-service", @@ -5764,8 +5650,8 @@ dependencies = [ [[package]] name = "penumbra-txhash" -version = "0.80.2" -source = "git+https://github.com/penumbra-zone/penumbra.git?rev=87adc8d6b15f6081c1adf169daed4ca8873bd9f6#87adc8d6b15f6081c1adf169daed4ca8873bd9f6" +version = "0.80.4" +source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" dependencies = [ "anyhow", "blake2b_simd 1.0.2", @@ -5784,9 +5670,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", @@ -5800,7 +5686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.4.0", + "indexmap 2.5.0", ] [[package]] @@ -5810,7 +5696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -5830,7 +5716,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5983,12 +5869,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6017,11 +5903,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -6073,7 +5959,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "version_check", "yansi", ] @@ -6121,7 +6007,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.75", + "syn 2.0.77", "tempfile", ] @@ -6135,7 +6021,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6173,9 +6059,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2 1.0.86", ] @@ -6306,9 +6192,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -6385,10 +6271,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "h2", + "http", + "http-body", + "hyper", "hyper-rustls", "ipnet", "js-sys", @@ -6559,7 +6445,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rust-embed-utils", - "syn 2.0.75", + "syn 2.0.77", "walkdir", ] @@ -6609,9 +6495,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -6630,9 +6516,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -6779,7 +6665,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -6787,11 +6673,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6909,9 +6795,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -6927,20 +6813,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -6977,7 +6863,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7011,7 +6897,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -7028,7 +6914,7 @@ dependencies = [ "darling", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7037,7 +6923,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -7215,7 +7101,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http 0.2.12", + "http", "httparse", "log", "rand 0.8.5", @@ -7275,7 +7161,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7312,9 +7198,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -7330,7 +7216,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7379,7 +7265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -7561,7 +7447,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7633,9 +7519,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -7668,7 +7554,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7683,9 +7569,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -7733,9 +7619,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -7795,31 +7681,20 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.4.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -7837,10 +7712,10 @@ dependencies = [ "axum", "base64 0.21.7", "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "h2", + "http", + "http-body", + "hyper", "hyper-timeout", "percent-encoding", "pin-project", @@ -7869,10 +7744,10 @@ dependencies = [ "base64 0.21.7", "bytes", "flate2", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "h2", + "http", + "http-body", + "hyper", "hyper-timeout", "percent-encoding", "pin-project", @@ -7895,7 +7770,7 @@ dependencies = [ "proc-macro2 1.0.86", "prost-build", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7926,7 +7801,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower-layer", "tower-service", "tracing", @@ -7961,7 +7836,7 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower", "tracing", ] @@ -7976,8 +7851,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "http-range-header", "pin-project-lite", "tower-layer", @@ -8016,7 +7891,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8161,7 +8036,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.12", + "http", "httparse", "log", "rand 0.8.5", @@ -8225,9 +8100,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -8368,7 +8243,7 @@ dependencies = [ "cfg-if", "git2", "regex", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "rustversion", "time", ] @@ -8447,7 +8322,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -8481,7 +8356,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8759,7 +8634,7 @@ dependencies = [ "futures", "futures-timer", "http-types", - "hyper 0.14.30", + "hyper", "log", "once_cell", "regex", @@ -8779,7 +8654,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -8820,7 +8695,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8840,7 +8715,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] From 61d19edd3bae5382f848f4bc4fcbf08bf13a545d Mon Sep 17 00:00:00 2001 From: elizabeth Date: Thu, 12 Sep 2024 22:19:31 -0400 Subject: [PATCH 06/11] bump penumbra --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb85786d57..4f09ade116 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1813,7 +1813,7 @@ dependencies = [ [[package]] name = "cnidarium" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "async-trait", @@ -1842,7 +1842,7 @@ dependencies = [ [[package]] name = "cnidarium-component" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "async-trait", @@ -2336,7 +2336,7 @@ dependencies = [ [[package]] name = "decaf377-fmd" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2350,7 +2350,7 @@ dependencies = [ [[package]] name = "decaf377-ka" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -5381,7 +5381,7 @@ dependencies = [ [[package]] name = "penumbra-asset" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5419,7 +5419,7 @@ dependencies = [ [[package]] name = "penumbra-ibc" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5456,7 +5456,7 @@ dependencies = [ [[package]] name = "penumbra-keys" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "aes", "anyhow", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "penumbra-num" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "penumbra-proto" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "async-trait", @@ -5565,7 +5565,7 @@ dependencies = [ [[package]] name = "penumbra-sct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5601,7 +5601,7 @@ dependencies = [ [[package]] name = "penumbra-tct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5629,7 +5629,7 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "futures", "hex", @@ -5651,7 +5651,7 @@ dependencies = [ [[package]] name = "penumbra-txhash" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=638266979adba9dac7db6f26140b2f122878dbbc#638266979adba9dac7db6f26140b2f122878dbbc" +source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" dependencies = [ "anyhow", "blake2b_simd 1.0.2", diff --git a/Cargo.toml b/Cargo.toml index 678b7dc9f6..b41af8a230 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,8 +110,8 @@ which = "4.4.0" wiremock = "0.5" [patch.'https://github.com/penumbra-zone/penumbra.git'] -penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } -penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } -penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } -cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } -cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "638266979adba9dac7db6f26140b2f122878dbbc" } +penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } +penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } +penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } +cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } +cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } From 58a76c48b092b0789263ccee6350154e1a2dd75e Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 16 Sep 2024 11:04:44 -0400 Subject: [PATCH 07/11] update penumbra --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f09ade116..b7ad737d9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1813,7 +1813,7 @@ dependencies = [ [[package]] name = "cnidarium" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "async-trait", @@ -1842,7 +1842,7 @@ dependencies = [ [[package]] name = "cnidarium-component" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "async-trait", @@ -2336,7 +2336,7 @@ dependencies = [ [[package]] name = "decaf377-fmd" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2350,7 +2350,7 @@ dependencies = [ [[package]] name = "decaf377-ka" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -5381,7 +5381,7 @@ dependencies = [ [[package]] name = "penumbra-asset" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5419,7 +5419,7 @@ dependencies = [ [[package]] name = "penumbra-ibc" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5456,7 +5456,7 @@ dependencies = [ [[package]] name = "penumbra-keys" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "aes", "anyhow", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "penumbra-num" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "penumbra-proto" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "async-trait", @@ -5565,7 +5565,7 @@ dependencies = [ [[package]] name = "penumbra-sct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5601,7 +5601,7 @@ dependencies = [ [[package]] name = "penumbra-tct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5629,7 +5629,7 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "futures", "hex", @@ -5651,7 +5651,7 @@ dependencies = [ [[package]] name = "penumbra-txhash" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a154a72efc88edf3dc737d38fb2eb76c92499128#a154a72efc88edf3dc737d38fb2eb76c92499128" +source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" dependencies = [ "anyhow", "blake2b_simd 1.0.2", diff --git a/Cargo.toml b/Cargo.toml index b41af8a230..047b2031d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,8 +110,8 @@ which = "4.4.0" wiremock = "0.5" [patch.'https://github.com/penumbra-zone/penumbra.git'] -penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } -penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } -penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } -cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } -cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "a154a72efc88edf3dc737d38fb2eb76c92499128" } +penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } +penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } +penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } +cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } +cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } From 094d35e6cf8539082a9e2db9fbbcdd6e9d480552 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 16 Sep 2024 14:04:34 -0400 Subject: [PATCH 08/11] update penumbra --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b7ad737d9d..ef09cd2b09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1813,7 +1813,7 @@ dependencies = [ [[package]] name = "cnidarium" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "async-trait", @@ -1842,7 +1842,7 @@ dependencies = [ [[package]] name = "cnidarium-component" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "async-trait", @@ -2336,7 +2336,7 @@ dependencies = [ [[package]] name = "decaf377-fmd" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2350,7 +2350,7 @@ dependencies = [ [[package]] name = "decaf377-ka" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -5381,7 +5381,7 @@ dependencies = [ [[package]] name = "penumbra-asset" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5419,7 +5419,7 @@ dependencies = [ [[package]] name = "penumbra-ibc" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5456,7 +5456,7 @@ dependencies = [ [[package]] name = "penumbra-keys" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "aes", "anyhow", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "penumbra-num" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "penumbra-proto" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "async-trait", @@ -5565,7 +5565,7 @@ dependencies = [ [[package]] name = "penumbra-sct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5601,7 +5601,7 @@ dependencies = [ [[package]] name = "penumbra-tct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5629,7 +5629,7 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "futures", "hex", @@ -5651,7 +5651,7 @@ dependencies = [ [[package]] name = "penumbra-txhash" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=a4b98d5888e0cc47a98a0da57107e77cc332800a#a4b98d5888e0cc47a98a0da57107e77cc332800a" +source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" dependencies = [ "anyhow", "blake2b_simd 1.0.2", diff --git a/Cargo.toml b/Cargo.toml index 047b2031d3..875f360428 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,8 +110,8 @@ which = "4.4.0" wiremock = "0.5" [patch.'https://github.com/penumbra-zone/penumbra.git'] -penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } -penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } -penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } -cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } -cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "a4b98d5888e0cc47a98a0da57107e77cc332800a" } +penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } +penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } +penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } +cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } +cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } From f04ba7ce0898c6ef088ef738a480c4c0134ef099 Mon Sep 17 00:00:00 2001 From: quasystaty Date: Mon, 16 Sep 2024 14:14:21 -0400 Subject: [PATCH 09/11] trigger manual docker-build workflow (#1499) --- .github/workflows/docker-build.yml | 5 +++++ .github/workflows/reusable-docker-build.yml | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 9b111c4a90..e5bf9cd724 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -51,6 +51,7 @@ jobs: package-name: composer binary-name: composer tag: ${{ inputs.tag }} + force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'composer' }} secrets: inherit conductor: @@ -66,6 +67,7 @@ jobs: package-name: conductor binary-name: conductor tag: ${{ inputs.tag }} + force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'conductor' }} secrets: inherit sequencer: @@ -81,6 +83,7 @@ jobs: package-name: sequencer binary-name: sequencer tag: ${{ inputs.tag }} + force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'sequencer' }} secrets: inherit sequencer-relayer: @@ -96,6 +99,7 @@ jobs: package-name: sequencer-relayer binary-name: sequencer-relayer tag: ${{ inputs.tag }} + force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'sequencer-relayer' }} secrets: inherit evm-bridge-withdrawer: @@ -111,6 +115,7 @@ jobs: package-name: evm-bridge-withdrawer binary-name: bridge-withdrawer tag: ${{ inputs.tag }} + force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'evm-bridge-withdrawer' }} secrets: inherit smoke-test: diff --git a/.github/workflows/reusable-docker-build.yml b/.github/workflows/reusable-docker-build.yml index b50484a8e0..f9f0f7db18 100644 --- a/.github/workflows/reusable-docker-build.yml +++ b/.github/workflows/reusable-docker-build.yml @@ -18,6 +18,10 @@ on: tag: required: false type: string + force: + required: false + type: boolean + default: false secrets: DOCKER_TOKEN: required: false @@ -34,7 +38,7 @@ jobs: contents: read id-token: write packages: write - if: startsWith(inputs.tag, inputs.binary-name) || !inputs.tag && (startsWith(github.ref, format('refs/tags/{0}-v', inputs.binary-name)) || github.ref == 'refs/heads/main' || github.event_name == 'pull_request' || github.event_name == 'merge_group') + if: inputs.force || startsWith(inputs.tag, inputs.binary-name) || !inputs.tag && (startsWith(github.ref, format('refs/tags/{0}-v', inputs.binary-name)) || github.ref == 'refs/heads/main' || github.event_name == 'pull_request' || github.event_name == 'merge_group') steps: # Checking out the repo - uses: actions/checkout@v4 From 1f3f08ebb95681e0280827de3915e58b7c7d4202 Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 16 Sep 2024 18:03:46 -0400 Subject: [PATCH 10/11] bump penumbra and hermes --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 10 +++++----- charts/hermes/values.yaml | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ef09cd2b09..bb37f0801b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1813,7 +1813,7 @@ dependencies = [ [[package]] name = "cnidarium" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "async-trait", @@ -1842,7 +1842,7 @@ dependencies = [ [[package]] name = "cnidarium-component" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "async-trait", @@ -2336,7 +2336,7 @@ dependencies = [ [[package]] name = "decaf377-fmd" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2350,7 +2350,7 @@ dependencies = [ [[package]] name = "decaf377-ka" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -5381,7 +5381,7 @@ dependencies = [ [[package]] name = "penumbra-asset" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5419,7 +5419,7 @@ dependencies = [ [[package]] name = "penumbra-ibc" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5456,7 +5456,7 @@ dependencies = [ [[package]] name = "penumbra-keys" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "aes", "anyhow", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "penumbra-num" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "penumbra-proto" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "async-trait", @@ -5565,7 +5565,7 @@ dependencies = [ [[package]] name = "penumbra-sct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5601,7 +5601,7 @@ dependencies = [ [[package]] name = "penumbra-tct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5629,7 +5629,7 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "futures", "hex", @@ -5651,7 +5651,7 @@ dependencies = [ [[package]] name = "penumbra-txhash" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=e4eb7297d1ac53a20f8ce31ba0faef09480824ac#e4eb7297d1ac53a20f8ce31ba0faef09480824ac" +source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" dependencies = [ "anyhow", "blake2b_simd 1.0.2", diff --git a/Cargo.toml b/Cargo.toml index 875f360428..2686e0eb87 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,8 +110,8 @@ which = "4.4.0" wiremock = "0.5" [patch.'https://github.com/penumbra-zone/penumbra.git'] -penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } -penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } -penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } -cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } -cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "e4eb7297d1ac53a20f8ce31ba0faef09480824ac" } +penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } +penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } +penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } +cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } +cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } diff --git a/charts/hermes/values.yaml b/charts/hermes/values.yaml index 9f8862fcc4..8603bcb1fd 100644 --- a/charts/hermes/values.yaml +++ b/charts/hermes/values.yaml @@ -3,7 +3,7 @@ global: replicaCount: 1 logLevel: debug -image: ghcr.io/astriaorg/hermes:sha-903bac5 +image: ghcr.io/astriaorg/hermes:sha-450f848 fullnameOverride: "" nameOverride: "" From dce447732b064d33ac127553dfb139f1fb4ae8eb Mon Sep 17 00:00:00 2001 From: elizabeth Date: Mon, 16 Sep 2024 19:58:37 -0400 Subject: [PATCH 11/11] update penumbra --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bb37f0801b..eaffb2f37f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1813,7 +1813,7 @@ dependencies = [ [[package]] name = "cnidarium" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "async-trait", @@ -1842,7 +1842,7 @@ dependencies = [ [[package]] name = "cnidarium-component" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "async-trait", @@ -2336,7 +2336,7 @@ dependencies = [ [[package]] name = "decaf377-fmd" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "ark-ff 0.4.2", "ark-serialize 0.4.2", @@ -2350,7 +2350,7 @@ dependencies = [ [[package]] name = "decaf377-ka" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "ark-ff 0.4.2", "decaf377", @@ -5381,7 +5381,7 @@ dependencies = [ [[package]] name = "penumbra-asset" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5419,7 +5419,7 @@ dependencies = [ [[package]] name = "penumbra-ibc" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5456,7 +5456,7 @@ dependencies = [ [[package]] name = "penumbra-keys" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "aes", "anyhow", @@ -5500,7 +5500,7 @@ dependencies = [ [[package]] name = "penumbra-num" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "penumbra-proto" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "async-trait", @@ -5565,7 +5565,7 @@ dependencies = [ [[package]] name = "penumbra-sct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -5601,7 +5601,7 @@ dependencies = [ [[package]] name = "penumbra-tct" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "ark-ed-on-bls12-377", "ark-ff 0.4.2", @@ -5629,7 +5629,7 @@ dependencies = [ [[package]] name = "penumbra-tower-trace" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "futures", "hex", @@ -5651,7 +5651,7 @@ dependencies = [ [[package]] name = "penumbra-txhash" version = "0.80.4" -source = "git+https://github.com/noot/penumbra.git?rev=6a62c4c4fe376190631b53bee9bf54ce53eb9d85#6a62c4c4fe376190631b53bee9bf54ce53eb9d85" +source = "git+https://github.com/noot/penumbra.git?rev=3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8#3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" dependencies = [ "anyhow", "blake2b_simd 1.0.2", diff --git a/Cargo.toml b/Cargo.toml index 2686e0eb87..e5135f6136 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -110,8 +110,8 @@ which = "4.4.0" wiremock = "0.5" [patch.'https://github.com/penumbra-zone/penumbra.git'] -penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } -penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } -penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } -cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } -cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "6a62c4c4fe376190631b53bee9bf54ce53eb9d85" } +penumbra-ibc = { git = "https://github.com/noot/penumbra.git", rev = "3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" } +penumbra-proto = { git = "https://github.com/noot/penumbra.git", rev = "3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" } +penumbra-tower-trace = { git = "https://github.com/noot/penumbra.git", rev = "3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" } +cnidarium = { git = "https://github.com/noot/penumbra.git", rev = "3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" } +cnidarium-component = { git = "https://github.com/noot/penumbra.git", rev = "3bf75a2fd2afa43f39320ffef3b8d5360ea9c5f8" }