diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..8e1d86ecd9b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +**/Cargo.lock linguist-generated=false \ No newline at end of file diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml index 94574c1d74a..dcbf3c32d47 100644 --- a/.github/workflows/continous-delivery.yml +++ b/.github/workflows/continous-delivery.yml @@ -121,7 +121,7 @@ jobs: if: ${{ !cancelled() && !failure() && ((github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'release') }} steps: - - uses: actions/checkout@v3.2.0 + - uses: actions/checkout@v3.3.0 with: persist-credentials: false @@ -215,7 +215,7 @@ jobs: if: github.event_name == 'workflow_dispatch' steps: - - uses: actions/checkout@v3.2.0 + - uses: actions/checkout@v3.3.0 with: persist-credentials: false diff --git a/.github/workflows/delete-gcp-resources.yml b/.github/workflows/delete-gcp-resources.yml index 7996b53bfc4..1fa558502ad 100644 --- a/.github/workflows/delete-gcp-resources.yml +++ b/.github/workflows/delete-gcp-resources.yml @@ -182,7 +182,7 @@ jobs: contents: 'read' id-token: 'write' steps: - - uses: actions/checkout@v3.2.0 + - uses: actions/checkout@v3.3.0 with: persist-credentials: false diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 376141ae245..96b2636d1e0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -37,7 +37,7 @@ jobs: - name: Rust files id: changed-files-rust - uses: tj-actions/changed-files@v35.5.6 + uses: tj-actions/changed-files@v35.6.0 with: files: | **/*.rs @@ -49,7 +49,7 @@ jobs: - name: Workflow files id: changed-files-workflows - uses: tj-actions/changed-files@v35.5.6 + uses: tj-actions/changed-files@v35.6.0 with: files: | .github/workflows/*.yml diff --git a/.github/workflows/project-management.yml b/.github/workflows/project-management.yml index 584672354b8..d5944115aa3 100644 --- a/.github/workflows/project-management.yml +++ b/.github/workflows/project-management.yml @@ -12,7 +12,7 @@ jobs: name: Adds all new issues to the "Zebra Backlog" Github project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.4.0 + - uses: actions/add-to-project@v0.4.1 with: project-url: https://github.com/orgs/ZcashFoundation/projects/9 # TODO: use a PAT from a `bot` account we create for the organization @@ -23,7 +23,7 @@ jobs: name: Adds all new issues to the "ZF Engineering Backlog" Github project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.4.0 + - uses: actions/add-to-project@v0.4.1 with: project-url: https://github.com/orgs/ZcashFoundation/projects/13 # TODO: use a PAT from a `bot` account we create for the organization diff --git a/Cargo.lock b/Cargo.lock index 2865aa5f88b..7cc9658bd6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1255,6 +1255,27 @@ dependencies = [ "byteorder", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "eyre" version = "0.6.7" @@ -2003,6 +2024,16 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "ipnet" version = "2.4.0" @@ -2205,6 +2236,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.6" @@ -3095,9 +3132,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3933d3ac2717077b3d5f42b40f59edfb1fb6a8c14e1c7de0f38075c4bac8e314" +checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" dependencies = [ "bytes", "prost-derive", @@ -3125,9 +3162,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9935362e8369bc3acd874caeeae814295c504c2bdbcde5c024089cf8b4dc12" +checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" dependencies = [ "anyhow", "itertools", @@ -3431,15 +3468,6 @@ version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "reqwest" version = "0.11.14" @@ -3572,6 +3600,20 @@ dependencies = [ "semver 1.0.16", ] +[[package]] +name = "rustix" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.42.0", +] + [[package]] name = "rustls" version = "0.20.7" @@ -3728,9 +3770,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sentry" -version = "0.29.3" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f8ce69326daef9d845c3fd17149bd3dbd7caf5dc65dbbad9f5441a40ee407f" +checksum = "b5ce6d3512e2617c209ec1e86b0ca2fea06454cd34653c91092bf0f3ec41f8e3" dependencies = [ "httpdate", "reqwest", @@ -3738,6 +3780,7 @@ dependencies = [ "sentry-backtrace", "sentry-contexts", "sentry-core", + "sentry-tracing", "tokio", "ureq", "webpki-roots", @@ -3745,9 +3788,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.29.3" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed6c0254d4cce319800609aa0d41b486ee57326494802045ff27434fc9a2030" +checksum = "0e7fe408d4d1f8de188a9309916e02e129cbe51ca19e55badea5a64899399b1a" dependencies = [ "backtrace", "once_cell", @@ -3757,9 +3800,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.29.3" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3277dc5d2812562026f2095c7841f3d61bbe6789159b7da54f41d540787f818" +checksum = "5695096a059a89973ec541062d331ff4c9aeef9c2951416c894f0fff76340e7d" dependencies = [ "hostname", "libc", @@ -3771,9 +3814,9 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.29.3" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5acbd3da4255938cf0384b6b140e6c07ff65919c26e4d7a989d8d90ee88fa91" +checksum = "5b22828bfd118a7b660cf7a155002a494755c0424cebb7061e4743ecde9c7dbc" dependencies = [ "once_cell", "rand 0.8.5", @@ -3784,9 +3827,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.29.3" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b4272dc996c37f2ade1d2b9fc8a605956ae6290f01463d30c28d1c6bf29c1b" +checksum = "3f4eda5496b64975306ce37b7ccdc5f264fd1da25c1d5aac324b460edab29ded" dependencies = [ "sentry-core", "tracing-core", @@ -3795,9 +3838,9 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.29.3" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d8587b12c0b8211bb3066979ee57af6e8657e23cf439dc6c8581fd86de24e8" +checksum = "360ee3270f7a4a1eee6c667f7d38360b995431598a73b740dfe420da548d9cc9" dependencies = [ "debugid", "getrandom 0.2.8", @@ -4144,16 +4187,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys 0.42.0", ] [[package]] @@ -5733,7 +5775,6 @@ dependencies = [ "reqwest", "semver 1.0.16", "sentry", - "sentry-tracing", "serde", "serde_json", "tempfile", diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md index ecc8d91ca68..1e39023cd71 100644 --- a/book/src/SUMMARY.md +++ b/book/src/SUMMARY.md @@ -11,6 +11,7 @@ - [Lightwalletd](user/lightwalletd.md) - [zk-SNARK Parameters](user/parameters.md) - [Mining](user/mining.md) + - [Testnet Mining with s-nomp](user/mining-testnet-s-nomp.md) - [Developer Documentation](dev.md) - [Contribution Guide](CONTRIBUTING.md) - [Design Overview](dev/overview.md) diff --git a/book/src/user/mining.md b/book/src/user/mining.md index bb329f0a418..cb7a2be2ccf 100644 --- a/book/src/user/mining.md +++ b/book/src/user/mining.md @@ -175,6 +175,6 @@ If you can see something similar to the following then you are good to go. Just point your mining pool software to the Zebra RPC endpoint (127.0.0.1:8232). Zebra supports the RPC methods needed to run most mining pool software. -If you want to run an experimental `s-nomp` mining pool with Zebra on testnet, please refer to [this document](https://github.com/ZcashFoundation/zebra/blob/main/book/src/user/mining-testnet-s-nomp.md) for a very detailed guide. `s-nomp` is not compatible with NU5, so some mining functions are disabled. +If you want to run an experimental `s-nomp` mining pool with Zebra on testnet, please refer to [this document](mining-testnet-s-nomp.md) for a very detailed guide. `s-nomp` is not compatible with NU5, so some mining functions are disabled. If your mining pool software needs additional support, or if you as a miner need additional RPC methods, then please open a ticket in the [Zebra repository](https://github.com/ZcashFoundation/zebra/issues/new). diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index da587823410..209d7f63532 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -37,7 +37,7 @@ regex = "1.7.1" rlimit = "0.9.1" rocksdb = { version = "0.20.1", default_features = false, features = ["lz4"] } serde = { version = "1.0.152", features = ["serde_derive"] } -tempfile = "3.3.0" +tempfile = "3.4.0" thiserror = "1.0.38" rayon = "1.6.1" diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 1db25151279..7394925f0dd 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -36,4 +36,4 @@ tracing-error = "0.2.0" tracing = "0.1.37" [dev-dependencies] -tempfile = "3.3.0" +tempfile = "3.4.0" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index f45e57ca11b..4d21ea12b7b 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -34,7 +34,7 @@ getblocktemplate-rpcs = [ "zebra-chain/getblocktemplate-rpcs", ] -sentry = ["dep:sentry", "sentry-tracing"] +sentry = ["dep:sentry"] flamegraph = ["tracing-flame", "inferno"] journald = ["tracing-journald"] filter-reload = ["hyper"] @@ -135,8 +135,7 @@ num-integer = "0.1.45" rand = { version = "0.8.5", package = "rand" } # prod feature sentry -sentry-tracing = { version = "0.29.3", optional = true } -sentry = { version = "0.29.3", default-features = false, features = ["backtrace", "contexts", "reqwest", "rustls"], optional = true } +sentry = { version = "0.30.0", default-features = false, features = ["backtrace", "contexts", "reqwest", "rustls", "tracing"], optional = true } # prod feature flamegraph tracing-flame = { version = "0.2.0", optional = true } @@ -180,7 +179,7 @@ semver = "1.0.16" # zebra-rpc needs the preserve_order feature, it also makes test results more stable serde_json = { version = "1.0.93", features = ["preserve_order"] } -tempfile = "3.3.0" +tempfile = "3.4.0" hyper = { version = "0.14.24", features = ["http1", "http2", "server"]} reqwest = "0.11.14" @@ -189,7 +188,7 @@ tokio = { version = "1.25.0", features = ["full", "tracing", "test-util"] } tokio-stream = "0.1.12" # test feature lightwalletd-grpc-tests -prost = "0.11.7" +prost = "0.11.8" tonic = "0.8.0" proptest = "0.10.1" diff --git a/zebrad/src/components/tracing/component.rs b/zebrad/src/components/tracing/component.rs index 6c58a8809ff..35d26caa1e8 100644 --- a/zebrad/src/components/tracing/component.rs +++ b/zebrad/src/components/tracing/component.rs @@ -154,7 +154,7 @@ impl Tracing { let subscriber = subscriber.with(journaldlayer); #[cfg(feature = "sentry")] - let subscriber = subscriber.with(sentry_tracing::layer()); + let subscriber = subscriber.with(sentry::integrations::tracing::layer()); // spawn the console server in the background, and apply the console layer // TODO: set Builder::poll_duration_histogram_max() if needed