Merge branch 'main' into recently-spent-outpoints

ZcashFoundation · Oct 24, 2022 · 96beae2 · 96beae2
2 parents 7167846 + a2dba8c
commit 96beae2
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Rust files
         id: changed-files-rust
-        uses: tj-actions/changed-files@v32.1.2
+        uses: tj-actions/changed-files@v33.0.0
         with:
           files: |
             **/*.rs
@@ -51,7 +51,7 @@ jobs:
 
       - name: Workflow files
         id: changed-files-workflows
-        uses: tj-actions/changed-files@v32.1.2
+        uses: tj-actions/changed-files@v33.0.0
         with:
           files: |
             .github/workflows/*.yml

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 edition = "2021"
 
 [dependencies]
-futures = "0.3.24"
+futures = "0.3.25"
 futures-core = "0.3.25"
 pin-project = "1.0.12"
 rayon = "1.5.3"

diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
@@ -60,12 +60,12 @@ tracing = "0.1.37"
 
 # Serialization
 hex = { version = "0.4.3", features = ["serde"] }
-serde = { version = "1.0.145", features = ["serde_derive", "rc"] }
+serde = { version = "1.0.147", features = ["serde_derive", "rc"] }
 serde_with = "2.0.1"
 serde-big-array = "0.4.1"
 
 # Processing
-futures = "0.3.24"
+futures = "0.3.25"
 itertools = "0.10.5"
 rayon = "1.5.3"
 

diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml
@@ -23,10 +23,10 @@ dirs = "4.0.0"
 displaydoc = "0.2.3"
 lazy_static = "1.4.0"
 once_cell = "1.15.0"
-serde = { version = "1.0.145", features = ["serde_derive"] }
+serde = { version = "1.0.147", features = ["serde_derive"] }
 
-futures = "0.3.24"
-futures-util = "0.3.24"
+futures = "0.3.25"
+futures-util = "0.3.25"
 metrics = "0.20.1"
 thiserror = "1.0.37"
 tokio = { version = "1.21.2", features = ["time", "sync", "tracing", "rt-multi-thread"] }

diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml
@@ -26,10 +26,10 @@ pin-project = "1.0.12"
 rand = { version = "0.8.5", package = "rand" }
 rayon = "1.5.3"
 regex = "1.6.0"
-serde = { version = "1.0.145", features = ["serde_derive"] }
+serde = { version = "1.0.147", features = ["serde_derive"] }
 thiserror = "1.0.37"
 
-futures = "0.3.24"
+futures = "0.3.25"
 tokio = { version = "1.21.2", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
 tokio-stream = { version = "0.1.11", features = ["sync", "time"] }
 tokio-util = { version = "0.7.4", features = ["codec"] }

diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml
@@ -14,7 +14,7 @@ getblocktemplate-rpcs = ["zebra-state/getblocktemplate-rpcs"]
 
 [dependencies]
 chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }
-futures = "0.3.24"
+futures = "0.3.25"
 
 # lightwalletd sends JSON-RPC requests over HTTP 1.1
 hyper = { version = "0.14.20", features = ["http1", "server"] }
@@ -35,7 +35,7 @@ tracing = "0.1.37"
 tracing-futures = "0.2.5"
 
 hex = { version = "0.4.3", features = ["serde"] }
-serde = { version = "1.0.145", features = ["serde_derive"] }
+serde = { version = "1.0.147", features = ["serde_derive"] }
 
 proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }

diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml
@@ -14,7 +14,7 @@ bincode = "1.3.3"
 chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }
 dirs = "4.0.0"
 displaydoc = "0.2.3"
-futures = "0.3.24"
+futures = "0.3.25"
 hex = "0.4.3"
 indexmap = "1.9.1"
 itertools = "0.10.5"
@@ -24,7 +24,7 @@ mset = "0.1.0"
 regex = "1.6.0"
 rlimit = "0.8.3"
 rocksdb = { version = "0.19.0", default_features = false, features = ["lz4"] }
-serde = { version = "1.0.145", features = ["serde_derive"] }
+serde = { version = "1.0.147", features = ["serde_derive"] }
 tempfile = "3.3.0"
 thiserror = "1.0.37"
 

diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml
@@ -19,7 +19,7 @@ regex = "1.6.0"
 
 tokio = { version = "1.21.2", features = ["full", "tracing", "test-util"] }
 tower = { version = "0.4.13", features = ["util"] }
-futures = "0.3.24"
+futures = "0.3.25"
 
 color-eyre = "0.6.2"
 # This is a transitive dependency via color-eyre.

diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
@@ -82,10 +82,10 @@ humantime = "2.1.0"
 humantime-serde = "1.1.1"
 indexmap = "1.9.1"
 lazy_static = "1.4.0"
-serde = { version = "1.0.145", features = ["serde_derive"] }
+serde = { version = "1.0.147", features = ["serde_derive"] }
 toml = "0.5.9"
 
-futures = "0.3.24"
+futures = "0.3.25"
 rayon = "1.5.3"
 tokio = { version = "1.21.2", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] }
 tower = { version = "0.4.13", features = ["hedge", "limit"] }