From bf29ae36b811a9efc74082f633a400cd84d7bf00 Mon Sep 17 00:00:00 2001 From: N Date: Wed, 22 Jan 2025 16:05:19 -0800 Subject: [PATCH] fix(ci): fix big int version to avoid msrv (#1966) --- crates/test-artifacts/programs/Cargo.lock | 99 +++---------------- crates/test-artifacts/programs/Cargo.toml | 2 + .../programs/bn254-fp/Cargo.toml | 2 +- .../programs/bn254-fp2-addsub/Cargo.toml | 2 +- .../programs/bn254-fp2-mul/Cargo.toml | 2 +- .../programs/secp256r1-add/Cargo.toml | 2 +- .../programs/secp256r1-double/Cargo.toml | 2 +- .../programs/u256x2048-mul/Cargo.toml | 4 +- .../programs/uint256-arith/Cargo.toml | 2 +- 9 files changed, 26 insertions(+), 91 deletions(-) diff --git a/crates/test-artifacts/programs/Cargo.lock b/crates/test-artifacts/programs/Cargo.lock index 1d1f5dbf9e..54011d1bdb 100644 --- a/crates/test-artifacts/programs/Cargo.lock +++ b/crates/test-artifacts/programs/Cargo.lock @@ -516,12 +516,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const-oid" -version = "0.10.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ff6be19477a1bd5441f382916a89bc2a0b2c35db6d41e0f6e8538bf6d6463f" - [[package]] name = "convert_case" version = "0.4.0" @@ -586,19 +580,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "crypto-bigint" -version = "0.6.0-rc.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "040a95c58773f47c92f5f17814702bfd68e8ace9ddce4690c982d0019cac32e2" -dependencies = [ - "hybrid-array", - "num-traits", - "rand_core", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -778,21 +759,11 @@ version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ - "const-oid 0.9.6", + "const-oid", "pem-rfc7468", "zeroize", ] -[[package]] -name = "der" -version = "0.8.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82db698b33305f0134faf590b9d1259dc171b5481ac41d5c8146c3b3ee7d4319" -dependencies = [ - "const-oid 0.10.0-rc.3", - "zeroize", -] - [[package]] name = "deranged" version = "0.3.11" @@ -843,7 +814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", - "const-oid 0.9.6", + "const-oid", "crypto-common", "subtle", ] @@ -854,9 +825,9 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.9", + "der", "digest 0.10.7", - "elliptic-curve 0.13.8", + "elliptic-curve", "rfc6979", "signature", "spki", @@ -934,7 +905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", - "crypto-bigint 0.5.5", + "crypto-bigint", "digest 0.10.7", "ff", "generic-array 0.14.7", @@ -942,22 +913,7 @@ dependencies = [ "pem-rfc7468", "pkcs8", "rand_core", - "sec1 0.7.3", - "subtle", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.14.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc43715037532dc2d061e5c97e81b684c28993d52a4fa4eb7d2ce2826d78f2f2" -dependencies = [ - "base16ct", - "crypto-bigint 0.6.0-rc.5", - "hybrid-array", - "rand_core", - "sec1 0.8.0-rc.3", + "sec1", "subtle", "zeroize", ] @@ -1229,16 +1185,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "hybrid-array" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a9a965bb102c1c891fb017c09a05c965186b1265a207640f323ddd009f9deb" -dependencies = [ - "typenum", - "zeroize", -] - [[package]] name = "iana-time-zone" version = "0.1.61" @@ -1361,7 +1307,7 @@ checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa", - "elliptic-curve 0.13.8", + "elliptic-curve", "once_cell", "sha2 0.10.8", "signature", @@ -1565,7 +1511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ "ecdsa", - "elliptic-curve 0.13.8", + "elliptic-curve", "primeorder", "sha2 0.10.8", ] @@ -1866,7 +1812,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.9", + "der", "spki", ] @@ -1897,7 +1843,7 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "elliptic-curve 0.13.8", + "elliptic-curve", ] [[package]] @@ -2228,26 +2174,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", - "der 0.7.9", + "der", "generic-array 0.14.7", "pkcs8", "subtle", "zeroize", ] -[[package]] -name = "sec1" -version = "0.8.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1988446eff153796413a73669dfaa4caa3f5ce8b25fac89e3821a39c611772e" -dependencies = [ - "base16ct", - "der 0.8.0-rc.1", - "hybrid-array", - "subtle", - "zeroize", -] - [[package]] name = "secp256k1-add-test" version = "1.1.0" @@ -2285,7 +2218,7 @@ name = "secp256r1-add-test" version = "1.1.0" dependencies = [ "common-test-utils", - "elliptic-curve 0.14.0-rc.1", + "elliptic-curve", "hex-literal", "num", "p256", @@ -2306,7 +2239,7 @@ name = "secp256r1-double-test" version = "1.1.0" dependencies = [ "common-test-utils", - "elliptic-curve 0.14.0-rc.1", + "elliptic-curve", "hex-literal", "num", "p256", @@ -2520,7 +2453,7 @@ version = "4.0.1" dependencies = [ "cfg-if", "dashu", - "elliptic-curve 0.13.8", + "elliptic-curve", "generic-array 1.1.0", "itertools 0.13.0", "k256", @@ -2647,7 +2580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.9", + "der", ] [[package]] @@ -3025,7 +2958,7 @@ dependencies = [ name = "uint256-arith-program" version = "1.1.0" dependencies = [ - "crypto-bigint 0.6.0-rc.5", + "crypto-bigint", "sp1-derive", "sp1-zkvm", ] diff --git a/crates/test-artifacts/programs/Cargo.toml b/crates/test-artifacts/programs/Cargo.toml index 260310e9ed..8dd1c9b246 100644 --- a/crates/test-artifacts/programs/Cargo.toml +++ b/crates/test-artifacts/programs/Cargo.toml @@ -45,6 +45,8 @@ members = [ resolver = "2" [workspace.dependencies] +num-bigint = "=0.4.6" +crypto-bigint = "0.5" serde = "1.0.204" serde_json = "1.0.132" diff --git a/crates/test-artifacts/programs/bn254-fp/Cargo.toml b/crates/test-artifacts/programs/bn254-fp/Cargo.toml index a2b789730c..bf4c510d1a 100644 --- a/crates/test-artifacts/programs/bn254-fp/Cargo.toml +++ b/crates/test-artifacts/programs/bn254-fp/Cargo.toml @@ -7,5 +7,5 @@ publish = false [dependencies] sp1-zkvm = { path = "../../../../crates/zkvm/entrypoint" } -num-bigint = "0.4.6" +num-bigint = { workspace = true } rand = "0.8.5" diff --git a/crates/test-artifacts/programs/bn254-fp2-addsub/Cargo.toml b/crates/test-artifacts/programs/bn254-fp2-addsub/Cargo.toml index d6a8351978..77458b9481 100644 --- a/crates/test-artifacts/programs/bn254-fp2-addsub/Cargo.toml +++ b/crates/test-artifacts/programs/bn254-fp2-addsub/Cargo.toml @@ -7,5 +7,5 @@ publish = false [dependencies] sp1-zkvm = { path = "../../../../crates/zkvm/entrypoint" } -num-bigint = "0.4.6" +num-bigint = { workspace = true } rand = "0.8.5" diff --git a/crates/test-artifacts/programs/bn254-fp2-mul/Cargo.toml b/crates/test-artifacts/programs/bn254-fp2-mul/Cargo.toml index 41aba97a83..96b1612db1 100644 --- a/crates/test-artifacts/programs/bn254-fp2-mul/Cargo.toml +++ b/crates/test-artifacts/programs/bn254-fp2-mul/Cargo.toml @@ -7,5 +7,5 @@ publish = false [dependencies] sp1-zkvm = { path = "../../../../crates/zkvm/entrypoint" } -num-bigint = "0.4.6" +num-bigint = { workspace = true } rand = "0.8.5" diff --git a/crates/test-artifacts/programs/secp256r1-add/Cargo.toml b/crates/test-artifacts/programs/secp256r1-add/Cargo.toml index 03926de266..ce7556e298 100644 --- a/crates/test-artifacts/programs/secp256r1-add/Cargo.toml +++ b/crates/test-artifacts/programs/secp256r1-add/Cargo.toml @@ -12,4 +12,4 @@ common-test-utils = { path = "../common" } hex-literal = "0.4.1" num = { version = "0.4.1", default-features = false } p256 = { version = "0.13.2", default-features = false, features = ["arithmetic"] } -elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] } \ No newline at end of file +elliptic-curve = { version = "=0.13.8", default-features = false, features = ["sec1"] } \ No newline at end of file diff --git a/crates/test-artifacts/programs/secp256r1-double/Cargo.toml b/crates/test-artifacts/programs/secp256r1-double/Cargo.toml index 9797ad1864..d02b4111ba 100644 --- a/crates/test-artifacts/programs/secp256r1-double/Cargo.toml +++ b/crates/test-artifacts/programs/secp256r1-double/Cargo.toml @@ -12,4 +12,4 @@ common-test-utils = { path = "../common" } hex-literal = "0.4.1" num = { version = "0.4.1", default-features = false } p256 = { version = "0.13.2", default-features = false, features = ["arithmetic"] } -elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] } \ No newline at end of file +elliptic-curve = { version = "=0.13.8", default-features = false, features = ["sec1"] } \ No newline at end of file diff --git a/crates/test-artifacts/programs/u256x2048-mul/Cargo.toml b/crates/test-artifacts/programs/u256x2048-mul/Cargo.toml index cac74cafa8..cb96293c74 100644 --- a/crates/test-artifacts/programs/u256x2048-mul/Cargo.toml +++ b/crates/test-artifacts/programs/u256x2048-mul/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] sp1-zkvm = { path = "../../../../crates/zkvm/entrypoint" } sp1-derive = { path = "../../../../crates/derive" } -num-bigint = "0.4.6" +num-bigint = { workspace = true } num = { version = "0.4.1" } rand = "0.8.5" -bytemuck = "1.15.0" \ No newline at end of file +bytemuck = "1.15.0" diff --git a/crates/test-artifacts/programs/uint256-arith/Cargo.toml b/crates/test-artifacts/programs/uint256-arith/Cargo.toml index 7ea91e234b..9ce053a279 100644 --- a/crates/test-artifacts/programs/uint256-arith/Cargo.toml +++ b/crates/test-artifacts/programs/uint256-arith/Cargo.toml @@ -7,4 +7,4 @@ publish = false [dependencies] sp1-zkvm = { path = "../../../../crates/zkvm/entrypoint" } sp1-derive = { path = "../../../../crates/derive" } -crypto-bigint = "0.6.0-pre.12" +crypto-bigint = { workspace = true }