Skip to content

Commit 245e4d6

Browse files
tchardingtcharding
committed
Upgrade secp to 0.31.1
Upgrade to the latest released version of `rust-secp256k1`. Do just the build errors. Note one deprecated call to `thread_rng()` is added, I'm not sure why this line was building before but anyways the `rand` stuff will be done next.
1 parent a40653c commit 245e4d6

File tree

9 files changed

+164
-64
lines changed

9 files changed

+164
-64
lines changed

‎Cargo-minimal.lock‎

Lines changed: 116 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ dependencies = [
189189
"cc",
190190
]
191191

192+
[[package]]
193+
name = "bitflags"
194+
version = "2.4.2"
195+
source = "registry+https://github.com/rust-lang/crates.io-index"
196+
checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
197+
192198
[[package]]
193199
name = "byteorder"
194200
version = "1.3.0"
@@ -203,9 +209,9 @@ checksum = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
203209

204210
[[package]]
205211
name = "cfg-if"
206-
version = "0.1.2"
212+
version = "1.0.0"
207213
source = "registry+https://github.com/rust-lang/crates.io-index"
208-
checksum = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
214+
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
209215

210216
[[package]]
211217
name = "chacha20-poly1305"
@@ -216,13 +222,14 @@ dependencies = [
216222

217223
[[package]]
218224
name = "getrandom"
219-
version = "0.2.0"
225+
version = "0.3.0"
220226
source = "registry+https://github.com/rust-lang/crates.io-index"
221-
checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4"
227+
checksum = "71393ecc86efbf00e4ca13953979ba8b94cfe549a4b74cc26d8b62f4d8feac2b"
222228
dependencies = [
223229
"cfg-if",
224230
"libc",
225231
"wasi",
232+
"windows-targets",
226233
]
227234

228235
[[package]]
@@ -276,9 +283,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
276283

277284
[[package]]
278285
name = "libc"
279-
version = "0.2.143"
286+
version = "0.2.155"
280287
source = "registry+https://github.com/rust-lang/crates.io-index"
281-
checksum = "edc207893e85c5d6be840e969b496b53d94cec8be2d501b214f50daa97fa8024"
288+
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
282289

283290
[[package]]
284291
name = "memmap2"
@@ -291,9 +298,9 @@ dependencies = [
291298

292299
[[package]]
293300
name = "ppv-lite86"
294-
version = "0.2.8"
301+
version = "0.2.14"
295302
source = "registry+https://github.com/rust-lang/crates.io-index"
296-
checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
303+
checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741"
297304

298305
[[package]]
299306
name = "proc-macro2"
@@ -315,42 +322,33 @@ dependencies = [
315322

316323
[[package]]
317324
name = "rand"
318-
version = "0.8.0"
325+
version = "0.9.0"
319326
source = "registry+https://github.com/rust-lang/crates.io-index"
320-
checksum = "a76330fb486679b4ace3670f117bbc9e16204005c4bde9c4bd372f45bed34f12"
327+
checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
321328
dependencies = [
322-
"libc",
323329
"rand_chacha",
324330
"rand_core",
325-
"rand_hc",
331+
"zerocopy",
326332
]
327333

328334
[[package]]
329335
name = "rand_chacha"
330-
version = "0.3.0"
336+
version = "0.9.0"
331337
source = "registry+https://github.com/rust-lang/crates.io-index"
332-
checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
338+
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
333339
dependencies = [
334340
"ppv-lite86",
335341
"rand_core",
336342
]
337343

338344
[[package]]
339345
name = "rand_core"
340-
version = "0.6.2"
346+
version = "0.9.0"
341347
source = "registry+https://github.com/rust-lang/crates.io-index"
342-
checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
348+
checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff"
343349
dependencies = [
344350
"getrandom",
345-
]
346-
347-
[[package]]
348-
name = "rand_hc"
349-
version = "0.3.0"
350-
source = "registry+https://github.com/rust-lang/crates.io-index"
351-
checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
352-
dependencies = [
353-
"rand_core",
351+
"zerocopy",
354352
]
355353

356354
[[package]]
@@ -370,9 +368,9 @@ checksum = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
370368

371369
[[package]]
372370
name = "secp256k1"
373-
version = "0.30.0"
371+
version = "0.31.1"
374372
source = "registry+https://github.com/rust-lang/crates.io-index"
375-
checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
373+
checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
376374
dependencies = [
377375
"bitcoin_hashes 0.14.0",
378376
"rand",
@@ -382,9 +380,9 @@ dependencies = [
382380

383381
[[package]]
384382
name = "secp256k1-sys"
385-
version = "0.10.0"
383+
version = "0.11.0"
386384
source = "registry+https://github.com/rust-lang/crates.io-index"
387-
checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b"
385+
checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
388386
dependencies = [
389387
"cc",
390388
]
@@ -454,6 +452,93 @@ checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
454452

455453
[[package]]
456454
name = "wasi"
457-
version = "0.9.0+wasi-snapshot-preview1"
455+
version = "0.13.0+wasi-0.2.0"
456+
source = "registry+https://github.com/rust-lang/crates.io-index"
457+
checksum = "652cd73449d0b957a2743b70c72d79d34a5fa505696488f4ca90b46f6da94118"
458+
dependencies = [
459+
"bitflags",
460+
"wit-bindgen-rt",
461+
]
462+
463+
[[package]]
464+
name = "windows-targets"
465+
version = "0.52.0"
466+
source = "registry+https://github.com/rust-lang/crates.io-index"
467+
checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
468+
dependencies = [
469+
"windows_aarch64_gnullvm",
470+
"windows_aarch64_msvc",
471+
"windows_i686_gnu",
472+
"windows_i686_msvc",
473+
"windows_x86_64_gnu",
474+
"windows_x86_64_gnullvm",
475+
"windows_x86_64_msvc",
476+
]
477+
478+
[[package]]
479+
name = "windows_aarch64_gnullvm"
480+
version = "0.52.0"
481+
source = "registry+https://github.com/rust-lang/crates.io-index"
482+
checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
483+
484+
[[package]]
485+
name = "windows_aarch64_msvc"
486+
version = "0.52.0"
458487
source = "registry+https://github.com/rust-lang/crates.io-index"
459-
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
488+
checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
489+
490+
[[package]]
491+
name = "windows_i686_gnu"
492+
version = "0.52.0"
493+
source = "registry+https://github.com/rust-lang/crates.io-index"
494+
checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
495+
496+
[[package]]
497+
name = "windows_i686_msvc"
498+
version = "0.52.0"
499+
source = "registry+https://github.com/rust-lang/crates.io-index"
500+
checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
501+
502+
[[package]]
503+
name = "windows_x86_64_gnu"
504+
version = "0.52.0"
505+
source = "registry+https://github.com/rust-lang/crates.io-index"
506+
checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
507+
508+
[[package]]
509+
name = "windows_x86_64_gnullvm"
510+
version = "0.52.0"
511+
source = "registry+https://github.com/rust-lang/crates.io-index"
512+
checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
513+
514+
[[package]]
515+
name = "windows_x86_64_msvc"
516+
version = "0.52.0"
517+
source = "registry+https://github.com/rust-lang/crates.io-index"
518+
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
519+
520+
[[package]]
521+
name = "wit-bindgen-rt"
522+
version = "0.21.0"
523+
source = "registry+https://github.com/rust-lang/crates.io-index"
524+
checksum = "026d24a27f6712541fa534f2954bd9e0eb66172f033c2157c0f31d106255c497"
525+
526+
[[package]]
527+
name = "zerocopy"
528+
version = "0.8.0"
529+
source = "registry+https://github.com/rust-lang/crates.io-index"
530+
checksum = "df7885ffcb82507a0f213c593e77c5f13d12cb96588d4e835ad7e9423ba034db"
531+
dependencies = [
532+
"zerocopy-derive",
533+
]
534+
535+
[[package]]
536+
name = "zerocopy-derive"
537+
version = "0.8.0"
538+
source = "registry+https://github.com/rust-lang/crates.io-index"
539+
checksum = "930ad75608219e8ffdb8962a5433cb2b30064c7ccb564d3b76c2963390b1e435"
540+
dependencies = [
541+
"proc-macro2",
542+
"quote",
543+
"syn",
544+
]

‎Cargo-recent.lock‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,14 @@ dependencies = [
218218

219219
[[package]]
220220
name = "getrandom"
221-
version = "0.2.15"
221+
version = "0.3.4"
222222
source = "registry+https://github.com/rust-lang/crates.io-index"
223-
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
223+
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
224224
dependencies = [
225225
"cfg-if",
226226
"libc",
227-
"wasi",
227+
"r-efi",
228+
"wasip2",
228229
]
229230

230231
[[package]]
@@ -324,32 +325,37 @@ dependencies = [
324325
"proc-macro2",
325326
]
326327

328+
[[package]]
329+
name = "r-efi"
330+
version = "5.3.0"
331+
source = "registry+https://github.com/rust-lang/crates.io-index"
332+
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
333+
327334
[[package]]
328335
name = "rand"
329-
version = "0.8.5"
336+
version = "0.9.2"
330337
source = "registry+https://github.com/rust-lang/crates.io-index"
331-
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
338+
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
332339
dependencies = [
333-
"libc",
334340
"rand_chacha",
335341
"rand_core",
336342
]
337343

338344
[[package]]
339345
name = "rand_chacha"
340-
version = "0.3.1"
346+
version = "0.9.0"
341347
source = "registry+https://github.com/rust-lang/crates.io-index"
342-
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
348+
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
343349
dependencies = [
344350
"ppv-lite86",
345351
"rand_core",
346352
]
347353

348354
[[package]]
349355
name = "rand_core"
350-
version = "0.6.4"
356+
version = "0.9.3"
351357
source = "registry+https://github.com/rust-lang/crates.io-index"
352-
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
358+
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
353359
dependencies = [
354360
"getrandom",
355361
]
@@ -371,9 +377,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
371377

372378
[[package]]
373379
name = "secp256k1"
374-
version = "0.30.0"
380+
version = "0.31.1"
375381
source = "registry+https://github.com/rust-lang/crates.io-index"
376-
checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
382+
checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
377383
dependencies = [
378384
"bitcoin_hashes 0.14.0",
379385
"rand",
@@ -383,9 +389,9 @@ dependencies = [
383389

384390
[[package]]
385391
name = "secp256k1-sys"
386-
version = "0.10.1"
392+
version = "0.11.0"
387393
source = "registry+https://github.com/rust-lang/crates.io-index"
388-
checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
394+
checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
389395
dependencies = [
390396
"cc",
391397
]
@@ -461,10 +467,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
461467
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
462468

463469
[[package]]
464-
name = "wasi"
465-
version = "0.11.0+wasi-snapshot-preview1"
470+
name = "wasip2"
471+
version = "1.0.1+wasi-0.2.4"
472+
source = "registry+https://github.com/rust-lang/crates.io-index"
473+
checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
474+
dependencies = [
475+
"wit-bindgen",
476+
]
477+
478+
[[package]]
479+
name = "wit-bindgen"
480+
version = "0.46.0"
466481
source = "registry+https://github.com/rust-lang/crates.io-index"
467-
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
482+
checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
468483

469484
[[package]]
470485
name = "zerocopy"

‎bitcoin/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ hex = { package = "hex-conservative", version = "0.3.0", default-features = fals
3333
internals = { package = "bitcoin-internals", path = "../internals", features = ["alloc", "hex"] }
3434
io = { package = "bitcoin-io", path = "../io", default-features = false, features = ["alloc", "hashes"] }
3535
primitives = { package = "bitcoin-primitives", path = "../primitives", default-features = false, features = ["alloc", "hex"] }
36-
secp256k1 = { version = "0.30.0", default-features = false, features = ["hashes", "alloc"] }
36+
secp256k1 = { version = "0.31.1", default-features = false, features = ["hashes", "alloc", "rand"] }
3737
units = { package = "bitcoin-units", path = "../units", default-features = false, features = ["alloc"] }
3838

3939
arbitrary = { version = "1.4.1", optional = true }

‎bitcoin/examples/sign-tx-segwit-v0.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn main() {
7070

7171
// Sign the sighash using the secp256k1 library (exported by rust-bitcoin).
7272
let msg = Message::from(sighash);
73-
let signature = secp.sign_ecdsa(&msg, &sk);
73+
let signature = secp.sign_ecdsa(msg, &sk);
7474

7575
// Update the witness stack.
7676
let signature = bitcoin::ecdsa::Signature { signature, sighash_type };

0 commit comments

Comments
 (0)