Enabling newer modules (#527)

csjones · web-flow · commit 9683e8e311c7 · 2024-05-12T23:50:36.000-07:00
diff --git a/Package.swift b/Package.swift
@@ -26,6 +26,7 @@ let package = Package(
                 .define("ECMULT_WINDOW_SIZE", to: "15"),
                 // Enabling additional secp256k1 modules.
                 .define("ENABLE_MODULE_ECDH"),
+                .define("ENABLE_MODULE_ELLSWIFT"),
                 .define("ENABLE_MODULE_EXTRAKEYS"),
                 .define("ENABLE_MODULE_RECOVERY"),
                 .define("ENABLE_MODULE_SCHNORRSIG")
@@ -38,15 +39,18 @@ let package = Package(
                 .define("ECMULT_GEN_PREC_BITS", to: "4"),
                 .define("ECMULT_WINDOW_SIZE", to: "15"),
                 // Enabling additional secp256k1-zkp modules.
+                .define("ENABLE_MODULE_BPPP"),
                 .define("ENABLE_MODULE_ECDH"),
                 .define("ENABLE_MODULE_ECDSA_ADAPTOR"),
                 .define("ENABLE_MODULE_ECDSA_S2C"),
+                .define("ENABLE_MODULE_ELLSWIFT"),
                 .define("ENABLE_MODULE_EXTRAKEYS"),
                 .define("ENABLE_MODULE_GENERATOR"),
                 .define("ENABLE_MODULE_MUSIG"),
                 .define("ENABLE_MODULE_RANGEPROOF"),
                 .define("ENABLE_MODULE_RECOVERY"),
                 .define("ENABLE_MODULE_SCHNORRSIG"),
+                .define("ENABLE_MODULE_SCHNORRSIG_HALFAGG"),
                 .define("ENABLE_MODULE_SURJECTIONPROOF"),
                 .define("ENABLE_MODULE_WHITELIST"),
                 // Some modules need additional header search paths
diff --git a/Sources/secp256k1_bindings/include/secp256k1_ellswift.h b/Sources/secp256k1_bindings/include/secp256k1_ellswift.h
@@ -0,0 +1 @@
+../../../Submodules/secp256k1/include/secp256k1_ellswift.h
diff --git a/Sources/secp256k1_bindings/src/modules/ellswift/main_impl.h b/Sources/secp256k1_bindings/src/modules/ellswift/main_impl.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1/src/modules/ellswift/main_impl.h
diff --git a/Sources/zkp/ASN1/Basic ASN1 Types/ObjectIdentifier.swift b/Sources/zkp/ASN1/Basic ASN1 Types/ObjectIdentifier.swift
@@ -170,7 +170,7 @@
         }
 
         enum AlgorithmIdentifier {
-            static let idEcPublicKey: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 10045, 2, 1]
+            static let idEcPublicKey: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 10_045, 2, 1]
         }
 
         enum NameAttributes {
@@ -189,8 +189,8 @@
             static let countryName: ASN1.ASN1ObjectIdentifier = [2, 5, 4, 6]
             static let serialNumber: ASN1.ASN1ObjectIdentifier = [2, 5, 4, 5]
             static let pseudonym: ASN1.ASN1ObjectIdentifier = [2, 5, 4, 65]
-            static let domainComponent: ASN1.ASN1ObjectIdentifier = [0, 9, 2342, 19200300, 100, 1, 25]
-            static let emailAddress: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 113549, 1, 9, 1]
+            static let domainComponent: ASN1.ASN1ObjectIdentifier = [0, 9, 2_342, 19_200_300, 100, 1, 25]
+            static let emailAddress: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 113_549, 1, 9, 1]
         }
     }
 
diff --git a/Sources/zkp_bindings/include/secp256k1_bppp.h b/Sources/zkp_bindings/include/secp256k1_bppp.h
@@ -0,0 +1 @@
+../../../Submodules/secp256k1-zkp/include/secp256k1_bppp.h
diff --git a/Sources/zkp_bindings/include/secp256k1_ellswift.h b/Sources/zkp_bindings/include/secp256k1_ellswift.h
@@ -0,0 +1 @@
+../../../Submodules/secp256k1-zkp/include/secp256k1_ellswift.h
diff --git a/Sources/zkp_bindings/include/secp256k1_schnorrsig_halfagg.h b/Sources/zkp_bindings/include/secp256k1_schnorrsig_halfagg.h
@@ -0,0 +1 @@
+../../../Submodules/secp256k1-zkp/include/secp256k1_schnorrsig_halfagg.h
diff --git a/Sources/zkp_bindings/src/modules/bppp/bppp_norm_product_impl.h b/Sources/zkp_bindings/src/modules/bppp/bppp_norm_product_impl.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1-zkp/src/modules/bppp/bppp_norm_product_impl.h
diff --git a/Sources/zkp_bindings/src/modules/bppp/bppp_transcript_impl.h b/Sources/zkp_bindings/src/modules/bppp/bppp_transcript_impl.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1-zkp/src/modules/bppp/bppp_transcript_impl.h
diff --git a/Sources/zkp_bindings/src/modules/bppp/bppp_util.h b/Sources/zkp_bindings/src/modules/bppp/bppp_util.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1-zkp/src/modules/bppp/bppp_util.h
diff --git a/Sources/zkp_bindings/src/modules/bppp/main.h b/Sources/zkp_bindings/src/modules/bppp/main.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1-zkp/src/modules/bppp/main.h
diff --git a/Sources/zkp_bindings/src/modules/bppp/main_impl.h b/Sources/zkp_bindings/src/modules/bppp/main_impl.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1-zkp/src/modules/bppp/main_impl.h
diff --git a/Sources/zkp_bindings/src/modules/ellswift/main_impl.h b/Sources/zkp_bindings/src/modules/ellswift/main_impl.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1-zkp/src/modules/ellswift/main_impl.h
diff --git a/Sources/zkp_bindings/src/modules/schnorrsig_halfagg/main_impl.h b/Sources/zkp_bindings/src/modules/schnorrsig_halfagg/main_impl.h
@@ -0,0 +1 @@
+../../../../../Submodules/secp256k1-zkp/src/modules/schnorrsig_halfagg/main_impl.h
diff --git a/Tests/zkpTests/secp256k1Tests.swift b/Tests/zkpTests/secp256k1Tests.swift
@@ -396,7 +396,7 @@ final class secp256k1Tests: XCTestCase {
 
         let set0 = Set(array)
 
-        array = [UInt8](repeating: 1, count: Int.random(in: 10...100000))
+        array = [UInt8](repeating: 1, count: Int.random(in: 10...100_000))
 
         XCTAssertGreaterThan(array.count, 9)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../Submodules/secp256k1/include/secp256k1_ellswift.h`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../../Submodules/secp256k1/src/modules/ellswift/main_impl.h`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`enum AlgorithmIdentifier {`
`173`		`- static let idEcPublicKey: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 10045, 2, 1]`
	`173`	`+ static let idEcPublicKey: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 10_045, 2, 1]`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`enum NameAttributes {`
`@@ -189,8 +189,8 @@`
`189`	`189`	`static let countryName: ASN1.ASN1ObjectIdentifier = [2, 5, 4, 6]`
`190`	`190`	`static let serialNumber: ASN1.ASN1ObjectIdentifier = [2, 5, 4, 5]`
`191`	`191`	`static let pseudonym: ASN1.ASN1ObjectIdentifier = [2, 5, 4, 65]`
`192`		`- static let domainComponent: ASN1.ASN1ObjectIdentifier = [0, 9, 2342, 19200300, 100, 1, 25]`
`193`		`- static let emailAddress: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 113549, 1, 9, 1]`
	`192`	`+ static let domainComponent: ASN1.ASN1ObjectIdentifier = [0, 9, 2_342, 19_200_300, 100, 1, 25]`
	`193`	`+ static let emailAddress: ASN1.ASN1ObjectIdentifier = [1, 2, 840, 113_549, 1, 9, 1]`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../Submodules/secp256k1-zkp/include/secp256k1_bppp.h`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../../../Submodules/secp256k1-zkp/src/modules/bppp/bppp_norm_product_impl.h`