@typeberry/lib 0.8.4-2e4ce67 → 0.8.4-9502983

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.8.4-2e4ce67",
+  "version": "0.8.4-9502983",
   "description": "Typeberry Library",
   "main": "./bin/lib/index.js",
   "types": "./bin/lib/index.d.ts",
@@ -267,7 +267,7 @@
     "@fluffylabs/anan-as": "^1.4.0",
     "@noble/ed25519": "2.2.3",
     "hash-wasm": "4.12.0",
-    "@typeberry/native": "0.5.1",
+    "@typeberry/native": "0.3.0-5dae93e",
     "eventemitter3": "^5.0.1",
     "@opentelemetry/api": "1.9.0"
   },

package/packages/jam/safrole/bandersnatch-vrf.d.ts

@@ -21,8 +21,8 @@ declare function verifySeal(bandersnatch: BandernsatchWasm, authorKey: Bandersna
 declare function getRingCommitment(bandersnatch: BandernsatchWasm, validators: BandersnatchKey[]): Promise<Result<BandersnatchRingRoot, null>>;
 declare function verifyTickets(bandersnatch: BandernsatchWasm, numberOfValidators: number, epochRoot: BandersnatchRingRoot, tickets: readonly SignedTicket[], entropy: EntropyHash): Promise<{
     isValid: boolean;
-    tickets: EntropyHash[];
-}>;
+    entropyHash: EntropyHash;
+}[]>;
 declare function generateSeal(bandersnatch: BandernsatchWasm, authorKey: BandersnatchSecretSeed, input: BytesBlob, auxData: BytesBlob): Promise<Result<BandersnatchVrfSignature, null>>;
 export type VrfOutputHash = Opaque<OpaqueHash, "VRF Output Hash">;
 declare function getVrfOutputHash(bandersnatch: BandernsatchWasm, authorKey: BandersnatchSecretSeed, input: BytesBlob): Promise<Result<VrfOutputHash, null>>;

package/packages/jam/safrole/bandersnatch-vrf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bandersnatch-vrf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-vrf.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAsB,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAwC/D,QAAA,MAAM,SAAS;;;;;;;;CAQd,CAAC;AAKF,eAAe,SAAS,CAAC;AAIzB,iBAAe,iBAAiB,CAC9B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,EAChC,gBAAgB,EAAE,wBAAwB,EAC1C,oBAAoB,EAAE,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC,CAkBnD;AAED,iBAAe,UAAU,CACvB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,GAC/B,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAapC;AAED,iBAAS,iBAAiB,CACxB,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,eAAe,EAAE,GAC5B,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAe7C;AAgBD,iBAAe,aAAa,CAC1B,YAAY,EAAE,gBAAgB,EAC9B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CA0BvD;AAGD,iBAAe,YAAY,CACzB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,CAQjD;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAGlE,iBAAe,gBAAgB,CAC7B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAQtC;AAKD;;GAEG;AACH,iBAAe,eAAe,CAC5B,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,eAAe,EAAE,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,WAAW,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,CA0CvC"}
+{"version":3,"file":"bandersnatch-vrf.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/safrole/bandersnatch-vrf.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAsB,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAS,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAwC/D,QAAA,MAAM,SAAS;;;;;;;;CAQd,CAAC;AAKF,eAAe,SAAS,CAAC;AAIzB,iBAAe,iBAAiB,CAC9B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,EAChC,gBAAgB,EAAE,wBAAwB,EAC1C,oBAAoB,EAAE,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC,CAkBnD;AAED,iBAAe,UAAU,CACvB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,OAAO,EAAE,SAAS,EAClB,qBAAqB,EAAE,SAAS,GAC/B,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAapC;AAED,iBAAS,iBAAiB,CACxB,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,eAAe,EAAE,GAC5B,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,CAe7C;AAmBD,iBAAe,aAAa,CAC1B,YAAY,EAAE,gBAAgB,EAC9B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,EAAE,CAAC,CAqB3D;AAGD,iBAAe,YAAY,CACzB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC,CAQjD;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAGlE,iBAAe,gBAAgB,CAC7B,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,sBAAsB,EACjC,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAQtC;AAKD;;GAEG;AACH,iBAAe,eAAe,CAC5B,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,eAAe,EAAE,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,WAAW,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,CAAC,CA0CvC"}

package/packages/jam/safrole/bandersnatch-vrf.js

@@ -88,20 +88,17 @@ async function getRingCommitmentNoCache(bandersnatch, keys) {
     }
     return Result.ok(Bytes.fromBlob(commitmentResult.subarray(1), BANDERSNATCH_RING_ROOT_BYTES).asOpaque());
 }
+// One byte for result discriminator (`ResultValues`) and the rest is entropy hash.
+const TICKET_RESULT_LENGTH = 1 + HASH_SIZE;
 async function verifyTickets(bandersnatch, numberOfValidators, epochRoot, tickets, entropy) {
     const contextLength = entropy.length + JAM_TICKET_SEAL.length + 1;
     const ticketsData = BytesBlob.blobFromParts(tickets.map((ticket) => BytesBlob.blobFromParts([ticket.signature.raw, JAM_TICKET_SEAL, entropy.raw, Uint8Array.of(ticket.attempt)])
         .raw)).raw;
     const verificationResult = await bandersnatch.batchVerifyTicket(numberOfValidators, epochRoot.raw, ticketsData, contextLength);
-    const isValid = verificationResult[RESULT_INDEX] === ResultValues.Ok;
-    // NOTE: in case of failure, the hashes will be all zeros, but we can safely
-    // keep the same code path.
-    const chunks = BytesBlob.blobFrom(verificationResult.subarray(1)).chunks(HASH_SIZE);
-    const results = [];
-    for (const entropyHash of chunks) {
-        results.push(Bytes.fromBlob(entropyHash.raw, HASH_SIZE).asOpaque());
-    }
-    return { isValid, tickets: results };
+    return Array.from(BytesBlob.blobFrom(verificationResult).chunks(TICKET_RESULT_LENGTH)).map((result) => ({
+        isValid: result.raw[RESULT_INDEX] === ResultValues.Ok,
+        entropyHash: Bytes.fromBlob(result.raw.subarray(1, TICKET_RESULT_LENGTH), HASH_SIZE).asOpaque(),
+    }));
 }
 const SEAL_FAILED_ERROR = () => "Seal generation failed";
 async function generateSeal(bandersnatch, authorKey, input, auxData) {

package/packages/jam/safrole/bandersnatch-vrf.test.js

@@ -71,8 +71,8 @@ describe("Bandersnatch verification", () => {
                 "0x3a5d10abc80dda33fe3f40b3bb2e3eefd3e97dda3d617a860c9d94eb70b832ad",
             ].map((x) => Bytes.parseBytes(x, HASH_SIZE));
             const result = await bandersnatchVrf.verifyTickets(await bandersnatchWasm, bandersnatchKeys.length, commitment, tickets, entropy);
-            assert.strictEqual(result.isValid, true);
-            assert.deepStrictEqual(result.tickets.map((x) => x.toString()), expectedIds.map((x) => x.toString()));
+            assert.strictEqual(result.every((x) => x.isValid), true);
+            assert.deepStrictEqual(result.map((x) => x.entropyHash.toString()), expectedIds.map((x) => x.toString()));
         });
         it("should detect that one signature is incorrect", async () => {
             const tickets = [
@@ -90,16 +90,14 @@ describe("Bandersnatch verification", () => {
                 },
             ];
             const entropy = Bytes.parseBytes("0xbb30a42c1e62f0afda5f0a4e8a562f7a13a24cea00ee81917b86b89e801314aa", HASH_SIZE).asOpaque();
-            // Batch verification fails as a whole when any signature is invalid,
-            // and in that case all returned entropy hashes are zeroed out.
             const expectedIds = [
                 "0x0000000000000000000000000000000000000000000000000000000000000000",
-                "0x0000000000000000000000000000000000000000000000000000000000000000",
-                "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "0x13fecb426e0a73b84b58b9a0832b11582dc971e79c5399e69f0baf1a244c7787",
+                "0x3a5d10abc80dda33fe3f40b3bb2e3eefd3e97dda3d617a860c9d94eb70b832ad",
             ].map((x) => Bytes.parseBytes(x, HASH_SIZE));
             const result = await bandersnatchVrf.verifyTickets(await bandersnatchWasm, bandersnatchKeys.length, commitment, tickets, entropy);
-            assert.strictEqual(result.isValid, false);
-            assert.deepStrictEqual(result.tickets.map((x) => x.toString()), expectedIds.map((x) => x.toString()));
+            assert.deepStrictEqual(result.map((x) => x.isValid), [false, true, true]);
+            assert.deepStrictEqual(result.map((x) => x.entropyHash.toString()), expectedIds.map((x) => x.toString()));
         });
     });
     describe("verifySeal", () => {
@@ -170,7 +168,7 @@ describe("Bandersnatch verification", () => {
             const commitment = await bandersnatchVrf.getRingCommitment(await bandersnatchWasm, ringKeys);
             assert.ok(commitment.isOk);
             const verifyResult = await bandersnatchVrf.verifyTickets(await bandersnatchWasm, ringKeys.length, commitment.ok, genResult.ok, entropy);
-            assert.ok(verifyResult.isValid, "Generated tickets should pass verification");
+            assert.ok(verifyResult.every((r) => r.isValid), "Generated tickets should pass verification");
         });
     });
 });

package/packages/jam/safrole/safrole.js

@@ -260,15 +260,15 @@ export class Safrole {
          */
         // TODO [ToDr] Verify that ticket attempt is in correct range.
         const verificationResult = extrinsic.length === 0
-            ? { isValid: true, tickets: [] }
+            ? []
             : await bandersnatchVrf.verifyTickets(await this.bandersnatch, validators.length, epochRoot, extrinsic, entropy);
-        if (!verificationResult.isValid) {
-            return Result.error(SafroleErrorCode.BadTicketProof, () => "Safrole: invalid ticket proof in extrinsic");
-        }
         const tickets = extrinsic.map((ticket, i) => ({
-            id: verificationResult.tickets[i],
+            id: verificationResult[i].entropyHash,
             attempt: ticket.attempt,
         }));
+        if (!verificationResult.every((x) => x.isValid)) {
+            return Result.error(SafroleErrorCode.BadTicketProof, () => "Safrole: invalid ticket proof in extrinsic");
+        }
         /**
          * Verify if tickets are sorted and unique
          *

package/packages/jam/safrole/safrole.test.js

@@ -67,10 +67,10 @@ const fakeSealingKeys = {
 describe("Safrole", () => {
     let blake2b;
     beforeEach(async () => {
-        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve({
-            isValid: true,
-            tickets: [Bytes.zero(HASH_SIZE), Bytes.fill(HASH_SIZE, 1)],
-        }));
+        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve([
+            { isValid: true, entropyHash: Bytes.zero(HASH_SIZE) },
+            { isValid: true, entropyHash: Bytes.fill(HASH_SIZE, 1) },
+        ]));
         blake2b = await Blake2b.createHasher();
     });
     afterEach(() => {
@@ -146,7 +146,7 @@ describe("Safrole", () => {
         }
     });
     it("should return bad ticket proof error", async () => {
-        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve({ isValid: false, tickets: [Bytes.zero(HASH_SIZE)] }));
+        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve([{ isValid: false, entropyHash: Bytes.zero(HASH_SIZE) }]));
         const punishSet = SortedSet.fromArray(hashComparator);
         const state = {
             timeslot: tryAsTimeSlot(1),
@@ -188,10 +188,10 @@ describe("Safrole", () => {
         }
     });
     it("should return duplicated ticket error", async () => {
-        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve({
-            isValid: true,
-            tickets: [Bytes.zero(HASH_SIZE), Bytes.zero(HASH_SIZE)],
-        }));
+        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve([
+            { isValid: true, entropyHash: Bytes.zero(HASH_SIZE) },
+            { isValid: true, entropyHash: Bytes.zero(HASH_SIZE) },
+        ]));
         const punishSet = SortedSet.fromArray(hashComparator);
         const state = {
             timeslot: tryAsTimeSlot(1),
@@ -237,10 +237,10 @@ describe("Safrole", () => {
         }
     });
     it("should return bad ticket order error", async () => {
-        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve({
-            isValid: true,
-            tickets: [Bytes.fill(HASH_SIZE, 1), Bytes.zero(HASH_SIZE)],
-        }));
+        mock.method(bandersnatchVrf, "verifyTickets", () => Promise.resolve([
+            { isValid: true, entropyHash: Bytes.fill(HASH_SIZE, 1) },
+            { isValid: true, entropyHash: Bytes.zero(HASH_SIZE) },
+        ]));
         const punishSet = SortedSet.fromArray(hashComparator);
         const state = {
             timeslot: tryAsTimeSlot(1),

package/packages/workers/block-authorship/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/main.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAiB3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAK9E,KAAK,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAwBlD,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,iBAmapG"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../packages/workers/block-authorship/main.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAiB3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAK9E,KAAK,MAAM,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;AAwBlD,wBAAsB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,iBAiapG"}

package/packages/workers/block-authorship/main.js

@@ -232,15 +232,13 @@ export async function main(config, comms, networkingComms) {
      */
     async function verifyAndAddToPool(epochIndex, tickets, state) {
         const results = await bandersnatchVrf.verifyTickets(bandersnatch, state.designatedValidatorData.length, state.epochRoot, tickets, getTicketEntropy(epochIndex, state));
-        if (results.tickets.length !== tickets.length) {
-            logger.error `verifyTickets returned ${results.tickets.length} results for ${tickets.length} tickets`;
+        if (results.length !== tickets.length) {
+            logger.error `verifyTickets returned ${results.length} results for ${tickets.length} tickets`;
             return false;
         }
-        // Batch verification: either the whole batch is valid or none of the tickets are.
-        if (!results.isValid) {
-            return false;
-        }
-        const verified = tickets.map((ticket, i) => ({ ticket, id: results.tickets[i] }));
+        const verified = tickets
+            .map((ticket, i) => ({ ticket, id: results[i].entropyHash }))
+            .filter((_, i) => results[i].isValid);
         addToPool(epochIndex, verified);
         return verified.length > 0;
     }