@aztec/simulator 0.68.0 → 0.68.2
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/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +21 -14
- package/dest/avm/avm_simulator.d.ts +1 -0
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +35 -18
- package/dest/avm/avm_tree.d.ts +0 -22
- package/dest/avm/avm_tree.d.ts.map +1 -1
- package/dest/avm/avm_tree.js +22 -81
- package/dest/avm/errors.d.ts +8 -1
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +13 -3
- package/dest/avm/journal/journal.d.ts +0 -4
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +1 -11
- package/dest/avm/journal/nullifiers.d.ts +0 -4
- package/dest/avm/journal/nullifiers.d.ts.map +1 -1
- package/dest/avm/journal/nullifiers.js +1 -11
- package/dest/avm/journal/public_storage.d.ts +1 -49
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.js +1 -19
- package/dest/avm/opcodes/addressing_mode.js +3 -3
- package/dest/avm/opcodes/ec_add.d.ts.map +1 -1
- package/dest/avm/opcodes/ec_add.js +5 -4
- package/dest/avm/opcodes/external_calls.js +2 -2
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +5 -5
- package/dest/avm/opcodes/misc.d.ts.map +1 -1
- package/dest/avm/opcodes/misc.js +3 -3
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +9 -6
- package/dest/public/bytecode_errors.d.ts +4 -0
- package/dest/public/bytecode_errors.d.ts.map +1 -0
- package/dest/public/bytecode_errors.js +7 -0
- package/dest/public/enqueued_call_side_effect_trace.d.ts +6 -1
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
- package/dest/public/enqueued_call_side_effect_trace.js +58 -9
- package/dest/public/fixtures/index.d.ts +13 -8
- package/dest/public/fixtures/index.d.ts.map +1 -1
- package/dest/public/fixtures/index.js +97 -35
- package/dest/public/public_processor.d.ts +9 -3
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +49 -19
- package/dest/public/side_effect_errors.js +2 -2
- package/dest/public/unique_class_ids.d.ts +37 -0
- package/dest/public/unique_class_ids.d.ts.map +1 -0
- package/dest/public/unique_class_ids.js +66 -0
- package/package.json +10 -10
- package/src/avm/avm_memory_types.ts +29 -13
- package/src/avm/avm_simulator.ts +45 -19
- package/src/avm/avm_tree.ts +29 -91
- package/src/avm/errors.ts +13 -2
- package/src/avm/journal/journal.ts +0 -23
- package/src/avm/journal/nullifiers.ts +0 -11
- package/src/avm/journal/public_storage.ts +2 -21
- package/src/avm/opcodes/addressing_mode.ts +2 -2
- package/src/avm/opcodes/ec_add.ts +4 -3
- package/src/avm/opcodes/external_calls.ts +1 -1
- package/src/avm/opcodes/hashing.ts +6 -4
- package/src/avm/opcodes/misc.ts +4 -3
- package/src/avm/opcodes/multi_scalar_mul.ts +10 -5
- package/src/public/bytecode_errors.ts +6 -0
- package/src/public/enqueued_call_side_effect_trace.ts +75 -7
- package/src/public/fixtures/index.ts +143 -45
- package/src/public/public_processor.ts +79 -15
- package/src/public/side_effect_errors.ts +1 -1
- package/src/public/unique_class_ids.ts +80 -0
|
@@ -3,7 +3,7 @@ import { MerkleTreeId, NestedProcessReturnValues, Tx, TxExecutionPhase, makeProc
|
|
|
3
3
|
import { Fr, Gas, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, NULLIFIER_SUBTREE_HEIGHT, PublicDataWrite, } from '@aztec/circuits.js';
|
|
4
4
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
|
-
import { Timer } from '@aztec/foundation/timer';
|
|
6
|
+
import { Timer, elapsed, executeTimeout } from '@aztec/foundation/timer';
|
|
7
7
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
8
8
|
import { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
|
|
9
9
|
import { Attributes, trackSpan } from '@aztec/telemetry-client';
|
|
@@ -15,8 +15,9 @@ import { PublicTxSimulator } from './public_tx_simulator.js';
|
|
|
15
15
|
* Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
|
|
16
16
|
*/
|
|
17
17
|
export class PublicProcessorFactory {
|
|
18
|
-
constructor(contractDataSource, telemetryClient) {
|
|
18
|
+
constructor(contractDataSource, dateProvider, telemetryClient) {
|
|
19
19
|
this.contractDataSource = contractDataSource;
|
|
20
|
+
this.dateProvider = dateProvider;
|
|
20
21
|
this.telemetryClient = telemetryClient;
|
|
21
22
|
}
|
|
22
23
|
/**
|
|
@@ -29,9 +30,18 @@ export class PublicProcessorFactory {
|
|
|
29
30
|
create(merkleTree, maybeHistoricalHeader, globalVariables, enforceFeePayment) {
|
|
30
31
|
const historicalHeader = maybeHistoricalHeader ?? merkleTree.getInitialHeader();
|
|
31
32
|
const worldStateDB = new WorldStateDB(merkleTree, this.contractDataSource);
|
|
32
|
-
const publicTxSimulator =
|
|
33
|
+
const publicTxSimulator = this.createPublicTxSimulator(merkleTree, worldStateDB, this.telemetryClient, globalVariables,
|
|
33
34
|
/*doMerkleOperations=*/ true, enforceFeePayment);
|
|
34
|
-
return new PublicProcessor(merkleTree, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, this.telemetryClient);
|
|
35
|
+
return new PublicProcessor(merkleTree, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, this.dateProvider, this.telemetryClient);
|
|
36
|
+
}
|
|
37
|
+
createPublicTxSimulator(db, worldStateDB, telemetryClient, globalVariables, doMerkleOperations, enforceFeePayment) {
|
|
38
|
+
return new PublicTxSimulator(db, worldStateDB, telemetryClient, globalVariables, doMerkleOperations, enforceFeePayment);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
class PublicProcessorTimeoutError extends Error {
|
|
42
|
+
constructor(message = 'Timed out while processing tx') {
|
|
43
|
+
super(message);
|
|
44
|
+
this.name = 'PublicProcessorTimeoutError';
|
|
35
45
|
}
|
|
36
46
|
}
|
|
37
47
|
/**
|
|
@@ -45,12 +55,13 @@ let PublicProcessor = (() => {
|
|
|
45
55
|
let _processPrivateOnlyTx_decorators;
|
|
46
56
|
let _processTxWithPublicCalls_decorators;
|
|
47
57
|
return _a = class PublicProcessor {
|
|
48
|
-
constructor(db, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, telemetryClient, log = createLogger('simulator:public-processor')) {
|
|
58
|
+
constructor(db, globalVariables, historicalHeader, worldStateDB, publicTxSimulator, dateProvider, telemetryClient, log = createLogger('simulator:public-processor')) {
|
|
49
59
|
this.db = (__runInitializers(this, _instanceExtraInitializers), db);
|
|
50
60
|
this.globalVariables = globalVariables;
|
|
51
61
|
this.historicalHeader = historicalHeader;
|
|
52
62
|
this.worldStateDB = worldStateDB;
|
|
53
63
|
this.publicTxSimulator = publicTxSimulator;
|
|
64
|
+
this.dateProvider = dateProvider;
|
|
54
65
|
this.log = log;
|
|
55
66
|
this.metrics = new PublicProcessorMetrics(telemetryClient, 'PublicProcessor');
|
|
56
67
|
}
|
|
@@ -63,7 +74,7 @@ let PublicProcessor = (() => {
|
|
|
63
74
|
* @param processedTxHandler - Handler for processed txs in the context of block building or proving.
|
|
64
75
|
* @returns The list of processed txs with their circuit simulation outputs.
|
|
65
76
|
*/
|
|
66
|
-
async process(txs, maxTransactions = txs.length, txValidator) {
|
|
77
|
+
async process(txs, maxTransactions = txs.length, txValidator, deadline) {
|
|
67
78
|
// The processor modifies the tx objects in place, so we need to clone them.
|
|
68
79
|
txs = txs.map(tx => Tx.clone(tx));
|
|
69
80
|
const result = [];
|
|
@@ -77,18 +88,19 @@ let PublicProcessor = (() => {
|
|
|
77
88
|
break;
|
|
78
89
|
}
|
|
79
90
|
try {
|
|
80
|
-
const [processedTx, returnValues] = await this.processTx(tx, txValidator);
|
|
91
|
+
const [processedTx, returnValues] = await this.processTx(tx, txValidator, deadline);
|
|
81
92
|
result.push(processedTx);
|
|
82
93
|
returns = returns.concat(returnValues);
|
|
83
94
|
totalGas = totalGas.add(processedTx.gasUsed.publicGas);
|
|
84
95
|
}
|
|
85
96
|
catch (err) {
|
|
97
|
+
if (err?.name === 'PublicProcessorTimeoutError') {
|
|
98
|
+
this.log.warn(`Stopping tx processing due to timeout.`);
|
|
99
|
+
break;
|
|
100
|
+
}
|
|
86
101
|
const errorMessage = err instanceof Error ? err.message : 'Unknown error';
|
|
87
102
|
this.log.warn(`Failed to process tx ${tx.getTxHash()}: ${errorMessage} ${err?.stack}`);
|
|
88
|
-
failed.push({
|
|
89
|
-
tx,
|
|
90
|
-
error: err instanceof Error ? err : new Error(errorMessage),
|
|
91
|
-
});
|
|
103
|
+
failed.push({ tx, error: err instanceof Error ? err : new Error(errorMessage) });
|
|
92
104
|
returns.push(new NestedProcessReturnValues([]));
|
|
93
105
|
}
|
|
94
106
|
}
|
|
@@ -97,13 +109,11 @@ let PublicProcessor = (() => {
|
|
|
97
109
|
this.metrics.recordAllTxs(totalGas, rate);
|
|
98
110
|
return [result, failed, returns];
|
|
99
111
|
}
|
|
100
|
-
async processTx(tx, txValidator) {
|
|
101
|
-
const [processedTx, returnValues] =
|
|
102
|
-
? await this.processPrivateOnlyTx(tx)
|
|
103
|
-
: await this.processTxWithPublicCalls(tx);
|
|
112
|
+
async processTx(tx, txValidator, deadline) {
|
|
113
|
+
const [time, [processedTx, returnValues]] = await elapsed(() => this.processTxWithinDeadline(tx, deadline));
|
|
104
114
|
this.log.verbose(!tx.hasPublicCalls()
|
|
105
|
-
? `Processed tx ${processedTx.hash} with no public calls`
|
|
106
|
-
: `Processed tx ${processedTx.hash} with ${tx.enqueuedPublicFunctionCalls.length} public calls`, {
|
|
115
|
+
? `Processed tx ${processedTx.hash} with no public calls in ${time}ms`
|
|
116
|
+
: `Processed tx ${processedTx.hash} with ${tx.enqueuedPublicFunctionCalls.length} public calls in ${time}ms`, {
|
|
107
117
|
txHash: processedTx.hash,
|
|
108
118
|
txFee: processedTx.txEffect.transactionFee.toBigInt(),
|
|
109
119
|
revertCode: processedTx.txEffect.revertCode.getCode(),
|
|
@@ -116,6 +126,7 @@ let PublicProcessor = (() => {
|
|
|
116
126
|
unencryptedLogCount: processedTx.txEffect.unencryptedLogs.getTotalLogCount(),
|
|
117
127
|
privateLogCount: processedTx.txEffect.privateLogs.length,
|
|
118
128
|
l2ToL1MessageCount: processedTx.txEffect.l2ToL1Msgs.length,
|
|
129
|
+
durationMs: time,
|
|
119
130
|
});
|
|
120
131
|
// Commit the state updates from this transaction
|
|
121
132
|
await this.worldStateDB.commit();
|
|
@@ -156,6 +167,25 @@ let PublicProcessor = (() => {
|
|
|
156
167
|
this.metrics.recordTreeInsertions(Number(treeInsertionEnd - treeInsertionStart) / 1000);
|
|
157
168
|
return [processedTx, returnValues ?? []];
|
|
158
169
|
}
|
|
170
|
+
/** Processes the given tx within deadline. Returns timeout if deadline is hit. */
|
|
171
|
+
async processTxWithinDeadline(tx, deadline) {
|
|
172
|
+
const processFn = tx.hasPublicCalls()
|
|
173
|
+
? () => this.processTxWithPublicCalls(tx)
|
|
174
|
+
: () => this.processPrivateOnlyTx(tx);
|
|
175
|
+
if (!deadline) {
|
|
176
|
+
return await processFn();
|
|
177
|
+
}
|
|
178
|
+
const timeout = +deadline - this.dateProvider.now();
|
|
179
|
+
this.log.debug(`Processing tx ${tx.getTxHash().toString()} within ${timeout}ms`, {
|
|
180
|
+
deadline: deadline.toISOString(),
|
|
181
|
+
now: new Date(this.dateProvider.now()).toISOString(),
|
|
182
|
+
txHash: tx.getTxHash().toString(),
|
|
183
|
+
});
|
|
184
|
+
if (timeout < 0) {
|
|
185
|
+
throw new PublicProcessorTimeoutError();
|
|
186
|
+
}
|
|
187
|
+
return await executeTimeout(() => processFn(), timeout, () => new PublicProcessorTimeoutError());
|
|
188
|
+
}
|
|
159
189
|
/**
|
|
160
190
|
* Creates the public data write for paying the tx fee.
|
|
161
191
|
* This is used in private only txs, since for txs with public calls
|
|
@@ -187,7 +217,7 @@ let PublicProcessor = (() => {
|
|
|
187
217
|
.unrollLogs()
|
|
188
218
|
.filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
|
|
189
219
|
.map(log => ContractClassRegisteredEvent.fromLog(log.data)));
|
|
190
|
-
return [processedTx];
|
|
220
|
+
return [processedTx, undefined];
|
|
191
221
|
}
|
|
192
222
|
async processTxWithPublicCalls(tx) {
|
|
193
223
|
const timer = new Timer();
|
|
@@ -233,4 +263,4 @@ let PublicProcessor = (() => {
|
|
|
233
263
|
_a;
|
|
234
264
|
})();
|
|
235
265
|
export { PublicProcessor };
|
|
236
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":"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"}
|
|
266
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,YAAY,EAEZ,yBAAyB,EAEzB,EAAE,EACF,gBAAgB,EAEhB,gCAAgC,EAChC,oCAAoC,GACrC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAIL,EAAE,EACF,GAAG,EAEH,sBAAsB,EACtB,qBAAqB,EACrB,wBAAwB,EACxB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAqB,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,4CAA4C,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAqD,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEnH,OAAO,EAAE,8BAA8B,EAAE,iCAAiC,EAAE,MAAM,kBAAkB,CAAC;AACrG,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,MAAM,OAAO,sBAAsB;IACjC,YACU,kBAAsC,EACtC,YAA0B,EAC1B,eAAgC;QAFhC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,oBAAe,GAAf,eAAe,CAAiB;IACvC,CAAC;IAEJ;;;;;;OAMG;IACI,MAAM,CACX,UAAqC,EACrC,qBAA8C,EAC9C,eAAgC,EAChC,iBAA0B;QAE1B,MAAM,gBAAgB,GAAG,qBAAqB,IAAI,UAAU,CAAC,gBAAgB,EAAE,CAAC;QAEhF,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,CACpD,UAAU,EACV,YAAY,EACZ,IAAI,CAAC,eAAe,EACpB,eAAe;QACf,uBAAuB,CAAC,IAAI,EAC5B,iBAAiB,CAClB,CAAC;QAEF,OAAO,IAAI,eAAe,CACxB,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,eAAe,CACrB,CAAC;IACJ,CAAC;IAES,uBAAuB,CAC/B,EAA6B,EAC7B,YAA0B,EAC1B,eAAgC,EAChC,eAAgC,EAChC,kBAA2B,EAC3B,iBAA0B;QAE1B,OAAO,IAAI,iBAAiB,CAC1B,EAAE,EACF,YAAY,EACZ,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;IACJ,CAAC;CACF;AAED,MAAM,2BAA4B,SAAQ,KAAK;IAC7C,YAAY,UAAkB,+BAA+B;QAC3D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;IAC5C,CAAC;CACF;AAED;;;GAGG;IACU,eAAe;;;;;;sBAAf,eAAe;YAE1B,YACY,EAA6B,EAC7B,eAAgC,EAChC,gBAA6B,EAC7B,YAA0B,EAC1B,iBAAoC,EACtC,YAA0B,EAClC,eAAgC,EACxB,MAAM,YAAY,CAAC,4BAA4B,CAAC;gBAP9C,OAAE,IAHH,mDAAe,EAGd,EAAE,EAA2B;gBAC7B,oBAAe,GAAf,eAAe,CAAiB;gBAChC,qBAAgB,GAAhB,gBAAgB,CAAa;gBAC7B,iBAAY,GAAZ,YAAY,CAAc;gBAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;gBACtC,iBAAY,GAAZ,YAAY,CAAc;gBAE1B,QAAG,GAAH,GAAG,CAA6C;gBAExD,IAAI,CAAC,OAAO,GAAG,IAAI,sBAAsB,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;YAChF,CAAC;YAED,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC7B,CAAC;YAED;;;;;eAKG;YACI,KAAK,CAAC,OAAO,CAClB,GAAS,EACT,eAAe,GAAG,GAAG,CAAC,MAAM,EAC5B,WAAsC,EACtC,QAAe;gBAEf,4EAA4E;gBAC5E,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBAClC,MAAM,MAAM,GAAkB,EAAE,CAAC;gBACjC,MAAM,MAAM,GAAe,EAAE,CAAC;gBAC9B,IAAI,OAAO,GAAgC,EAAE,CAAC;gBAC9C,IAAI,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAE1B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,4CAA4C;oBAC5C,IAAI,MAAM,CAAC,MAAM,IAAI,eAAe,EAAE,CAAC;wBACrC,MAAM;oBACR,CAAC;oBACD,IAAI,CAAC;wBACH,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;wBACpF,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBACzB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;wBACvC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBACzD,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,IAAI,GAAG,EAAE,IAAI,KAAK,6BAA6B,EAAE,CAAC;4BAChD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;4BACxD,MAAM;wBACR,CAAC;wBACD,MAAM,YAAY,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC;wBAC1E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,SAAS,EAAE,KAAK,YAAY,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;wBAEvF,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;wBACjF,OAAO,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC;oBAClD,CAAC;gBACH,CAAC;gBAED,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1D,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAE1C,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACnC,CAAC;YAGO,KAAK,CAAC,SAAS,CACrB,EAAM,EACN,WAAsC,EACtC,QAAe;gBAEf,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAE5G,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,CAAC,EAAE,CAAC,cAAc,EAAE;oBAClB,CAAC,CAAC,gBAAgB,WAAW,CAAC,IAAI,4BAA4B,IAAI,IAAI;oBACtE,CAAC,CAAC,gBAAgB,WAAW,CAAC,IAAI,SAAS,EAAE,CAAC,2BAA2B,CAAC,MAAM,oBAAoB,IAAI,IAAI,EAC9G;oBACE,MAAM,EAAE,WAAW,CAAC,IAAI;oBACxB,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE;oBACrD,UAAU,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE;oBACrD,YAAY,EAAE,WAAW,CAAC,YAAY;oBACtC,OAAO,EAAE,WAAW,CAAC,OAAO;oBAC5B,oBAAoB,EAAE,WAAW,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM;oBAClE,cAAc,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM;oBACtD,aAAa,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM;oBACrD,qBAAqB,EAAE,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,gBAAgB,EAAE;oBAChF,mBAAmB,EAAE,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,gBAAgB,EAAE;oBAC5E,eAAe,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM;oBACxD,kBAAkB,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM;oBAC1D,UAAU,EAAE,IAAI;iBACjB,CACF,CAAC;gBAEF,iDAAiD;gBACjD,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;gBAEjC,8BAA8B;gBAC9B,IAAI,WAAW,EAAE,CAAC;oBAChB,iEAAiE;oBACjE,+EAA+E;oBAC/E,oFAAoF;oBACpF,iFAAiF;oBACjF,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;oBAClE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;wBACnB,MAAM,IAAI,KAAK,CAAC,eAAe,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,4CAA4C,CAAC,CAAC;oBAC9F,CAAC;gBACH,CAAC;gBACD,+EAA+E;gBAC/E,sHAAsH;gBACtH,uEAAuE;gBACvE,gIAAgI;gBAChI,4HAA4H;gBAC5H,gDAAgD;gBAChD,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnD,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CACxB,YAAY,CAAC,cAAc,EAC3B,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAC9E,CAAC;gBACF,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CACvB,YAAY,CAAC,cAAc,EAC3B,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EACnG,wBAAwB,CACzB,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,WAAW,EAAE,CAAC;wBAChB,yEAAyE;wBACzE,MAAM,IAAI,KAAK,CAAC,eAAe,WAAW,CAAC,IAAI,4CAA4C,CAAC,CAAC;oBAC/F,CAAC;yBAAM,CAAC;wBACN,0GAA0G;wBAC1G,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6DAA6D,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC;oBAClG,CAAC;gBACH,CAAC;gBAED,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAC5B,YAAY,CAAC,gBAAgB,EAC7B,WAAW,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC7D,CAAC;gBACF,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACjD,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,GAAG,IAAK,CAAC,CAAC;gBAEzF,OAAO,CAAC,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC;YAC3C,CAAC;YAED,kFAAkF;YAC1E,KAAK,CAAC,uBAAuB,CACnC,EAAM,EACN,QAAe;gBAEf,MAAM,SAAS,GAA0E,EAAE,CAAC,cAAc,EAAE;oBAC1G,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC;oBACzC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;gBAExC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO,MAAM,SAAS,EAAE,CAAC;gBAC3B,CAAC;gBAED,MAAM,OAAO,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;gBACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,WAAW,OAAO,IAAI,EAAE;oBAC/E,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;oBAChC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE;oBACpD,MAAM,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE;iBAClC,CAAC,CAAC;gBAEH,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;oBAChB,MAAM,IAAI,2BAA2B,EAAE,CAAC;gBAC1C,CAAC;gBAED,OAAO,MAAM,cAAc,CACzB,GAAG,EAAE,CAAC,SAAS,EAAE,EACjB,OAAO,EACP,GAAG,EAAE,CAAC,IAAI,2BAA2B,EAAE,CACxC,CAAC;YACJ,CAAC;YAED;;;;eAIG;YACK,KAAK,CAAC,4BAA4B,CAAC,KAAS,EAAE,QAAsB;gBAC1E,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;oBACtB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBAClE,OAAO;gBACT,CAAC;gBAED,MAAM,eAAe,GAAG,uBAAuB,CAAC,QAAQ,CAAC;gBACzD,MAAM,WAAW,GAAG,iCAAiC,CAAC,QAAQ,CAAC,CAAC;gBAChE,MAAM,QAAQ,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAC;gBAE1D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,KAAK,CAAC,QAAQ,EAAE,6BAA6B,QAAQ,EAAE,CAAC,CAAC;gBAErF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;gBAElF,IAAI,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CACb,gEAAgE,OAAO,CAAC,QAAQ,EAAE,UAAU,KAAK,CAAC,QAAQ,EAAE,GAAG,CAChH,CAAC;gBACJ,CAAC;gBAED,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC1C,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,eAAe,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;gBAEnF,OAAO,IAAI,eAAe,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;YACvD,CAAC;YAKO,KAAK,CAAC,oBAAoB,CAAC,EAAM;gBACvC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC7C,MAAM,cAAc,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAE3D,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAE5G,MAAM,WAAW,GAAG,gCAAgC,CAClD,EAAE,EACF,cAAc,EACd,yBAAyB,EACzB,IAAI,CAAC,eAAe,CACrB,CAAC;gBAEF,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAClC,GAAG,EAAE,CAAC,iBAAiB;qBACpB,UAAU,EAAE;qBACZ,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,4BAA4B,CAAC,8BAA8B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;qBACpF,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,4BAA4B,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAC9D,CAAC;gBACF,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAClC,CAAC;YAKO,KAAK,CAAC,wBAAwB,CAAC,EAAM;gBAC3C,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAE1B,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,GAC7E,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAE5C,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACvB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;gBAC3D,CAAC;gBAED,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC9B,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;wBACvB,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAChD,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;oBAClE,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAClC,GAAG,EAAE,CAAC,iBAAiB;qBACpB,UAAU,EAAE;qBACZ,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,4BAA4B,CAAC,8BAA8B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;qBACpF,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,4BAA4B,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAC9D,CAAC;gBAEF,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC;gBAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBAEjE,MAAM,WAAW,GAAG,oCAAoC,CAAC,EAAE,EAAE,iBAAiB,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;gBAEnH,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,gBAAgB,CAAC,SAAS,CAAC,EAAE,YAAY,IAAI,EAAE,CAAC;gBAEnH,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACrC,CAAC;;;;qCA7MA,SAAS,CAAC,2BAA2B,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;gDA8IvG,SAAS,CAAC,sCAAsC,EAAE,CAAC,EAAM,EAAE,EAAE,CAAC,CAAC;oBAC9D,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE;iBAChD,CAAC,CAAC;oDAuBF,SAAS,CAAC,0CAA0C,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBAC5D,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE;iBAChD,CAAC,CAAC;YAxKH,4KAAc,SAAS,6DA6EtB;YAmED,6MAAc,oBAAoB,6DAoBjC;YAKD,yNAAc,wBAAwB,6DAmCrC;;;;;SAlRU,eAAe"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export class SideEffectLimitReachedError extends Error {
|
|
2
2
|
constructor(sideEffectType, limit) {
|
|
3
|
-
super(`Reached the limit on number of '${sideEffectType}'
|
|
3
|
+
super(`Reached the limit (${limit}) on number of '${sideEffectType}' per tx`);
|
|
4
4
|
this.name = 'SideEffectLimitReachedError';
|
|
5
5
|
}
|
|
6
6
|
}
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lkZV9lZmZlY3RfZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9zaWRlX2VmZmVjdF9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLDJCQUE0QixTQUFRLEtBQUs7SUFDcEQsWUFBWSxjQUFzQixFQUFFLEtBQWE7UUFDL0MsS0FBSyxDQUFDLHNCQUFzQixLQUFLLG1CQUFtQixjQUFjLFVBQVUsQ0FBQyxDQUFDO1FBQzlFLElBQUksQ0FBQyxJQUFJLEdBQUcsNkJBQTZCLENBQUM7SUFDNUMsQ0FBQztDQUNGIn0=
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A class manage a de-duplicated set of class IDs that errors if you try to add a duplicate.
|
|
3
|
+
* Useful for bytecode retrieval hints to avoid duplicates in parent trace & grandparent trace....
|
|
4
|
+
*/
|
|
5
|
+
export declare class UniqueClassIds {
|
|
6
|
+
private readonly parent?;
|
|
7
|
+
private readonly classIds;
|
|
8
|
+
constructor(parent?: UniqueClassIds | undefined);
|
|
9
|
+
/**
|
|
10
|
+
* Create a fork that references this one as its parent
|
|
11
|
+
*/
|
|
12
|
+
fork(): UniqueClassIds;
|
|
13
|
+
/**
|
|
14
|
+
* Check for a class ID here or in parent's (recursively).
|
|
15
|
+
*
|
|
16
|
+
* @param classId - the contract class ID (as a string) to check
|
|
17
|
+
* @returns boolean: whether the class ID is here
|
|
18
|
+
*/
|
|
19
|
+
has(classId: string): boolean;
|
|
20
|
+
/**
|
|
21
|
+
* Get the total number of classIds
|
|
22
|
+
*/
|
|
23
|
+
size(): number;
|
|
24
|
+
/**
|
|
25
|
+
* Add a class ID (if not already present) to the set.
|
|
26
|
+
*
|
|
27
|
+
* @param classId - the contract class ID (as a string)
|
|
28
|
+
*/
|
|
29
|
+
add(classId: string): void;
|
|
30
|
+
/**
|
|
31
|
+
* Merge in another set of unique class IDs into this one, but fail on duplicates.
|
|
32
|
+
*
|
|
33
|
+
* @param incoming: other unique class IDs
|
|
34
|
+
*/
|
|
35
|
+
acceptAndMerge(incoming: UniqueClassIds): void;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=unique_class_ids.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unique_class_ids.d.ts","sourceRoot":"","sources":["../../src/public/unique_class_ids.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,qBAAa,cAAc;IAGb,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAFpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;gBAEtB,MAAM,CAAC,4BAAgB;IAEpD;;OAEG;IACI,IAAI;IAIX;;;;;OAKG;IACI,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAWpC;;OAEG;IACI,IAAI,IAAI,MAAM;IAIrB;;;;OAIG;IACI,GAAG,CAAC,OAAO,EAAE,MAAM;IAW1B;;;;OAIG;IACI,cAAc,CAAC,QAAQ,EAAE,cAAc;CAc/C"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS } from '@aztec/circuits.js';
|
|
2
|
+
import { strict as assert } from 'assert';
|
|
3
|
+
/**
|
|
4
|
+
* A class manage a de-duplicated set of class IDs that errors if you try to add a duplicate.
|
|
5
|
+
* Useful for bytecode retrieval hints to avoid duplicates in parent trace & grandparent trace....
|
|
6
|
+
*/
|
|
7
|
+
export class UniqueClassIds {
|
|
8
|
+
constructor(parent) {
|
|
9
|
+
this.parent = parent;
|
|
10
|
+
this.classIds = new Set();
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Create a fork that references this one as its parent
|
|
14
|
+
*/
|
|
15
|
+
fork() {
|
|
16
|
+
return new UniqueClassIds(/*parent=*/ this);
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Check for a class ID here or in parent's (recursively).
|
|
20
|
+
*
|
|
21
|
+
* @param classId - the contract class ID (as a string) to check
|
|
22
|
+
* @returns boolean: whether the class ID is here
|
|
23
|
+
*/
|
|
24
|
+
has(classId) {
|
|
25
|
+
// First try check this' classIds
|
|
26
|
+
let here = this.classIds.has(classId);
|
|
27
|
+
// Then try parent's
|
|
28
|
+
if (!here && this.parent) {
|
|
29
|
+
// Note: this will recurse to grandparent/etc until we reach top or find it
|
|
30
|
+
here = this.parent.has(classId);
|
|
31
|
+
}
|
|
32
|
+
return here;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Get the total number of classIds
|
|
36
|
+
*/
|
|
37
|
+
size() {
|
|
38
|
+
return this.classIds.size + (this.parent ? this.parent.size() : 0);
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Add a class ID (if not already present) to the set.
|
|
42
|
+
*
|
|
43
|
+
* @param classId - the contract class ID (as a string)
|
|
44
|
+
*/
|
|
45
|
+
add(classId) {
|
|
46
|
+
assert(!this.has(classId), `Bug! Tried to add duplicate classId ${classId} to set of unique classIds.`);
|
|
47
|
+
if (!this.has(classId)) {
|
|
48
|
+
this.classIds.add(classId);
|
|
49
|
+
assert(this.size() <= MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, `Bug! Surpassed limit (${MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS}) of unique contract class IDs used for bytecode retrievals.`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Merge in another set of unique class IDs into this one, but fail on duplicates.
|
|
54
|
+
*
|
|
55
|
+
* @param incoming: other unique class IDs
|
|
56
|
+
*/
|
|
57
|
+
acceptAndMerge(incoming) {
|
|
58
|
+
for (const classId of incoming.classIds.keys()) {
|
|
59
|
+
assert(!this.has(classId), `Bug! Cannot merge classId ${classId} into set of unique classIds as it already exists.`);
|
|
60
|
+
this.classIds.add(classId);
|
|
61
|
+
}
|
|
62
|
+
// since set() has an assertion, and size() always checks parent, this should be impossible
|
|
63
|
+
assert(this.size() <= MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS, `Bug! Merging unique class Ids should never exceed the limit of ${MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS}.`);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5pcXVlX2NsYXNzX2lkcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvdW5pcXVlX2NsYXNzX2lkcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsNkNBQTZDLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVuRixPQUFPLEVBQUUsTUFBTSxJQUFJLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUUxQzs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sY0FBYztJQUd6QixZQUE2QixNQUF1QjtRQUF2QixXQUFNLEdBQU4sTUFBTSxDQUFpQjtRQUZuQyxhQUFRLEdBQWdCLElBQUksR0FBRyxFQUFFLENBQUM7SUFFSSxDQUFDO0lBRXhEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxjQUFjLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLEdBQUcsQ0FBQyxPQUFlO1FBQ3hCLGlDQUFpQztRQUNqQyxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN0QyxvQkFBb0I7UUFDcEIsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDekIsMkVBQTJFO1lBQzNFLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsQyxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxJQUFJO1FBQ1QsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksR0FBRyxDQUFDLE9BQWU7UUFDeEIsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSx1Q0FBdUMsT0FBTyw2QkFBNkIsQ0FBQyxDQUFDO1FBQ3hHLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDdkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDM0IsTUFBTSxDQUNKLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSw2Q0FBNkMsRUFDNUQseUJBQXlCLDZDQUE2Qyw4REFBOEQsQ0FDckksQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLGNBQWMsQ0FBQyxRQUF3QjtRQUM1QyxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQztZQUMvQyxNQUFNLENBQ0osQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUNsQiw2QkFBNkIsT0FBTyxvREFBb0QsQ0FDekYsQ0FBQztZQUNGLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdCLENBQUM7UUFDRCwyRkFBMkY7UUFDM0YsTUFBTSxDQUNKLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSw2Q0FBNkMsRUFDNUQsa0VBQWtFLDZDQUE2QyxHQUFHLENBQ25ILENBQUM7SUFDSixDQUFDO0NBQ0YifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/simulator",
|
|
3
|
-
"version": "0.68.
|
|
3
|
+
"version": "0.68.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"clean": "rm -rf ./dest .tsbuildinfo",
|
|
23
23
|
"formatting": "run -T prettier --check ./src && run -T eslint ./src",
|
|
24
24
|
"formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
|
|
25
|
-
"test": "HARDWARE_CONCURRENCY
|
|
25
|
+
"test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
|
|
26
26
|
},
|
|
27
27
|
"inherits": [
|
|
28
28
|
"../package.common.json"
|
|
@@ -66,14 +66,14 @@
|
|
|
66
66
|
]
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@aztec/circuit-types": "0.68.
|
|
70
|
-
"@aztec/circuits.js": "0.68.
|
|
71
|
-
"@aztec/foundation": "0.68.
|
|
72
|
-
"@aztec/noir-protocol-circuits-types": "0.68.
|
|
73
|
-
"@aztec/protocol-contracts": "0.68.
|
|
74
|
-
"@aztec/telemetry-client": "0.68.
|
|
75
|
-
"@aztec/types": "0.68.
|
|
76
|
-
"@aztec/world-state": "0.68.
|
|
69
|
+
"@aztec/circuit-types": "0.68.2",
|
|
70
|
+
"@aztec/circuits.js": "0.68.2",
|
|
71
|
+
"@aztec/foundation": "0.68.2",
|
|
72
|
+
"@aztec/noir-protocol-circuits-types": "0.68.2",
|
|
73
|
+
"@aztec/protocol-contracts": "0.68.2",
|
|
74
|
+
"@aztec/telemetry-client": "0.68.2",
|
|
75
|
+
"@aztec/types": "0.68.2",
|
|
76
|
+
"@aztec/world-state": "0.68.2",
|
|
77
77
|
"@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
|
|
78
78
|
"@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
|
|
79
79
|
"@noir-lang/types": "portal:../../noir/packages/types",
|
|
@@ -15,7 +15,12 @@ import { type FunctionsOf } from '@aztec/foundation/types';
|
|
|
15
15
|
|
|
16
16
|
import { strict as assert } from 'assert';
|
|
17
17
|
|
|
18
|
-
import {
|
|
18
|
+
import {
|
|
19
|
+
InstructionExecutionError,
|
|
20
|
+
InvalidTagValueError,
|
|
21
|
+
MemorySliceOutOfRangeError,
|
|
22
|
+
TagCheckError,
|
|
23
|
+
} from './errors.js';
|
|
19
24
|
import { Addressing, AddressingMode } from './opcodes/addressing_mode.js';
|
|
20
25
|
|
|
21
26
|
/** MemoryValue gathers the common operations for all memory types. */
|
|
@@ -271,7 +276,11 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
271
276
|
|
|
272
277
|
public getSlice(offset: number, size: number): MemoryValue[] {
|
|
273
278
|
assert(Number.isInteger(offset) && Number.isInteger(size));
|
|
274
|
-
|
|
279
|
+
|
|
280
|
+
if (offset + size > TaggedMemory.MAX_MEMORY_SIZE) {
|
|
281
|
+
throw new MemorySliceOutOfRangeError(offset, size);
|
|
282
|
+
}
|
|
283
|
+
|
|
275
284
|
const slice = new Array<MemoryValue>(size);
|
|
276
285
|
|
|
277
286
|
for (let i = 0; i < size; i++) {
|
|
@@ -299,7 +308,11 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
299
308
|
|
|
300
309
|
public setSlice(offset: number, slice: MemoryValue[]) {
|
|
301
310
|
assert(Number.isInteger(offset));
|
|
302
|
-
|
|
311
|
+
|
|
312
|
+
if (offset + slice.length > TaggedMemory.MAX_MEMORY_SIZE) {
|
|
313
|
+
throw new MemorySliceOutOfRangeError(offset, slice.length);
|
|
314
|
+
}
|
|
315
|
+
|
|
303
316
|
slice.forEach((element, idx) => {
|
|
304
317
|
this._mem.set(offset + idx, element);
|
|
305
318
|
});
|
|
@@ -316,8 +329,9 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
316
329
|
* Check that the memory at the given offset matches the specified tag.
|
|
317
330
|
*/
|
|
318
331
|
public checkTag(tag: TypeTag, offset: number) {
|
|
319
|
-
|
|
320
|
-
|
|
332
|
+
const gotTag = this.getTag(offset);
|
|
333
|
+
if (gotTag !== tag) {
|
|
334
|
+
throw TagCheckError.forOffset(offset, TypeTag[gotTag], TypeTag[tag]);
|
|
321
335
|
}
|
|
322
336
|
}
|
|
323
337
|
|
|
@@ -336,13 +350,13 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
336
350
|
public static checkIsValidTag(tagNumber: number) {
|
|
337
351
|
if (
|
|
338
352
|
![
|
|
353
|
+
TypeTag.FIELD,
|
|
339
354
|
TypeTag.UINT1,
|
|
340
355
|
TypeTag.UINT8,
|
|
341
356
|
TypeTag.UINT16,
|
|
342
357
|
TypeTag.UINT32,
|
|
343
358
|
TypeTag.UINT64,
|
|
344
359
|
TypeTag.UINT128,
|
|
345
|
-
TypeTag.FIELD,
|
|
346
360
|
].includes(tagNumber)
|
|
347
361
|
) {
|
|
348
362
|
throw new InvalidTagValueError(tagNumber);
|
|
@@ -382,21 +396,23 @@ export class TaggedMemory implements TaggedMemoryInterface {
|
|
|
382
396
|
public static getTag(v: MemoryValue | undefined): TypeTag {
|
|
383
397
|
let tag = TypeTag.INVALID;
|
|
384
398
|
|
|
399
|
+
// Not sure why, but using instanceof here doesn't work and leads odd behavior,
|
|
400
|
+
// but using constructor.name does the job...
|
|
385
401
|
if (v === undefined) {
|
|
386
402
|
tag = TypeTag.FIELD; // uninitialized memory is Field(0)
|
|
387
|
-
} else if (v
|
|
403
|
+
} else if (v.constructor.name == 'Field') {
|
|
388
404
|
tag = TypeTag.FIELD;
|
|
389
|
-
} else if (v
|
|
405
|
+
} else if (v.constructor.name == 'Uint1') {
|
|
390
406
|
tag = TypeTag.UINT1;
|
|
391
|
-
} else if (v
|
|
407
|
+
} else if (v.constructor.name == 'Uint8') {
|
|
392
408
|
tag = TypeTag.UINT8;
|
|
393
|
-
} else if (v
|
|
409
|
+
} else if (v.constructor.name == 'Uint16') {
|
|
394
410
|
tag = TypeTag.UINT16;
|
|
395
|
-
} else if (v
|
|
411
|
+
} else if (v.constructor.name == 'Uint32') {
|
|
396
412
|
tag = TypeTag.UINT32;
|
|
397
|
-
} else if (v
|
|
413
|
+
} else if (v.constructor.name == 'Uint64') {
|
|
398
414
|
tag = TypeTag.UINT64;
|
|
399
|
-
} else if (v
|
|
415
|
+
} else if (v.constructor.name == 'Uint128') {
|
|
400
416
|
tag = TypeTag.UINT128;
|
|
401
417
|
}
|
|
402
418
|
|
package/src/avm/avm_simulator.ts
CHANGED
|
@@ -97,25 +97,22 @@ export class AvmSimulator {
|
|
|
97
97
|
* Fetch the bytecode and execute it in the current context.
|
|
98
98
|
*/
|
|
99
99
|
public async execute(): Promise<AvmContractCallResult> {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
},
|
|
111
|
-
/*noirCallStack=*/ [],
|
|
100
|
+
let bytecode: Buffer | undefined;
|
|
101
|
+
try {
|
|
102
|
+
bytecode = await this.context.persistableState.getBytecode(this.context.environment.address);
|
|
103
|
+
} catch (err: any) {
|
|
104
|
+
if (!(err instanceof AvmExecutionError || err instanceof SideEffectLimitReachedError)) {
|
|
105
|
+
this.log.error(`Unknown error thrown by AVM during bytecode retrieval: ${err}`);
|
|
106
|
+
throw err;
|
|
107
|
+
}
|
|
108
|
+
return await this.handleFailureToRetrieveBytecode(
|
|
109
|
+
`Bytecode retrieval for contract '${this.context.environment.address}' failed with ${err}. Reverting...`,
|
|
112
110
|
);
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
revertReason,
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
if (!bytecode) {
|
|
114
|
+
return await this.handleFailureToRetrieveBytecode(
|
|
115
|
+
`No bytecode found at: ${this.context.environment.address}. Reverting...`,
|
|
119
116
|
);
|
|
120
117
|
}
|
|
121
118
|
|
|
@@ -189,7 +186,16 @@ export class AvmSimulator {
|
|
|
189
186
|
return results;
|
|
190
187
|
} catch (err: any) {
|
|
191
188
|
this.log.verbose('Exceptional halt (revert by something other than REVERT opcode)');
|
|
192
|
-
|
|
189
|
+
// FIXME: weird that we have to do this OutOfGasError check because:
|
|
190
|
+
// 1. OutOfGasError is an AvmExecutionError, so that check should cover both
|
|
191
|
+
// 2. We should at least be able to do instanceof OutOfGasError instead of checking the constructor name
|
|
192
|
+
if (
|
|
193
|
+
!(
|
|
194
|
+
err.constructor.name == 'OutOfGasError' ||
|
|
195
|
+
err instanceof AvmExecutionError ||
|
|
196
|
+
err instanceof SideEffectLimitReachedError
|
|
197
|
+
)
|
|
198
|
+
) {
|
|
193
199
|
this.log.error(`Unknown error thrown by AVM: ${err}`);
|
|
194
200
|
throw err;
|
|
195
201
|
}
|
|
@@ -207,6 +213,26 @@ export class AvmSimulator {
|
|
|
207
213
|
}
|
|
208
214
|
}
|
|
209
215
|
|
|
216
|
+
private async handleFailureToRetrieveBytecode(message: string): Promise<AvmContractCallResult> {
|
|
217
|
+
// revert, consuming all gas
|
|
218
|
+
const fnName = await this.context.persistableState.getPublicFunctionDebugName(this.context.environment);
|
|
219
|
+
const revertReason = new AvmRevertReason(
|
|
220
|
+
message,
|
|
221
|
+
/*failingFunction=*/ {
|
|
222
|
+
contractAddress: this.context.environment.address,
|
|
223
|
+
functionName: fnName,
|
|
224
|
+
},
|
|
225
|
+
/*noirCallStack=*/ [],
|
|
226
|
+
);
|
|
227
|
+
this.log.warn(message);
|
|
228
|
+
return new AvmContractCallResult(
|
|
229
|
+
/*reverted=*/ true,
|
|
230
|
+
/*output=*/ [],
|
|
231
|
+
/*gasLeft=*/ { l2Gas: 0, daGas: 0 }, // consumes all allocated gas
|
|
232
|
+
revertReason,
|
|
233
|
+
);
|
|
234
|
+
}
|
|
235
|
+
|
|
210
236
|
private tallyInstruction(pc: number, opcode: string, gasUsed: Gas) {
|
|
211
237
|
const opcodeTally = this.opcodeTallies.get(opcode) || ({ count: 0, gas: { l2Gas: 0, daGas: 0 } } as OpcodeTally);
|
|
212
238
|
opcodeTally.count++;
|