@aztec/stdlib 2.1.0-rc.9 → 3.0.0-devnet.2

package/dest/tx/tx_effect.js

@@ -1,6 +1,6 @@
-import { CONTRACT_CLASS_LOGS_PREFIX, L2_L1_MSGS_PREFIX, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTES_PREFIX, NULLIFIERS_PREFIX, PRIVATE_LOGS_PREFIX, PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, PUBLIC_LOGS_PREFIX, REVERT_CODE_PREFIX, TX_FEE_PREFIX } from '@aztec/constants';
+import { decodeTxStartMarker, encodeTxStartMarker, isValidTxStartMarker } from '@aztec/blob-lib/encoding';
+import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/constants';
 import { makeTuple, makeTupleAsync } from '@aztec/foundation/array';
-import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -12,14 +12,8 @@ import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
 import { PrivateLog } from '../logs/private_log.js';
-import { PublicLog } from '../logs/public_log.js';
+import { FlatPublicLogs, PublicLog } from '../logs/public_log.js';
 import { TxHash } from './tx_hash.js';
-// This will appear as 0x74785f7374617274 in logs
-export const TX_START_PREFIX = 8392562855083340404n;
-// These are helper constants to decode tx effects from blob encoded fields
-export const TX_START_PREFIX_BYTES_LENGTH = TX_START_PREFIX.toString(16).length / 2;
-// 7 bytes for: | 0 | txlen[0] | txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revertCode |
-export const TX_EFFECT_PREFIX_BYTE_LENGTH = TX_START_PREFIX_BYTES_LENGTH + 7;
 export class TxEffect {
     revertCode;
     txHash;
@@ -116,7 +110,7 @@ export class TxEffect {
             serializeArrayOfBufferableToVector(this.l2ToL1Msgs, 1),
             serializeArrayOfBufferableToVector(this.publicDataWrites, 1),
             serializeArrayOfBufferableToVector(this.privateLogs, 1),
-            serializeArrayOfBufferableToVector(this.publicLogs, 1),
+            serializeArrayOfBufferableToVector(this.publicLogs, 4),
             serializeArrayOfBufferableToVector(this.contractClassLogs, 1)
         ]);
     }
@@ -132,7 +126,7 @@ export class TxEffect {
    * @returns An instance of TxEffect.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new TxEffect(RevertCode.fromBuffer(reader), TxHash.fromBuffer(reader), Fr.fromBuffer(reader), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(PublicDataWrite), reader.readVectorUint8Prefix(PrivateLog), reader.readVectorUint8Prefix(PublicLog), reader.readVectorUint8Prefix(ContractClassLog));
+        return new TxEffect(RevertCode.fromBuffer(reader), TxHash.fromBuffer(reader), Fr.fromBuffer(reader), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(Fr), reader.readVectorUint8Prefix(PublicDataWrite), reader.readVectorUint8Prefix(PrivateLog), reader.readVector(PublicLog), reader.readVectorUint8Prefix(ContractClassLog));
     }
     /**
    * Computes txOutHash of this tx effect.
@@ -145,217 +139,84 @@ export class TxEffect {
         return computeUnbalancedMerkleTreeRoot(l2ToL1Msgs.map((msg)=>msg.toBuffer()));
     }
     static async random(numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, maxEffects = undefined) {
-        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(maxEffects === undefined ? MAX_NOTE_HASHES_PER_TX : Math.min(maxEffects, MAX_NOTE_HASHES_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_NULLIFIERS_PER_TX : Math.min(maxEffects, MAX_NULLIFIERS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_L2_TO_L1_MSGS_PER_TX : Math.min(maxEffects, MAX_L2_TO_L1_MSGS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX : Math.min(maxEffects, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX), PublicDataWrite.random), makeTuple(MAX_PRIVATE_LOGS_PER_TX, ()=>PrivateLog.random()), await makeTupleAsync(numPublicCallsPerTx * numPublicLogsPerCall, async ()=>await PublicLog.random()), await makeTupleAsync(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.random));
+        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(maxEffects === undefined ? MAX_NOTE_HASHES_PER_TX : Math.min(maxEffects, MAX_NOTE_HASHES_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_NULLIFIERS_PER_TX : Math.min(maxEffects, MAX_NULLIFIERS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_L2_TO_L1_MSGS_PER_TX : Math.min(maxEffects, MAX_L2_TO_L1_MSGS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX : Math.min(maxEffects, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX), PublicDataWrite.random), makeTuple(MAX_PRIVATE_LOGS_PER_TX, ()=>PrivateLog.random()), await Promise.all(new Array(numPublicCallsPerTx * numPublicLogsPerCall).fill(null).map(()=>PublicLog.random())), await makeTupleAsync(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.random));
     }
     static empty() {
         return new TxEffect(RevertCode.OK, TxHash.zero(), Fr.ZERO, [], [], [], [], [], [], []);
     }
-    isEmpty() {
-        return this.nullifiers.length === 0;
-    }
     /** Returns a hex representation of the TxEffect object. */ toString() {
         return bufferToHex(this.toBuffer());
     }
     /**
-   * Returns the prefix as used in a blob.
-   * Used to prefix a 'block' of tx effects with its type and length.
-   */ toPrefix(type, length) {
-        const buf = Buffer.alloc(4);
-        buf.writeUint8(type);
-        buf.writeUInt16BE(length, 2);
-        return new Fr(buf);
-    }
-    /**
-   * Decodes the prefix as used in a blob to tx effect type and length.
-   */ static fromPrefix(prefix) {
-        const buf = prefix.toBuffer().subarray(-4);
-        return {
-            type: buf[0],
-            length: new Fr(buf.subarray(-2)).toNumber()
-        };
-    }
-    /**
-   * Encodes the first field of a tx effect as used in a blob:
-   * TX_START_PREFIX | 0 | txlen[0] txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revert_code
-   */ encodeFirstField(length, revertCode) {
-        const lengthBuf = Buffer.alloc(2);
-        lengthBuf.writeUInt16BE(length, 0);
-        return new Fr(Buffer.concat([
-            toBufferBE(TX_START_PREFIX, TX_START_PREFIX_BYTES_LENGTH),
-            Buffer.alloc(1),
-            lengthBuf,
-            Buffer.alloc(1),
-            Buffer.from([
-                REVERT_CODE_PREFIX
-            ]),
-            Buffer.alloc(1),
-            revertCode.toBuffer()
-        ]));
-    }
-    /**
-   * Decodes the first field of a tx effect as used in a blob:
-   * TX_START_PREFIX | 0 | txlen[0] txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revert_code
-   * Assumes that isFirstField has been called already.
-   */ static decodeFirstField(field) {
-        const buf = field.toBuffer().subarray(-TX_EFFECT_PREFIX_BYTE_LENGTH);
-        return {
-            length: new Fr(buf.subarray(TX_START_PREFIX_BYTES_LENGTH + 1, TX_START_PREFIX_BYTES_LENGTH + 3)).toNumber(),
-            revertCode: buf[buf.length - 1]
-        };
-    }
-    /**
-   * Determines whether a field is the first field of a tx effect
-   */ static isFirstField(field) {
-        const buf = field.toBuffer();
-        if (!buf.subarray(0, field.size - TX_EFFECT_PREFIX_BYTE_LENGTH).equals(Buffer.alloc(field.size - TX_EFFECT_PREFIX_BYTE_LENGTH))) {
-            return false;
-        }
-        const sliced = buf.subarray(-TX_EFFECT_PREFIX_BYTE_LENGTH);
-        if (// Checking we start with the correct prefix...
-        !new Fr(sliced.subarray(0, TX_START_PREFIX_BYTES_LENGTH)).equals(new Fr(TX_START_PREFIX)) || // ...and include the revert code prefix..
-        sliced[sliced.length - 3] !== REVERT_CODE_PREFIX || // ...and the following revert code is valid.
-        sliced[sliced.length - 1] > 4) {
-            return false;
-        }
-        return true;
-    }
-    /**
-   * Returns a flat packed array of prefixed fields of all tx effects, used for blobs.
+   * Returns a flat packed array of fields of all tx effects, to be appended to blobs.
+   * Must match the implementation in noir-protocol-circuits/crates/rollup-lib/src/tx_base/components/tx_blob_data.nr
    */ toBlobFields() {
-        if (this.isEmpty()) {
-            return [];
-        }
         const flattened = [];
-        // We reassign the first field when we know the length of all effects - see below
+        // We reassign the first field at the end when we know the length of all effects to create the tx start marker.
         flattened.push(Fr.ZERO);
         flattened.push(this.txHash.hash);
-        // TODO: how long should tx fee be? For now, not using toPrefix()
-        flattened.push(new Fr(Buffer.concat([
-            Buffer.from([
-                TX_FEE_PREFIX
-            ]),
-            Buffer.alloc(1),
-            this.transactionFee.toBuffer().subarray(3)
-        ])));
-        if (this.noteHashes.length) {
-            flattened.push(this.toPrefix(NOTES_PREFIX, this.noteHashes.length));
-            flattened.push(...this.noteHashes);
-        }
-        if (this.nullifiers.length) {
-            flattened.push(this.toPrefix(NULLIFIERS_PREFIX, this.nullifiers.length));
-            flattened.push(...this.nullifiers);
-        }
-        if (this.l2ToL1Msgs.length) {
-            flattened.push(this.toPrefix(L2_L1_MSGS_PREFIX, this.l2ToL1Msgs.length));
-            flattened.push(...this.l2ToL1Msgs);
-        }
-        if (this.publicDataWrites.length) {
-            flattened.push(this.toPrefix(PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, this.publicDataWrites.length));
-            flattened.push(...this.publicDataWrites.flatMap((w)=>w.toBlobFields()));
-        }
-        if (this.privateLogs.length) {
-            flattened.push(this.toPrefix(PRIVATE_LOGS_PREFIX, this.privateLogs.length));
-            flattened.push(...this.privateLogs.flatMap((l)=>l.toBlobFields()));
-        }
-        if (this.publicLogs.length) {
-            flattened.push(this.toPrefix(PUBLIC_LOGS_PREFIX, this.publicLogs.length));
-            flattened.push(...this.publicLogs.flatMap((l)=>l.toBlobFields()));
-        }
-        if (this.contractClassLogs.length) {
-            flattened.push(this.toPrefix(CONTRACT_CLASS_LOGS_PREFIX, this.contractClassLogs.length));
-            flattened.push(...this.contractClassLogs.flatMap((l)=>l.toBlobFields()));
-        }
-        // The first value appended to each list of fields representing a tx effect is:
-        // TX_START_PREFIX | 0 | txlen[0] txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revert_code
-        // Tx start and len are to aid decomposing/ identifying when we reach a new tx effect
-        // The remaining bytes are used for revert code, since that only requires 3 bytes
-        flattened[0] = this.encodeFirstField(flattened.length, this.revertCode);
+        flattened.push(this.transactionFee);
+        flattened.push(...this.noteHashes);
+        flattened.push(...this.nullifiers);
+        flattened.push(...this.l2ToL1Msgs);
+        flattened.push(...this.publicDataWrites.flatMap((w)=>w.toBlobFields()));
+        flattened.push(...this.privateLogs.flatMap((l)=>l.toBlobFields()));
+        const flattenedPublicLogs = FlatPublicLogs.fromLogs(this.publicLogs);
+        flattened.push(...flattenedPublicLogs.toBlobFields());
+        flattened.push(...this.contractClassLogs.flatMap((l)=>l.toBlobFields()));
+        flattened[0] = encodeTxStartMarker({
+            revertCode: this.revertCode.getCode(),
+            numBlobFields: flattened.length,
+            numNoteHashes: this.noteHashes.length,
+            numNullifiers: this.nullifiers.length,
+            numL2ToL1Msgs: this.l2ToL1Msgs.length,
+            numPublicDataWrites: this.publicDataWrites.length,
+            numPrivateLogs: this.privateLogs.length,
+            publicLogsLength: flattenedPublicLogs.length,
+            contractClassLogLength: this.contractClassLogs[0]?.emittedLength ?? 0
+        });
         return flattened;
     }
     /**
-   * Decodes a flat packed array of prefixed fields to TxEffect
+   * Decodes a flat packed array of fields to TxEffect.
    */ static fromBlobFields(fields) {
-        const ensureEmpty = (arr)=>{
-            if (arr.length) {
-                throw new Error('Invalid fields given to TxEffect.fromBlobFields(): Attempted to assign property twice.');
-            }
-        };
-        const effect = this.empty();
         const reader = FieldReader.asReader(fields);
         const totalFields = reader.remainingFields();
         if (!totalFields) {
-            return effect;
+            throw new Error('Cannot process empty blob fields.');
         }
-        const firstField = reader.readField();
-        if (!this.isFirstField(firstField)) {
-            throw new Error('Invalid fields given to TxEffect.fromBlobFields(): First field invalid.');
+        const txStartMarker = decodeTxStartMarker(reader.readField());
+        if (!isValidTxStartMarker(txStartMarker)) {
+            throw new Error('Invalid fields given to TxEffect.fromBlobFields(): invalid TxStartMarker');
         }
-        const { length: fieldsToProcess, revertCode } = this.decodeFirstField(firstField);
-        effect.revertCode = RevertCode.fromField(new Fr(revertCode));
-        effect.txHash = new TxHash(reader.readField());
-        // TODO: how long should tx fee be? For now, not using fromPrefix()
-        const prefixedFee = reader.readField();
-        // NB: Fr.fromBuffer hangs here if you provide a buffer less than 32 in len
-        // todo: try new Fr(prefixedFee.toBuffer().subarray(3))
-        effect.transactionFee = Fr.fromBuffer(Buffer.concat([
-            Buffer.alloc(3),
-            prefixedFee.toBuffer().subarray(3)
-        ]));
-        let fieldsProcessed = totalFields - reader.remainingFields();
-        while(fieldsProcessed < fieldsToProcess){
-            const { type, length } = this.fromPrefix(reader.readField());
-            switch(type){
-                case NOTES_PREFIX:
-                    ensureEmpty(effect.noteHashes);
-                    effect.noteHashes = reader.readFieldArray(length);
-                    break;
-                case NULLIFIERS_PREFIX:
-                    ensureEmpty(effect.nullifiers);
-                    effect.nullifiers = reader.readFieldArray(length);
-                    break;
-                case L2_L1_MSGS_PREFIX:
-                    ensureEmpty(effect.l2ToL1Msgs);
-                    effect.l2ToL1Msgs = reader.readFieldArray(length);
-                    break;
-                case PUBLIC_DATA_UPDATE_REQUESTS_PREFIX:
-                    {
-                        ensureEmpty(effect.publicDataWrites);
-                        effect.publicDataWrites = Array.from({
-                            length
-                        }, ()=>PublicDataWrite.fromBlobFields(reader));
-                        break;
-                    }
-                case PRIVATE_LOGS_PREFIX:
-                    {
-                        ensureEmpty(effect.privateLogs);
-                        effect.privateLogs = Array.from({
-                            length
-                        }, ()=>PrivateLog.fromBlobFields(reader));
-                        break;
-                    }
-                case PUBLIC_LOGS_PREFIX:
-                    {
-                        ensureEmpty(effect.publicLogs);
-                        effect.publicLogs = Array.from({
-                            length
-                        }, ()=>PublicLog.fromBlobFields(reader));
-                        break;
-                    }
-                case CONTRACT_CLASS_LOGS_PREFIX:
-                    {
-                        ensureEmpty(effect.contractClassLogs);
-                        effect.contractClassLogs = Array.from({
-                            length
-                        }, ()=>ContractClassLog.fromBlobFields(reader));
-                        break;
-                    }
-                case REVERT_CODE_PREFIX:
-                default:
-                    throw new Error(`Too many fields to decode given to TxEffect.fromBlobFields()`);
-            }
-            fieldsProcessed = totalFields - reader.remainingFields();
-        }
-        return effect;
+        const revertCode = RevertCode.fromField(new Fr(txStartMarker.revertCode));
+        const txHash = new TxHash(reader.readField());
+        const transactionFee = reader.readField();
+        const noteHashes = reader.readFieldArray(txStartMarker.numNoteHashes);
+        const nullifiers = reader.readFieldArray(txStartMarker.numNullifiers);
+        const l2ToL1Msgs = reader.readFieldArray(txStartMarker.numL2ToL1Msgs);
+        const publicDataWrites = Array.from({
+            length: txStartMarker.numPublicDataWrites
+        }, ()=>PublicDataWrite.fromBlobFields(reader));
+        const privateLogs = Array.from({
+            length: txStartMarker.numPrivateLogs
+        }, ()=>PrivateLog.fromBlobFields(reader));
+        const publicLogs = FlatPublicLogs.fromBlobFields(txStartMarker.publicLogsLength, reader).toLogs();
+        const contractClassLogs = txStartMarker.contractClassLogLength > 0 ? [
+            ContractClassLog.fromBlobFields(txStartMarker.contractClassLogLength, reader)
+        ] : [];
+        return TxEffect.from({
+            revertCode,
+            txHash,
+            transactionFee,
+            noteHashes,
+            nullifiers,
+            l2ToL1Msgs,
+            publicDataWrites,
+            privateLogs,
+            publicLogs,
+            contractClassLogs
+        });
     }
     static from(fields) {
         return new TxEffect(fields.revertCode, fields.txHash, fields.transactionFee, fields.noteHashes, fields.nullifiers, fields.l2ToL1Msgs, fields.publicDataWrites, fields.privateLogs, fields.publicLogs, fields.contractClassLogs);
@@ -384,7 +245,7 @@ export class TxEffect {
       l2ToL1Msgs: [${this.l2ToL1Msgs.map((h)=>h.toString()).join(', ')}],
       publicDataWrites: [${this.publicDataWrites.map((h)=>h.toString()).join(', ')}],
       privateLogs: [${this.privateLogs.map((l)=>l.fields.map((f)=>f.toString()).join(',')).join(', ')}],
-      publicLogs: [${this.publicLogs.map((l)=>l.fields.map((f)=>f.toString()).join(',')).join(', ')}],
+      publicLogs: ${inspect(this.publicLogs)},
       contractClassLogs: [${this.contractClassLogs.map((l)=>l.toFields().map((f)=>f.toString()).join(',')).join(', ')}],
      }`;
     }

package/dest/tx/validator/error_texts.d.ts

@@ -9,7 +9,7 @@ export declare const TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP = "Invalid expiration
 export declare const TX_ERROR_INCORRECT_L1_CHAIN_ID = "Incorrect L1 chain id";
 export declare const TX_ERROR_INCORRECT_ROLLUP_VERSION = "Incorrect rollup version";
 export declare const TX_ERROR_INCORRECT_VK_TREE_ROOT = "Incorrect verification keys tree root";
-export declare const TX_ERROR_INCORRECT_PROTOCOL_CONTRACT_TREE_ROOT = "Incorrect protocol contracts tree root";
+export declare const TX_ERROR_INCORRECT_PROTOCOL_CONTRACTS_HASH = "Incorrect protocol contracts hash";
 export declare const TX_ERROR_INVALID_PROOF = "Invalid proof";
 export declare const TX_ERROR_INCORRECT_CALLDATA = "Incorrect calldata for public call";
 export declare const TX_ERROR_CALLDATA_COUNT_MISMATCH = "Wrong number of calldata for public calls";

package/dest/tx/validator/error_texts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error_texts.d.ts","sourceRoot":"","sources":["../../../src/tx/validator/error_texts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,uCAAuC,mCAAmC,CAAC;AACxF,eAAO,MAAM,+BAA+B,8CAA8C,CAAC;AAC3F,eAAO,MAAM,2BAA2B,wEAAwE,CAAC;AAGjH,eAAO,MAAM,mCAAmC,qCAAqC,CAAC;AAGtF,eAAO,MAAM,kCAAkC,8BAA8B,CAAC;AAC9E,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAGhE,eAAO,MAAM,qCAAqC,iCAAiC,CAAC;AACpF,eAAO,MAAM,8BAA8B,0BAA0B,CAAC;AACtE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,+BAA+B,0CAA0C,CAAC;AACvF,eAAO,MAAM,8CAA8C,2CAA2C,CAAC;AAGvG,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAGtD,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAChF,eAAO,MAAM,gCAAgC,8CAA8C,CAAC;AAC5F,eAAO,MAAM,iCAAiC,uDAAuD,CAAC;AACtG,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAC5F,eAAO,MAAM,kCAAkC,yCAAyC,CAAC;AACzF,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAC7E,eAAO,MAAM,mCAAmC,2CAA2C,CAAC;AAC5F,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAG3D,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAG9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAC"}
+{"version":3,"file":"error_texts.d.ts","sourceRoot":"","sources":["../../../src/tx/validator/error_texts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,uCAAuC,mCAAmC,CAAC;AACxF,eAAO,MAAM,+BAA+B,8CAA8C,CAAC;AAC3F,eAAO,MAAM,2BAA2B,wEAAwE,CAAC;AAGjH,eAAO,MAAM,mCAAmC,qCAAqC,CAAC;AAGtF,eAAO,MAAM,kCAAkC,8BAA8B,CAAC;AAC9E,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAGhE,eAAO,MAAM,qCAAqC,iCAAiC,CAAC;AACpF,eAAO,MAAM,8BAA8B,0BAA0B,CAAC;AACtE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,+BAA+B,0CAA0C,CAAC;AACvF,eAAO,MAAM,0CAA0C,sCAAsC,CAAC;AAG9F,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAGtD,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAChF,eAAO,MAAM,gCAAgC,8CAA8C,CAAC;AAC5F,eAAO,MAAM,iCAAiC,uDAAuD,CAAC;AACtG,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAC5F,eAAO,MAAM,kCAAkC,yCAAyC,CAAC;AACzF,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAC7E,eAAO,MAAM,mCAAmC,2CAA2C,CAAC;AAC5F,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAG3D,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAG9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAC"}

package/dest/tx/validator/error_texts.js

@@ -13,7 +13,7 @@ export const TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP = 'Invalid expiration timesta
 export const TX_ERROR_INCORRECT_L1_CHAIN_ID = 'Incorrect L1 chain id';
 export const TX_ERROR_INCORRECT_ROLLUP_VERSION = 'Incorrect rollup version';
 export const TX_ERROR_INCORRECT_VK_TREE_ROOT = 'Incorrect verification keys tree root';
-export const TX_ERROR_INCORRECT_PROTOCOL_CONTRACT_TREE_ROOT = 'Incorrect protocol contracts tree root';
+export const TX_ERROR_INCORRECT_PROTOCOL_CONTRACTS_HASH = 'Incorrect protocol contracts hash';
 // Proof
 export const TX_ERROR_INVALID_PROOF = 'Invalid proof';
 //Data

package/dest/versioning/versioning.d.ts

@@ -7,11 +7,11 @@ export type ComponentsVersions = {
     l1ChainId: number;
     l1RollupAddress: EthAddress;
     rollupVersion: number;
-    l2ProtocolContractsTreeRoot: string;
+    l2ProtocolContractsHash: string;
     l2CircuitsVkTreeRoot: string;
 };
 /** Returns components versions from chain config. */
-export declare function getComponentsVersionsFromConfig(config: ChainConfig, l2ProtocolContractsTreeRoot: string | Fr, l2CircuitsVkTreeRoot: string | Fr): ComponentsVersions;
+export declare function getComponentsVersionsFromConfig(config: ChainConfig, l2ProtocolContractsHash: string | Fr, l2CircuitsVkTreeRoot: string | Fr): ComponentsVersions;
 /** Returns a compressed string representation of the version (around 32 chars). Used in p2p ENRs. */
 export declare function compressComponentVersions(versions: ComponentsVersions): string;
 export declare class ComponentsVersionsError extends Error {

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,2BAA2B,CAAC;AAE7D,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"}
+{"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;AAE7D,8IAA8I;AAC9I,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,UAAU,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;IAChC,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,qDAAqD;AACrD,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,WAAW,EACnB,uBAAuB,EAAE,MAAM,GAAG,EAAE,EACpC,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,mBAc1D;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/versioning/versioning.js

@@ -1,15 +1,15 @@
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-/** Returns components versions from chain config. */ export function getComponentsVersionsFromConfig(config, l2ProtocolContractsTreeRoot, l2CircuitsVkTreeRoot) {
+/** Returns components versions from chain config. */ export function getComponentsVersionsFromConfig(config, l2ProtocolContractsHash, l2CircuitsVkTreeRoot) {
     return {
         l1ChainId: config.l1ChainId,
         l1RollupAddress: config.l1Contracts?.rollupAddress,
         rollupVersion: config.rollupVersion,
-        l2ProtocolContractsTreeRoot: l2ProtocolContractsTreeRoot.toString(),
+        l2ProtocolContractsHash: l2ProtocolContractsHash.toString(),
         l2CircuitsVkTreeRoot: l2CircuitsVkTreeRoot.toString()
     };
 }
 /** Returns a compressed string representation of the version (around 32 chars). Used in p2p ENRs. */ export function compressComponentVersions(versions) {
-    if (versions.l1RollupAddress === undefined || versions.l2ProtocolContractsTreeRoot === undefined || versions.l2CircuitsVkTreeRoot === undefined) {
+    if (versions.l1RollupAddress === undefined || versions.l2ProtocolContractsHash === undefined || versions.l2CircuitsVkTreeRoot === undefined) {
         throw new Error(`Component versions are not set: ${jsonStringify(versions)}`);
     }
     return [
@@ -17,7 +17,7 @@ import { jsonStringify } from '@aztec/foundation/json-rpc';
         versions.l1ChainId,
         versions.l1RollupAddress.toString().slice(2, 10),
         versions.rollupVersion,
-        versions.l2ProtocolContractsTreeRoot.toString().slice(2, 10),
+        versions.l2ProtocolContractsHash.toString().slice(2, 10),
         versions.l2CircuitsVkTreeRoot.toString().slice(2, 10)
     ].join('-');
 }
@@ -28,7 +28,7 @@ export class ComponentsVersionsError extends Error {
     }
 }
 /** Checks if the compressed string matches against the expected versions. Throws on mismatch. */ export function checkCompressedComponentVersion(compressed, expected) {
-    const [versionVersion, l1ChainId, l1RollupAddress, rollupVersion, l2ProtocolContractsTreeRoot, l2CircuitsVkTreeRoot] = compressed.split('-');
+    const [versionVersion, l1ChainId, l1RollupAddress, rollupVersion, l2ProtocolContractsHash, l2CircuitsVkTreeRoot] = compressed.split('-');
     if (versionVersion !== '00') {
         throw new ComponentsVersionsError('version', '00', versionVersion);
     }
@@ -41,8 +41,8 @@ export class ComponentsVersionsError extends Error {
     if (rollupVersion !== expected.rollupVersion.toString()) {
         throw new ComponentsVersionsError('L2 chain version', expected.rollupVersion.toString(), rollupVersion);
     }
-    if (l2ProtocolContractsTreeRoot !== expected.l2ProtocolContractsTreeRoot.toString().slice(2, 10)) {
-        throw new ComponentsVersionsError(`L2 protocol contracts vk tree root`, expected.l2ProtocolContractsTreeRoot.toString(), l2ProtocolContractsTreeRoot);
+    if (l2ProtocolContractsHash !== expected.l2ProtocolContractsHash.toString().slice(2, 10)) {
+        throw new ComponentsVersionsError(`L2 protocol contracts vk tree root`, expected.l2ProtocolContractsHash.toString(), l2ProtocolContractsHash);
     }
     if (l2CircuitsVkTreeRoot !== expected.l2CircuitsVkTreeRoot.toString().slice(2, 10)) {
         throw new ComponentsVersionsError('L2 circuits vk tree root', expected.l2CircuitsVkTreeRoot.toString(), l2CircuitsVkTreeRoot);
@@ -51,7 +51,7 @@ export class ComponentsVersionsError extends Error {
 /** Checks that two component versions match. Undefined fields are ignored. */ export function validatePartialComponentVersionsMatch(expected, actual) {
     for (const key of [
         'l1RollupAddress',
-        'l2ProtocolContractsTreeRoot',
+        'l2ProtocolContractsHash',
         'l2CircuitsVkTreeRoot',
         'l1ChainId',
         'rollupVersion'
@@ -67,11 +67,16 @@ export class ComponentsVersionsError extends Error {
 }
 /** Returns a Koa middleware that injects the versioning info as headers. */ export function getVersioningMiddleware(versions) {
     return async (ctx, next)=>{
-        await next();
-        for(const key in versions){
-            const value = versions[key];
-            if (value !== undefined) {
-                ctx.set(`x-aztec-${key}`, value.toString());
+        try {
+            await next();
+        } finally{
+            // Always add version headers, even if there was an error
+            // This allows the client to detect version mismatches before processing other errors
+            for(const key in versions){
+                const value = versions[key];
+                if (value !== undefined) {
+                    ctx.set(`x-aztec-${key}`, value.toString());
+                }
             }
         }
     };

package/dest/world-state/index.d.ts

@@ -0,0 +1,2 @@
+export * from './world_state_revision.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/world-state/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/world-state/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC"}

package/dest/world-state/index.js

@@ -0,0 +1 @@
+export * from './world_state_revision.js';

package/dest/world-state/world_state_revision.d.ts

@@ -0,0 +1,22 @@
+import { z } from 'zod';
+export declare class WorldStateRevision {
+    readonly forkId: number;
+    readonly blockNumber: number;
+    readonly includeUncommitted: boolean;
+    constructor(forkId: number, blockNumber: number, includeUncommitted: boolean);
+    static empty(): WorldStateRevision;
+    static get schema(): z.ZodObject<{
+        forkId: z.ZodNumber;
+        blockNumber: z.ZodNumber;
+        includeUncommitted: z.ZodBoolean;
+    }, "strip", z.ZodTypeAny, {
+        blockNumber: number;
+        forkId: number;
+        includeUncommitted: boolean;
+    }, {
+        blockNumber: number;
+        forkId: number;
+        includeUncommitted: boolean;
+    }>;
+}
+//# sourceMappingURL=world_state_revision.d.ts.map

package/dest/world-state/world_state_revision.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"world_state_revision.d.ts","sourceRoot":"","sources":["../../src/world-state/world_state_revision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,qBAAa,kBAAkB;aAEX,MAAM,EAAE,MAAM;aACd,WAAW,EAAE,MAAM;aACnB,kBAAkB,EAAE,OAAO;gBAF3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,OAAO;IAG7C,MAAM,CAAC,KAAK;IAIZ,MAAM,KAAK,MAAM;;;;;;;;;;;;OAMhB;CACF"}

package/dest/world-state/world_state_revision.js

@@ -0,0 +1,21 @@
+import { z } from 'zod';
+export class WorldStateRevision {
+    forkId;
+    blockNumber;
+    includeUncommitted;
+    constructor(forkId, blockNumber, includeUncommitted){
+        this.forkId = forkId;
+        this.blockNumber = blockNumber;
+        this.includeUncommitted = includeUncommitted;
+    }
+    static empty() {
+        return new WorldStateRevision(0, 0, false);
+    }
+    static get schema() {
+        return z.object({
+            forkId: z.number(),
+            blockNumber: z.number(),
+            includeUncommitted: z.boolean()
+        });
+    }
+}

package/dest/zkpassport/index.d.ts

@@ -1,15 +1,21 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/fields';
 export type ViemZkPassportProofParams = {
-    vkeyHash: `0x${string}`;
-    proof: `0x${string}`;
-    publicInputs: `0x${string}`[];
-    committedInputs: `0x${string}`;
-    committedInputCounts: bigint[];
-    validityPeriodInSeconds: bigint;
-    domain: string;
-    scope: string;
-    devMode: boolean;
+    proofVerificationData: {
+        vkeyHash: `0x${string}`;
+        proof: `0x${string}`;
+        publicInputs: `0x${string}`[];
+    };
+    commitments: {
+        committedInputs: `0x${string}`;
+        committedInputCounts: bigint[];
+    };
+    serviceConfig: {
+        validityPeriodInSeconds: bigint;
+        domain: string;
+        scope: string;
+        devMode: boolean;
+    };
 };
 export declare class ZkPassportProofParams {
     devMode: boolean;

package/dest/zkpassport/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zkpassport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;IACxB,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,KAAK,MAAM,EAAE,EAAE,CAAC;IAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAIF,qBAAa,qBAAqB;IAEvB,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,EAAE,EAAE;IAClB,eAAe,EAAE,MAAM;IACvB,oBAAoB,EAAE,MAAM,EAAE;IAC9B,uBAAuB,EAAE,MAAM;IAC/B,MAAM,EAAE,MAAM;IACd,KAAK,EAAE,MAAM;gBARb,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,EAAE,EAAE,EAClB,eAAe,EAAE,MAAM,EACvB,oBAAoB,EAAE,MAAM,EAAE,EAC9B,uBAAuB,EAAE,MAAM,EAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM;IAGtB,QAAQ;IAkBR,MAAM,CAAC,MAAM;IAqBb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;IAehC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IAcjD,MAAM,IAAI,yBAAyB;CAapC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zkpassport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,MAAM,MAAM,yBAAyB,GAAG;IACtC,qBAAqB,EAAE;QACrB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QACxB,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;QACrB,YAAY,EAAE,KAAK,MAAM,EAAE,EAAE,CAAC;KAC/B,CAAC;IACF,WAAW,EAAE;QACX,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;QAC/B,oBAAoB,EAAE,MAAM,EAAE,CAAC;KAChC,CAAC;IACF,aAAa,EAAE;QACb,uBAAuB,EAAE,MAAM,CAAC;QAChC,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAIF,qBAAa,qBAAqB;IAEvB,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,EAAE,EAAE;IAClB,eAAe,EAAE,MAAM;IACvB,oBAAoB,EAAE,MAAM,EAAE;IAC9B,uBAAuB,EAAE,MAAM;IAC/B,MAAM,EAAE,MAAM;IACd,KAAK,EAAE,MAAM;gBARb,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,EAAE,EAAE,EAClB,eAAe,EAAE,MAAM,EACvB,oBAAoB,EAAE,MAAM,EAAE,EAC9B,uBAAuB,EAAE,MAAM,EAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM;IAGtB,QAAQ;IAkBR,MAAM,CAAC,MAAM;IAqBb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;IAehC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IAcjD,MAAM,IAAI,yBAAyB;CAmBpC"}

package/dest/zkpassport/index.js

@@ -56,26 +56,32 @@ export class ZkPassportProofParams {
         const publicInputs = Array.from({
             length: Number(publicInputsCount)
         }, ()=>Fr.random());
-        return new ZkPassportProofParams(false, Buffer32.random(), randomBytes(1024), publicInputs, committedInputs, committedInputCounts, BigInt(100 * 60 * 60 * 24), 'sequencer.alpha-testnet.aztec.network', 'personhood');
+        return new ZkPassportProofParams(false, Buffer32.random(), randomBytes(1024), publicInputs, committedInputs, committedInputCounts, BigInt(7 * 24 * 60 * 60), 'sequencer.alpha-testnet.aztec.network', 'personhood');
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new ZkPassportProofParams(reader.readBoolean(), reader.readObject(Buffer32), reader.readBuffer(), reader.readVector(Fr), reader.readBuffer(), reader.readUint256Vector(), reader.readUInt256(), reader.readString(), reader.readString());
     }
     static fromViem(params) {
-        return new ZkPassportProofParams(params.devMode, Buffer32.fromString(params.vkeyHash), Buffer.from(withoutHexPrefix(params.proof), 'hex'), params.publicInputs.map((input)=>Fr.fromString(input)), Buffer.from(withoutHexPrefix(params.committedInputs), 'hex'), params.committedInputCounts, params.validityPeriodInSeconds, params.domain, params.scope);
+        return new ZkPassportProofParams(params.serviceConfig.devMode, Buffer32.fromString(params.proofVerificationData.vkeyHash), Buffer.from(withoutHexPrefix(params.proofVerificationData.proof), 'hex'), params.proofVerificationData.publicInputs.map((input)=>Fr.fromString(input)), Buffer.from(withoutHexPrefix(params.commitments.committedInputs), 'hex'), params.commitments.committedInputCounts, params.serviceConfig.validityPeriodInSeconds, params.serviceConfig.domain, params.serviceConfig.scope);
     }
     toViem() {
         return {
-            devMode: this.devMode,
-            vkeyHash: this.vkeyHash.toString(),
-            proof: `0x${this.proof.toString('hex')}`,
-            publicInputs: this.publicInputs.map((input)=>input.toString()),
-            committedInputs: `0x${this.committedInputs.toString('hex')}`,
-            committedInputCounts: this.committedInputCounts,
-            validityPeriodInSeconds: this.validityPeriodInSeconds,
-            domain: this.domain,
-            scope: this.scope
+            serviceConfig: {
+                devMode: this.devMode,
+                validityPeriodInSeconds: this.validityPeriodInSeconds,
+                domain: this.domain,
+                scope: this.scope
+            },
+            proofVerificationData: {
+                vkeyHash: this.vkeyHash.toString(),
+                proof: `0x${this.proof.toString('hex')}`,
+                publicInputs: this.publicInputs.map((input)=>input.toString())
+            },
+            commitments: {
+                committedInputs: `0x${this.committedInputs.toString('hex')}`,
+                committedInputCounts: this.committedInputCounts
+            }
         };
     }
 }