@aztec/stdlib 0.86.0 → 0.87.0

package/dest/update-checker/update-checker.js

@@ -0,0 +1,121 @@
+import { RegistryContract } from '@aztec/ethereum';
+import { createLogger } from '@aztec/foundation/log';
+import { RunningPromise } from '@aztec/foundation/running-promise';
+import { fileURLToPath } from '@aztec/foundation/url';
+import { EventEmitter } from 'events';
+import { readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+import { isDeepStrictEqual } from 'util';
+import { z } from 'zod';
+const updateConfigSchema = z.object({
+    version: z.string().optional(),
+    config: z.any().optional()
+});
+export class UpdateChecker extends EventEmitter {
+    updatesUrl;
+    nodeVersion;
+    rollupVersion;
+    fetch;
+    getLatestRollupVersion;
+    checkIntervalMs;
+    log;
+    runningPromise;
+    lastPatchedConfig;
+    constructor(updatesUrl, nodeVersion, rollupVersion, fetch1, getLatestRollupVersion, checkIntervalMs = 60_000, log = createLogger('foundation:update-check')){
+        super(), this.updatesUrl = updatesUrl, this.nodeVersion = nodeVersion, this.rollupVersion = rollupVersion, this.fetch = fetch1, this.getLatestRollupVersion = getLatestRollupVersion, this.checkIntervalMs = checkIntervalMs, this.log = log, this.lastPatchedConfig = {}, this.runChecks = async ()=>{
+            await Promise.all([
+                this.checkRollupVersion(),
+                this.checkConfig()
+            ]);
+        };
+        this.runningPromise = new RunningPromise(this.runChecks, this.log, this.checkIntervalMs);
+    }
+    static async new(config) {
+        const registryContract = new RegistryContract(config.publicClient, config.registryContractAddress);
+        const getLatestRollupVersion = ()=>registryContract.getRollupVersions().then((versions)=>versions.at(-1));
+        return new UpdateChecker(config.baseURL, config.nodeVersion ?? getPackageVersion(), await getLatestRollupVersion(), config.fetch ?? fetch, getLatestRollupVersion, config.checkIntervalMs);
+    }
+    start() {
+        if (this.runningPromise.isRunning()) {
+            this.log.debug(`Can't start update checker again`);
+            return;
+        }
+        this.log.info('Starting update checker', {
+            nodeVersion: this.nodeVersion,
+            rollupVersion: this.rollupVersion
+        });
+        this.runningPromise.start();
+    }
+    stop() {
+        if (!this.runningPromise.isRunning()) {
+            this.log.debug(`Can't stop update checker because it is not running`);
+            return Promise.resolve();
+        }
+        return this.runningPromise.stop();
+    }
+    trigger() {
+        return this.runningPromise.trigger();
+    }
+    runChecks;
+    async checkRollupVersion() {
+        try {
+            const canonicalRollupVersion = await this.getLatestRollupVersion();
+            if (canonicalRollupVersion !== this.rollupVersion) {
+                this.log.debug('New canonical rollup version', {
+                    currentVersion: this.rollupVersion,
+                    latestVersion: canonicalRollupVersion
+                });
+                this.emit('newRollupVersion', {
+                    currentVersion: this.rollupVersion,
+                    latestVersion: canonicalRollupVersion
+                });
+            }
+        } catch (err) {
+            this.log.warn(`Failed to check if there is a new rollup`, err);
+        }
+    }
+    async checkConfig() {
+        try {
+            const response = await this.fetch(this.updatesUrl);
+            const body = await response.json();
+            if (!response.ok) {
+                this.log.warn(`Unexpected HTTP response checking for updates`, {
+                    status: response.status,
+                    body: await response.text(),
+                    url: this.updatesUrl
+                });
+            }
+            const { version, config } = updateConfigSchema.parse(body);
+            if (this.nodeVersion && version && version !== this.nodeVersion) {
+                this.log.debug('New node version', {
+                    currentVersion: this.nodeVersion,
+                    latestVersion: version
+                });
+                this.emit('newNodeVersion', {
+                    currentVersion: this.nodeVersion,
+                    latestVersion: version
+                });
+            }
+            if (config && Object.keys(config).length > 0 && !isDeepStrictEqual(config, this.lastPatchedConfig)) {
+                this.log.debug('New node config', {
+                    config
+                });
+                this.lastPatchedConfig = config;
+                this.emit('updateNodeConfig', config);
+            }
+        } catch (err) {
+            this.log.warn(`Failed to check if there is an update`, err);
+        }
+    }
+}
+/**
+ * Returns package version.
+ */ export function getPackageVersion() {
+    try {
+        const releasePleaseManifestPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json');
+        const version = JSON.parse(readFileSync(releasePleaseManifestPath).toString())['.'];
+        return version;
+    } catch  {
+        return undefined;
+    }
+}

package/dest/validators/schemas.d.ts

@@ -61,29 +61,29 @@ export declare const ValidatorStatsSchema: z.ZodObject<{
     totalSlots: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     missedProposals: z.ZodObject<{
         currentStreak: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-        rate: z.ZodNumber;
+        rate: z.ZodOptional<z.ZodNumber>;
         count: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         currentStreak: number;
-        rate: number;
         count: number;
+        rate?: number | undefined;
     }, {
         currentStreak: string | number | bigint;
-        rate: number;
         count: string | number | bigint;
+        rate?: number | undefined;
     }>;
     missedAttestations: z.ZodObject<{
         currentStreak: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-        rate: z.ZodNumber;
+        rate: z.ZodOptional<z.ZodNumber>;
         count: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         currentStreak: number;
-        rate: number;
         count: number;
+        rate?: number | undefined;
     }, {
         currentStreak: string | number | bigint;
-        rate: number;
         count: string | number | bigint;
+        rate?: number | undefined;
     }>;
     history: z.ZodArray<z.ZodObject<{
         slot: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
@@ -100,13 +100,13 @@ export declare const ValidatorStatsSchema: z.ZodObject<{
     totalSlots: number;
     missedProposals: {
         currentStreak: number;
-        rate: number;
         count: number;
+        rate?: number | undefined;
     };
     missedAttestations: {
         currentStreak: number;
-        rate: number;
         count: number;
+        rate?: number | undefined;
     };
     history: {
         status: "block-mined" | "block-proposed" | "block-missed" | "attestation-sent" | "attestation-missed";
@@ -127,13 +127,13 @@ export declare const ValidatorStatsSchema: z.ZodObject<{
     totalSlots: string | number | bigint;
     missedProposals: {
         currentStreak: string | number | bigint;
-        rate: number;
         count: string | number | bigint;
+        rate?: number | undefined;
     };
     missedAttestations: {
         currentStreak: string | number | bigint;
-        rate: number;
         count: string | number | bigint;
+        rate?: number | undefined;
     };
     history: {
         status: "block-mined" | "block-proposed" | "block-missed" | "attestation-sent" | "attestation-missed";
@@ -182,29 +182,29 @@ export declare const ValidatorsStatsSchema: z.ZodObject<{
         totalSlots: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         missedProposals: z.ZodObject<{
             currentStreak: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            rate: z.ZodNumber;
+            rate: z.ZodOptional<z.ZodNumber>;
             count: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             currentStreak: number;
-            rate: number;
             count: number;
+            rate?: number | undefined;
         }, {
             currentStreak: string | number | bigint;
-            rate: number;
             count: string | number | bigint;
+            rate?: number | undefined;
         }>;
         missedAttestations: z.ZodObject<{
             currentStreak: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
-            rate: z.ZodNumber;
+            rate: z.ZodOptional<z.ZodNumber>;
             count: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             currentStreak: number;
-            rate: number;
             count: number;
+            rate?: number | undefined;
         }, {
             currentStreak: string | number | bigint;
-            rate: number;
             count: string | number | bigint;
+            rate?: number | undefined;
         }>;
         history: z.ZodArray<z.ZodObject<{
             slot: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
@@ -221,13 +221,13 @@ export declare const ValidatorsStatsSchema: z.ZodObject<{
         totalSlots: number;
         missedProposals: {
             currentStreak: number;
-            rate: number;
             count: number;
+            rate?: number | undefined;
         };
         missedAttestations: {
             currentStreak: number;
-            rate: number;
             count: number;
+            rate?: number | undefined;
         };
         history: {
             status: "block-mined" | "block-proposed" | "block-missed" | "attestation-sent" | "attestation-missed";
@@ -248,13 +248,13 @@ export declare const ValidatorsStatsSchema: z.ZodObject<{
         totalSlots: string | number | bigint;
         missedProposals: {
             currentStreak: string | number | bigint;
-            rate: number;
             count: string | number | bigint;
+            rate?: number | undefined;
         };
         missedAttestations: {
             currentStreak: string | number | bigint;
-            rate: number;
             count: string | number | bigint;
+            rate?: number | undefined;
         };
         history: {
             status: "block-mined" | "block-proposed" | "block-missed" | "attestation-sent" | "attestation-missed";
@@ -280,13 +280,13 @@ export declare const ValidatorsStatsSchema: z.ZodObject<{
         totalSlots: number;
         missedProposals: {
             currentStreak: number;
-            rate: number;
             count: number;
+            rate?: number | undefined;
         };
         missedAttestations: {
             currentStreak: number;
-            rate: number;
             count: number;
+            rate?: number | undefined;
         };
         history: {
             status: "block-mined" | "block-proposed" | "block-missed" | "attestation-sent" | "attestation-missed";
@@ -312,13 +312,13 @@ export declare const ValidatorsStatsSchema: z.ZodObject<{
         totalSlots: string | number | bigint;
         missedProposals: {
             currentStreak: string | number | bigint;
-            rate: number;
             count: string | number | bigint;
+            rate?: number | undefined;
         };
         missedAttestations: {
             currentStreak: string | number | bigint;
-            rate: number;
             count: string | number | bigint;
+            rate?: number | undefined;
         };
         history: {
             status: "block-mined" | "block-proposed" | "block-missed" | "attestation-sent" | "attestation-missed";

package/dest/validators/schemas.js

@@ -20,7 +20,7 @@ const ValidatorTimeStatSchema = z.object({
 });
 const ValidatorFilteredHistorySchema = z.object({
     currentStreak: schemas.Integer,
-    rate: z.number(),
+    rate: z.number().optional(),
     count: schemas.Integer
 });
 export const ValidatorStatsSchema = z.object({

package/dest/validators/types.d.ts

@@ -20,12 +20,12 @@ export type ValidatorStats = {
     totalSlots: number;
     missedProposals: {
         currentStreak: number;
-        rate: number;
+        rate?: number;
         count: number;
     };
     missedAttestations: {
         currentStreak: number;
-        rate: number;
+        rate?: number;
         count: number;
     };
     history: ValidatorStatusHistory;

package/dest/validators/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validators/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,aAAa,CAAC;AAE1D,MAAM,MAAM,qBAAqB,GAC7B,aAAa,GACb,gBAAgB,GAChB,cAAc,GACd,kBAAkB,GAClB,oBAAoB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,EAAE,CAAC;AAEvF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,UAAU,CAAC;IACpB,YAAY,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,eAAe,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACpE,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE;QACf,aAAa,EAAE,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,kBAAkB,EAAE;QAClB,aAAa,EAAE,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,OAAO,EAAE,sBAAsB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validators/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,aAAa,CAAC;AAE1D,MAAM,MAAM,qBAAqB,GAC7B,aAAa,GACb,gBAAgB,GAChB,cAAc,GACd,kBAAkB,GAClB,oBAAoB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,qBAAqB,CAAA;CAAE,EAAE,CAAC;AAEvF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,UAAU,CAAC;IACpB,YAAY,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,eAAe,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACpE,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE;QACf,aAAa,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,kBAAkB,EAAE;QAClB,aAAa,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,OAAO,EAAE,sBAAsB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/dest/versioning/versioning.d.ts

@@ -1,7 +1,7 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
 import type Koa from 'koa';
-import type { ChainConfig } from '../config/config.js';
+import type { ChainConfig } from '../config/chain-config.js';
 /** Fields that identify a version of the Aztec protocol. Any mismatch between these fields should signal an incompatibility between nodes. */
 export type ComponentsVersions = {
     l1ChainId: number;

package/dest/versioning/versioning.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../../src/versioning/versioning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKvD,8IAA8I;AAC9I,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,UAAU,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,2BAA2B,EAAE,MAAM,CAAC;IACpC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,qDAAqD;AACrD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,WAAW,EACnB,2BAA2B,EAAE,MAAM,GAAG,EAAE,EACxC,oBAAoB,EAAE,MAAM,GAAG,EAAE,GAChC,kBAAkB,CAQpB;AAED,qGAAqG;AACrG,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAiB9E;AAED,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIzD;AAED,iGAAiG;AACjG,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,QA6B/F;AAED,8EAA8E;AAC9E,wBAAgB,qCAAqC,CACnD,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACrC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,QAiBpC;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,SACxD,IAAI,OAAO,QAAQ,MAAM,QAAQ,IAAI,CAAC,mBAS1D;AAED,0FAA0F;AAC1F,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,iBAC3D;IAAE,OAAO,EAAE;QAAE,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,mBAYzF"}
+{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../../src/versioning/versioning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAK7D,8IAA8I;AAC9I,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,UAAU,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,2BAA2B,EAAE,MAAM,CAAC;IACpC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,qDAAqD;AACrD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,WAAW,EACnB,2BAA2B,EAAE,MAAM,GAAG,EAAE,EACxC,oBAAoB,EAAE,MAAM,GAAG,EAAE,GAChC,kBAAkB,CAQpB;AAED,qGAAqG;AACrG,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAiB9E;AAED,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIzD;AAED,iGAAiG;AACjG,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,QA6B/F;AAED,8EAA8E;AAC9E,wBAAgB,qCAAqC,CACnD,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACrC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,QAiBpC;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,IAC7D,KAAK,GAAG,CAAC,OAAO,EAAE,MAAM,MAAM,OAAO,CAAC,IAAI,CAAC,mBAS1D;AAED,0FAA0F;AAC1F,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,IACxE,aAAa;IAAE,OAAO,EAAE;QAAE,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,mBAYzF"}

package/dest/vks/verification_key.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fq, Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { CircuitType } from '../types/shared.js';
@@ -20,7 +18,7 @@ export declare class G1AffineElement {
      * Serialize as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer  or BufferReader to read from.
@@ -50,7 +48,7 @@ export declare class CommitmentMap {
      * Serialize as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
      * @param buffer - Buffer or BufferReader to read from.
@@ -72,12 +70,12 @@ export declare class VerificationKeyAsFields {
     get circuitSize(): number;
     get isRecursive(): boolean;
     static get schema(): import("zod").ZodType<VerificationKeyAsFields, any, string>;
-    toJSON(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
     /**
      * Serialize as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): (number | Fr)[];
     /**
      * Deserializes from a buffer or reader, corresponding to a write in cpp.
@@ -152,7 +150,7 @@ export declare class VerificationKey {
      * Serialize as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Deserializes class from a buffer.
      * @returns A VerificationKey instance.
@@ -184,13 +182,13 @@ export declare class VerificationKeyData {
      * Serialize as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;
     static fromBuffer(buffer: Buffer | BufferReader): VerificationKeyData;
     static fromString(str: string): VerificationKeyData;
     clone(): VerificationKeyData;
     /** Returns a hex representation for JSON serialization. */
-    toJSON(): Buffer;
+    toJSON(): Buffer<ArrayBufferLike>;
     /** Creates an instance from a hex string. */
     static get schema(): import("zod").ZodType<VerificationKeyData, any, string>;
 }

package/dest/vks/verification_key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verification_key.d.ts","sourceRoot":"","sources":["../../src/vks/verification_key.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verification_key.d.ts","sourceRoot":"","sources":["../../src/vks/verification_key.ts"],"names":[],"mappings":"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"}

package/dest/vks/vk_witness_data.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { VK_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, type Tuple } from '@aztec/foundation/serialize';
@@ -26,7 +24,7 @@ export declare class VkWitnessData {
     vkPath: Tuple<Fr, typeof VK_TREE_HEIGHT>);
     static empty(): VkWitnessData;
     static fromBuffer(buffer: Buffer | BufferReader): VkWitnessData;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;
 }
 //# sourceMappingURL=vk_witness_data.d.ts.map

package/dest/vks/vk_witness_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vk_witness_data.d.ts","sourceRoot":"","sources":["../../src/vks/vk_witness_data.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,qBAAa,aAAa;IAEf,EAAE,EAAE,mBAAmB;IAC9B;;OAEG;IACI,OAAO,EAAE,MAAM;IACtB;;OAEG;IACI,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;gBARxC,EAAE,EAAE,mBAAmB;IAC9B;;OAEG;IACI,OAAO,EAAE,MAAM;IACtB;;OAEG;IACI,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGjD,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,QAAQ;CAGT"}
+{"version":3,"file":"vk_witness_data.d.ts","sourceRoot":"","sources":["../../src/vks/vk_witness_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,KAAK,KAAK,EAAqB,MAAM,6BAA6B,CAAC;AAG1F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,qBAAa,aAAa;IAEf,EAAE,EAAE,mBAAmB;IAC9B;;OAEG;IACI,OAAO,EAAE,MAAM;IACtB;;OAEG;IACI,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;gBARxC,EAAE,EAAE,mBAAmB;IAC9B;;OAEG;IACI,OAAO,EAAE,MAAM;IACtB;;OAEG;IACI,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,cAAc,CAAC;IAGjD,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAS/C,QAAQ;IAIR,QAAQ;CAGT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -49,7 +49,8 @@
     "./database-version": "./dest/database-version/index.js",
     "./validators": "./dest/validators/index.js",
     "./file-store": "./dest/file-store/index.js",
-    "./snapshots": "./dest/snapshots/index.js"
+    "./snapshots": "./dest/snapshots/index.js",
+    "./update-checker": "./dest/update-checker/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -66,13 +67,15 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.86.0",
-    "@aztec/blob-lib": "0.86.0",
-    "@aztec/constants": "0.86.0",
-    "@aztec/ethereum": "0.86.0",
-    "@aztec/foundation": "0.86.0",
-    "@aztec/noir-noirc_abi": "0.86.0",
+    "@aztec/bb.js": "0.87.0",
+    "@aztec/blob-lib": "0.87.0",
+    "@aztec/constants": "0.87.0",
+    "@aztec/ethereum": "0.87.0",
+    "@aztec/foundation": "0.87.0",
+    "@aztec/noir-noirc_abi": "0.87.0",
     "@google-cloud/storage": "^7.15.0",
+    "axios": "^1.9.0",
+    "json-stringify-deterministic": "1.0.12",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",
     "lodash.omit": "^4.5.0",
@@ -91,14 +94,14 @@
     "@types/lodash.isequal": "^4.5.8",
     "@types/lodash.omit": "^4.5.7",
     "@types/lodash.times": "^4.3.9",
-    "@types/node": "^18.7.23",
+    "@types/node": "^22.15.17",
     "@types/pako": "^2.0.3",
-    "eslint": "^8.35.0",
+    "eslint": "^9.26.0",
     "jest": "^29.5.0",
     "jest-mock-extended": "^4.0.0-beta1",
-    "prettier": "^2.8.4",
+    "prettier": "^3.5.3",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -108,7 +111,7 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   },
   "jest": {
     "extensionsToTreatAsEsm": [

package/src/abi/abi.ts

@@ -209,12 +209,19 @@ export interface FunctionDebugMetadata {
 
 export const FunctionDebugMetadataSchema = z.object({
   debugSymbols: z.object({
-    locations: z.record(
-      z.array(z.object({ span: z.object({ start: z.number(), end: z.number() }), file: z.number() })),
-    ),
-    brillig_locations: z.record(
-      z.record(z.array(z.object({ span: z.object({ start: z.number(), end: z.number() }), file: z.number() }))),
-    ),
+    location_tree: z.object({
+      locations: z.array(
+        z.object({
+          parent: z.number().nullable(),
+          value: z.object({
+            span: z.object({ start: z.number(), end: z.number() }),
+            file: z.number(),
+          }),
+        }),
+      ),
+    }),
+    acir_locations: z.record(z.number()),
+    brillig_locations: z.record(z.record(z.number())),
   }),
   files: z.record(z.object({ source: z.string(), path: z.string() })),
 }) satisfies z.ZodType<FunctionDebugMetadata>;
@@ -246,10 +253,10 @@ export const FunctionArtifactSchema = FunctionAbiSchema.and(
 ) satisfies ZodFor<FunctionArtifact>;
 
 /** A file ID. It's assigned during compilation. */
-export type FileId = number;
+type FileId = number;
 
 /** A pointer to a specific section of the source code. */
-export interface SourceCodeLocation {
+interface SourceCodeLocation {
   /** The section of the source code. */
   span: {
     /** The byte where the section starts. */
@@ -269,12 +276,22 @@ export type OpcodeLocation = string;
 
 export type BrilligFunctionId = number;
 
-export type OpcodeToLocationsMap = Record<OpcodeLocation, SourceCodeLocation[]>;
+export type OpcodeToLocationsMap = Record<OpcodeLocation, number>;
+
+export type LocationNodeDebugInfo = {
+  parent: number | null;
+  value: SourceCodeLocation;
+};
+
+export type LocationTree = {
+  locations: LocationNodeDebugInfo[];
+};
 
 /** The debug information for a given function. */
 export interface DebugInfo {
   /** A map of the opcode location to the source code location. */
-  locations: OpcodeToLocationsMap;
+  location_tree: LocationTree;
+  acir_locations: OpcodeToLocationsMap;
   /** For each Brillig function, we have a map of the opcode location to the source code location. */
   brillig_locations: Record<BrilligFunctionId, OpcodeToLocationsMap>;
 }
@@ -481,11 +498,11 @@ export function getDefaultInitializer(contractArtifact: ContractArtifact): Funct
   const functionAbis = getAllFunctionAbis(contractArtifact);
   const initializers = functionAbis.filter(f => f.isInitializer);
   return initializers.length > 1
-    ? initializers.find(f => f.name === 'constructor') ??
+    ? (initializers.find(f => f.name === 'constructor') ??
         initializers.find(f => f.name === 'initializer') ??
         initializers.find(f => f.parameters?.length === 0) ??
         initializers.find(f => f.functionType === FunctionType.PRIVATE) ??
-        initializers[0]
+        initializers[0])
     : initializers[0];
 }
 

package/src/abi/contract_artifact.ts

@@ -216,31 +216,17 @@ function generateFunctionArtifact(
 }
 
 function getFunctionType(fn: NoirCompiledContractFunction): FunctionType {
-  if (fn.custom_attributes.some(attr => attr.endsWith(AZTEC_PRIVATE_ATTRIBUTE))) {
+  if (fn.custom_attributes.includes(AZTEC_PRIVATE_ATTRIBUTE)) {
     return FunctionType.PRIVATE;
-  } else if (fn.custom_attributes.some(attr => attr.endsWith(AZTEC_PUBLIC_ATTRIBUTE))) {
+  } else if (fn.custom_attributes.includes(AZTEC_PUBLIC_ATTRIBUTE)) {
     return FunctionType.PUBLIC;
-  } else if (fn.custom_attributes.some(attr => attr.endsWith(AZTEC_UTILITY_ATTRIBUTE))) {
+  } else if (fn.custom_attributes.includes(AZTEC_UTILITY_ATTRIBUTE)) {
     return FunctionType.UTILITY;
   } else {
     throw new Error(`Invalid function type for a noir contract function ${fn.name}`);
   }
 }
 
-// TODO(https://github.com/noir-lang/noir/issues/7912): Replace the above function with this one once the linked issue
-// is fixed.
-// function getFunctionType(fn: NoirCompiledContractFunction): FunctionType {
-//   if (fn.custom_attributes.includes(AZTEC_PRIVATE_ATTRIBUTE)) {
-//     return FunctionType.PRIVATE;
-//   } else if (fn.custom_attributes.includes(AZTEC_PUBLIC_ATTRIBUTE)) {
-//     return FunctionType.PUBLIC;
-//   } else if (fn.custom_attributes.includes(AZTEC_UTILITY_ATTRIBUTE)) {
-//     return FunctionType.UTILITY;
-//   } else {
-//     throw new Error(`Invalid function type for a noir contract function ${fn.name}`);
-//   }
-// }
-
 /**
  * Returns true if the first parameter is kernel function inputs.
  *

package/src/abi/decoder.ts

@@ -13,7 +13,10 @@ export type AbiDecoded = bigint | boolean | AztecAddress | AbiDecoded[] | { [key
  * Decodes values using a provided ABI.
  */
 class AbiDecoder {
-  constructor(private types: AbiType[], private flattened: Fr[]) {}
+  constructor(
+    private types: AbiType[],
+    private flattened: Fr[],
+  ) {}
 
   /**
    * Decodes a single return value from field to the given type.
@@ -116,7 +119,11 @@ export function decodeFromAbi(typ: AbiType[], buffer: Fr[]) {
  */
 export class FunctionSignatureDecoder {
   private separator: string;
-  constructor(private name: string, private parameters: ABIParameter[], private includeNames = false) {
+  constructor(
+    private name: string,
+    private parameters: ABIParameter[],
+    private includeNames = false,
+  ) {
     this.separator = includeNames ? ', ' : ',';
   }
 
@@ -143,7 +150,7 @@ export class FunctionSignatureDecoder {
       case 'struct':
         return `(${param.fields.map(field => `${this.decodeParameter(field)}`).join(this.separator)})`;
       default:
-        throw new Error(`Unsupported type: ${param}`);
+        throw new Error(`Unsupported type: ${param.kind}`);
     }
   }