Skip to content

Commit 11b8786

Browse files
committed
Merge rust-bitcoin#591: Commit "minimal" and "latest" lockfiles
bd9d3c9 test: pin 'half' dependency on 1.41.1. (Andrew Poelstra) 7fc8419 cargo fmt (Andrew Poelstra) 1b12cc5 contrib: commit "minimal" and "latest" tested lockfiles (Andrew Poelstra) 0494f50 fix correct minimal versions for serde crates (Andrew Poelstra) b03602b tests: replace cbor with more-recently-deprecated serde_cbor (Andrew Poelstra) Pull request description: This is a proposed strategy for maintaining tested lockfiles in the rust-bitcoin ecosystem. The idea is that we would have both a "minimal" and a "latest" lockfile, and in both cases we have trusted crev reviews for all dependencies (this is not implemented here, I'd like to start by committing the lockfiles so we can agree what to review). Periodically we can update the "latest" one to reflect new versions of deps that we've gotten around to reviewing. I have local nix build scripts that are able to test every commit of proposed PRs against both lockfiles. In CI it is probably reasonable to at least do `cargo test --locked --all-features` with both of them, to make sure that the tests at least pass on each PR with them. Thoughts? ACKs for top commit: sanket1729: ACK bd9d3c9. Verified the lockfiles. The latest one has a couple lines diff, but that is expected :) . minimal one is the same Tree-SHA512: 6f14406a595aa6a6006b35828080b00b1b87209cb3dd6512c0e08eb92ae1ff27df005494189504cd5654eac1607cc98e902ccdd62b221cb865652c29dd958463
2 parents b7e38eb + bd9d3c9 commit 11b8786

File tree

5 files changed

+925
-17
lines changed

5 files changed

+925
-17
lines changed

Cargo.toml

+3-7
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ global-context-less-secure = ["global-context"]
3838

3939
[dependencies]
4040
secp256k1-sys = { version = "0.8.1", default-features = false, path = "./secp256k1-sys" }
41-
serde = { version = "1.0", default-features = false, optional = true }
41+
serde = { version = "1.0.103", default-features = false, optional = true }
4242

4343
# You likely only want to enable these if you explicitly do not want to use "std", otherwise enable
4444
# the respective -std feature e.g., bitcoin-hashes-std
@@ -47,14 +47,10 @@ rand = { version = "0.8", default-features = false, optional = true }
4747

4848
[dev-dependencies]
4949
rand_core = "0.6"
50-
serde_test = "1.0"
50+
serde_cbor = "0.10.0"
51+
serde_test = "1.0.19"
5152
bincode = "1.3.3"
5253

53-
# cbor does not build on WASM, we use it in a single trivial test (an example of when
54-
# fixed-width-serde breaks down). Just run the test when on an x86_64 machine.
55-
[target.'cfg(target_arch = "x86_64")'.dev-dependencies]
56-
cbor = "0.4.1"
57-
5854
[target.wasm32-unknown-unknown.dev-dependencies]
5955
wasm-bindgen-test = "0.3"
6056
getrandom = { version = "0.2", features = ["js"] }

contrib/Cargo.latest.lock

+343
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,343 @@
1+
# This file is automatically @generated by Cargo.
2+
# It is not intended for manual editing.
3+
version = 3
4+
5+
[[package]]
6+
name = "bincode"
7+
version = "1.3.3"
8+
source = "registry+https://github.com/rust-lang/crates.io-index"
9+
checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
10+
dependencies = [
11+
"serde",
12+
]
13+
14+
[[package]]
15+
name = "bitcoin-private"
16+
version = "0.1.0"
17+
source = "registry+https://github.com/rust-lang/crates.io-index"
18+
checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57"
19+
20+
[[package]]
21+
name = "bitcoin_hashes"
22+
version = "0.12.0"
23+
source = "registry+https://github.com/rust-lang/crates.io-index"
24+
checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501"
25+
dependencies = [
26+
"bitcoin-private",
27+
]
28+
29+
[[package]]
30+
name = "bumpalo"
31+
version = "3.12.0"
32+
source = "registry+https://github.com/rust-lang/crates.io-index"
33+
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
34+
35+
[[package]]
36+
name = "byteorder"
37+
version = "1.4.3"
38+
source = "registry+https://github.com/rust-lang/crates.io-index"
39+
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
40+
41+
[[package]]
42+
name = "cc"
43+
version = "1.0.79"
44+
source = "registry+https://github.com/rust-lang/crates.io-index"
45+
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
46+
47+
[[package]]
48+
name = "cfg-if"
49+
version = "1.0.0"
50+
source = "registry+https://github.com/rust-lang/crates.io-index"
51+
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
52+
53+
[[package]]
54+
name = "console_error_panic_hook"
55+
version = "0.1.7"
56+
source = "registry+https://github.com/rust-lang/crates.io-index"
57+
checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
58+
dependencies = [
59+
"cfg-if",
60+
"wasm-bindgen",
61+
]
62+
63+
[[package]]
64+
name = "getrandom"
65+
version = "0.2.8"
66+
source = "registry+https://github.com/rust-lang/crates.io-index"
67+
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
68+
dependencies = [
69+
"cfg-if",
70+
"js-sys",
71+
"libc",
72+
"wasi",
73+
"wasm-bindgen",
74+
]
75+
76+
[[package]]
77+
name = "half"
78+
version = "1.8.2"
79+
source = "registry+https://github.com/rust-lang/crates.io-index"
80+
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
81+
82+
[[package]]
83+
name = "js-sys"
84+
version = "0.3.61"
85+
source = "registry+https://github.com/rust-lang/crates.io-index"
86+
checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
87+
dependencies = [
88+
"wasm-bindgen",
89+
]
90+
91+
[[package]]
92+
name = "libc"
93+
version = "0.2.140"
94+
source = "registry+https://github.com/rust-lang/crates.io-index"
95+
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
96+
97+
[[package]]
98+
name = "log"
99+
version = "0.4.17"
100+
source = "registry+https://github.com/rust-lang/crates.io-index"
101+
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
102+
dependencies = [
103+
"cfg-if",
104+
]
105+
106+
[[package]]
107+
name = "once_cell"
108+
version = "1.17.1"
109+
source = "registry+https://github.com/rust-lang/crates.io-index"
110+
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
111+
112+
[[package]]
113+
name = "ppv-lite86"
114+
version = "0.2.17"
115+
source = "registry+https://github.com/rust-lang/crates.io-index"
116+
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
117+
118+
[[package]]
119+
name = "proc-macro2"
120+
version = "1.0.52"
121+
source = "registry+https://github.com/rust-lang/crates.io-index"
122+
checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
123+
dependencies = [
124+
"unicode-ident",
125+
]
126+
127+
[[package]]
128+
name = "quote"
129+
version = "1.0.26"
130+
source = "registry+https://github.com/rust-lang/crates.io-index"
131+
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
132+
dependencies = [
133+
"proc-macro2",
134+
]
135+
136+
[[package]]
137+
name = "rand"
138+
version = "0.8.5"
139+
source = "registry+https://github.com/rust-lang/crates.io-index"
140+
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
141+
dependencies = [
142+
"libc",
143+
"rand_chacha",
144+
"rand_core",
145+
]
146+
147+
[[package]]
148+
name = "rand_chacha"
149+
version = "0.3.1"
150+
source = "registry+https://github.com/rust-lang/crates.io-index"
151+
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
152+
dependencies = [
153+
"ppv-lite86",
154+
"rand_core",
155+
]
156+
157+
[[package]]
158+
name = "rand_core"
159+
version = "0.6.4"
160+
source = "registry+https://github.com/rust-lang/crates.io-index"
161+
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
162+
dependencies = [
163+
"getrandom",
164+
]
165+
166+
[[package]]
167+
name = "scoped-tls"
168+
version = "1.0.1"
169+
source = "registry+https://github.com/rust-lang/crates.io-index"
170+
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
171+
172+
[[package]]
173+
name = "secp256k1"
174+
version = "0.27.0"
175+
dependencies = [
176+
"bincode",
177+
"bitcoin_hashes",
178+
"getrandom",
179+
"rand",
180+
"rand_core",
181+
"secp256k1-sys",
182+
"serde",
183+
"serde_cbor",
184+
"serde_test",
185+
"wasm-bindgen-test",
186+
]
187+
188+
[[package]]
189+
name = "secp256k1-sys"
190+
version = "0.8.1"
191+
dependencies = [
192+
"cc",
193+
"libc",
194+
]
195+
196+
[[package]]
197+
name = "serde"
198+
version = "1.0.157"
199+
source = "registry+https://github.com/rust-lang/crates.io-index"
200+
checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca"
201+
202+
[[package]]
203+
name = "serde_cbor"
204+
version = "0.10.2"
205+
source = "registry+https://github.com/rust-lang/crates.io-index"
206+
checksum = "f7081ed758ec726a6ed8ee7e92f5d3f6e6f8c3901b1f972e3a4a2f2599fad14f"
207+
dependencies = [
208+
"byteorder",
209+
"half",
210+
"serde",
211+
]
212+
213+
[[package]]
214+
name = "serde_test"
215+
version = "1.0.157"
216+
source = "registry+https://github.com/rust-lang/crates.io-index"
217+
checksum = "4231c6fab29d02b3cc705db3422aa36f7d23f1e1c096c947c8b8816d7c43dd45"
218+
dependencies = [
219+
"serde",
220+
]
221+
222+
[[package]]
223+
name = "syn"
224+
version = "1.0.109"
225+
source = "registry+https://github.com/rust-lang/crates.io-index"
226+
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
227+
dependencies = [
228+
"proc-macro2",
229+
"quote",
230+
"unicode-ident",
231+
]
232+
233+
[[package]]
234+
name = "unicode-ident"
235+
version = "1.0.8"
236+
source = "registry+https://github.com/rust-lang/crates.io-index"
237+
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
238+
239+
[[package]]
240+
name = "wasi"
241+
version = "0.11.0+wasi-snapshot-preview1"
242+
source = "registry+https://github.com/rust-lang/crates.io-index"
243+
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
244+
245+
[[package]]
246+
name = "wasm-bindgen"
247+
version = "0.2.84"
248+
source = "registry+https://github.com/rust-lang/crates.io-index"
249+
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
250+
dependencies = [
251+
"cfg-if",
252+
"wasm-bindgen-macro",
253+
]
254+
255+
[[package]]
256+
name = "wasm-bindgen-backend"
257+
version = "0.2.84"
258+
source = "registry+https://github.com/rust-lang/crates.io-index"
259+
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
260+
dependencies = [
261+
"bumpalo",
262+
"log",
263+
"once_cell",
264+
"proc-macro2",
265+
"quote",
266+
"syn",
267+
"wasm-bindgen-shared",
268+
]
269+
270+
[[package]]
271+
name = "wasm-bindgen-futures"
272+
version = "0.4.34"
273+
source = "registry+https://github.com/rust-lang/crates.io-index"
274+
checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
275+
dependencies = [
276+
"cfg-if",
277+
"js-sys",
278+
"wasm-bindgen",
279+
"web-sys",
280+
]
281+
282+
[[package]]
283+
name = "wasm-bindgen-macro"
284+
version = "0.2.84"
285+
source = "registry+https://github.com/rust-lang/crates.io-index"
286+
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
287+
dependencies = [
288+
"quote",
289+
"wasm-bindgen-macro-support",
290+
]
291+
292+
[[package]]
293+
name = "wasm-bindgen-macro-support"
294+
version = "0.2.84"
295+
source = "registry+https://github.com/rust-lang/crates.io-index"
296+
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
297+
dependencies = [
298+
"proc-macro2",
299+
"quote",
300+
"syn",
301+
"wasm-bindgen-backend",
302+
"wasm-bindgen-shared",
303+
]
304+
305+
[[package]]
306+
name = "wasm-bindgen-shared"
307+
version = "0.2.84"
308+
source = "registry+https://github.com/rust-lang/crates.io-index"
309+
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
310+
311+
[[package]]
312+
name = "wasm-bindgen-test"
313+
version = "0.3.34"
314+
source = "registry+https://github.com/rust-lang/crates.io-index"
315+
checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b"
316+
dependencies = [
317+
"console_error_panic_hook",
318+
"js-sys",
319+
"scoped-tls",
320+
"wasm-bindgen",
321+
"wasm-bindgen-futures",
322+
"wasm-bindgen-test-macro",
323+
]
324+
325+
[[package]]
326+
name = "wasm-bindgen-test-macro"
327+
version = "0.3.34"
328+
source = "registry+https://github.com/rust-lang/crates.io-index"
329+
checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9"
330+
dependencies = [
331+
"proc-macro2",
332+
"quote",
333+
]
334+
335+
[[package]]
336+
name = "web-sys"
337+
version = "0.3.61"
338+
source = "registry+https://github.com/rust-lang/crates.io-index"
339+
checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
340+
dependencies = [
341+
"js-sys",
342+
"wasm-bindgen",
343+
]

0 commit comments

Comments
 (0)