Commit 1fd697f
committed
62f9f2b bitcoind: extract `libexec/bitcoin-node` and `bin/bitcoin-cli` alongside `bitcoind` (Толли)
Pull request description:
The build script previously extracted only `bin/bitcoind` from the downloaded tarball and discarded the rest. Downstream crates that need `bin/bitcoin-cli` or since v30 -the multiprocess `libexec/bitcoin-node` had to maintain their own download + unpack logic, defeating the point of corepc's auto-download. sv2-apps is one such crate: it carries a manual download + extract + macOS codesigning block specifically to get at `libexec/bitcoin-node` for `-ipcbind=unix`.
This PR extends the extraction filter to pull `bin/bitcoind`, `bin/bitcoin-cli`, and (when feature `30_0`+ is enabled) `libexec/bitcoin-node` from the `.tar.gz`. The cache-completeness check and the macOS arm64 ad-hoc signing pass are updated to match.
Closes #566
## Tested
- `cargo build --features "30_2 download"` from a clean cache: all three binaries on disk, all `codesign -v` pass, `bitcoin-node -regtest -ipcbind=unix` creates `regtest/node.sock`.
- `cargo build --features "23_2 download"`: extracts `bitcoind` + `bitcoin-cli` only (no `libexec/bitcoin-node` in pre-v30 tarballs); rebuild cache-hits, no re-download loop.
- Tarball layout verified identical across `bitcoin-30.2-x86_64-linux-gnu.tar.gz` and `bitcoin-30.2-arm64-apple-darwin.tar.gz`.
ACKs for top commit:
tcharding:
ACK 62f9f2b
Tree-SHA512: 51d7c9c83f90545da83b046f3c2b13e3c500ce113053e5450e2de7056578549e6551bf2f64bb40ba1613e2156ff02e168f364dd1c5500650defaec58a76ac891
1 file changed
Lines changed: 42 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
88 | | - | |
| 87 | + | |
| 88 | + | |
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
96 | 104 | | |
97 | 105 | | |
98 | 106 | | |
| |||
139 | 147 | | |
140 | 148 | | |
141 | 149 | | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
142 | 155 | | |
143 | 156 | | |
144 | 157 | | |
145 | | - | |
| 158 | + | |
146 | 159 | | |
147 | 160 | | |
148 | 161 | | |
| |||
175 | 188 | | |
176 | 189 | | |
177 | 190 | | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
188 | | - | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
196 | 216 | | |
197 | 217 | | |
198 | 218 | | |
| |||
0 commit comments