From 09e7c117e65cf554b1c79f1acb9bfb144a61ab25 Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 19 Dec 2022 10:06:43 -0400 Subject: [PATCH 01/12] fix(ci): remove warnings caused by missing `actions/checkout` --- .github/workflows/continous-delivery.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml index 04828142ed9..1b063f1f741 100644 --- a/.github/workflows/continous-delivery.yml +++ b/.github/workflows/continous-delivery.yml @@ -99,6 +99,10 @@ jobs: if: ${{ !cancelled() && !failure() && ((github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'release') }} steps: + - uses: actions/checkout@v3.2.0 + with: + persist-credentials: false + - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 with: @@ -189,6 +193,10 @@ jobs: if: github.event_name == 'workflow_dispatch' steps: + - uses: actions/checkout@v3.2.0 + with: + persist-credentials: false + - name: Inject slug/short variables uses: rlespinasse/github-slug-action@v4 with: From 9c5c60a114ef74e68dcc65b4700140d7b5cb04ac Mon Sep 17 00:00:00 2001 From: arya2 Date: Thu, 22 Dec 2022 20:02:35 -0500 Subject: [PATCH 02/12] Updates design overview page of book with: - a simplified graph of service dependencies in design overview - links to notable blog posts - removals of some out-of-date text also corrects issue/pr refs in an rfc --- book/book.toml | 1 + .../src/dev/diagrams/service-dependencies.svg | 115 ++++++++++++++++++ book/src/dev/overview.md | 12 +- .../dev/rfcs/0001-pipelinable-block-lookup.md | 5 +- book/theme/css/custom.css | 10 ++ 5 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 book/src/dev/diagrams/service-dependencies.svg create mode 100644 book/theme/css/custom.css diff --git a/book/book.toml b/book/book.toml index 1356c961dc2..340da4f7c96 100644 --- a/book/book.toml +++ b/book/book.toml @@ -14,3 +14,4 @@ command = "mdbook-mermaid" [output.html] additional-js = ["mermaid.min.js", "mermaid-init.js"] +additional-css = ["theme/css/custom.css"] diff --git a/book/src/dev/diagrams/service-dependencies.svg b/book/src/dev/diagrams/service-dependencies.svg new file mode 100644 index 00000000000..ebf60d11176 --- /dev/null +++ b/book/src/dev/diagrams/service-dependencies.svg @@ -0,0 +1,115 @@ + + +services + + + +state + +state + + + +transaction_verifier + +transaction_verifier + + + +state->transaction_verifier + + + + + +mempool + +mempool + + + +state->mempool + + + + + +chain_verifier + +chain_verifier + + + +state->chain_verifier + + + + + +transaction_verifier->mempool + + + + + +transaction_verifier->chain_verifier + + + + + +inbound + +inbound + + + +mempool->inbound + + + + + +chain_verifier->inbound + + + + + +syncer + +syncer + + + +chain_verifier->syncer + + + + + +peer_set + +peer_set + + + +inbound->peer_set + + + + + +peer_set->mempool + + + + + +peer_set->syncer + + + + + \ No newline at end of file diff --git a/book/src/dev/overview.md b/book/src/dev/overview.md index 8ad85403391..0b825b41cad 100644 --- a/book/src/dev/overview.md +++ b/book/src/dev/overview.md @@ -1,6 +1,6 @@ # Design Overview -This document sketches the future design for Zebra. +This document sketches the design for Zebra. ## Desiderata @@ -34,6 +34,15 @@ The following are general desiderata for Zebra: lightweight applications like light wallets. Those applications should use a light client protocol. +## Notable Blog Posts +- [A New Network Stack For Zcash](https://www.zfnd.org/blog/a-new-network-stack-for-zcash) +- [Composable Futures-based Batch Verification](https://www.zfnd.org/blog/futures-batch-verification) +- [Decoding Bitcoin Messages with Tokio Codecs](https://www.zfnd.org/blog/decoding-bitcoin-messages-with-tokio-codecs) + +## Service Dependencies + +![Service Dependencies](diagrams/service-dependencies.svg) + ## Architecture Unlike `zcashd`, which originated as a Bitcoin Core fork and inherited its @@ -278,7 +287,6 @@ verify blocks or transactions, and add them to the relevant state. #### Internal Dependencies - `zebra-chain` for data structure definitions -- `zebra-network` possibly? for definitions of network messages? #### Responsible for diff --git a/book/src/dev/rfcs/0001-pipelinable-block-lookup.md b/book/src/dev/rfcs/0001-pipelinable-block-lookup.md index 94ce707abd3..0c7ad66bde1 100644 --- a/book/src/dev/rfcs/0001-pipelinable-block-lookup.md +++ b/book/src/dev/rfcs/0001-pipelinable-block-lookup.md @@ -1,8 +1,7 @@ - Feature Name: Pipelinable Block Syncing and Lookup - Start Date: 2020-07-02 -- Design PR: [rust-lang/rfcs#0000](https://github.com/rust-lang/rfcs/pull/0000) -- Rust Issue: [rust-lang/rust#0000](https://github.com/rust-lang/rust/issues/0000) - +- Design PR: [ZcashFoundation/zebra#583](https://github.com/ZcashFoundation/zebra/pull/583) +- Zebra Issue: [ZcashFoundation/zebra#504](https://github.com/ZcashFoundation/zebra/issues/504) # Summary [summary]: #summary diff --git a/book/theme/css/custom.css b/book/theme/css/custom.css new file mode 100644 index 00000000000..908dbd4602d --- /dev/null +++ b/book/theme/css/custom.css @@ -0,0 +1,10 @@ +img[src = "diagrams/service-dependencies.svg"] { + display: block; + margin: 0px auto; +} + +html.navy img[src = "diagrams/service-dependencies.svg"], +html.ayu img[src = "diagrams/service-dependencies.svg"], +html.coal img[src = "diagrams/service-dependencies.svg"] { + filter: invert(1); +} \ No newline at end of file From f2520bfd023164bdd81c667f7ea49e9dce122919 Mon Sep 17 00:00:00 2001 From: arya2 Date: Wed, 4 Jan 2023 19:22:46 -0500 Subject: [PATCH 03/12] Updates service dependencies diagram --- .../src/dev/diagrams/service-dependencies.svg | 239 ++++++++++++------ book/src/dev/overview.md | 2 + 2 files changed, 163 insertions(+), 78 deletions(-) diff --git a/book/src/dev/diagrams/service-dependencies.svg b/book/src/dev/diagrams/service-dependencies.svg index ebf60d11176..b8fdc9a249c 100644 --- a/book/src/dev/diagrams/service-dependencies.svg +++ b/book/src/dev/diagrams/service-dependencies.svg @@ -1,115 +1,198 @@ - + --> + services - - + -state - -state +transaction_verifier + +transaction_verifier - + -transaction_verifier - -transaction_verifier +state + +state - + -state->transaction_verifier - - +transaction_verifier->state + + mempool - -mempool + +mempool - + + +mempool->transaction_verifier + + + + -state->mempool - - +mempool->state + + + + + +peer_set + +peer_set + + + +mempool->peer_set + + chain_verifier - -chain_verifier + +chain_verifier - + -state->chain_verifier - - +chain_verifier->state + + - - -transaction_verifier->mempool - - + + +checkpoint_verifier + +checkpoint_verifier - - -transaction_verifier->chain_verifier - - + + +chain_verifier->checkpoint_verifier + + + + + +block_verifier + +block_verifier + + + +chain_verifier->block_verifier + + inbound - -inbound - - - -mempool->inbound - - - - - -chain_verifier->inbound - - + +inbound - - -syncer - -syncer + + +inbound->state + + - + -chain_verifier->syncer - - +inbound->mempool + + - - -peer_set - -peer_set + + +inbound->chain_verifier + + - + inbound->peer_set - - + + - - -peer_set->mempool - - + + +rpc_server + +rpc_server - - -peer_set->syncer - - + + +rpc_server->state + + + + + +rpc_server->mempool + + + + + +rpc_server->chain_verifier + + + + + +syncer + +syncer + + + +rpc_server->syncer + + + + + +rpc_server->peer_set + + + + + +checkpoint_verifier->state + + + + + +syncer->chain_verifier + + + + + +syncer->peer_set + + + + + +peer_set->inbound + + + + + +block_verifier->transaction_verifier + + + + + +block_verifier->state + + \ No newline at end of file diff --git a/book/src/dev/overview.md b/book/src/dev/overview.md index 0b825b41cad..13aaf9d3e46 100644 --- a/book/src/dev/overview.md +++ b/book/src/dev/overview.md @@ -41,6 +41,8 @@ The following are general desiderata for Zebra: ## Service Dependencies +Note: dotted lines are for "getblocktemplate-rpcs" feature + ![Service Dependencies](diagrams/service-dependencies.svg) ## Architecture From 63cee81e84769719568356cf8d17f5c7d7cc87b3 Mon Sep 17 00:00:00 2001 From: Arya Date: Wed, 4 Jan 2023 19:24:31 -0500 Subject: [PATCH 04/12] Apply suggestions from code review Co-authored-by: teor --- book/src/dev/overview.md | 2 ++ book/src/dev/rfcs/0001-pipelinable-block-lookup.md | 1 + 2 files changed, 3 insertions(+) diff --git a/book/src/dev/overview.md b/book/src/dev/overview.md index 13aaf9d3e46..ec7b0a63197 100644 --- a/book/src/dev/overview.md +++ b/book/src/dev/overview.md @@ -289,6 +289,8 @@ verify blocks or transactions, and add them to the relevant state. #### Internal Dependencies - `zebra-chain` for data structure definitions +- `zebra-node-services` for shared request type definitions +- `zebra-utils` for developer and power user tools #### Responsible for diff --git a/book/src/dev/rfcs/0001-pipelinable-block-lookup.md b/book/src/dev/rfcs/0001-pipelinable-block-lookup.md index 0c7ad66bde1..0dc24a22042 100644 --- a/book/src/dev/rfcs/0001-pipelinable-block-lookup.md +++ b/book/src/dev/rfcs/0001-pipelinable-block-lookup.md @@ -2,6 +2,7 @@ - Start Date: 2020-07-02 - Design PR: [ZcashFoundation/zebra#583](https://github.com/ZcashFoundation/zebra/pull/583) - Zebra Issue: [ZcashFoundation/zebra#504](https://github.com/ZcashFoundation/zebra/issues/504) + # Summary [summary]: #summary From 5eb64d0fab305bc9d032aa7dd9f173c5ec916e12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jan 2023 16:00:37 +0000 Subject: [PATCH 05/12] build(deps): bump tj-actions/changed-files from 35.3.1 to 35.4.0 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 35.3.1 to 35.4.0. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v35.3.1...v35.4.0) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 067ef553682..d0ac7aa7ddc 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.3.1 + uses: tj-actions/changed-files@v35.4.0 with: files: | **/*.rs @@ -49,7 +49,7 @@ jobs: - name: Workflow files id: changed-files-workflows - uses: tj-actions/changed-files@v35.3.1 + uses: tj-actions/changed-files@v35.4.0 with: files: | .github/workflows/*.yml From f601bf39b515a6ecb0cd26286b6cdfac193cd444 Mon Sep 17 00:00:00 2001 From: arya2 Date: Fri, 6 Jan 2023 17:04:26 -0500 Subject: [PATCH 06/12] updates diagram and adds doc links --- .../src/dev/diagrams/service-dependencies.svg | 274 ++++++++---------- book/src/dev/overview.md | 31 +- book/theme/css/custom.css | 13 +- 3 files changed, 164 insertions(+), 154 deletions(-) diff --git a/book/src/dev/diagrams/service-dependencies.svg b/book/src/dev/diagrams/service-dependencies.svg index b8fdc9a249c..3ebd62bdf56 100644 --- a/book/src/dev/diagrams/service-dependencies.svg +++ b/book/src/dev/diagrams/service-dependencies.svg @@ -1,198 +1,174 @@ - - + + + + + + services - + transaction_verifier - -transaction_verifier - + +transaction_verifier + - + state - -state - + +state + -transaction_verifier->state - - +transaction_verifier->state + + - + mempool - -mempool - + +mempool + - -mempool->transaction_verifier - - + +mempool->transaction_verifier + + -mempool->state - - +mempool->state + + - + peer_set - -peer_set - + +peer_set + - -mempool->peer_set - - - - - -chain_verifier - -chain_verifier - - - -chain_verifier->state - - - - - -checkpoint_verifier - -checkpoint_verifier - - - -chain_verifier->checkpoint_verifier - - - - - -block_verifier - -block_verifier - - - -chain_verifier->block_verifier - - + +mempool->peer_set + + - + inbound - -inbound - + +inbound + - -inbound->state - - + +inbound->state + + - -inbound->mempool - - + +inbound->mempool + + + + +chain_verifier + +chain_verifier + - -inbound->chain_verifier - - - - - -inbound->peer_set - - + +inbound->chain_verifier + + - + rpc_server - -rpc_server - + +rpc_server + - -rpc_server->state - - + +rpc_server->state + + - -rpc_server->mempool - - + +rpc_server->mempool + + - -rpc_server->chain_verifier - - - - - -syncer - -syncer + +rpc_server->chain_verifier + + - - -rpc_server->syncer - - + + +checkpoint_verifier + +checkpoint_verifier + + + +chain_verifier->checkpoint_verifier + + - - -rpc_server->peer_set - - + + +block_verifier + +block_verifier + + + +chain_verifier->block_verifier + + - -checkpoint_verifier->state - - + +checkpoint_verifier->state + + + + +syncer + +syncer + - -syncer->chain_verifier - - + +syncer->chain_verifier + + - -syncer->peer_set - - - - - -peer_set->inbound - - + +syncer->peer_set + + - -block_verifier->transaction_verifier - - + +block_verifier->transaction_verifier + + - -block_verifier->state - - + +block_verifier->state + + \ No newline at end of file diff --git a/book/src/dev/overview.md b/book/src/dev/overview.md index ec7b0a63197..f224b1a953a 100644 --- a/book/src/dev/overview.md +++ b/book/src/dev/overview.md @@ -43,7 +43,36 @@ The following are general desiderata for Zebra: Note: dotted lines are for "getblocktemplate-rpcs" feature -![Service Dependencies](diagrams/service-dependencies.svg) +
+{{#include diagrams/service-dependencies.svg}} +
+ + ## Architecture diff --git a/book/theme/css/custom.css b/book/theme/css/custom.css index 908dbd4602d..495c0d89ad7 100644 --- a/book/theme/css/custom.css +++ b/book/theme/css/custom.css @@ -1,10 +1,15 @@ -img[src = "diagrams/service-dependencies.svg"] { +#service-dep-diagram { display: block; margin: 0px auto; } -html.navy img[src = "diagrams/service-dependencies.svg"], -html.ayu img[src = "diagrams/service-dependencies.svg"], -html.coal img[src = "diagrams/service-dependencies.svg"] { +#service-dep-diagram a:hover { + text-decoration: none; + filter: drop-shadow(0 0 4px #000); +} + +html.navy #service-dep-diagram, +html.ayu #service-dep-diagram, +html.coal #service-dep-diagram { filter: invert(1); } \ No newline at end of file From ca8fd7e650cd60a7c7e4d2c4ae6744ef28ccdc2d Mon Sep 17 00:00:00 2001 From: arya2 Date: Fri, 6 Jan 2023 18:03:57 -0500 Subject: [PATCH 07/12] uses opacity to indicate clickability instead of drop shadow --- book/theme/css/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/theme/css/custom.css b/book/theme/css/custom.css index 495c0d89ad7..62fb70f38ea 100644 --- a/book/theme/css/custom.css +++ b/book/theme/css/custom.css @@ -5,7 +5,7 @@ #service-dep-diagram a:hover { text-decoration: none; - filter: drop-shadow(0 0 4px #000); + opacity: 0.65; } html.navy #service-dep-diagram, From 9619258ded67a95000717d4fd032f68d5d489cc5 Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 9 Jan 2023 10:48:52 -0400 Subject: [PATCH 08/12] fix: typo in arguments --- .github/workflows/continous-delivery.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml index 1b063f1f741..e5ae282fcf3 100644 --- a/.github/workflows/continous-delivery.yml +++ b/.github/workflows/continous-delivery.yml @@ -225,7 +225,7 @@ jobs: --container-stdin \ --container-tty \ --container-image ${{ env.GAR_BASE }}/zebrad@${{ needs.build.outputs.image_digest }} \ - --create-disk=name=auto-delete=yes,size=300GB,type=pd-ssd \ + --create-disk=auto-delete=yes,size=300GB,type=pd-ssd \ --container-mount-disk=mount-path='/zebrad-cache' \ --machine-type ${{ env.MACHINE_TYPE }} \ --zone ${{ env.ZONE }} \ From f67d7e656dbf4f6da8474da560148cebff912442 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:01:24 +0000 Subject: [PATCH 09/12] build(deps): bump insta from 1.24.1 to 1.26.0 Bumps [insta](https://github.com/mitsuhiko/insta) from 1.24.1 to 1.26.0. - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/insta/compare/1.24.1...1.26.0) --- updated-dependencies: - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 21 +++++---------------- zebra-rpc/Cargo.toml | 2 +- zebra-state/Cargo.toml | 2 +- zebra-test/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf836e60e28..1b7512807d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -788,15 +788,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -1998,9 +1997,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.24.1" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5686bd8e9239eabe90bb30a0c341bffd6fdc177fb556708f2cb792bf00352d" +checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" dependencies = [ "console", "lazy_static", @@ -4146,16 +4145,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "textwrap" version = "0.11.0" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index d48ab38300c..c6c59506e45 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -70,7 +70,7 @@ zebra-script = { path = "../zebra-script" } zebra-state = { path = "../zebra-state" } [dev-dependencies] -insta = { version = "1.24.1", features = ["redactions", "json", "ron"] } +insta = { version = "1.26.0", features = ["redactions", "json", "ron"] } proptest = "0.10.1" proptest-derive = "0.3.0" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index b7f70d9f3c1..374b8f34f45 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -62,7 +62,7 @@ once_cell = "1.17.0" spandoc = "0.2.2" hex = { version = "0.4.3", features = ["serde"] } -insta = { version = "1.24.1", features = ["ron"] } +insta = { version = "1.26.0", features = ["ron"] } proptest = "0.10.1" proptest-derive = "0.3.0" diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 64a9d38b71d..931de4588a5 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" hex = "0.4.3" indexmap = "1.9.2" lazy_static = "1.4.0" -insta = "1.24.1" +insta = "1.26.0" proptest = "0.10.1" once_cell = "1.17.0" rand = { version = "0.8.5", package = "rand" } From 5270b7ee6847ad7e6f5d492c59c53f6218c5b1af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 16:01:38 +0000 Subject: [PATCH 10/12] build(deps): bump regex from 1.7.0 to 1.7.1 Bumps [regex](https://github.com/rust-lang/regex) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- zebra-network/Cargo.toml | 2 +- zebra-state/Cargo.toml | 2 +- zebra-test/Cargo.toml | 2 +- zebrad/Cargo.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf836e60e28..a75227561fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3397,9 +3397,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 16de0b526a4..7c8532f7258 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -26,7 +26,7 @@ ordered-map = "0.4.2" pin-project = "1.0.12" rand = { version = "0.8.5", package = "rand" } rayon = "1.6.1" -regex = "1.7.0" +regex = "1.7.1" serde = { version = "1.0.152", features = ["serde_derive"] } thiserror = "1.0.38" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index b7f70d9f3c1..560df90612e 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -34,7 +34,7 @@ itertools = "0.10.5" lazy_static = "1.4.0" metrics = "0.20.1" mset = "0.1.0" -regex = "1.7.0" +regex = "1.7.1" rlimit = "0.9.0" rocksdb = { version = "0.19.0", default_features = false, features = ["lz4"] } serde = { version = "1.0.152", features = ["serde_derive"] } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 64a9d38b71d..5b3f39e4190 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -15,7 +15,7 @@ insta = "1.24.1" proptest = "0.10.1" once_cell = "1.17.0" rand = { version = "0.8.5", package = "rand" } -regex = "1.7.0" +regex = "1.7.1" tokio = { version = "1.24.1", features = ["full", "tracing", "test-util"] } tower = { version = "0.4.13", features = ["util"] } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 29b117e16f2..abb761eda35 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -168,7 +168,7 @@ tonic-build = { version = "0.8.0", optional = true } abscissa_core = { version = "0.5", features = ["testing"] } hex = "0.4.3" once_cell = "1.17.0" -regex = "1.7.0" +regex = "1.7.1" semver = "1.0.16" # zebra-rpc needs the preserve_order feature, it also makes test results more stable From c4ae96724695ca28dee01ec52149c08dc43b0ea2 Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 9 Jan 2023 16:06:16 -0400 Subject: [PATCH 11/12] fix: add the whole disk name as this is a single instance --- .github/workflows/continous-delivery.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml index e5ae282fcf3..8a680c9752d 100644 --- a/.github/workflows/continous-delivery.yml +++ b/.github/workflows/continous-delivery.yml @@ -226,6 +226,7 @@ jobs: --container-tty \ --container-image ${{ env.GAR_BASE }}/zebrad@${{ needs.build.outputs.image_digest }} \ --create-disk=auto-delete=yes,size=300GB,type=pd-ssd \ + --create-disk=name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }},auto-delete=yes,size=300GB,type=pd-ssd \ --container-mount-disk=mount-path='/zebrad-cache' \ --machine-type ${{ env.MACHINE_TYPE }} \ --zone ${{ env.ZONE }} \ From 40007ff8bff502bfd41aa619da172ed5da2ad21b Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 9 Jan 2023 16:07:30 -0400 Subject: [PATCH 12/12] fix: add dis name to mount --- .github/workflows/continous-delivery.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continous-delivery.yml b/.github/workflows/continous-delivery.yml index 8a680c9752d..1adb5297d70 100644 --- a/.github/workflows/continous-delivery.yml +++ b/.github/workflows/continous-delivery.yml @@ -227,7 +227,7 @@ jobs: --container-image ${{ env.GAR_BASE }}/zebrad@${{ needs.build.outputs.image_digest }} \ --create-disk=auto-delete=yes,size=300GB,type=pd-ssd \ --create-disk=name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }},auto-delete=yes,size=300GB,type=pd-ssd \ - --container-mount-disk=mount-path='/zebrad-cache' \ + --container-mount-disk=mount-path='/zebrad-cache',name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }} \ --machine-type ${{ env.MACHINE_TYPE }} \ --zone ${{ env.ZONE }} \ --labels=app=zebrad,environment=qa,network=${NETWORK},github_ref=${{ env.GITHUB_REF_SLUG_URL }} \