fix abi

Author: spiral-ladder

src/AggregatePublicKey.zig

@@ -16,14 +16,14 @@ pub fn toPublicKey(self: *const Self) PublicKey {
 /// If pks_validate is true, validates each public key before aggregation.
 ///
 /// Returns an error if the slice is empty or if any public key validation fails.
-pub fn aggregate(pks: []*const PublicKey, pks_validate: bool) BlstError!Self {
+pub fn aggregate(pks: []const PublicKey.Point, _: bool) BlstError!Self {
     if (pks.len == 0) return BlstError.AggrTypeMismatch;
-    if (pks_validate) for (pks) |pk| try pk.validate();
+    // if (pks_validate) for (pks) |pk| try PublicKey.validate(&pk.point);
 
     var agg_pk = Self{};
-    c.blst_p1_from_affine(&agg_pk.point, &pks[0].point);
+    c.blst_p1_from_affine(&agg_pk.point, &pks[0]);
     for (1..pks.len) |i| {
-        c.blst_p1_add_or_double_affine(&agg_pk.point, &agg_pk.point, &pks[i].point);
+        c.blst_p1_add_or_double_affine(&agg_pk.point, &agg_pk.point, &pks[i]);
     }
     return agg_pk;
 }
@@ -48,7 +48,7 @@ pub fn aggregateWithRandomness(
     if (scratch.len < c.blst_p1s_mult_pippenger_scratch_sizeof(pks.len)) {
         return BlstError.AggrTypeMismatch;
     }
-    if (pks_validate) for (pks) |pk| try pk.validate();
+    if (pks_validate) for (pks) |pk| try PublicKey.validate(&pk.point);
 
     var scalars_refs: [128]*const u8 = undefined;
     for (0..pks.len) |i| scalars_refs[i] = &randomness[i * 32];

src/PublicKey.zig

@@ -11,12 +11,12 @@ const Self = @This();
 
 // Core operations
 
-/// Checks that the public key is not infinity and is in the correct subgroup.
+/// Checks that a given `Point` is not infinity and is in the correct subgroup.
 ///
 /// Returns a `BlstError` if verification fails.
-pub fn validate(self: *const Self) BlstError!void {
-    if (c.blst_p1_affine_is_inf(&self.point)) return BlstError.PkIsInfinity;
-    if (!c.blst_p1_affine_in_g1(&self.point)) return BlstError.PointNotInGroup;
+pub fn validate(point: *const Point) BlstError!void {
+    if (c.blst_p1_affine_is_inf(point)) return BlstError.PkIsInfinity;
+    if (!c.blst_p1_affine_in_g1(point)) return BlstError.PointNotInGroup;
 }
 
 /// Validate a serialized public key.

src/Signature.zig

@@ -32,7 +32,7 @@ pub fn verify(
 ) BlstError!void {
     if (sig_groupcheck) try self.validate(false);
 
-    if (pk_validate) try pk.validate();
+    if (pk_validate) try PublicKey.validate(&pk.point);
 
     if (msg.len == 0 or dst.len == 0) {
         return BlstError.BadEncoding;
@@ -118,7 +118,7 @@ pub fn fastAggregateVerify(
     buffer: *[Pairing.sizeOf()]u8,
     msg: [32]u8,
     dst: []const u8,
-    pks: []*const PublicKey,
+    pks: []const PublicKey.Point,
 ) BlstError!bool {
     const agg_pk = try AggregatePublicKey.aggregate(pks, false);
     const pk = agg_pk.toPublicKey();

src/eth_c_abi.zig

@@ -106,7 +106,7 @@ export fn publicKeyToBytes(out: [*c]u8, pk: *const blst.PublicKey) void {
 ///
 /// Returns 0 on success, error code on failure.
 export fn publicKeyValidate(a: *const blst.PublicKey) c_uint {
-    a.validate() catch |e| return intFromError(e);
+    PublicKey.validate(&a.point) catch |e| return intFromError(e);
     return 0;
 }
 
@@ -143,8 +143,8 @@ export fn publicKeyAggregateWithRandomness(
 /// Aggregate multiple `blst.PublicKey`s.
 ///
 /// Returns 0 on success, error code on failure.
-export fn publicKeyAggregate(out: *PublicKey, pks: [*c]*const PublicKey.Point, len: c_uint, pks_validate: bool) c_uint {
-    const agg_pk = blst.AggregatePublicKey.aggregate(@ptrCast(pks[0..len]), pks_validate) catch |e| return intFromError(e);
+export fn publicKeyAggregate(out: *PublicKey, pks: [*c]const PublicKey.Point, len: c_uint, pks_validate: bool) c_uint {
+    const agg_pk = blst.AggregatePublicKey.aggregate(pks[0..len], pks_validate) catch |e| return intFromError(e);
     out.* = agg_pk.toPublicKey();
 
     return 0;
@@ -224,15 +224,15 @@ export fn signatureFastAggregateVerify(
     sig: *const Signature,
     sig_groupcheck: bool,
     msg: *[32]u8,
-    pks: [*c]*const PublicKey.Point,
+    pks: [*c]const PublicKey.Point,
     pks_len: c_uint,
 ) c_uint {
     const res = sig.fastAggregateVerify(
         sig_groupcheck,
         &scratch_pairing,
         msg.*,
         DST,
-        @ptrCast(pks[0..pks_len]),
+        pks[0..pks_len],
     ) catch |e| return intFromError(e);
     return @intFromBool(!res);
 }