@aztec/stdlib 0.0.1-commit.3895657bc → 0.0.1-commit.3e3d0c9cd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/block/l2_block_source.d.ts +9 -8
- package/dest/block/l2_block_source.d.ts.map +1 -1
- package/dest/epoch-helpers/index.d.ts +5 -1
- package/dest/epoch-helpers/index.d.ts.map +1 -1
- package/dest/epoch-helpers/index.js +4 -2
- package/dest/interfaces/archiver.js +2 -2
- package/dest/interfaces/aztec-node-admin.d.ts +10 -1
- package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
- package/dest/interfaces/aztec-node.d.ts +3 -2
- package/dest/interfaces/aztec-node.d.ts.map +1 -1
- package/dest/interfaces/aztec-node.js +2 -0
- package/dest/interfaces/block-builder.d.ts +11 -9
- package/dest/interfaces/block-builder.d.ts.map +1 -1
- package/dest/interfaces/block-builder.js +10 -5
- package/dest/interfaces/configs.d.ts +12 -2
- package/dest/interfaces/configs.d.ts.map +1 -1
- package/dest/interfaces/configs.js +2 -0
- package/dest/interfaces/l2_logs_source.d.ts +5 -3
- package/dest/interfaces/l2_logs_source.d.ts.map +1 -1
- package/dest/interfaces/merkle_tree_operations.d.ts +9 -19
- package/dest/interfaces/merkle_tree_operations.d.ts.map +1 -1
- package/dest/interfaces/prover-client.d.ts +6 -1
- package/dest/interfaces/prover-client.d.ts.map +1 -1
- package/dest/interfaces/prover-client.js +7 -1
- package/dest/interfaces/world_state.d.ts +5 -4
- package/dest/interfaces/world_state.d.ts.map +1 -1
- package/dest/logs/index.d.ts +2 -1
- package/dest/logs/index.d.ts.map +1 -1
- package/dest/logs/index.js +1 -0
- package/dest/logs/log_filter.d.ts +4 -1
- package/dest/logs/log_filter.d.ts.map +1 -1
- package/dest/logs/log_filter.js +2 -1
- package/dest/logs/tagging_index_range.d.ts +40 -0
- package/dest/logs/tagging_index_range.d.ts.map +1 -0
- package/dest/logs/tagging_index_range.js +8 -0
- package/dest/messaging/l1_to_l2_message_source.d.ts +4 -2
- package/dest/messaging/l1_to_l2_message_source.d.ts.map +1 -1
- package/dest/messaging/l2_to_l1_membership.d.ts +32 -6
- package/dest/messaging/l2_to_l1_membership.d.ts.map +1 -1
- package/dest/messaging/l2_to_l1_membership.js +69 -26
- package/dest/tx/private_execution_result.d.ts +6 -6
- package/dest/tx/private_execution_result.d.ts.map +1 -1
- package/dest/tx/private_execution_result.js +6 -6
- package/dest/tx/profiling.d.ts +14 -2
- package/dest/tx/profiling.d.ts.map +1 -1
- package/dest/tx/profiling.js +13 -3
- package/dest/tx/tx_receipt.d.ts +7 -2
- package/dest/tx/tx_receipt.d.ts.map +1 -1
- package/dest/tx/tx_receipt.js +6 -3
- package/dest/update-checker/package_version.d.ts +2 -2
- package/dest/update-checker/package_version.d.ts.map +1 -1
- package/dest/update-checker/package_version.js +16 -3
- package/dest/validators/errors.d.ts +6 -1
- package/dest/validators/errors.d.ts.map +1 -1
- package/dest/validators/errors.js +7 -0
- package/dest/versioning/versioning.d.ts +4 -2
- package/dest/versioning/versioning.d.ts.map +1 -1
- package/dest/versioning/versioning.js +4 -1
- package/package.json +8 -8
- package/src/block/l2_block_source.ts +8 -7
- package/src/epoch-helpers/index.ts +3 -0
- package/src/gas/README.md +123 -0
- package/src/interfaces/archiver.ts +2 -2
- package/src/interfaces/aztec-node.ts +10 -1
- package/src/interfaces/block-builder.ts +19 -11
- package/src/interfaces/configs.ts +9 -1
- package/src/interfaces/l2_logs_source.ts +4 -1
- package/src/interfaces/merkle_tree_operations.ts +8 -18
- package/src/interfaces/prover-client.ts +8 -0
- package/src/interfaces/world_state.ts +4 -3
- package/src/logs/index.ts +1 -0
- package/src/logs/log_filter.ts +5 -0
- package/src/logs/tagging_index_range.ts +24 -0
- package/src/messaging/l1_to_l2_message_source.ts +3 -1
- package/src/messaging/l2_to_l1_membership.ts +98 -33
- package/src/tx/private_execution_result.ts +5 -5
- package/src/tx/profiling.ts +11 -2
- package/src/tx/tx_receipt.ts +7 -2
- package/src/update-checker/package_version.ts +19 -6
- package/src/validators/errors.ts +9 -0
- package/src/versioning/versioning.ts +4 -1
|
@@ -84,38 +84,60 @@ import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedShaRoot }
|
|
|
84
84
|
*/ export function getL2ToL1MessageLeafId(membershipWitness) {
|
|
85
85
|
return 2n ** BigInt(membershipWitness.siblingPath.pathSize) + membershipWitness.leafIndex;
|
|
86
86
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
87
|
+
/**
|
|
88
|
+
* Computes the L2 to L1 membership witness for a given message in a transaction.
|
|
89
|
+
*
|
|
90
|
+
* @param node - The Aztec node to query for block/tx/epoch data.
|
|
91
|
+
* @param message - The L2 to L1 message hash to prove membership of.
|
|
92
|
+
* @param txHash - The hash of the transaction that emitted the message.
|
|
93
|
+
* @param messageIndexInTx - Optional index of the message within the transaction's L2-to-L1 messages.
|
|
94
|
+
* If not provided, the message is found by scanning the tx's messages (throws if duplicates exist).
|
|
95
|
+
* @returns The membership witness and epoch number, or undefined if the tx is not yet in a block/epoch.
|
|
96
|
+
*/ export async function computeL2ToL1MembershipWitness(node, message, txHash, messageIndexInTx) {
|
|
97
|
+
const { epochNumber, blockNumber } = await node.getTxReceipt(txHash);
|
|
98
|
+
if (epochNumber === undefined || blockNumber === undefined) {
|
|
90
99
|
return undefined;
|
|
91
100
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
const checkpointIndex =
|
|
102
|
-
blockIndex = messagesInCheckpoint.findIndex((messagesInBlock)=>{
|
|
103
|
-
txIndex = messagesInBlock.findIndex((messagesInTx)=>{
|
|
104
|
-
messageIndexInTx = messagesInTx.findIndex((msg)=>msg.equals(message));
|
|
105
|
-
return messageIndexInTx !== -1;
|
|
106
|
-
});
|
|
107
|
-
return txIndex !== -1;
|
|
108
|
-
});
|
|
109
|
-
return blockIndex !== -1;
|
|
110
|
-
});
|
|
101
|
+
const [messagesInEpoch, block, txEffect, checkpointsData] = await Promise.all([
|
|
102
|
+
node.getL2ToL1Messages(epochNumber),
|
|
103
|
+
node.getBlock(blockNumber),
|
|
104
|
+
node.getTxEffect(txHash),
|
|
105
|
+
node.getCheckpointsDataForEpoch(epochNumber)
|
|
106
|
+
]);
|
|
107
|
+
if (messagesInEpoch.length === 0 || !block || !txEffect) {
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
110
|
+
const checkpointIndex = checkpointsData.findIndex((c)=>c.checkpointNumber === block.checkpointNumber);
|
|
111
111
|
if (checkpointIndex === -1) {
|
|
112
|
-
|
|
112
|
+
return undefined;
|
|
113
113
|
}
|
|
114
|
-
|
|
114
|
+
const blockIndex = block.indexWithinCheckpoint;
|
|
115
|
+
const txIndex = txEffect.txIndexInBlock;
|
|
116
|
+
const { root, leafIndex, siblingPath } = computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, message, checkpointIndex, blockIndex, txIndex, messageIndexInTx);
|
|
117
|
+
return {
|
|
118
|
+
epochNumber,
|
|
119
|
+
root,
|
|
120
|
+
leafIndex,
|
|
121
|
+
siblingPath
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* Computes a membership witness for a message in the epoch's L2-to-L1 message tree, given explicit position indices.
|
|
126
|
+
*
|
|
127
|
+
* @param messagesInEpoch - All L2-to-L1 messages in the epoch, organized as checkpoints → blocks → txs → messages.
|
|
128
|
+
* @param message - The message hash to prove membership of.
|
|
129
|
+
* @param checkpointIndex - Index of the checkpoint within the epoch's message array.
|
|
130
|
+
* @param blockIndex - Index of the block within the checkpoint.
|
|
131
|
+
* @param txIndex - Index of the transaction within the block.
|
|
132
|
+
* @param messageIndexInTx - Optional index of the message within the transaction's messages.
|
|
133
|
+
* If not provided, the message is found by scanning (throws if duplicates exist within the tx).
|
|
134
|
+
*/ /** @internal Exported for testing only. */ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoch, message, checkpointIndex, blockIndex, txIndex, messageIndexInTx) {
|
|
115
135
|
const messagesInTx = messagesInEpoch[checkpointIndex][blockIndex][txIndex];
|
|
136
|
+
const resolvedMessageIndex = resolveMessageIndex(messagesInTx, message, messageIndexInTx);
|
|
137
|
+
// Build the tx tree.
|
|
116
138
|
const txTree = UnbalancedMerkleTreeCalculator.create(messagesInTx.map((msg)=>msg.toBuffer()));
|
|
117
139
|
// Get the sibling path of the target message in the tx tree.
|
|
118
|
-
const pathToMessageInTxSubtree = txTree.getSiblingPathByLeafIndex(
|
|
140
|
+
const pathToMessageInTxSubtree = txTree.getSiblingPathByLeafIndex(resolvedMessageIndex);
|
|
119
141
|
// Build the tree of the block containing the target message.
|
|
120
142
|
const blockTree = buildBlockTree(messagesInEpoch[checkpointIndex][blockIndex]);
|
|
121
143
|
// Get the sibling path of the tx out hash in the block tree.
|
|
@@ -149,7 +171,7 @@ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoc
|
|
|
149
171
|
// Compute the combined index.
|
|
150
172
|
// It is the index of the message in the balanced tree (by filling up the wonky tree with empty nodes) at its current
|
|
151
173
|
// height. It's used to validate the membership proof.
|
|
152
|
-
const messageLeafPosition = txTree.getLeafLocation(
|
|
174
|
+
const messageLeafPosition = txTree.getLeafLocation(resolvedMessageIndex);
|
|
153
175
|
const txLeafPosition = blockTree.getLeafLocation(txIndex);
|
|
154
176
|
const blockLeafPosition = checkpointTree.getLeafLocation(blockIndex);
|
|
155
177
|
const checkpointLeafPosition = epochTree.getLeafLocation(checkpointIndex);
|
|
@@ -165,6 +187,27 @@ export function computeL2ToL1MembershipWitnessFromMessagesInEpoch(messagesInEpoc
|
|
|
165
187
|
siblingPath: new SiblingPath(combinedPath.length, combinedPath)
|
|
166
188
|
};
|
|
167
189
|
}
|
|
190
|
+
function resolveMessageIndex(messagesInTx, message, messageIndexInTx) {
|
|
191
|
+
if (messageIndexInTx !== undefined) {
|
|
192
|
+
if (!messagesInTx[messageIndexInTx]?.equals(message)) {
|
|
193
|
+
throw new Error(`Message at index ${messageIndexInTx} in tx does not match the expected message ${message}`);
|
|
194
|
+
}
|
|
195
|
+
return messageIndexInTx;
|
|
196
|
+
}
|
|
197
|
+
const indices = messagesInTx.reduce((acc, msg, i)=>{
|
|
198
|
+
if (msg.equals(message)) {
|
|
199
|
+
acc.push(i);
|
|
200
|
+
}
|
|
201
|
+
return acc;
|
|
202
|
+
}, []);
|
|
203
|
+
if (indices.length === 0) {
|
|
204
|
+
throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
|
|
205
|
+
}
|
|
206
|
+
if (indices.length > 1) {
|
|
207
|
+
throw new Error(`Multiple messages with the same value ${message} found in tx (indices: ${indices.join(', ')}). ` + `Provide messageIndexInTx to disambiguate.`);
|
|
208
|
+
}
|
|
209
|
+
return indices[0];
|
|
210
|
+
}
|
|
168
211
|
function buildCheckpointTree(messagesInCheckpoint) {
|
|
169
212
|
const blockOutHashes = messagesInCheckpoint.map((messagesInBlock)=>buildBlockTree(messagesInBlock).getRoot());
|
|
170
213
|
return buildCompressedTree(blockOutHashes);
|
|
@@ -6,7 +6,7 @@ import { NoteSelector } from '../abi/note_selector.js';
|
|
|
6
6
|
import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
|
|
7
7
|
import type { IsEmpty } from '../kernel/utils/interfaces.js';
|
|
8
8
|
import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
|
|
9
|
-
import { type
|
|
9
|
+
import { type TaggingIndexRange } from '../logs/tagging_index_range.js';
|
|
10
10
|
import { Note } from '../note/note.js';
|
|
11
11
|
import { type ZodFor } from '../schemas/index.js';
|
|
12
12
|
import { HashedValues } from './hashed_values.js';
|
|
@@ -108,8 +108,8 @@ export declare class PrivateCallExecutionResult {
|
|
|
108
108
|
offchainEffects: {
|
|
109
109
|
data: Fr[];
|
|
110
110
|
}[];
|
|
111
|
-
/** The
|
|
112
|
-
|
|
111
|
+
/** The tagging index ranges used in this tx to compute tags for private logs */
|
|
112
|
+
taggingIndexRanges: TaggingIndexRange[];
|
|
113
113
|
/** The nested executions. */
|
|
114
114
|
nestedExecutionResults: PrivateCallExecutionResult[];
|
|
115
115
|
/**
|
|
@@ -138,8 +138,8 @@ export declare class PrivateCallExecutionResult {
|
|
|
138
138
|
offchainEffects: {
|
|
139
139
|
data: Fr[];
|
|
140
140
|
}[],
|
|
141
|
-
/** The
|
|
142
|
-
|
|
141
|
+
/** The tagging index ranges used in this tx to compute tags for private logs */
|
|
142
|
+
taggingIndexRanges: TaggingIndexRange[],
|
|
143
143
|
/** The nested executions. */
|
|
144
144
|
nestedExecutionResults: PrivateCallExecutionResult[],
|
|
145
145
|
/**
|
|
@@ -181,4 +181,4 @@ export declare class PrivateExecutionProfileResult {
|
|
|
181
181
|
}>;
|
|
182
182
|
});
|
|
183
183
|
}
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb25fcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJpdmF0ZV9leGVjdXRpb25fcmVzdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR25FLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN4RixPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU3RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN6RixPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBMkIsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNqRyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdkMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFzQixNQUFNLHFCQUFxQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRDs7R0FFRztBQUNILHFCQUFhLFdBQVc7SUFFcEIsZ0JBQWdCO0lBQ1QsSUFBSSxFQUFFLElBQUk7SUFDakIsb0NBQW9DO0lBQzdCLFdBQVcsRUFBRSxFQUFFO0lBQ3RCLDJDQUEyQztJQUNwQyxVQUFVLEVBQUUsRUFBRTtJQUNyQixnQ0FBZ0M7SUFDekIs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_execution_result.d.ts","sourceRoot":"","sources":["../../src/tx/private_execution_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"private_execution_result.d.ts","sourceRoot":"","sources":["../../src/tx/private_execution_result.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { NoteSelector } from '../abi/note_selector.js';
|
|
|
6
6
|
import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
|
|
7
7
|
import { sortByCounter } from '../kernel/utils/order_and_comparison.js';
|
|
8
8
|
import { ContractClassLog } from '../logs/contract_class_log.js';
|
|
9
|
-
import {
|
|
9
|
+
import { TaggingIndexRangeSchema } from '../logs/tagging_index_range.js';
|
|
10
10
|
import { Note } from '../note/note.js';
|
|
11
11
|
import { mapSchema, schemas } from '../schemas/index.js';
|
|
12
12
|
import { HashedValues } from './hashed_values.js';
|
|
@@ -100,13 +100,13 @@ export class PrivateExecutionResult {
|
|
|
100
100
|
noteHashNullifierCounterMap;
|
|
101
101
|
returnValues;
|
|
102
102
|
offchainEffects;
|
|
103
|
-
|
|
103
|
+
taggingIndexRanges;
|
|
104
104
|
nestedExecutionResults;
|
|
105
105
|
contractClassLogs;
|
|
106
106
|
profileResult;
|
|
107
107
|
constructor(// Needed for prover
|
|
108
108
|
/** The ACIR bytecode. */ acir, /** The verification key. */ vk, /** The partial witness. */ partialWitness, // Needed for the verifier (kernel)
|
|
109
|
-
/** The call stack item. */ publicInputs, /** The notes created in the executed function. */ newNotes, /** Mapping of note hash counter to the counter of its nullifier. */ noteHashNullifierCounterMap, /** The raw return values of the executed function. */ returnValues, /** The offchain effects emitted during execution of this function call via the `emit_offchain_effect` oracle. */ offchainEffects, /** The
|
|
109
|
+
/** The call stack item. */ publicInputs, /** The notes created in the executed function. */ newNotes, /** Mapping of note hash counter to the counter of its nullifier. */ noteHashNullifierCounterMap, /** The raw return values of the executed function. */ returnValues, /** The offchain effects emitted during execution of this function call via the `emit_offchain_effect` oracle. */ offchainEffects, /** The tagging index ranges used in this tx to compute tags for private logs */ taggingIndexRanges, /** The nested executions. */ nestedExecutionResults, /**
|
|
110
110
|
* Contract class logs emitted during execution of this function call.
|
|
111
111
|
* Note: We only need to collect the ContractClassLogFields as preimages for the tx.
|
|
112
112
|
* But keep them as ContractClassLog so that we can verify the log hashes before submitting the tx (TODO).
|
|
@@ -119,7 +119,7 @@ export class PrivateExecutionResult {
|
|
|
119
119
|
this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
|
|
120
120
|
this.returnValues = returnValues;
|
|
121
121
|
this.offchainEffects = offchainEffects;
|
|
122
|
-
this.
|
|
122
|
+
this.taggingIndexRanges = taggingIndexRanges;
|
|
123
123
|
this.nestedExecutionResults = nestedExecutionResults;
|
|
124
124
|
this.contractClassLogs = contractClassLogs;
|
|
125
125
|
this.profileResult = profileResult;
|
|
@@ -136,13 +136,13 @@ export class PrivateExecutionResult {
|
|
|
136
136
|
offchainEffects: z.array(z.object({
|
|
137
137
|
data: z.array(schemas.Fr)
|
|
138
138
|
})),
|
|
139
|
-
|
|
139
|
+
taggingIndexRanges: z.array(TaggingIndexRangeSchema),
|
|
140
140
|
nestedExecutionResults: z.array(z.lazy(()=>PrivateCallExecutionResult.schema)),
|
|
141
141
|
contractClassLogs: z.array(CountedContractClassLog.schema)
|
|
142
142
|
}).transform(PrivateCallExecutionResult.from);
|
|
143
143
|
}
|
|
144
144
|
static from(fields) {
|
|
145
|
-
return new PrivateCallExecutionResult(fields.acir, fields.vk, fields.partialWitness, fields.publicInputs, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.offchainEffects, fields.
|
|
145
|
+
return new PrivateCallExecutionResult(fields.acir, fields.vk, fields.partialWitness, fields.publicInputs, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.offchainEffects, fields.taggingIndexRanges, fields.nestedExecutionResults, fields.contractClassLogs);
|
|
146
146
|
}
|
|
147
147
|
static async random(nested = 1) {
|
|
148
148
|
return new PrivateCallExecutionResult(randomBytes(4), randomBytes(4), new Map([
|
package/dest/tx/profiling.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import { type ZodFor } from '@aztec/foundation/schemas';
|
|
3
3
|
import { z } from 'zod';
|
|
4
|
+
import { AztecAddress } from '../aztec-address/index.js';
|
|
4
5
|
import type { AztecNode } from '../interfaces/aztec-node.js';
|
|
5
6
|
import { type PrivateExecutionStep } from '../kernel/private_kernel_prover_output.js';
|
|
6
7
|
export type RoundTripStats = {
|
|
@@ -474,10 +475,21 @@ export declare class TxProfileResult {
|
|
|
474
475
|
}
|
|
475
476
|
export declare class UtilityExecutionResult {
|
|
476
477
|
result: Fr[];
|
|
478
|
+
offchainEffects: {
|
|
479
|
+
data: Fr[];
|
|
480
|
+
contractAddress: AztecAddress;
|
|
481
|
+
}[];
|
|
482
|
+
/** Timestamp of the anchor block used during utility execution. */
|
|
483
|
+
anchorBlockTimestamp: bigint;
|
|
477
484
|
stats?: SimulationStats | undefined;
|
|
478
|
-
constructor(result: Fr[],
|
|
485
|
+
constructor(result: Fr[], offchainEffects: {
|
|
486
|
+
data: Fr[];
|
|
487
|
+
contractAddress: AztecAddress;
|
|
488
|
+
}[],
|
|
489
|
+
/** Timestamp of the anchor block used during utility execution. */
|
|
490
|
+
anchorBlockTimestamp: bigint, stats?: SimulationStats | undefined);
|
|
479
491
|
static get schema(): ZodFor<UtilityExecutionResult>;
|
|
480
492
|
static random(): UtilityExecutionResult;
|
|
481
493
|
}
|
|
482
494
|
export {};
|
|
483
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
495
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsaW5nLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvcHJvZmlsaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQXFCLE1BQU0sMkJBQTJCLENBQUM7QUFFM0UsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDN0QsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQThCLE1BQU0sMkNBQTJDLENBQUM7QUFFbEgsTUFBTSxNQUFNLGNBQWMsR0FBRztJQUMzQiwwRUFBMEU7SUFDMUUsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQiw4RUFBOEU7SUFDOUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLHNDQUFzQztJQUN0QyxrQkFBa0IsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUM3QiwwRUFBMEU7SUFDMUUsZ0JBQWdCLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FBQztDQUM5QixDQUFDO0FBU0YsTUFBTSxNQUFNLFNBQVMsR0FBRztJQUN0Qiw0QkFBNEI7SUFDNUIsU0FBUyxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxTQUFTLEVBQUU7UUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLENBQUE7S0FBRSxDQUFDLENBQUMsQ0FBQztJQUNqRSxzREFBc0Q7SUFDdEQsVUFBVSxFQUFFLGNBQWMsQ0FBQztDQUM1QixDQUFDO0FBT0YsS0FBSyxjQUFjLEdBQUc7SUFDcEIsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDLE1BQU0s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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/tx/profiling.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"profiling.d.ts","sourceRoot":"","sources":["../../src/tx/profiling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,2BAA2B,CAAC;AAE3E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,KAAK,oBAAoB,EAA8B,MAAM,2CAA2C,CAAC;AAElH,MAAM,MAAM,cAAc,GAAG;IAC3B,0EAA0E;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sCAAsC;IACtC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,0EAA0E;IAC1E,gBAAgB,EAAE,MAAM,EAAE,EAAE,CAAC;CAC9B,CAAC;AASF,MAAM,MAAM,SAAS,GAAG;IACtB,4BAA4B;IAC5B,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC,CAAC;IACjE,sDAAsD;IACtD,UAAU,EAAE,cAAc,CAAC;CAC5B,CAAC;AAOF,KAAK,cAAc,GAAG;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;CAC/C,CAAC;AAQF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM/B,CAAC;AAEH,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,cAAc,CAAC;IACxB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG7B,CAAC;AAEH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOlC,CAAC;AAEH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,YAAY,EAAE,SAAS,CAAC;CACzB;AAED,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGhC,CAAC;AAEH,qBAAa,eAAe;IAEjB,cAAc,EAAE,oBAAoB,EAAE;IACtC,KAAK,EAAE,YAAY;IAF5B,YACS,cAAc,EAAE,oBAAoB,EAAE,EACtC,KAAK,EAAE,YAAY,EACxB;IACJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,CAO3C;IAED,MAAM,CAAC,MAAM,IAAI,eAAe,CAsC/B;CACF;AAED,qBAAa,sBAAsB;IAExB,MAAM,EAAE,EAAE,EAAE;IACZ,eAAe,EAAE;QAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAAC,eAAe,EAAE,YAAY,CAAA;KAAE,EAAE;IACvE,mEAAmE;IAC5D,oBAAoB,EAAE,MAAM;IAC5B,KAAK,CAAC;IALf,YACS,MAAM,EAAE,EAAE,EAAE,EACZ,eAAe,EAAE;QAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAAC,eAAe,EAAE,YAAY,CAAA;KAAE,EAAE;IACvE,mEAAmE;IAC5D,oBAAoB,EAAE,MAAM,EAC5B,KAAK,CAAC,6BAAiB,EAC5B;IAEJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAYlD;IAED,MAAM,CAAC,MAAM,IAAI,sBAAsB,CAyBtC;CACF"}
|
package/dest/tx/profiling.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import { optional, schemas } from '@aztec/foundation/schemas';
|
|
3
3
|
import { z } from 'zod';
|
|
4
|
+
import { AztecAddress } from '../aztec-address/index.js';
|
|
4
5
|
import { PrivateExecutionStepSchema } from '../kernel/private_kernel_prover_output.js';
|
|
5
6
|
const RoundTripStatsSchema = z.object({
|
|
6
7
|
roundTrips: z.number(),
|
|
@@ -113,21 +114,30 @@ export class TxProfileResult {
|
|
|
113
114
|
}
|
|
114
115
|
export class UtilityExecutionResult {
|
|
115
116
|
result;
|
|
117
|
+
offchainEffects;
|
|
118
|
+
anchorBlockTimestamp;
|
|
116
119
|
stats;
|
|
117
|
-
constructor(result, stats){
|
|
120
|
+
constructor(result, offchainEffects, /** Timestamp of the anchor block used during utility execution. */ anchorBlockTimestamp, stats){
|
|
118
121
|
this.result = result;
|
|
122
|
+
this.offchainEffects = offchainEffects;
|
|
123
|
+
this.anchorBlockTimestamp = anchorBlockTimestamp;
|
|
119
124
|
this.stats = stats;
|
|
120
125
|
}
|
|
121
126
|
static get schema() {
|
|
122
127
|
return z.object({
|
|
123
128
|
result: z.array(schemas.Fr),
|
|
129
|
+
offchainEffects: z.array(z.object({
|
|
130
|
+
data: z.array(schemas.Fr),
|
|
131
|
+
contractAddress: AztecAddress.schema
|
|
132
|
+
})),
|
|
133
|
+
anchorBlockTimestamp: schemas.BigInt,
|
|
124
134
|
stats: optional(SimulationStatsSchema)
|
|
125
|
-
}).transform(({ result, stats })=>new UtilityExecutionResult(result, stats));
|
|
135
|
+
}).transform(({ result, offchainEffects, anchorBlockTimestamp, stats })=>new UtilityExecutionResult(result, offchainEffects, anchorBlockTimestamp, stats));
|
|
126
136
|
}
|
|
127
137
|
static random() {
|
|
128
138
|
return new UtilityExecutionResult([
|
|
129
139
|
Fr.random()
|
|
130
|
-
], {
|
|
140
|
+
], [], 0n, {
|
|
131
141
|
nodeRPCCalls: {
|
|
132
142
|
perMethod: {
|
|
133
143
|
getBlockHeader: {
|
package/dest/tx/tx_receipt.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
1
|
+
import { BlockNumber, EpochNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { RevertCode } from '../avm/revert_code.js';
|
|
3
3
|
import { BlockHash } from '../block/block_hash.js';
|
|
4
4
|
import { DebugLog } from '../logs/debug_log.js';
|
|
@@ -43,6 +43,8 @@ export declare class TxReceipt {
|
|
|
43
43
|
blockHash?: BlockHash | undefined;
|
|
44
44
|
/** The block number in which the transaction was included. */
|
|
45
45
|
blockNumber?: BlockNumber | undefined;
|
|
46
|
+
/** The epoch number in which the transaction was included. */
|
|
47
|
+
epochNumber?: EpochNumber | undefined;
|
|
46
48
|
/**
|
|
47
49
|
* Debug logs collected during public function execution. Served only when the node is in test mode and placed on
|
|
48
50
|
* the receipt only because it's a convenient place for it (the logs are printed out by the wallet when a mined
|
|
@@ -64,6 +66,8 @@ export declare class TxReceipt {
|
|
|
64
66
|
blockHash?: BlockHash | undefined,
|
|
65
67
|
/** The block number in which the transaction was included. */
|
|
66
68
|
blockNumber?: BlockNumber | undefined,
|
|
69
|
+
/** The epoch number in which the transaction was included. */
|
|
70
|
+
epochNumber?: EpochNumber | undefined,
|
|
67
71
|
/**
|
|
68
72
|
* Debug logs collected during public function execution. Served only when the node is in test mode and placed on
|
|
69
73
|
* the receipt only because it's a convenient place for it (the logs are printed out by the wallet when a mined
|
|
@@ -90,8 +94,9 @@ export declare class TxReceipt {
|
|
|
90
94
|
transactionFee?: bigint;
|
|
91
95
|
blockHash?: BlockHash;
|
|
92
96
|
blockNumber?: BlockNumber;
|
|
97
|
+
epochNumber?: EpochNumber;
|
|
93
98
|
debugLogs?: DebugLog[];
|
|
94
99
|
}): TxReceipt;
|
|
95
100
|
static executionResultFromRevertCode(revertCode: RevertCode): TxExecutionResult;
|
|
96
101
|
}
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcmVjZWlwdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R4L3R4X3JlY2VpcHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsV0FBVyxFQUFxQixNQUFNLGlDQUFpQyxDQUFDO0FBSWpILE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBVyxNQUFNLHVCQUF1QixDQUFDO0FBQzdELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdEMsMkNBQTJDO0FBQzNDLG9CQUFZLFFBQVE7SUFDbEIsT0FBTyxZQUFZO0lBQ25CLE9BQU8sWUFBWTtJQUNuQixRQUFRLGFBQWE7SUFDckIsWUFBWSxpQkFBaUI7SUFDN0IsTUFBTSxXQUFXO0lBQ2pCLFNBQVMsY0FBYztDQUN4QjtBQUVELGlEQUFpRDtBQUNqRCxlQUFPLE1BQU0sZ0JBQWdCLEVBQUUsUUFBUSxFQU90QyxDQUFDO0FBRUYseURBQXlEO0FBQ3pELG9CQUFZLGlCQUFpQjtJQUMzQixPQUFPLFlBQVk7SUFDbkIsa0JBQWtCLHVCQUF1QjtJQUN6QyxpQkFBaUIsc0JBQXNCO0lBQ3ZDLGFBQWEsa0JBQWtCO0NBQ2hDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxxQkFBYSxTQUFTO0lBRWxCLDZDQUE2QztJQUN0QyxNQUFNLEVBQUUsTUFBTTtJQUNyQixtREFBbUQ7SUFDNUMsTUFBTSxFQUFFLFFBQVE7SUFDdkIsK0VBQStFO0lBQ3hFLGVBQWUsRUFBRSxpQkFBaUIsR0FBRyxTQUFTO0lBQ3JELGdEQUFnRDtJQUN6QyxLQUFLLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFDaEMsb0RBQW9EO0lBQzdDLGNBQWMsQ0FBQztJQUN0Qix3REFBd0Q7SUFDakQsU0FBUyxDQUFDO0lBQ2pCLDhEQUE4RDtJQUN2RCxXQUFXLENBQUM7SUFDbkIsOERBQThEO0lBQ3ZELFdBQVcsQ0FBQztJQUNuQjs7OztPQUlHO0lBQ0ksU0FBUyxDQUFDO0lBdEJuQjtJQUNFLDZDQUE2QztJQUN0QyxNQUFNLEVBQUUsTUFBTTtJQUNyQixtREFBbUQ7SUFDNUMsTUFBTSxFQUFFLFFBQVE7SUFDdkIsK0VBQStFO0lBQ3hFLGVBQWUsRUFBRSxpQkFBaUIsR0FBRyxTQUFTO0lBQ3JELGdEQUFnRDtJQUN6QyxLQUFLLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFDaEMsb0RBQW9EO0lBQzdDLGNBQWMsQ0FBQyxvQkFBUTtJQUM5Qix3REFBd0Q7SUFDakQsU0FBUyxDQUFDLHVCQUFXO0lBQzVCLDhEQUE4RDtJQUN2RCxXQUFXLENBQUMseUJBQWE7SUFDaEMsOERBQThEO0lBQ3ZELFdBQVcsQ0FBQyx5QkFBYTtJQUNoQzs7OztPQUlHO0lBQ0ksU0FBUyxDQUFDLHdCQUFZLEVBQzNCO0lBRUosaUVBQWlFO0lBQ2pFLHFCQUFxQixJQUFJLE9BQU8sQ0FFL0I7SUFFRCwwREFBMEQ7SUFDMUQsb0JBQW9CLElBQUksT0FBTyxDQUU5QjtJQUVELG1IQUFtSDtJQUNuSCxPQUFPLElBQUksT0FBTyxDQU9qQjtJQUVELGtEQUFrRDtJQUNsRCxTQUFTLElBQUksT0FBTyxDQUVuQjtJQUVELG1EQUFtRDtJQUNuRCxTQUFTLElBQUksT0FBTyxDQUVuQjtJQUVELE1BQU0sQ0FBQyxLQUFLLGNBRVg7SUFFRCxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FjckM7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUNsQixNQUFNLEVBQUUsTUFBTSxDQUFDO1FBQ2YsTUFBTSxFQUFFLFFBQVEsQ0FBQztRQUNqQixlQUFlLENBQUMsRUFBRSxpQkFBaUIsQ0FBQztRQUNwQyxLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDZixjQUFjLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDeEIsU0FBUyxDQUFDLEVBQUUsU0FBUyxDQUFDO1FBQ3RCLFdBQVcsQ0FBQyxFQUFFLFdBQVcsQ0FBQztRQUMxQixXQUFXLENBQUMsRUFBRSxXQUFXLENBQUM7UUFDMUIsU0FBUyxDQUFDLEVBQUUsUUFBUSxFQUFFLENBQUM7S0FDeEIsYUFZQTtJQUVELE9BQWMsNkJBQTZCLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxpQkFBaUIsQ0FZckY7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_receipt.d.ts","sourceRoot":"","sources":["../../src/tx/tx_receipt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"tx_receipt.d.ts","sourceRoot":"","sources":["../../src/tx/tx_receipt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,WAAW,EAAqB,MAAM,iCAAiC,CAAC;AAIjH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,2CAA2C;AAC3C,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,YAAY,iBAAiB;IAC7B,MAAM,WAAW;IACjB,SAAS,cAAc;CACxB;AAED,iDAAiD;AACjD,eAAO,MAAM,gBAAgB,EAAE,QAAQ,EAOtC,CAAC;AAEF,yDAAyD;AACzD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,kBAAkB,uBAAuB;IACzC,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;CAChC;AAED;;;;;GAKG;AACH,qBAAa,SAAS;IAElB,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,mDAAmD;IAC5C,MAAM,EAAE,QAAQ;IACvB,+EAA+E;IACxE,eAAe,EAAE,iBAAiB,GAAG,SAAS;IACrD,gDAAgD;IACzC,KAAK,EAAE,MAAM,GAAG,SAAS;IAChC,oDAAoD;IAC7C,cAAc,CAAC;IACtB,wDAAwD;IACjD,SAAS,CAAC;IACjB,8DAA8D;IACvD,WAAW,CAAC;IACnB,8DAA8D;IACvD,WAAW,CAAC;IACnB;;;;OAIG;IACI,SAAS,CAAC;IAtBnB;IACE,6CAA6C;IACtC,MAAM,EAAE,MAAM;IACrB,mDAAmD;IAC5C,MAAM,EAAE,QAAQ;IACvB,+EAA+E;IACxE,eAAe,EAAE,iBAAiB,GAAG,SAAS;IACrD,gDAAgD;IACzC,KAAK,EAAE,MAAM,GAAG,SAAS;IAChC,oDAAoD;IAC7C,cAAc,CAAC,oBAAQ;IAC9B,wDAAwD;IACjD,SAAS,CAAC,uBAAW;IAC5B,8DAA8D;IACvD,WAAW,CAAC,yBAAa;IAChC,8DAA8D;IACvD,WAAW,CAAC,yBAAa;IAChC;;;;OAIG;IACI,SAAS,CAAC,wBAAY,EAC3B;IAEJ,iEAAiE;IACjE,qBAAqB,IAAI,OAAO,CAE/B;IAED,0DAA0D;IAC1D,oBAAoB,IAAI,OAAO,CAE9B;IAED,mHAAmH;IACnH,OAAO,IAAI,OAAO,CAOjB;IAED,kDAAkD;IAClD,SAAS,IAAI,OAAO,CAEnB;IAED,mDAAmD;IACnD,SAAS,IAAI,OAAO,CAEnB;IAED,MAAM,CAAC,KAAK,cAEX;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,CAcrC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,QAAQ,CAAC;QACjB,eAAe,CAAC,EAAE,iBAAiB,CAAC;QACpC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;KACxB,aAYA;IAED,OAAc,6BAA6B,CAAC,UAAU,EAAE,UAAU,GAAG,iBAAiB,CAYrF;CACF"}
|
package/dest/tx/tx_receipt.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BlockNumberSchema } from '@aztec/foundation/branded-types';
|
|
1
|
+
import { BlockNumberSchema, EpochNumberSchema } from '@aztec/foundation/branded-types';
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { RevertCode } from '../avm/revert_code.js';
|
|
4
4
|
import { BlockHash } from '../block/block_hash.js';
|
|
@@ -42,8 +42,9 @@ import { TxHash } from './tx_hash.js';
|
|
|
42
42
|
transactionFee;
|
|
43
43
|
blockHash;
|
|
44
44
|
blockNumber;
|
|
45
|
+
epochNumber;
|
|
45
46
|
debugLogs;
|
|
46
|
-
constructor(/** A unique identifier for a transaction. */ txHash, /** The transaction's block finalization status. */ status, /** The execution result of the transaction, only set when tx is in a block. */ executionResult, /** Description of transaction error, if any. */ error, /** The transaction fee paid for the transaction. */ transactionFee, /** The hash of the block containing the transaction. */ blockHash, /** The block number in which the transaction was included. */ blockNumber, /**
|
|
47
|
+
constructor(/** A unique identifier for a transaction. */ txHash, /** The transaction's block finalization status. */ status, /** The execution result of the transaction, only set when tx is in a block. */ executionResult, /** Description of transaction error, if any. */ error, /** The transaction fee paid for the transaction. */ transactionFee, /** The hash of the block containing the transaction. */ blockHash, /** The block number in which the transaction was included. */ blockNumber, /** The epoch number in which the transaction was included. */ epochNumber, /**
|
|
47
48
|
* Debug logs collected during public function execution. Served only when the node is in test mode and placed on
|
|
48
49
|
* the receipt only because it's a convenient place for it (the logs are printed out by the wallet when a mined
|
|
49
50
|
* tx receipt is obtained).
|
|
@@ -55,6 +56,7 @@ import { TxHash } from './tx_hash.js';
|
|
|
55
56
|
this.transactionFee = transactionFee;
|
|
56
57
|
this.blockHash = blockHash;
|
|
57
58
|
this.blockNumber = blockNumber;
|
|
59
|
+
this.epochNumber = epochNumber;
|
|
58
60
|
this.debugLogs = debugLogs;
|
|
59
61
|
}
|
|
60
62
|
/** Returns true if the transaction was executed successfully. */ hasExecutionSucceeded() {
|
|
@@ -83,12 +85,13 @@ import { TxHash } from './tx_hash.js';
|
|
|
83
85
|
error: z.string().optional(),
|
|
84
86
|
blockHash: BlockHash.schema.optional(),
|
|
85
87
|
blockNumber: BlockNumberSchema.optional(),
|
|
88
|
+
epochNumber: EpochNumberSchema.optional(),
|
|
86
89
|
transactionFee: schemas.BigInt.optional(),
|
|
87
90
|
debugLogs: z.array(DebugLog.schema).optional()
|
|
88
91
|
}).transform((fields)=>TxReceipt.from(fields));
|
|
89
92
|
}
|
|
90
93
|
static from(fields) {
|
|
91
|
-
return new TxReceipt(fields.txHash, fields.status, fields.executionResult, fields.error, fields.transactionFee, fields.blockHash, fields.blockNumber, fields.debugLogs);
|
|
94
|
+
return new TxReceipt(fields.txHash, fields.status, fields.executionResult, fields.error, fields.transactionFee, fields.blockHash, fields.blockNumber, fields.epochNumber, fields.debugLogs);
|
|
92
95
|
}
|
|
93
96
|
static executionResultFromRevertCode(revertCode) {
|
|
94
97
|
if (revertCode.equals(RevertCode.OK)) {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
/** Returns the package version from the release-please manifest, or undefined if not found. */
|
|
1
|
+
/** Returns the package version from the release-please manifest or the package.json, or undefined if not found. */
|
|
2
2
|
export declare function getPackageVersion(): string | undefined;
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFja2FnZV92ZXJzaW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXBkYXRlLWNoZWNrZXIvcGFja2FnZV92ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLG1IQUFtSDtBQUNuSCx3QkFBZ0IsaUJBQWlCLElBQUksTUFBTSxHQUFHLFNBQVMsQ0F1QnREIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package_version.d.ts","sourceRoot":"","sources":["../../src/update-checker/package_version.ts"],"names":[],"mappings":"AAKA
|
|
1
|
+
{"version":3,"file":"package_version.d.ts","sourceRoot":"","sources":["../../src/update-checker/package_version.ts"],"names":[],"mappings":"AAKA,mHAAmH;AACnH,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAuBtD"}
|
|
@@ -1,11 +1,24 @@
|
|
|
1
1
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
2
2
|
import { readFileSync } from 'fs';
|
|
3
3
|
import { dirname, resolve } from 'path';
|
|
4
|
-
/** Returns the package version from the release-please manifest, or undefined if not found. */ export function getPackageVersion() {
|
|
4
|
+
/** Returns the package version from the release-please manifest or the package.json, or undefined if not found. */ export function getPackageVersion() {
|
|
5
|
+
const dir = dirname(fileURLToPath(import.meta.url));
|
|
6
|
+
// Try the release-please manifest first (works in dev/repo checkout).
|
|
5
7
|
try {
|
|
6
|
-
const releasePleaseManifestPath = resolve(
|
|
8
|
+
const releasePleaseManifestPath = resolve(dir, '../../../../.release-please-manifest.json');
|
|
7
9
|
return JSON.parse(readFileSync(releasePleaseManifestPath).toString())['.'];
|
|
8
10
|
} catch {
|
|
9
|
-
|
|
11
|
+
// Not in a repo checkout, fall through.
|
|
10
12
|
}
|
|
13
|
+
// Fall back to the stdlib package.json version (works in npm-installed packages).
|
|
14
|
+
try {
|
|
15
|
+
const packageJsonPath = resolve(dir, '../../package.json');
|
|
16
|
+
const version = JSON.parse(readFileSync(packageJsonPath).toString()).version;
|
|
17
|
+
if (version && version !== '0.1.0') {
|
|
18
|
+
return version;
|
|
19
|
+
}
|
|
20
|
+
} catch {
|
|
21
|
+
// No package.json found either.
|
|
22
|
+
}
|
|
23
|
+
return undefined;
|
|
11
24
|
}
|
|
@@ -19,6 +19,11 @@ export declare class TransactionsNotAvailableError extends ValidatorError {
|
|
|
19
19
|
export declare class FailedToReExecuteTransactionsError extends ValidatorError {
|
|
20
20
|
constructor(txHashes: TxHash[]);
|
|
21
21
|
}
|
|
22
|
+
export declare class ReExInitialStateMismatchError extends ValidatorError {
|
|
23
|
+
readonly expectedArchiveRoot: Fr;
|
|
24
|
+
readonly actualArchiveRoot: Fr;
|
|
25
|
+
constructor(expectedArchiveRoot: Fr, actualArchiveRoot: Fr);
|
|
26
|
+
}
|
|
22
27
|
export declare class ReExStateMismatchError extends ValidatorError {
|
|
23
28
|
readonly expectedArchiveRoot: Fr;
|
|
24
29
|
readonly actualArchiveRoot: Fr;
|
|
@@ -30,4 +35,4 @@ export declare class ReExFailedTxsError extends ValidatorError {
|
|
|
30
35
|
export declare class ReExTimeoutError extends ValidatorError {
|
|
31
36
|
constructor();
|
|
32
37
|
}
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmFsaWRhdG9ycy9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MscUJBQWEsY0FBZSxTQUFRLEtBQUs7SUFDdkMsWUFBWSxPQUFPLEVBQUUsTUFBTSxFQUUxQjtDQUNGO0FBRUQscUJBQWEsK0JBQWdDLFNBQVEsY0FBYztJQUNqRSxjQUVDO0NBQ0Y7QUFFRCxxQkFBYSx1QkFBd0IsU0FBUSxjQUFjO2FBRXZDLGNBQWMsRUFBRSxNQUFNO2FBQ3RCLGFBQWEsRUFBRSxNQUFNO2FBQ3JCLElBQUksRUFBRSxVQUFVO0lBSGxDLFlBQ2tCLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLElBQUksRUFBRSxVQUFVLEVBR2pDO0NBQ0Y7QUFFRCxxQkFBYSw2QkFBOEIsU0FBUSxjQUFjO0lBQy9ELFlBQVksUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUU3QjtDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsY0FBYztJQUNwRSxZQUFZLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFFN0I7Q0FDRjtBQUVELHFCQUFhLDZCQUE4QixTQUFRLGNBQWM7YUFFN0MsbUJBQW1CLEVBQUUsRUFBRTthQUN2QixpQkFBaUIsRUFBRSxFQUFFO0lBRnZDLFlBQ2tCLG1CQUFtQixFQUFFLEVBQUUsRUFDdkIsaUJBQWlCLEVBQUUsRUFBRSxFQUd0QztDQUNGO0FBRUQscUJBQWEsc0JBQXVCLFNBQVEsY0FBYzthQUV0QyxtQkFBbUIsRUFBRSxFQUFFO2FBQ3ZCLGlCQUFpQixFQUFFLEVBQUU7SUFGdkMsWUFDa0IsbUJBQW1CLEVBQUUsRUFBRSxFQUN2QixpQkFBaUIsRUFBRSxFQUFFLEVBR3RDO0NBQ0Y7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxjQUFjO0lBQ3BELFlBQVksWUFBWSxFQUFFLE1BQU0sRUFFL0I7Q0FDRjtBQUVELHFCQUFhLGdCQUFpQixTQUFRLGNBQWM7SUFDbEQsY0FFQztDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/validators/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,cAAe,SAAQ,KAAK;IACvC,YAAY,OAAO,EAAE,MAAM,EAE1B;CACF;AAED,qBAAa,+BAAgC,SAAQ,cAAc;IACjE,cAEC;CACF;AAED,qBAAa,uBAAwB,SAAQ,cAAc;aAEvC,cAAc,EAAE,MAAM;aACtB,aAAa,EAAE,MAAM;aACrB,IAAI,EAAE,UAAU;IAHlC,YACkB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,UAAU,EAGjC;CACF;AAED,qBAAa,6BAA8B,SAAQ,cAAc;IAC/D,YAAY,QAAQ,EAAE,MAAM,EAAE,EAE7B;CACF;AAED,qBAAa,kCAAmC,SAAQ,cAAc;IACpE,YAAY,QAAQ,EAAE,MAAM,EAAE,EAE7B;CACF;AAED,qBAAa,sBAAuB,SAAQ,cAAc;aAEtC,mBAAmB,EAAE,EAAE;aACvB,iBAAiB,EAAE,EAAE;IAFvC,YACkB,mBAAmB,EAAE,EAAE,EACvB,iBAAiB,EAAE,EAAE,EAGtC;CACF;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,YAAY,YAAY,EAAE,MAAM,EAE/B;CACF;AAED,qBAAa,gBAAiB,SAAQ,cAAc;IAClD,cAEC;CACF"}
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/validators/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,cAAe,SAAQ,KAAK;IACvC,YAAY,OAAO,EAAE,MAAM,EAE1B;CACF;AAED,qBAAa,+BAAgC,SAAQ,cAAc;IACjE,cAEC;CACF;AAED,qBAAa,uBAAwB,SAAQ,cAAc;aAEvC,cAAc,EAAE,MAAM;aACtB,aAAa,EAAE,MAAM;aACrB,IAAI,EAAE,UAAU;IAHlC,YACkB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,UAAU,EAGjC;CACF;AAED,qBAAa,6BAA8B,SAAQ,cAAc;IAC/D,YAAY,QAAQ,EAAE,MAAM,EAAE,EAE7B;CACF;AAED,qBAAa,kCAAmC,SAAQ,cAAc;IACpE,YAAY,QAAQ,EAAE,MAAM,EAAE,EAE7B;CACF;AAED,qBAAa,6BAA8B,SAAQ,cAAc;aAE7C,mBAAmB,EAAE,EAAE;aACvB,iBAAiB,EAAE,EAAE;IAFvC,YACkB,mBAAmB,EAAE,EAAE,EACvB,iBAAiB,EAAE,EAAE,EAGtC;CACF;AAED,qBAAa,sBAAuB,SAAQ,cAAc;aAEtC,mBAAmB,EAAE,EAAE;aACvB,iBAAiB,EAAE,EAAE;IAFvC,YACkB,mBAAmB,EAAE,EAAE,EACvB,iBAAiB,EAAE,EAAE,EAGtC;CACF;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,YAAY,YAAY,EAAE,MAAM,EAE/B;CACF;AAED,qBAAa,gBAAiB,SAAQ,cAAc;IAClD,cAEC;CACF"}
|
|
@@ -26,6 +26,13 @@ export class FailedToReExecuteTransactionsError extends ValidatorError {
|
|
|
26
26
|
super(`Failed to re-execute transactions: ${txHashes.join(', ')}`);
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
+
export class ReExInitialStateMismatchError extends ValidatorError {
|
|
30
|
+
expectedArchiveRoot;
|
|
31
|
+
actualArchiveRoot;
|
|
32
|
+
constructor(expectedArchiveRoot, actualArchiveRoot){
|
|
33
|
+
super('Re-execution initial state mismatch'), this.expectedArchiveRoot = expectedArchiveRoot, this.actualArchiveRoot = actualArchiveRoot;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
29
36
|
export class ReExStateMismatchError extends ValidatorError {
|
|
30
37
|
expectedArchiveRoot;
|
|
31
38
|
actualArchiveRoot;
|
|
@@ -22,11 +22,13 @@ export declare function checkCompressedComponentVersion(compressed: string, expe
|
|
|
22
22
|
/** Checks that two component versions match. Undefined fields are ignored. */
|
|
23
23
|
export declare function validatePartialComponentVersionsMatch(expected: Partial<ComponentsVersions>, actual: Partial<ComponentsVersions>): void;
|
|
24
24
|
/** Returns a Koa middleware that injects the versioning info as headers. */
|
|
25
|
-
export declare function getVersioningMiddleware(versions: Partial<ComponentsVersions
|
|
25
|
+
export declare function getVersioningMiddleware(versions: Partial<ComponentsVersions>, opts?: {
|
|
26
|
+
packageVersion?: string;
|
|
27
|
+
}): (ctx: Koa.Context, next: () => Promise<void>) => Promise<void>;
|
|
26
28
|
/** Returns a json rpc client handler that rejects responses with mismatching versions. */
|
|
27
29
|
export declare function getVersioningResponseHandler(versions: Partial<ComponentsVersions>): ({ headers }: {
|
|
28
30
|
headers: {
|
|
29
31
|
get: (header: string) => string | null | undefined;
|
|
30
32
|
};
|
|
31
33
|
}) => Promise<void>;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbmluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZlcnNpb25pbmcvdmVyc2lvbmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssR0FBRyxNQUFNLEtBQUssQ0FBQztBQUUzQixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU3RCw4SUFBOEk7QUFDOUksTUFBTSxNQUFNLGtCQUFrQixHQUFHO0lBQy9CLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFJbEIsZUFBZSxFQUFFLFVBQVUsQ0FBQztJQUM1QixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHVCQUF1QixFQUFFLE1BQU0sQ0FBQztJQUNoQyxvQkFBb0IsRUFBRSxNQUFNLENBQUM7Q0FDOUIsQ0FBQztBQUVGLHFEQUFxRDtBQUNyRCx3QkFBZ0IsK0JBQStCLENBQzdDLE1BQU0sRUFBRSxXQUFXLEVBQ25CLHVCQUF1QixFQUFFLE1BQU0sR0FBRyxFQUFFLEVBQ3BDLG9CQUFvQixFQUFFLE1BQU0sR0FBRyxFQUFFLEdBQ2hDLGtCQUFrQixDQVFwQjtBQUVELHFHQUFxRztBQUNyRyx3QkFBZ0IseUJBQXlCLENBQUMsUUFBUSxFQUFFLGtCQUFrQixHQUFHLE1BQU0sQ0FpQjlFO0FBRUQscUJBQWEsdUJBQXdCLFNBQVEsS0FBSztJQUNoRCxZQUFZLEdBQUcsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUd2RDtDQUNGO0FBRUQsaUdBQWlHO0FBQ2pHLHdCQUFnQiwrQkFBK0IsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxrQkFBa0IsUUE2Qi9GO0FBRUQsOEVBQThFO0FBQzlFLHdCQUFnQixxQ0FBcUMsQ0FDbkQsUUFBUSxFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxFQUNyQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGtCQUFrQixDQUFDLFFBaUJwQztBQUVELDRFQUE0RTtBQUM1RSx3QkFBZ0IsdUJBQXVCLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLElBQUksQ0FBQyxFQUFFO0lBQUUsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsa0VBa0JoSDtBQUVELDBGQUEwRjtBQUMxRix3QkFBZ0IsNEJBQTRCLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQzs7OztvQkFhakYifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../../src/versioning/versioning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,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;IAChD,YAAY,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAGvD;CACF;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,
|
|
1
|
+
{"version":3,"file":"versioning.d.ts","sourceRoot":"","sources":["../../src/versioning/versioning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,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;IAChD,YAAY,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAGvD;CACF;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,EAAE,IAAI,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,kEAkBhH;AAED,0FAA0F;AAC1F,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC;;;;oBAajF"}
|
|
@@ -65,7 +65,7 @@ export class ComponentsVersionsError extends Error {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
|
-
/** Returns a Koa middleware that injects the versioning info as headers. */ export function getVersioningMiddleware(versions) {
|
|
68
|
+
/** Returns a Koa middleware that injects the versioning info as headers. */ export function getVersioningMiddleware(versions, opts) {
|
|
69
69
|
return async (ctx, next)=>{
|
|
70
70
|
try {
|
|
71
71
|
await next();
|
|
@@ -78,6 +78,9 @@ export class ComponentsVersionsError extends Error {
|
|
|
78
78
|
ctx.set(`x-aztec-${key}`, value.toString());
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
+
if (opts?.packageVersion) {
|
|
82
|
+
ctx.set('x-aztec-packageVersion', opts.packageVersion);
|
|
83
|
+
}
|
|
81
84
|
}
|
|
82
85
|
};
|
|
83
86
|
}
|