@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/file-store/s3.js

@@ -0,0 +1,252 @@
+import { createLogger } from '@aztec/foundation/log';
+import { GetObjectCommand, HeadObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { createReadStream, createWriteStream } from 'fs';
+import { mkdir, mkdtemp, stat, unlink } from 'fs/promises';
+import { tmpdir } from 'os';
+import { basename, dirname, join } from 'path';
+import { finished } from 'stream/promises';
+import { createGzip } from 'zlib';
+function normalizeBasePath(path) {
+    return path?.replace(/^\/+|\/+$/g, '') ?? '';
+}
+export class S3FileStore {
+    bucketName;
+    basePath;
+    log;
+    s3;
+    region;
+    endpoint;
+    publicBaseUrl;
+    constructor(bucketName, basePath, opts, log = createLogger('stdlib:s3-file-store')){
+        this.bucketName = bucketName;
+        this.basePath = basePath;
+        this.log = log;
+        this.endpoint = opts.endpoint;
+        this.region = this.endpoint ? 'auto' : process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? 'us-east-1';
+        this.publicBaseUrl = opts.publicBaseUrl;
+        const clientOptions = {};
+        if (this.endpoint) {
+            clientOptions.region = 'auto';
+            clientOptions.endpoint = this.endpoint;
+            clientOptions.forcePathStyle = true;
+        } else {
+            clientOptions.region = this.region;
+        }
+        this.s3 = new S3Client(clientOptions);
+    }
+    async save(path, data, opts = {}) {
+        const key = this.getFullPath(path);
+        const shouldCompress = !!opts.compress;
+        const body = shouldCompress ? (await import('zlib')).gzipSync(data) : data;
+        const contentLength = body.length;
+        const contentType = this.detectContentType(key, shouldCompress);
+        const put = new PutObjectCommand({
+            Bucket: this.bucketName,
+            Key: key,
+            Body: body,
+            ContentType: contentType,
+            CacheControl: opts.metadata?.['Cache-control'],
+            Metadata: this.extractUserMetadata(opts.metadata),
+            ContentLength: contentLength
+        });
+        await this.s3.send(put);
+        return this.buildReturnedUrl(key, !!opts.public);
+    }
+    async upload(destPath, srcPath, opts = {}) {
+        const key = this.getFullPath(destPath);
+        const shouldCompress = opts.compress !== false; // default true like GCS impl
+        await mkdir(dirname(srcPath), {
+            recursive: true
+        }).catch(()=>undefined);
+        let contentLength;
+        let bodyPath = srcPath;
+        // We don't set Content-Encoding and we avoid SigV4 streaming (aws-chunked).
+        // With AWS SigV4 streaming uploads (Content-Encoding: aws-chunked[,gzip]), servers require
+        // x-amz-decoded-content-length (the size of the decoded payload) and an exact Content-Length
+        // that includes chunk metadata. For on-the-fly compression, providing
+        // those values without buffering or a pre-pass is impractical. Instead, we pre-gzip to a temp file
+        // to know ContentLength up-front and upload the gzipped bytes as-is, omitting Content-Encoding.
+        // Reference: AWS SigV4 streaming (chunked upload) requirements —
+        // https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html
+        if (shouldCompress) {
+            // Pre-gzip to a temp file so we know the exact length for R2/S3 headers
+            const tmpDir = await mkdtemp(join(tmpdir(), 's3-upload-'));
+            const gzPath = join(tmpDir, `${basename(srcPath)}.gz`);
+            const source = createReadStream(srcPath);
+            const gz = createGzip();
+            const out = createWriteStream(gzPath);
+            try {
+                await finished(source.pipe(gz).pipe(out));
+                const st = await stat(gzPath);
+                contentLength = st.size;
+                bodyPath = gzPath;
+            } catch (err) {
+                // Ensure temp file is removed on failure
+                await unlink(gzPath).catch(()=>undefined);
+                throw err;
+            }
+        } else {
+            const st = await stat(srcPath);
+            contentLength = st.size;
+            bodyPath = srcPath;
+        }
+        const bodyStream = createReadStream(bodyPath);
+        const contentType = this.detectContentType(key, shouldCompress);
+        try {
+            const put = new PutObjectCommand({
+                Bucket: this.bucketName,
+                Key: key,
+                Body: bodyStream,
+                ContentType: contentType,
+                CacheControl: opts.metadata?.['Cache-control'],
+                Metadata: this.extractUserMetadata(opts.metadata),
+                // Explicitly set ContentLength so R2 can compute x-amz-decoded-content-length correctly
+                ContentLength: contentLength
+            });
+            await this.s3.send(put);
+        } finally{
+            if (shouldCompress && bodyPath !== srcPath) {
+                await unlink(bodyPath).catch(()=>undefined);
+            }
+        }
+        return this.buildReturnedUrl(key, !!opts.public);
+    }
+    async read(pathOrUrlStr) {
+        const { bucket, key } = this.getBucketAndKey(pathOrUrlStr);
+        const out = await this.s3.send(new GetObjectCommand({
+            Bucket: bucket,
+            Key: key
+        }));
+        const stream = out.Body;
+        const chunks = [];
+        for await (const chunk of stream){
+            chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+        }
+        return Buffer.concat(chunks);
+    }
+    async download(pathOrUrlStr, destPath) {
+        const { bucket, key } = this.getBucketAndKey(pathOrUrlStr);
+        const out = await this.s3.send(new GetObjectCommand({
+            Bucket: bucket,
+            Key: key
+        }));
+        await mkdir(dirname(destPath), {
+            recursive: true
+        });
+        const write = createWriteStream(destPath);
+        await finished(out.Body.pipe(write));
+    }
+    async exists(pathOrUrlStr) {
+        try {
+            const { bucket, key } = this.getBucketAndKey(pathOrUrlStr);
+            await this.s3.send(new HeadObjectCommand({
+                Bucket: bucket,
+                Key: key
+            }));
+            return true;
+        } catch (err) {
+            const code = err?.$metadata?.httpStatusCode ?? err?.name ?? err?.Code;
+            if (code === 404 || code === 'NotFound' || code === 'NoSuchKey') {
+                return false;
+            }
+            this.log.warn(`Error checking existence for ${pathOrUrlStr}: ${err?.message ?? String(err)}`);
+            return false;
+        }
+    }
+    extractUserMetadata(meta) {
+        if (!meta) {
+            return undefined;
+        }
+        const { ['Cache-control']: _ignored, ...rest } = meta;
+        return Object.keys(rest).length ? rest : undefined;
+    }
+    detectContentType(key, isCompressed) {
+        // Basic content type inference
+        const lower = key.toLowerCase();
+        if (lower.endsWith('.json') || lower.endsWith('.json.gz')) {
+            return 'application/json';
+        }
+        if (lower.endsWith('.txt') || lower.endsWith('.log') || lower.endsWith('.csv') || lower.endsWith('.md')) {
+            return 'text/plain; charset=utf-8';
+        }
+        if (lower.endsWith('.db') || lower.endsWith('.sqlite') || lower.endsWith('.bin')) {
+            return 'application/octet-stream';
+        }
+        if (lower.endsWith('.wasm') || lower.endsWith('.wasm.gz')) {
+            return 'application/wasm';
+        }
+        // If compressed, prefer octet-stream unless known
+        if (isCompressed) {
+            return 'application/octet-stream';
+        }
+        return undefined;
+    }
+    buildReturnedUrl(key, makePublic) {
+        if (!makePublic) {
+            return `s3://${this.bucketName}/${key}`;
+        }
+        if (this.publicBaseUrl) {
+            const base = this.publicBaseUrl.replace(/\/$/, '');
+            // key already includes basePath via getFullPath, so do not prefix basePath again
+            const full = key.replace(/^\/+/, '');
+            return `${base}/${full}`;
+        }
+        // Try to synthesize a URL from endpoint if available (works for public R2 buckets)
+        if (this.endpoint) {
+            try {
+                const url = new URL(this.endpoint);
+                return `https://${this.bucketName}.${url.host}/${key}`;
+            } catch  {
+            // fallthrough
+            }
+        }
+        // Fallback to AWS style URL if region looks valid
+        return `https://${this.bucketName}.s3.${this.region}.amazonaws.com/${key}`;
+    }
+    getBucketAndKey(pathOrUrlStr) {
+        if (URL.canParse(pathOrUrlStr)) {
+            const url = new URL(pathOrUrlStr);
+            if (url.protocol === 's3:') {
+                return {
+                    bucket: url.host,
+                    key: url.pathname.replace(/^\/+/, '')
+                };
+            }
+            // For https URLs, try to infer virtual-hosted or path-style
+            if (url.protocol === 'https:' || url.protocol === 'http:') {
+                // If the URL matches the configured publicBaseUrl host, map back to our bucket and key
+                if (this.publicBaseUrl && url.host === new URL(this.publicBaseUrl).host) {
+                    return {
+                        bucket: this.bucketName,
+                        key: url.pathname.replace(/^\/+/, '')
+                    };
+                }
+                const hostParts = url.host.split('.');
+                if (hostParts.length > 3 && (hostParts[1] === 's3' || hostParts[hostParts.length - 2] === 'r2')) {
+                    // virtual hosted
+                    return {
+                        bucket: hostParts[0],
+                        key: url.pathname.replace(/^\/+/, '')
+                    };
+                } else if (this.endpoint && url.host === new URL(this.endpoint).host) {
+                    // path-style at custom endpoint
+                    const [bucket, ...rest] = url.pathname.replace(/^\/+/, '').split('/');
+                    return {
+                        bucket,
+                        key: rest.join('/')
+                    };
+                }
+            }
+        }
+        // Treat as path
+        return {
+            bucket: this.bucketName,
+            key: this.getFullPath(pathOrUrlStr)
+        };
+    }
+    getFullPath(path) {
+        const base = normalizeBasePath(this.basePath);
+        const rel = path.replace(/^\/+/, '');
+        return base ? join(base, rel) : rel;
+    }
+}

package/dest/gas/gas.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -28,6 +25,7 @@ export declare class Gas {
         daGas: string | number | bigint;
         l2Gas: string | number | bigint;
     }>;
+    getSize(): number;
     clone(): Gas;
     get(dimension: GasDimensions): number;
     equals(other: Gas): boolean;
@@ -36,7 +34,7 @@ export declare class Gas {
     static random(): Gas;
     isEmpty(): boolean;
     static fromBuffer(buffer: Buffer | BufferReader): Gas;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     [inspect.custom](): string;
     add(other: Gas): Gas;
     sub(other: Gas): Gas;

package/dest/gas/gas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas.d.ts","sourceRoot":"","sources":["../../src/gas/gas.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,eAAO,MAAM,aAAa,uBAAwB,CAAC;AACnD,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE3D,qCAAqC;AACrC,qBAAa,GAAG;aACc,KAAK,EAAE,MAAM;aAAkB,KAAK,EAAE,MAAM;gBAA5C,KAAK,EAAE,MAAM,EAAkB,KAAK,EAAE,MAAM;IAExE,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,KAAK,IAAI,GAAG;IAIZ,GAAG,CAAC,SAAS,EAAE,aAAa;IAI5B,MAAM,CAAC,KAAK,EAAE,GAAG;IAIjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAI1C,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,MAAM;IAIb,OAAO;IAIP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,GAAG;IAKrD,QAAQ;IAIR,CAAC,OAAO,CAAC,MAAM,CAAC;IAIhB,GAAG,CAAC,KAAK,EAAE,GAAG;IAId,GAAG,CAAC,KAAK,EAAE,GAAG;IAId,GAAG,CAAC,MAAM,EAAE,MAAM;IAIlB,wGAAwG;IACxG,KAAK,CAAC,KAAK,EAAE,GAAG;IAIhB,UAAU,CAAC,OAAO,EAAE,OAAO;IAO3B,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;CAI7C"}
+{"version":3,"file":"gas.d.ts","sourceRoot":"","sources":["../../src/gas/gas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,eAAO,MAAM,aAAa,uBAAwB,CAAC;AACnD,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE3D,qCAAqC;AACrC,qBAAa,GAAG;aAEI,KAAK,EAAE,MAAM;aACb,KAAK,EAAE,MAAM;gBADb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IAG/B,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,OAAO;IAIP,KAAK,IAAI,GAAG;IAIZ,GAAG,CAAC,SAAS,EAAE,aAAa;IAI5B,MAAM,CAAC,KAAK,EAAE,GAAG;IAIjB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAI1C,MAAM,CAAC,KAAK;IAIZ,MAAM,CAAC,MAAM;IAIb,OAAO;IAIP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,GAAG;IAKrD,QAAQ;IAIR,CAAC,OAAO,CAAC,MAAM,CAAC;IAIhB,GAAG,CAAC,KAAK,EAAE,GAAG;IAId,GAAG,CAAC,KAAK,EAAE,GAAG;IAId,GAAG,CAAC,MAAM,EAAE,MAAM;IAIlB,wGAAwG;IACxG,KAAK,CAAC,KAAK,EAAE,GAAG;IAIhB,UAAU,CAAC,OAAO,EAAE,OAAO;IAO3B,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;CAI7C"}

package/dest/gas/gas.js

@@ -20,6 +20,9 @@ export const GasDimensions = [
             l2Gas: schemas.UInt32
         }).transform(Gas.from);
     }
+    getSize() {
+        return 4 /* daGas */  + 4 /* l2Gas */ ;
+    }
     clone() {
         return new Gas(this.daGas, this.l2Gas);
     }
@@ -64,7 +67,7 @@ export const GasDimensions = [
         return this.daGas > other.daGas || this.l2Gas > other.l2Gas;
     }
     computeFee(gasFees) {
-        return GasDimensions.reduce((acc, dimension)=>acc.add(gasFees.get(dimension).mul(new Fr(this.get(dimension)))), Fr.ZERO);
+        return GasDimensions.reduce((acc, dimension)=>acc.add(new Fr(gasFees.get(dimension)).mul(new Fr(this.get(dimension)))), Fr.ZERO);
     }
     toFields() {
         return serializeToFields(this.daGas, this.l2Gas);

package/dest/gas/gas_fees.d.ts

@@ -1,45 +1,43 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { inspect } from 'util';
 import { z } from 'zod';
+import type { UInt128 } from '../types/shared.js';
 import type { GasDimensions } from './gas.js';
 /** Gas prices for each dimension. */
 export declare class GasFees {
-    readonly feePerDaGas: Fr;
-    readonly feePerL2Gas: Fr;
-    constructor(feePerDaGas: Fr | number | bigint, feePerL2Gas: Fr | number | bigint);
+    readonly feePerDaGas: UInt128;
+    readonly feePerL2Gas: UInt128;
+    constructor(feePerDaGas: number | bigint, feePerL2Gas: number | bigint);
     static get schema(): z.ZodEffects<z.ZodObject<{
-        feePerDaGas: z.ZodType<Fr, any, string>;
-        feePerL2Gas: z.ZodType<Fr, any, string>;
+        feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+        feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
     }, "strip", z.ZodTypeAny, {
-        feePerDaGas: Fr;
-        feePerL2Gas: Fr;
+        feePerDaGas: bigint;
+        feePerL2Gas: bigint;
     }, {
-        feePerDaGas: string;
-        feePerL2Gas: string;
+        feePerDaGas: string | number | bigint;
+        feePerL2Gas: string | number | bigint;
     }>, GasFees, {
-        feePerDaGas: string;
-        feePerL2Gas: string;
+        feePerDaGas: string | number | bigint;
+        feePerL2Gas: string | number | bigint;
     }>;
     clone(): GasFees;
     equals(other: GasFees): boolean;
-    get(dimension: GasDimensions): Fr;
+    get(dimension: GasDimensions): bigint;
     mul(scalar: number | bigint): GasFees;
     static from(fields: FieldsOf<GasFees>): GasFees;
     static random(): GasFees;
     static empty(): GasFees;
     isEmpty(): boolean;
     static fromBuffer(buffer: Buffer | BufferReader): GasFees;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromFields(fields: Fr[] | FieldReader): GasFees;
     toFields(): Fr[];
     toInspect(): {
-        feePerDaGas: number;
-        feePerL2Gas: number;
+        feePerDaGas: bigint;
+        feePerL2Gas: bigint;
     };
     [inspect.custom](): string;
 }

package/dest/gas/gas_fees.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas_fees.d.ts","sourceRoot":"","sources":["../../src/gas/gas_fees.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,qCAAqC;AACrC,qBAAa,OAAO;IAClB,SAAgB,WAAW,EAAE,EAAE,CAAC;IAChC,SAAgB,WAAW,EAAE,EAAE,CAAC;gBAEpB,WAAW,EAAE,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,EAAE,GAAG,MAAM,GAAG,MAAM;IAKhF,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,KAAK,IAAI,OAAO;IAIhB,MAAM,CAAC,KAAK,EAAE,OAAO;IAIrB,GAAG,CAAC,SAAS,EAAE,aAAa;IAS5B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAa3B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;IAIrC,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,KAAK;IAIZ,OAAO;IAIP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;IAKzD,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,QAAQ;IAIR,SAAS;;;;IAOT,CAAC,OAAO,CAAC,MAAM,CAAC;CAGjB"}
+{"version":3,"file":"gas_fees.d.ts","sourceRoot":"","sources":["../../src/gas/gas_fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EACL,YAAY,EACZ,WAAW,EAIZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,qCAAqC;AACrC,qBAAa,OAAO;IAClB,SAAgB,WAAW,EAAE,OAAO,CAAC;IACrC,SAAgB,WAAW,EAAE,OAAO,CAAC;gBAEzB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;IAKtE,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,KAAK,IAAI,OAAO;IAIhB,MAAM,CAAC,KAAK,EAAE,OAAO;IAIrB,GAAG,CAAC,SAAS,EAAE,aAAa;IAS5B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAU3B,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;IAIrC,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,KAAK;IAIZ,OAAO;IAIP,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;IAKzD,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C,QAAQ;IAIR,SAAS;;;;IAOT,CAAC,OAAO,CAAC,MAAM,CAAC;CAGjB"}

package/dest/gas/gas_fees.js

@@ -1,26 +1,25 @@
-import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
-import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
+import { BufferReader, FieldReader, bigintToUInt128BE, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { inspect } from 'util';
 import { z } from 'zod';
 /** Gas prices for each dimension. */ export class GasFees {
     feePerDaGas;
     feePerL2Gas;
     constructor(feePerDaGas, feePerL2Gas){
-        this.feePerDaGas = new Fr(feePerDaGas);
-        this.feePerL2Gas = new Fr(feePerL2Gas);
+        this.feePerDaGas = BigInt(feePerDaGas);
+        this.feePerL2Gas = BigInt(feePerL2Gas);
     }
     static get schema() {
         return z.object({
-            feePerDaGas: schemas.Fr,
-            feePerL2Gas: schemas.Fr
+            feePerDaGas: schemas.BigInt,
+            feePerL2Gas: schemas.BigInt
         }).transform(GasFees.from);
     }
     clone() {
         return new GasFees(this.feePerDaGas, this.feePerL2Gas);
     }
     equals(other) {
-        return this.feePerDaGas.equals(other.feePerDaGas) && this.feePerL2Gas.equals(other.feePerL2Gas);
+        return this.feePerDaGas === other.feePerDaGas && this.feePerL2Gas === other.feePerL2Gas;
     }
     get(dimension) {
         switch(dimension){
@@ -34,44 +33,44 @@ import { z } from 'zod';
         if (scalar === 1 || scalar === 1n) {
             return this.clone();
         } else if (typeof scalar === 'bigint') {
-            return new GasFees(new Fr(this.feePerDaGas.toBigInt() * scalar), new Fr(this.feePerL2Gas.toBigInt() * scalar));
+            return new GasFees(this.feePerDaGas * scalar, this.feePerL2Gas * scalar);
         } else {
-            return new GasFees(new Fr(this.feePerDaGas.toNumberUnsafe() * scalar), new Fr(this.feePerL2Gas.toNumberUnsafe() * scalar));
+            return new GasFees(Number(this.feePerDaGas) * scalar, Number(this.feePerL2Gas) * scalar);
         }
     }
     static from(fields) {
         return new GasFees(fields.feePerDaGas, fields.feePerL2Gas);
     }
     static random() {
-        return new GasFees(Fr.random(), Fr.random());
+        return new GasFees(Math.floor(Math.random() * 1e9), Math.floor(Math.random() * 1e9));
     }
     static empty() {
-        return new GasFees(Fr.ZERO, Fr.ZERO);
+        return new GasFees(0, 0);
     }
     isEmpty() {
-        return this.feePerDaGas.isZero() && this.feePerL2Gas.isZero();
+        return this.feePerDaGas === 0n && this.feePerL2Gas === 0n;
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new GasFees(reader.readObject(Fr), reader.readObject(Fr));
+        return new GasFees(reader.readUInt128(), reader.readUInt128());
     }
     toBuffer() {
-        return serializeToBuffer(this.feePerDaGas, this.feePerL2Gas);
+        return serializeToBuffer(bigintToUInt128BE(this.feePerDaGas), bigintToUInt128BE(this.feePerL2Gas));
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new GasFees(reader.readField(), reader.readField());
+        return new GasFees(reader.readField().toBigInt(), reader.readField().toBigInt());
     }
     toFields() {
         return serializeToFields(this.feePerDaGas, this.feePerL2Gas);
     }
     toInspect() {
         return {
-            feePerDaGas: this.feePerDaGas.toNumberUnsafe(),
-            feePerL2Gas: this.feePerL2Gas.toNumberUnsafe()
+            feePerDaGas: this.feePerDaGas,
+            feePerL2Gas: this.feePerL2Gas
         };
     }
     [inspect.custom]() {
-        return `GasFees { feePerDaGas=${this.feePerDaGas.toBigInt()} feePerL2Gas=${this.feePerL2Gas.toBigInt()} }`;
+        return `GasFees { feePerDaGas=${this.feePerDaGas} feePerL2Gas=${this.feePerL2Gas} }`;
     }
 }

package/dest/gas/gas_settings.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -41,30 +39,30 @@ export declare class GasSettings {
             l2Gas: string | number | bigint;
         }>;
         maxFeesPerGas: z.ZodEffects<z.ZodObject<{
-            feePerDaGas: z.ZodType<Fr, any, string>;
-            feePerL2Gas: z.ZodType<Fr, any, string>;
+            feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            feePerDaGas: Fr;
-            feePerL2Gas: Fr;
+            feePerDaGas: bigint;
+            feePerL2Gas: bigint;
         }, {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         }>, GasFees, {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         }>;
         maxPriorityFeesPerGas: z.ZodEffects<z.ZodObject<{
-            feePerDaGas: z.ZodType<Fr, any, string>;
-            feePerL2Gas: z.ZodType<Fr, any, string>;
+            feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+            feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
         }, "strip", z.ZodTypeAny, {
-            feePerDaGas: Fr;
-            feePerL2Gas: Fr;
+            feePerDaGas: bigint;
+            feePerL2Gas: bigint;
         }, {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         }>, GasFees, {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         }>;
     }, "strip", z.ZodTypeAny, {
         gasLimits: Gas;
@@ -81,12 +79,12 @@ export declare class GasSettings {
             l2Gas: string | number | bigint;
         };
         maxFeesPerGas: {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         };
         maxPriorityFeesPerGas: {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         };
     }>, GasSettings, {
         gasLimits: {
@@ -98,12 +96,12 @@ export declare class GasSettings {
             l2Gas: string | number | bigint;
         };
         maxFeesPerGas: {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         };
         maxPriorityFeesPerGas: {
-            feePerDaGas: string;
-            feePerL2Gas: string;
+            feePerDaGas: string | number | bigint;
+            feePerL2Gas: string | number | bigint;
         };
     }>;
     getSize(): number;
@@ -128,7 +126,7 @@ export declare class GasSettings {
     isEmpty(): boolean;
     equals(other: GasSettings): boolean;
     static fromBuffer(buffer: Buffer | BufferReader): GasSettings;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromFields(fields: Fr[] | FieldReader): GasSettings;
     toFields(): Fr[];
     static getFields(fields: FieldsOf<GasSettings>): readonly [Gas, Gas, GasFees, GasFees];

package/dest/gas/gas_settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas_settings.d.ts","sourceRoot":"","sources":["../../src/gas/gas_settings.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,GAAG,EAAiB,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,mGAAmG;AACnG,qBAAa,WAAW;aAEJ,SAAS,EAAE,GAAG;aACd,iBAAiB,EAAE,GAAG;aACtB,aAAa,EAAE,OAAO;aACtB,qBAAqB,EAAE,OAAO;gBAH9B,SAAS,EAAE,GAAG,EACd,iBAAiB,EAAE,GAAG,EACtB,aAAa,EAAE,OAAO,EACtB,qBAAqB,EAAE,OAAO;IAIhD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,OAAO,IAAI,MAAM;IAIjB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;QAChB,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzB,iBAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACjC,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjC,qBAAqB,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;KAC1C;IASD,KAAK;IASL,mFAAmF;IACnF,WAAW;IAWX,+BAA+B;IAC/B,MAAM,CAAC,KAAK;IAIZ,uGAAuG;IACvG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE;QACxB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,iBAAiB,CAAC,EAAE,GAAG,CAAC;QACxB,aAAa,EAAE,OAAO,CAAC;QACvB,qBAAqB,CAAC,EAAE,OAAO,CAAC;KACjC;IAYD,OAAO;IASP,MAAM,CAAC,KAAK,EAAE,WAAW;IASzB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAU7D,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,WAAW;IAU1D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC;CAG/C"}
+{"version":3,"file":"gas_settings.d.ts","sourceRoot":"","sources":["../../src/gas/gas_settings.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,GAAG,EAAiB,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,mGAAmG;AACnG,qBAAa,WAAW;aAEJ,SAAS,EAAE,GAAG;aACd,iBAAiB,EAAE,GAAG;aACtB,aAAa,EAAE,OAAO;aACtB,qBAAqB,EAAE,OAAO;gBAH9B,SAAS,EAAE,GAAG,EACd,iBAAiB,EAAE,GAAG,EACtB,aAAa,EAAE,OAAO,EACtB,qBAAqB,EAAE,OAAO;IAIhD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAShB;IAED,OAAO,IAAI,MAAM;IAIjB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;QAChB,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzB,iBAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;QACjC,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjC,qBAAqB,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;KAC1C;IASD,KAAK;IASL,mFAAmF;IACnF,WAAW;IAOX,+BAA+B;IAC/B,MAAM,CAAC,KAAK;IAIZ,uGAAuG;IACvG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE;QACxB,SAAS,CAAC,EAAE,GAAG,CAAC;QAChB,iBAAiB,CAAC,EAAE,GAAG,CAAC;QACxB,aAAa,EAAE,OAAO,CAAC;QACvB,qBAAqB,CAAC,EAAE,OAAO,CAAC;KACjC;IAYD,OAAO;IASP,MAAM,CAAC,KAAK,EAAE,WAAW;IASzB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAU7D,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,WAAW;IAU1D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC;CAG/C"}

package/dest/gas/gas_settings.js

@@ -1,4 +1,4 @@
-import { DEFAULT_GAS_LIMIT, DEFAULT_TEARDOWN_GAS_LIMIT, GAS_SETTINGS_LENGTH } from '@aztec/constants';
+import { DEFAULT_DA_GAS_LIMIT, DEFAULT_L2_GAS_LIMIT, DEFAULT_TEARDOWN_DA_GAS_LIMIT, DEFAULT_TEARDOWN_L2_GAS_LIMIT, GAS_SETTINGS_LENGTH } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { z } from 'zod';
@@ -35,7 +35,7 @@ import { GasFees } from './gas_fees.js';
         return new GasSettings(this.gasLimits.clone(), this.teardownGasLimits.clone(), this.maxFeesPerGas.clone(), this.maxPriorityFeesPerGas.clone());
     }
     /** Returns the maximum fee to be paid according to gas limits and max fees set. */ getFeeLimit() {
-        return GasDimensions.reduce((acc, dimension)=>this.maxFeesPerGas.get(dimension).mul(new Fr(this.gasLimits.get(dimension))).add(acc), Fr.ZERO);
+        return GasDimensions.reduce((acc, dimension)=>new Fr(this.maxFeesPerGas.get(dimension)).mul(new Fr(this.gasLimits.get(dimension))).add(acc), Fr.ZERO);
     }
     /** Zero-value gas settings. */ static empty() {
         return new GasSettings(Gas.empty(), Gas.empty(), GasFees.empty(), GasFees.empty());
@@ -43,12 +43,12 @@ import { GasFees } from './gas_fees.js';
     /** Default gas settings to use when user has not provided them. Requires explicit max fees per gas. */ static default(overrides) {
         return GasSettings.from({
             gasLimits: overrides.gasLimits ?? {
-                l2Gas: DEFAULT_GAS_LIMIT,
-                daGas: DEFAULT_GAS_LIMIT
+                l2Gas: DEFAULT_L2_GAS_LIMIT,
+                daGas: DEFAULT_DA_GAS_LIMIT
             },
             teardownGasLimits: overrides.teardownGasLimits ?? {
-                l2Gas: DEFAULT_TEARDOWN_GAS_LIMIT,
-                daGas: DEFAULT_TEARDOWN_GAS_LIMIT
+                l2Gas: DEFAULT_TEARDOWN_L2_GAS_LIMIT,
+                daGas: DEFAULT_TEARDOWN_DA_GAS_LIMIT
             },
             maxFeesPerGas: overrides.maxFeesPerGas,
             maxPriorityFeesPerGas: overrides.maxPriorityFeesPerGas ?? GasFees.empty()