Merge branch 'main' into refactor-docker-caching

ZcashFoundation · Sep 4, 2024 · 1b24949 · 1b24949
2 parents 0c0381c + e9bbb97
commit 1b24949
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 59 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -2434,6 +2434,16 @@ dependencies = [
  "lz4-sys",
 ]
 
+[[package]]
+name = "libyml"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980"
+dependencies = [
+ "anyhow",
+ "version_check",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.1.18"
@@ -4071,16 +4081,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
+name = "serde_yml"
+version = "0.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd"
 dependencies = [
  "indexmap 2.3.0",
  "itoa",
+ "libyml",
+ "memchr",
  "ryu",
  "serde",
- "unsafe-libyaml",
+ "version_check",
 ]
 
 [[package]]
@@ -5018,12 +5030,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -5108,9 +5114,9 @@ dependencies = [
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "visibility"
@@ -6318,7 +6324,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yml",
  "structopt",
  "syn 2.0.72",
  "thiserror",

diff --git a/book/src/user/requirements.md b/book/src/user/requirements.md
@@ -1,16 +1,22 @@
 # System Requirements
 
-We recommend the following requirements for compiling and running `zebrad`:
+Zebra has the following hardware requirements.
+
+## Recommended Requirements
 
 - 4 CPU cores
 - 16 GB RAM
-- 300 GB available disk space for building binaries and storing cached chain
-  state
+- 300 GB available disk space 
 - 100 Mbps network connection, with 300 GB of uploads and downloads per month
 
-Zebra's tests can take over an hour, depending on your machine. Note that you
-might be able to build and run Zebra on slower systems — we haven't tested its
-exact limits yet.
+## Minimum Hardware Requirements
+
+- 2 CPU cores
+- 4 GB RAM
+- 300 GB available disk space 
+
+[Zebra has successfully run on an Orange Pi Zero 2W with a 512 GB microSD card
+without any issues.](https://x.com/Zerodartz/status/1811460885996798159)
 
 ## Disk Requirements
 
@@ -48,9 +54,6 @@ networks.
 - Ongoing updates: 10 MB - 10 GB upload and download per day, depending on
   user-created transaction size and peer requests.
 
-Zebra performs an initial sync every time its internal database version changes,
-so some version upgrades might require a full download of the whole chain.
-
 Zebra needs some peers which have a round-trip latency of 2 seconds or less. If
 this is a problem for you, please [open a
 ticket.](https://github.com/ZcashFoundation/zebra/issues/new/choose)
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -127,7 +127,7 @@ COPY ./ ./
 # Entrypoint environment variables
 ENV ENTRYPOINT_FEATURES=${ENTRYPOINT_FEATURES}
 # We repeat the ARGs here, so they are available in the entrypoint.sh script for $RUN_ALL_EXPERIMENTAL_TESTS
-ARG EXPERIMENTAL_FEATURES="shielded-scan journald prometheus filter-reload"
+ARG EXPERIMENTAL_FEATURES="journald prometheus filter-reload"
 ENV ENTRYPOINT_FEATURES_EXPERIMENTAL="${ENTRYPOINT_FEATURES} ${EXPERIMENTAL_FEATURES}"
 
 # By default, runs the entrypoint tests specified by the environmental variables (if any are set)

diff --git a/openapi.yaml b/openapi.yaml
@@ -28,7 +28,7 @@ paths:
                   default: getinfo
                 id:
                   type: string
-                  default: x2r3lRddGL
+                  default: VuJXrxLSw8
                 params:
                   type: array
                   items: {}
@@ -61,7 +61,7 @@ paths:
                   default: getblockchaininfo
                 id:
                   type: string
-                  default: w8Lb0nAvLd
+                  default: HDVqYXM9m6
                 params:
                   type: array
                   items: {}
@@ -99,7 +99,7 @@ paths:
                   default: getaddressbalance
                 id:
                   type: string
-                  default: QbTztoTvRo
+                  default: Xw5TDBKXGl
                 params:
                   type: array
                   items: {}
@@ -147,7 +147,7 @@ paths:
                   default: sendrawtransaction
                 id:
                   type: string
-                  default: aDK5RQWj16
+                  default: QaJv2bXyZu
                 params:
                   type: array
                   items: {}
@@ -196,7 +196,7 @@ paths:
                   default: getblock
                 id:
                   type: string
-                  default: xxCP1d61X0
+                  default: k0DACJrgZs
                 params:
                   type: array
                   items: {}
@@ -239,7 +239,7 @@ paths:
                   default: getbestblockhash
                 id:
                   type: string
-                  default: DoZgd1j7xW
+                  default: rIFaLhZwHF
                 params:
                   type: array
                   items: {}
@@ -272,7 +272,7 @@ paths:
                   default: getbestblockheightandhash
                 id:
                   type: string
-                  default: 0iUFHsOjk3
+                  default: oxrhh1swvh
                 params:
                   type: array
                   items: {}
@@ -305,7 +305,7 @@ paths:
                   default: getrawmempool
                 id:
                   type: string
-                  default: WXG2c6FcCK
+                  default: E7oUD34jk2
                 params:
                   type: array
                   items: {}
@@ -343,7 +343,7 @@ paths:
                   default: z_gettreestate
                 id:
                   type: string
-                  default: 38P0xXV0do
+                  default: Hp22XK728i
                 params:
                   type: array
                   items: {}
@@ -393,7 +393,7 @@ paths:
                   default: z_getsubtreesbyindex
                 id:
                   type: string
-                  default: 662iR8VZGT
+                  default: Cs69hg68pl
                 params:
                   type: array
                   items: {}
@@ -432,7 +432,7 @@ paths:
                   default: getrawtransaction
                 id:
                   type: string
-                  default: UuvVrzSzqC
+                  default: iu395PEErc
                 params:
                   type: array
                   items: {}
@@ -480,7 +480,7 @@ paths:
                   default: getaddresstxids
                 id:
                   type: string
-                  default: KMss2wDMwH
+                  default: z3lOKfsQdp
                 params:
                   type: array
                   items: {}
@@ -528,7 +528,7 @@ paths:
                   default: getaddressutxos
                 id:
                   type: string
-                  default: 4Y6BAhe6Lf
+                  default: '7U4Q4dSxej'
                 params:
                   type: array
                   items: {}
@@ -571,7 +571,7 @@ paths:
                   default: getblockcount
                 id:
                   type: string
-                  default: nzPm5W3X1G
+                  default: '8yw3EX7Cwi'
                 params:
                   type: array
                   items: {}
@@ -609,7 +609,7 @@ paths:
                   default: getblockhash
                 id:
                   type: string
-                  default: KLKosq2Z8E
+                  default: ndDYksCl9E
                 params:
                   type: array
                   items: {}
@@ -657,7 +657,7 @@ paths:
                   default: getblocktemplate
                 id:
                   type: string
-                  default: spj7gKe2AA
+                  default: lJi2hfxty1
                 params:
                   type: array
                   items: {}
@@ -695,7 +695,7 @@ paths:
                   default: submitblock
                 id:
                   type: string
-                  default: QOQsC3nA7z
+                  default: '9fEFOdTQle'
                 params:
                   type: array
                   items: {}
@@ -728,7 +728,7 @@ paths:
                   default: getmininginfo
                 id:
                   type: string
-                  default: Si3Sdb9ICT
+                  default: Dytpq4f3lF
                 params:
                   type: array
                   items: {}
@@ -761,7 +761,7 @@ paths:
                   default: getnetworksolps
                 id:
                   type: string
-                  default: jWvKPdOxDa
+                  default: yX3woRnOaN
                 params:
                   type: array
                   items: {}
@@ -794,7 +794,7 @@ paths:
                   default: getnetworkhashps
                 id:
                   type: string
-                  default: wnFwBVFrN0
+                  default: AyAZMtbezv
                 params:
                   type: array
                   items: {}
@@ -827,7 +827,7 @@ paths:
                   default: getpeerinfo
                 id:
                   type: string
-                  default: NpKiq59CE8
+                  default: nNcrsu3ZAR
                 params:
                   type: array
                   items: {}
@@ -865,7 +865,7 @@ paths:
                   default: validateaddress
                 id:
                   type: string
-                  default: PDjTChWgFW
+                  default: LGyfO7zTjW
                 params:
                   type: array
                   items: {}
@@ -903,7 +903,7 @@ paths:
                   default: z_validateaddress
                 id:
                   type: string
-                  default: aCeb6xbIuo
+                  default: '2Q09a2Nh4N'
                 params:
                   type: array
                   items: {}
@@ -941,7 +941,7 @@ paths:
                   default: getblocksubsidy
                 id:
                   type: string
-                  default: EeBvVXCJon
+                  default: nv6lOWCRso
                 params:
                   type: array
                   items: {}
@@ -984,7 +984,7 @@ paths:
                   default: getdifficulty
                 id:
                   type: string
-                  default: jg2K8N0ZG4
+                  default: '2O3A0PF1SS'
                 params:
                   type: array
                   items: {}
@@ -1022,7 +1022,7 @@ paths:
                   default: z_listunifiedreceivers
                 id:
                   type: string
-                  default: Y3gscsg8yT
+                  default: XYgGcDIx2X
                 params:
                   type: array
                   items: {}

diff --git a/supply-chain/config.toml b/supply-chain/config.toml
@@ -1,4 +1,3 @@
-
 # cargo-vet config file
 
 [cargo-vet]
@@ -1414,10 +1413,6 @@ criteria = "safe-to-deploy"
 version = "3.8.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.serde_yaml]]
-version = "0.9.34+deprecated"
-criteria = "safe-to-deploy"
-
 [[exemptions.sha2]]
 version = "0.10.8"
 criteria = "safe-to-deploy"

diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml
@@ -77,7 +77,7 @@ openapi-generator = [
     "zebra-rpc",
     "syn",
     "quote",
-    "serde_yaml",
+    "serde_yml",
     "serde"
 ]
 
@@ -121,7 +121,7 @@ zcash_protocol.workspace = true
 rand = "0.8.5"
 syn = { version = "2.0.72", features = ["full"], optional = true }
 quote = { version = "1.0.36", optional = true }
-serde_yaml = { version = "0.9.34+deprecated", optional = true }
+serde_yml = { version = "0.0.12", optional = true }
 serde = { version = "1.0.204", features = ["serde_derive"], optional = true }
 indexmap = "2.3.0"
 
diff --git a/zebra-utils/README.md b/zebra-utils/README.md
@@ -112,7 +112,7 @@ This program is commonly used as part of `zebrad-log-filter` where hashes will b
 
 The program is designed to filter the output from the zebra terminal or log file. Each time a hash is seen the script will capture it and get the additional information using `zebrad-hash-lookup`.
 
-Assuming `zebrad`, `zclash-cli`, `zebrad-hash-lookup` and `zebrad-log-filter` are in your path the program can used as:
+Assuming `zebrad`, `zcash-cli`, `zebrad-hash-lookup` and `zebrad-log-filter` are in your path the program can used as:
 
 ```sh
 $ zebrad -v start | zebrad-log-filter