Skip to content

Commit 8966553

Browse files
tchardingtcharding
committed
Upgrade secp to 0.32.0-beta.0
Based on the release tracking PR rust-bitcoin/rust-secp256k1#843 Just do the build errors, lint warnings done next.
1 parent 41876bf commit 8966553

26 files changed

+340
-539
lines changed

‎Cargo-minimal.lock‎

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ name = "base58ck"
1919
version = "0.2.0"
2020
dependencies = [
2121
"bitcoin-internals",
22-
"bitcoin_hashes 0.16.0",
22+
"bitcoin_hashes",
2323
"hex_lit",
2424
]
2525

@@ -55,12 +55,12 @@ dependencies = [
5555
"bech32",
5656
"bincode",
5757
"bitcoin-internals",
58-
"bitcoin-io 0.2.0",
58+
"bitcoin-io",
5959
"bitcoin-primitives",
6060
"bitcoin-units",
61-
"bitcoin_hashes 0.16.0",
61+
"bitcoin_hashes",
6262
"bitcoinconsensus",
63-
"hex-conservative 0.3.0",
63+
"hex-conservative",
6464
"hex_lit",
6565
"secp256k1",
6666
"serde",
@@ -77,7 +77,7 @@ name = "bitcoin-consensus-encoding"
7777
version = "0.1.0"
7878
dependencies = [
7979
"bitcoin-internals",
80-
"bitcoin_hashes 0.16.0",
80+
"bitcoin_hashes",
8181
]
8282

8383
[[package]]
@@ -97,23 +97,17 @@ name = "bitcoin-internals"
9797
version = "0.4.0"
9898
dependencies = [
9999
"bincode",
100-
"hex-conservative 0.3.0",
100+
"hex-conservative",
101101
"serde",
102102
"serde_json",
103103
]
104104

105-
[[package]]
106-
name = "bitcoin-io"
107-
version = "0.1.1"
108-
source = "registry+https://github.com/rust-lang/crates.io-index"
109-
checksum = "17e5b76b88667412087beea1882980ad843b660490bbf6cce0a6cfc999c5b989"
110-
111105
[[package]]
112106
name = "bitcoin-io"
113107
version = "0.2.0"
114108
dependencies = [
115109
"bitcoin-internals",
116-
"bitcoin_hashes 0.16.0",
110+
"bitcoin_hashes",
117111
]
118112

119113
[[package]]
@@ -123,10 +117,10 @@ dependencies = [
123117
"arbitrary",
124118
"bitcoin",
125119
"bitcoin-internals",
126-
"bitcoin-io 0.2.0",
120+
"bitcoin-io",
127121
"bitcoin-units",
128-
"bitcoin_hashes 0.16.0",
129-
"hex-conservative 0.3.0",
122+
"bitcoin_hashes",
123+
"hex-conservative",
130124
"hex_lit",
131125
]
132126

@@ -140,8 +134,8 @@ dependencies = [
140134
"bitcoin-consensus-encoding",
141135
"bitcoin-internals",
142136
"bitcoin-units",
143-
"bitcoin_hashes 0.16.0",
144-
"hex-conservative 0.3.0",
137+
"bitcoin_hashes",
138+
"hex-conservative",
145139
"hex_lit",
146140
"serde",
147141
"serde_json",
@@ -160,22 +154,12 @@ dependencies = [
160154
"serde_test",
161155
]
162156

163-
[[package]]
164-
name = "bitcoin_hashes"
165-
version = "0.14.0"
166-
source = "registry+https://github.com/rust-lang/crates.io-index"
167-
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
168-
dependencies = [
169-
"bitcoin-io 0.1.1",
170-
"hex-conservative 0.2.0",
171-
]
172-
173157
[[package]]
174158
name = "bitcoin_hashes"
175159
version = "0.16.0"
176160
dependencies = [
177161
"bitcoin-internals",
178-
"hex-conservative 0.3.0",
162+
"hex-conservative",
179163
"serde",
180164
"serde_test",
181165
]
@@ -217,7 +201,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
217201
name = "chacha20-poly1305"
218202
version = "0.1.2"
219203
dependencies = [
220-
"hex-conservative 0.3.0",
204+
"hex-conservative",
221205
]
222206

223207
[[package]]
@@ -232,15 +216,6 @@ dependencies = [
232216
"windows-targets",
233217
]
234218

235-
[[package]]
236-
name = "hex-conservative"
237-
version = "0.2.0"
238-
source = "registry+https://github.com/rust-lang/crates.io-index"
239-
checksum = "e1aa273bf451e37ed35ced41c71a5e2a4e29064afb104158f2514bcd71c2c986"
240-
dependencies = [
241-
"arrayvec",
242-
]
243-
244219
[[package]]
245220
name = "hex-conservative"
246221
version = "0.3.0"
@@ -368,21 +343,20 @@ checksum = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
368343

369344
[[package]]
370345
name = "secp256k1"
371-
version = "0.31.1"
346+
version = "0.32.0-beta.0"
372347
source = "registry+https://github.com/rust-lang/crates.io-index"
373-
checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
348+
checksum = "48d704464027f5ca2d962ee85d162f12c6dc63043c15af2bead534ce268c42b6"
374349
dependencies = [
375-
"bitcoin_hashes 0.14.0",
376350
"rand",
377351
"secp256k1-sys",
378352
"serde",
379353
]
380354

381355
[[package]]
382356
name = "secp256k1-sys"
383-
version = "0.11.0"
357+
version = "0.12.0"
384358
source = "registry+https://github.com/rust-lang/crates.io-index"
385-
checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
359+
checksum = "6d3be00697c88c00fe102af8dc316038cc2062eab8da646e7463f4c0e70ca9fd"
386360
dependencies = [
387361
"cc",
388362
]

‎Cargo-recent.lock‎

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ name = "base58ck"
1919
version = "0.2.0"
2020
dependencies = [
2121
"bitcoin-internals",
22-
"bitcoin_hashes 0.16.0",
22+
"bitcoin_hashes",
2323
"hex_lit",
2424
]
2525

@@ -54,12 +54,12 @@ dependencies = [
5454
"bech32",
5555
"bincode",
5656
"bitcoin-internals",
57-
"bitcoin-io 0.2.0",
57+
"bitcoin-io",
5858
"bitcoin-primitives",
5959
"bitcoin-units",
60-
"bitcoin_hashes 0.16.0",
60+
"bitcoin_hashes",
6161
"bitcoinconsensus",
62-
"hex-conservative 0.3.0",
62+
"hex-conservative",
6363
"hex_lit",
6464
"secp256k1",
6565
"serde",
@@ -76,7 +76,7 @@ name = "bitcoin-consensus-encoding"
7676
version = "0.1.0"
7777
dependencies = [
7878
"bitcoin-internals",
79-
"bitcoin_hashes 0.16.0",
79+
"bitcoin_hashes",
8080
]
8181

8282
[[package]]
@@ -96,23 +96,17 @@ name = "bitcoin-internals"
9696
version = "0.4.0"
9797
dependencies = [
9898
"bincode",
99-
"hex-conservative 0.3.0",
99+
"hex-conservative",
100100
"serde",
101101
"serde_json",
102102
]
103103

104-
[[package]]
105-
name = "bitcoin-io"
106-
version = "0.1.3"
107-
source = "registry+https://github.com/rust-lang/crates.io-index"
108-
checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
109-
110104
[[package]]
111105
name = "bitcoin-io"
112106
version = "0.2.0"
113107
dependencies = [
114108
"bitcoin-internals",
115-
"bitcoin_hashes 0.16.0",
109+
"bitcoin_hashes",
116110
]
117111

118112
[[package]]
@@ -122,10 +116,10 @@ dependencies = [
122116
"arbitrary",
123117
"bitcoin",
124118
"bitcoin-internals",
125-
"bitcoin-io 0.2.0",
119+
"bitcoin-io",
126120
"bitcoin-units",
127-
"bitcoin_hashes 0.16.0",
128-
"hex-conservative 0.3.0",
121+
"bitcoin_hashes",
122+
"hex-conservative",
129123
"hex_lit",
130124
]
131125

@@ -139,8 +133,8 @@ dependencies = [
139133
"bitcoin-consensus-encoding",
140134
"bitcoin-internals",
141135
"bitcoin-units",
142-
"bitcoin_hashes 0.16.0",
143-
"hex-conservative 0.3.0",
136+
"bitcoin_hashes",
137+
"hex-conservative",
144138
"hex_lit",
145139
"serde",
146140
"serde_json",
@@ -159,22 +153,12 @@ dependencies = [
159153
"serde_test",
160154
]
161155

162-
[[package]]
163-
name = "bitcoin_hashes"
164-
version = "0.14.0"
165-
source = "registry+https://github.com/rust-lang/crates.io-index"
166-
checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
167-
dependencies = [
168-
"bitcoin-io 0.1.3",
169-
"hex-conservative 0.2.1",
170-
]
171-
172156
[[package]]
173157
name = "bitcoin_hashes"
174158
version = "0.16.0"
175159
dependencies = [
176160
"bitcoin-internals",
177-
"hex-conservative 0.3.0",
161+
"hex-conservative",
178162
"serde",
179163
"serde_test",
180164
]
@@ -213,7 +197,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
213197
name = "chacha20-poly1305"
214198
version = "0.1.2"
215199
dependencies = [
216-
"hex-conservative 0.3.0",
200+
"hex-conservative",
217201
]
218202

219203
[[package]]
@@ -228,15 +212,6 @@ dependencies = [
228212
"wasip2",
229213
]
230214

231-
[[package]]
232-
name = "hex-conservative"
233-
version = "0.2.1"
234-
source = "registry+https://github.com/rust-lang/crates.io-index"
235-
checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
236-
dependencies = [
237-
"arrayvec",
238-
]
239-
240215
[[package]]
241216
name = "hex-conservative"
242217
version = "0.3.0"
@@ -377,21 +352,20 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
377352

378353
[[package]]
379354
name = "secp256k1"
380-
version = "0.31.1"
355+
version = "0.32.0-beta.0"
381356
source = "registry+https://github.com/rust-lang/crates.io-index"
382-
checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
357+
checksum = "48d704464027f5ca2d962ee85d162f12c6dc63043c15af2bead534ce268c42b6"
383358
dependencies = [
384-
"bitcoin_hashes 0.14.0",
385359
"rand",
386360
"secp256k1-sys",
387361
"serde",
388362
]
389363

390364
[[package]]
391365
name = "secp256k1-sys"
392-
version = "0.11.0"
366+
version = "0.12.0"
393367
source = "registry+https://github.com/rust-lang/crates.io-index"
394-
checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
368+
checksum = "6d3be00697c88c00fe102af8dc316038cc2062eab8da646e7463f4c0e70ca9fd"
395369
dependencies = [
396370
"cc",
397371
]

‎Cargo.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,3 @@
22
members = ["addresses", "base58", "bitcoin", "chacha20_poly1305", "consensus_encoding", "fuzz", "hashes", "internals", "io", "p2p", "primitives", "units"]
33
exclude = ["benches"]
44
resolver = "2"
5-
6-
# Keep this patch for hashes because secp256k1 depends on bitcoin-hashes via crates.io
7-
# This allows testing changes to hashes with secp256k1
8-
# See https://github.com/rust-bitcoin/rust-bitcoin/pull/4284#pullrequestreview-2714442229
9-
[patch.crates-io.bitcoin_hashes]
10-
path = "hashes"

‎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.31.1", default-features = false, features = ["hashes", "alloc", "rand"] }
36+
secp256k1 = { version = "0.32.0-beta.0", default-features = false, features = ["alloc", "rand"] }
3737
units = { package = "bitcoin-units", path = "../units", default-features = false, features = ["alloc"] }
3838

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

‎bitcoin/embedded/src/main.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ extern crate alloc;
77
extern crate bitcoin;
88

99
use alloc::string::ToString;
10-
use alloc::vec;
1110
use core::panic::PanicInfo;
1211

1312
use alloc_cortex_m::CortexMHeap;
14-
use bitcoin::secp256k1::ffi::types::AlignedType;
15-
use bitcoin::secp256k1::Secp256k1;
1613
// use panic_halt as _;
1714
use bitcoin::{Address, Network, PrivateKey};
1815
use cortex_m_rt::entry;
@@ -30,19 +27,13 @@ fn main() -> ! {
3027

3128
unsafe { ALLOCATOR.init(cortex_m_rt::heap_start() as usize, HEAP_SIZE) }
3229

33-
let size = Secp256k1::preallocate_size();
34-
hprintln!("secp buf size {}", size * 16).unwrap();
35-
3630
// Load a private key
3731
let raw = "L1HKVVLHXiUhecWnwFYF6L3shkf1E12HUmuZTESvBXUdx3yqVP1D";
3832
let pk = PrivateKey::from_wif(raw).unwrap();
3933
hprintln!("Seed WIF: {}", pk).unwrap();
4034

41-
let mut buf_ful = vec![AlignedType::zeroed(); size];
42-
let secp = Secp256k1::preallocated_new(&mut buf_ful).unwrap();
43-
4435
// Derive address
45-
let pubkey = pk.public_key(&secp).try_into().unwrap();
36+
let pubkey = pk.public_key().try_into().unwrap();
4637
let address = Address::p2wpkh(pubkey, Network::Bitcoin);
4738
hprintln!("Address: {}", address).unwrap();
4839

0 commit comments

Comments
 (0)