@aztec/simulator 3.0.0-nightly.20251205 → 3.0.0-nightly.20251207
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/public/avm/avm_simulator.d.ts +1 -1
- package/dest/public/avm/avm_simulator.d.ts.map +1 -1
- package/dest/public/avm/avm_simulator.js +5 -4
- package/dest/public/avm/errors.d.ts +7 -1
- package/dest/public/avm/errors.d.ts.map +1 -1
- package/dest/public/avm/errors.js +14 -2
- package/dest/public/avm/opcodes/addressing_mode.js +2 -2
- package/dest/public/avm/opcodes/misc.js +2 -2
- package/dest/public/avm/revert_reason.d.ts +1 -1
- package/dest/public/avm/revert_reason.d.ts.map +1 -1
- package/dest/public/avm/revert_reason.js +3 -2
- package/dest/public/avm/serialization/bytecode_serialization.d.ts +1 -1
- package/dest/public/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/public/avm/serialization/bytecode_serialization.js +9 -6
- package/dest/public/debug_fn_name.d.ts +14 -1
- package/dest/public/debug_fn_name.d.ts.map +1 -1
- package/dest/public/debug_fn_name.js +19 -0
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts +8 -2
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -1
- package/dest/public/fixtures/public_tx_simulation_tester.js +12 -4
- package/dest/public/fixtures/simple_contract_data_source.d.ts +2 -2
- package/dest/public/fixtures/simple_contract_data_source.d.ts.map +1 -1
- package/dest/public/fixtures/simple_contract_data_source.js +4 -4
- package/dest/public/fixtures/token_test.d.ts +6 -2
- package/dest/public/fixtures/token_test.d.ts.map +1 -1
- package/dest/public/fixtures/token_test.js +12 -10
- package/dest/public/index.d.ts +2 -2
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +1 -1
- package/dest/public/public_processor/public_processor.d.ts +5 -5
- package/dest/public/public_processor/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor/public_processor.js +13 -12
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator.d.ts +6 -34
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator.js +22 -139
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.d.ts +42 -0
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.js +86 -0
- package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.d.ts +30 -0
- package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.d.ts.map +1 -0
- package/dest/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.js +170 -0
- package/dest/public/public_tx_simulator/index.d.ts +2 -1
- package/dest/public/public_tx_simulator/index.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/index.js +1 -0
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts +2 -2
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/public_tx_simulator.js +7 -3
- package/dest/public/state_manager/state_manager.d.ts +6 -1
- package/dest/public/state_manager/state_manager.d.ts.map +1 -1
- package/dest/public/state_manager/state_manager.js +4 -1
- package/package.json +16 -16
- package/src/public/avm/avm_simulator.ts +7 -4
- package/src/public/avm/errors.ts +16 -2
- package/src/public/avm/opcodes/addressing_mode.ts +2 -2
- package/src/public/avm/opcodes/misc.ts +2 -2
- package/src/public/avm/revert_reason.ts +5 -2
- package/src/public/avm/serialization/bytecode_serialization.ts +17 -6
- package/src/public/debug_fn_name.ts +25 -0
- package/src/public/fixtures/public_tx_simulation_tester.ts +27 -6
- package/src/public/fixtures/simple_contract_data_source.ts +5 -7
- package/src/public/fixtures/token_test.ts +17 -8
- package/src/public/index.ts +5 -1
- package/src/public/public_processor/public_processor.ts +16 -16
- package/src/public/public_tx_simulator/cpp_public_tx_simulator.ts +23 -174
- package/src/public/public_tx_simulator/cpp_public_tx_simulator_with_hinted_dbs.ts +132 -0
- package/src/public/public_tx_simulator/cpp_vs_ts_public_tx_simulator.ts +240 -0
- package/src/public/public_tx_simulator/index.ts +1 -0
- package/src/public/public_tx_simulator/public_tx_simulator.ts +10 -6
- package/src/public/state_manager/state_manager.ts +8 -1
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import { createLogger, logLevel } from '@aztec/foundation/log';
|
|
2
|
+
import { writeTestData } from '@aztec/foundation/testing/files';
|
|
3
|
+
import { avmSimulate } from '@aztec/native';
|
|
4
|
+
import { ProtocolContractsList } from '@aztec/protocol-contracts';
|
|
5
|
+
import { AvmFastSimulationInputs, AvmTxHint, PublicTxResult, deserializeFromMessagePack } from '@aztec/stdlib/avm';
|
|
6
|
+
import { SimulationError } from '@aztec/stdlib/errors';
|
|
7
|
+
import { WorldStateRevisionWithHandle } from '@aztec/stdlib/world-state';
|
|
8
|
+
import { strict as assert } from 'assert';
|
|
9
|
+
import { ContractProviderForCpp } from './contract_provider_for_cpp.js';
|
|
10
|
+
import { PublicTxSimulator } from './public_tx_simulator.js';
|
|
11
|
+
/**
|
|
12
|
+
* An implementation of PublicTxSimulator that first simulates in C++, then TS, an compares the results.
|
|
13
|
+
* The C++ simulator accesses the world state directly/natively within C++.
|
|
14
|
+
* For contract DB accesses, it makes callbacks through NAPI back to the TS PublicContractsDB cache.
|
|
15
|
+
*/ export class CppVsTsPublicTxSimulator extends PublicTxSimulator {
|
|
16
|
+
log;
|
|
17
|
+
constructor(merkleTree, contractsDB, globalVariables, config){
|
|
18
|
+
super(merkleTree, contractsDB, globalVariables, config);
|
|
19
|
+
this.log = createLogger(`simulator:cpp_public_tx_simulator`);
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Simulate a transaction's public portion using the C++ avvm simulator.
|
|
23
|
+
*
|
|
24
|
+
* @param tx - The transaction to simulate.
|
|
25
|
+
* @returns The result of the transaction's public execution.
|
|
26
|
+
*/ async simulate(tx) {
|
|
27
|
+
const txHash = this.computeTxHash(tx);
|
|
28
|
+
this.log.debug(`C++ simulation of ${tx.publicFunctionCalldata.length} public calls for tx ${txHash}`, {
|
|
29
|
+
txHash
|
|
30
|
+
});
|
|
31
|
+
// Run TS simulation to generate hints and public inputs
|
|
32
|
+
this.log.debug(`Running TS simulation for tx ${txHash}`);
|
|
33
|
+
// create checkpoint for ws
|
|
34
|
+
let tsResult;
|
|
35
|
+
let tsStateRef;
|
|
36
|
+
await this.merkleTree.createCheckpoint();
|
|
37
|
+
this.contractsDB.createCheckpoint();
|
|
38
|
+
try {
|
|
39
|
+
// Run the full TypeScript simulation using the parent class
|
|
40
|
+
// This will modify the merkle tree with the transaction's state changes
|
|
41
|
+
tsResult = await super.simulate(tx);
|
|
42
|
+
this.log.debug(`TS simulation completed for tx ${txHash}`);
|
|
43
|
+
tsStateRef = await this.merkleTree.getStateReference(); // capture tree roots for later comparsion
|
|
44
|
+
} catch (error) {
|
|
45
|
+
this.log.warn(`TS simulation failed, but still continuing with C++ simulation: ${error.message} ${error.stack}`);
|
|
46
|
+
} finally{
|
|
47
|
+
// revert checkpoint for ws and clear contract db changes
|
|
48
|
+
// (cpp should reapply exactly the same changes if there are no bugs)
|
|
49
|
+
await this.merkleTree.revertCheckpoint();
|
|
50
|
+
this.contractsDB.revertCheckpoint();
|
|
51
|
+
}
|
|
52
|
+
this.log.debug(`Running C++ simulation for tx ${txHash}`);
|
|
53
|
+
// Using the "as WorldStateRevisionWithHandle" is a bit of a "trust me bro", hence the assert.
|
|
54
|
+
let wsRevision = this.merkleTree.getRevision();
|
|
55
|
+
assert(wsRevision instanceof WorldStateRevisionWithHandle, 'CppPublicTxSimulator a real NativeWorldStateInstance with a handle to the C++ WorldState object');
|
|
56
|
+
const wsCppHandle = wsRevision.handle;
|
|
57
|
+
wsRevision = wsRevision.toWorldStateRevision(); // for msgpack serialization, we don't include the handle in the type
|
|
58
|
+
this.log.debug(`Running C++ simulation with world state revision ${JSON.stringify(wsRevision)}`);
|
|
59
|
+
// Create the fast simulation inputs
|
|
60
|
+
const txHint = AvmTxHint.fromTx(tx, this.globalVariables.gasFees);
|
|
61
|
+
const protocolContracts = ProtocolContractsList;
|
|
62
|
+
const fastSimInputs = new AvmFastSimulationInputs(wsRevision, this.config, txHint, this.globalVariables, protocolContracts);
|
|
63
|
+
// Create contract provider for callbacks to TypeScript PublicContractsDB from C++
|
|
64
|
+
const contractProvider = new ContractProviderForCpp(this.contractsDB, this.globalVariables);
|
|
65
|
+
// Serialize to msgpack and call the C++ simulator
|
|
66
|
+
this.log.debug(`Serializing fast simulation inputs to msgpack...`);
|
|
67
|
+
const inputBuffer = fastSimInputs.serializeWithMessagePack();
|
|
68
|
+
let resultBuffer;
|
|
69
|
+
try {
|
|
70
|
+
this.log.debug(`Calling C++ simulator for tx ${txHash}`);
|
|
71
|
+
resultBuffer = await avmSimulate(inputBuffer, contractProvider, wsCppHandle, logLevel);
|
|
72
|
+
} catch (error) {
|
|
73
|
+
throw new SimulationError(`C++ simulation failed: ${error.message}`, []);
|
|
74
|
+
}
|
|
75
|
+
// If we've reached this point, C++ succeeded during simulation,
|
|
76
|
+
// so we assert that TS also succeeded.
|
|
77
|
+
assert(tsResult !== undefined, 'TS simulation should have succeeded if C++ succeeded');
|
|
78
|
+
assert(tsStateRef !== undefined, 'TS state reference should have been captured if C++ succeeded');
|
|
79
|
+
// Deserialize the msgpack result
|
|
80
|
+
this.log.debug(`Deserializing C++ from buffer (size: ${resultBuffer.length})...`);
|
|
81
|
+
const cppResultJSON = deserializeFromMessagePack(resultBuffer);
|
|
82
|
+
// Write testdata if AZTEC_WRITE_TESTDATA=1.
|
|
83
|
+
writeTestData(`barretenberg/cpp/src/barretenberg/vm2/testing/tx_result_${txHash}.testdata.bin`, resultBuffer, /*raw=*/ true);
|
|
84
|
+
this.log.debug(`Deserializing C++ result to PublicTxResult...`);
|
|
85
|
+
const cppResult = PublicTxResult.fromPlainObject(cppResultJSON);
|
|
86
|
+
this.log.debug(`Done.`);
|
|
87
|
+
assert(cppResult.revertCode.equals(tsResult.revertCode));
|
|
88
|
+
assert(cppResult.gasUsed.totalGas.equals(tsResult.gasUsed.totalGas));
|
|
89
|
+
assert(cppResult.gasUsed.publicGas.equals(tsResult.gasUsed.publicGas));
|
|
90
|
+
assert(cppResult.gasUsed.teardownGas.equals(tsResult.gasUsed.teardownGas));
|
|
91
|
+
assert(cppResult.gasUsed.billedGas.equals(tsResult.gasUsed.billedGas));
|
|
92
|
+
assert(cppResult.publicInputs.toBuffer().equals(tsResult.publicInputs.toBuffer()));
|
|
93
|
+
// TODO(fcarreiro): complete this.
|
|
94
|
+
// Check that C++ hints are a strict subset of TS hints.
|
|
95
|
+
// Then enable for misc tests and validate hints.
|
|
96
|
+
//if (this.config?.collectHints) {
|
|
97
|
+
//}
|
|
98
|
+
if (this.config?.collectCallMetadata) {
|
|
99
|
+
assert(cppResult.getAppLogicReturnValues().length === tsResult.getAppLogicReturnValues().length);
|
|
100
|
+
for(let i = 0; i < cppResult.getAppLogicReturnValues().length; i++){
|
|
101
|
+
assert(cppResult.getAppLogicReturnValues()[i].equals(tsResult.getAppLogicReturnValues()[i]));
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
// Messages are still not ok for exceptional halts (they are not plumbed in C++).
|
|
105
|
+
const cppRevertReason = cppResult.findRevertReason() || {};
|
|
106
|
+
const tsRevertReason = tsResult.findRevertReason() || {};
|
|
107
|
+
const cppRevertReasonAsObject = JSON.parse(JSON.stringify(cppRevertReason));
|
|
108
|
+
const tsRevertReasonAsObject = JSON.parse(JSON.stringify(tsRevertReason));
|
|
109
|
+
if (JSON.stringify(cppRevertReasonAsObject) !== JSON.stringify(tsRevertReasonAsObject)) {
|
|
110
|
+
this.log.debug('cppResult.findRevertReason()', cppRevertReasonAsObject);
|
|
111
|
+
this.log.debug('tsResult.findRevertReason()', tsRevertReasonAsObject);
|
|
112
|
+
}
|
|
113
|
+
// TODO: dont compare the strings since this is not deterministic.
|
|
114
|
+
// Sometimes error messages are different between C++ and TS, so we omit in the default comparison
|
|
115
|
+
const cppRevertReasonWithoutMessage = {
|
|
116
|
+
...cppRevertReasonAsObject,
|
|
117
|
+
originalMessage: undefined
|
|
118
|
+
};
|
|
119
|
+
const tsRevertReasonWithoutMessage = {
|
|
120
|
+
...tsRevertReasonAsObject,
|
|
121
|
+
originalMessage: undefined
|
|
122
|
+
};
|
|
123
|
+
assert(JSON.stringify(cppRevertReasonWithoutMessage) === JSON.stringify(tsRevertReasonWithoutMessage));
|
|
124
|
+
const cppHasRevertMessage = cppRevertReasonAsObject.originalMessage && cppRevertReasonAsObject.originalMessage.length > 0;
|
|
125
|
+
const tsHasRevertMessage = tsRevertReasonAsObject.originalMessage && tsRevertReasonAsObject.originalMessage.length > 0;
|
|
126
|
+
// assert that if one of the error messages is non-empty, the other is
|
|
127
|
+
assert(cppHasRevertMessage === tsHasRevertMessage, 'One of the AVM simulators (C++ or TS) produced a revert message, but the other did not');
|
|
128
|
+
// Ideally, we'd love to be able to compare full error messages, but without a lot of work
|
|
129
|
+
// the two simulators will always be able to produce some differing errors.
|
|
130
|
+
// Commenting out the code below will enforce that the error messages are at least
|
|
131
|
+
// similar (one contains the other). Even this is not something we can guarantee.
|
|
132
|
+
//if (cppHasRevertMessage) {
|
|
133
|
+
// const cppRevertMessageContainsTs = cppRevertReasonAsObject.originalMessage.includes(
|
|
134
|
+
// tsRevertReasonAsObject.originalMessage,
|
|
135
|
+
// );
|
|
136
|
+
// const tsRevertMessageContainsCpp = tsRevertReasonAsObject.originalMessage.includes(
|
|
137
|
+
// cppRevertReasonAsObject.originalMessage,
|
|
138
|
+
// );
|
|
139
|
+
// assert(
|
|
140
|
+
// cppRevertMessageContainsTs || tsRevertMessageContainsCpp,
|
|
141
|
+
// 'The AVM simulators (C++ and TS) produced different revert messages (neither was a substring of the other)',
|
|
142
|
+
// );
|
|
143
|
+
//}
|
|
144
|
+
// Confirm that tree roots match
|
|
145
|
+
const cppStateRef = await this.merkleTree.getStateReference();
|
|
146
|
+
assert(cppStateRef.equals(tsStateRef), `Tree roots mismatch between TS and C++ public simulations for tx ${txHash}`);
|
|
147
|
+
this.log.debug(`C++ simulation completed for tx ${txHash}`, {
|
|
148
|
+
txHash,
|
|
149
|
+
reverted: !cppResult.revertCode.isOK(),
|
|
150
|
+
cppGasUsed: cppResult.gasUsed.totalGas.l2Gas
|
|
151
|
+
});
|
|
152
|
+
return tsResult;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
export class MeasuredCppVsTsPublicTxSimulator extends CppVsTsPublicTxSimulator {
|
|
156
|
+
metrics;
|
|
157
|
+
constructor(merkleTree, contractsDB, globalVariables, metrics, config){
|
|
158
|
+
super(merkleTree, contractsDB, globalVariables, config), this.metrics = metrics;
|
|
159
|
+
}
|
|
160
|
+
async simulate(tx, txLabel = 'unlabeledTx') {
|
|
161
|
+
this.metrics.startRecordingTxSimulation(txLabel);
|
|
162
|
+
let result;
|
|
163
|
+
try {
|
|
164
|
+
result = await super.simulate(tx);
|
|
165
|
+
} finally{
|
|
166
|
+
this.metrics.stopRecordingTxSimulation(txLabel, result?.gasUsed, result?.revertCode);
|
|
167
|
+
}
|
|
168
|
+
return result;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './public_tx_simulator.js';
|
|
2
|
+
export { CppPublicTxSimulator, TelemetryCppPublicTxSimulator } from './cpp_public_tx_simulator.js';
|
|
2
3
|
export type { PublicTxSimulatorInterface } from './public_tx_simulator_interface.js';
|
|
3
4
|
export { TelemetryPublicTxSimulator } from './telemetry_public_tx_simulator.js';
|
|
4
5
|
export type { PublicTxResult, PublicSimulatorConfig as PublicTxSimulatorConfig } from '@aztec/stdlib/avm';
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvcHVibGljX3R4X3NpbXVsYXRvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25HLFlBQVksRUFBRSwwQkFBMEIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ3JGLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ2hGLFlBQVksRUFBRSxjQUFjLEVBQUUscUJBQXFCLElBQUksdUJBQXVCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,YAAY,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,qBAAqB,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AACnG,YAAY,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,YAAY,EAAE,cAAc,EAAE,qBAAqB,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
2
2
|
import { type Logger } from '@aztec/foundation/log';
|
|
3
3
|
import { PublicSimulatorConfig, PublicTxResult } from '@aztec/stdlib/avm';
|
|
4
4
|
import { SimulationError } from '@aztec/stdlib/errors';
|
|
5
|
-
import
|
|
5
|
+
import { Gas } from '@aztec/stdlib/gas';
|
|
6
6
|
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/trees';
|
|
7
7
|
import { type GlobalVariables, NestedProcessReturnValues, PublicCallRequestWithCalldata, Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
|
|
8
8
|
import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js';
|
|
@@ -77,4 +77,4 @@ export declare class PublicTxSimulator implements PublicTxSimulatorInterface {
|
|
|
77
77
|
private payFee;
|
|
78
78
|
}
|
|
79
79
|
export {};
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3R4X3NpbXVsYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9wdWJsaWNfdHhfc2ltdWxhdG9yL3B1YmxpY190eF9zaW11bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUdsRSxPQUFPLEVBQWdDLHFCQUFxQixFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3hHLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEMsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBQ3BCLHlCQUF5QixFQUN6Qiw2QkFBNkIsRUFDN0IsRUFBRSxFQUNGLGdCQUFnQixFQUNqQixNQUFNLGtCQUFrQixDQUFDO0FBSTFCLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFJakYsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQWlCLE1BQU0seUJBQXlCLENBQUM7QUFPaEYsT0FBTyxLQUFLLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUN2RixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQXFDckYsNEJBQTRCO0FBQzVCLEtBQUssY0FBYyxHQUFHO0lBQ3BCLEtBQUssRUFBRSxnQkFBZ0IsQ0FBQztJQUN4QixVQUFVLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDcEIsWUFBWSxFQUFFLHlCQUF5QixFQUFFLENBQUM7SUFDMUMsUUFBUSxFQUFFLE9BQU8sQ0FBQztJQUNsQixZQUFZLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDaEMsQ0FBQztBQUVGLHFCQUFhLGlCQUFrQixZQUFXLDBCQUEwQjtJQUtoRSxTQUFTLENBQUMsVUFBVSxFQUFFLHlCQUF5QjtJQUMvQyxTQUFTLENBQUMsV0FBVyxFQUFFLGlCQUFpQjtJQUN4QyxTQUFTLENBQUMsZUFBZSxFQUFFLGVBQWU7SUFONUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUM7SUFDdEIsU0FBUyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUscUJBQXFCLENBQUM7SUFFakQsWUFDWSxVQUFVLEVBQUUseUJBQXlCLEVBQ3JDLFdBQVcsRUFBRSxpQkFBaUIsRUFDOUIsZUFBZSxFQUFFLGVBQWUsRUFDMUMsTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDLHFCQUFxQixDQUFDLEVBSXhDO0lBRUQ7Ozs7T0FJRztJQUNVLFFBQVEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0ErSHJEO0lBRUQsU0FBUyxDQUFDLGFBQWEsQ0FBQyxFQUFFLEVBQUUsRUFBRSxxQ0FFN0I7SUFFRDs7OztPQUlHO0lBQ0gsVUFBZ0IsYUFBYSxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxPQUFPLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FtQ3hHO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsVUFBZ0Isb0JBQW9CLENBQ2xDLEtBQUssRUFBRSxnQkFBZ0IsRUFDdkIsT0FBTyxFQUFFLGVBQWUsRUFDeEIsV0FBVyxFQUFFLDZCQUE2QixHQUN6QyxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0EyQmpDO0lBRUQ7Ozs7Ozs7Ozs7OztPQVlHO0lBQ0gsVUFBZ0IsNEJBQTRCLENBQzFDLFlBQVksRUFBRSw2QkFBNkIsRUFDM0MsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLEVBQUUsNkJBQTZCLEVBQ3BELFlBQVksRUFBRSxHQUFHLEVBQ2pCLGNBQWMsRUFBRSxFQUFFLEVBQ2xCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBcUJqQztJQUVEOztPQUVHO0lBQ0gsVUFBZ0IsK0JBQStCLENBQUMsT0FBTyxFQUFFLGVBQWUsaUJBeUJ2RTtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsVUFBZ0IsNEJBQTRCLENBQUMsT0FBTyxFQUFFLGVBQWUsaUJBMEVwRTtZQUVhLE1BQU07Q0FtQ3JCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAgC,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"public_tx_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/public_tx_simulator/public_tx_simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAgC,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EACL,KAAK,eAAe,EACpB,yBAAyB,EACzB,6BAA6B,EAC7B,EAAE,EACF,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAIjF,OAAO,EAAE,KAAK,iBAAiB,EAAiB,MAAM,yBAAyB,CAAC;AAOhF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAqCrF,4BAA4B;AAC5B,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,gBAAgB,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,yBAAyB,EAAE,CAAC;IAC1C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF,qBAAa,iBAAkB,YAAW,0BAA0B;IAKhE,SAAS,CAAC,UAAU,EAAE,yBAAyB;IAC/C,SAAS,CAAC,WAAW,EAAE,iBAAiB;IACxC,SAAS,CAAC,eAAe,EAAE,eAAe;IAN5C,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IAEjD,YACY,UAAU,EAAE,yBAAyB,EACrC,WAAW,EAAE,iBAAiB,EAC9B,eAAe,EAAE,eAAe,EAC1C,MAAM,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,EAIxC;IAED;;;;OAIG;IACU,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CA+HrD;IAED,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,qCAE7B;IAED;;;;OAIG;IACH,UAAgB,aAAa,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAmCxG;IAED;;;;;;OAMG;IACH,UAAgB,oBAAoB,CAClC,KAAK,EAAE,gBAAgB,EACvB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,6BAA6B,GACzC,OAAO,CAAC,sBAAsB,CAAC,CA2BjC;IAED;;;;;;;;;;;;OAYG;IACH,UAAgB,4BAA4B,CAC1C,YAAY,EAAE,6BAA6B,EAC3C,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,6BAA6B,EACpD,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,EAAE,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC,CAqBjC;IAED;;OAEG;IACH,UAAgB,+BAA+B,CAAC,OAAO,EAAE,eAAe,iBAyBvE;IAED;;;;;;;;OAQG;IACH,UAAgB,4BAA4B,CAAC,OAAO,EAAE,eAAe,iBA0EpE;YAEa,MAAM;CAmCrB"}
|
|
@@ -77,7 +77,7 @@ export class PublicTxSimulator {
|
|
|
77
77
|
// In that case the transaction will be thrown out.
|
|
78
78
|
const setupResult = await this.simulatePhase(TxExecutionPhase.SETUP, context);
|
|
79
79
|
if (setupResult.reverted) {
|
|
80
|
-
throw new Error(`
|
|
80
|
+
throw new Error(`[SETUP] UNRECOVERABLE ERROR! The transaction will be thrown out. ${setupResult.revertReason?.message}`);
|
|
81
81
|
}
|
|
82
82
|
processedPhases.push(setupResult);
|
|
83
83
|
}
|
|
@@ -136,14 +136,18 @@ export class PublicTxSimulator {
|
|
|
136
136
|
await this.payFee(context);
|
|
137
137
|
const publicInputs = await context.generateAvmCircuitPublicInputs();
|
|
138
138
|
const revertCode = context.getFinalRevertCode();
|
|
139
|
-
// We only return the app logic phase information.
|
|
139
|
+
// We only return the app logic phase information, and only 1 per phase.
|
|
140
140
|
const appLogicReturnValues = processedPhases.find(({ phase })=>phase === TxExecutionPhase.APP_LOGIC)?.returnValues ?? [];
|
|
141
|
+
// TODO(fcarreiro): This is a temporary backwards compatibility layer until we migrate to the C++ simulator.
|
|
142
|
+
if (context.revertReason !== undefined) {
|
|
143
|
+
appLogicReturnValues.revertReason = context.revertReason;
|
|
144
|
+
}
|
|
141
145
|
return new PublicTxResult(/*gasUsed=*/ {
|
|
142
146
|
totalGas: context.getActualGasUsed(),
|
|
143
147
|
teardownGas: context.teardownGasUsed,
|
|
144
148
|
publicGas: context.getActualPublicGasUsed(),
|
|
145
149
|
billedGas: context.getTotalGasUsed()
|
|
146
|
-
}, /*revertCode=*/ revertCode, /*
|
|
150
|
+
}, /*revertCode=*/ revertCode, /*callStackMetadata=*/ appLogicReturnValues, /*logs=*/ context.state.getActiveStateManager().getLogs(), /*hints=*/ hints, /*publicInputs=*/ publicInputs);
|
|
147
151
|
}
|
|
148
152
|
computeTxHash(tx) {
|
|
149
153
|
return tx.getTxHash();
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Fr } from '@aztec/foundation/fields';
|
|
2
2
|
import { type LogLevel } from '@aztec/foundation/log';
|
|
3
|
+
import { FunctionSelector } from '@aztec/stdlib/abi';
|
|
3
4
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
5
|
import { SerializableContractInstance } from '@aztec/stdlib/contract';
|
|
5
6
|
import type { DebugLog } from '@aztec/stdlib/logs';
|
|
@@ -153,7 +154,11 @@ export declare class PublicPersistableStateManager {
|
|
|
153
154
|
*/
|
|
154
155
|
getBytecode(contractAddress: AztecAddress): Promise<Buffer | undefined>;
|
|
155
156
|
getPublicFunctionDebugName(avmEnvironment: AvmExecutionEnvironment): Promise<string>;
|
|
157
|
+
getPublicFunctionSelectorAndName(avmEnvironment: AvmExecutionEnvironment): Promise<{
|
|
158
|
+
functionSelector?: FunctionSelector;
|
|
159
|
+
functionName?: string;
|
|
160
|
+
}>;
|
|
156
161
|
padTree(treeId: MerkleTreeId, leavesToInsert: number): Promise<void>;
|
|
157
162
|
getTreeSnapshots(): Promise<TreeSnapshots>;
|
|
158
163
|
}
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGVfbWFuYWdlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9zdGF0ZV9tYW5hZ2VyL3N0YXRlX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHdEUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBSWxELE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDbkYsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQU83RCxPQUFPLEtBQUssRUFBRSw4QkFBOEIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3hGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVwRDs7Ozs7Ozs7R0FRRztBQUNILHFCQUFhLDZCQUE2QjtJQU90QyxPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU87SUFDeEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXO0lBQzVCLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUN0QixPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWM7SUFDL0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsa0JBQWtCO0lBQ25DLE9BQU8sQ0FBQyxRQUFRLENBQUMsYUFBYTtJQUM5QixPQUFPLENBQUMsUUFBUSxDQUFDLFVBQVU7SUFiN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQTJDO0lBRS9ELHNEQUFzRDtJQUN0RCxPQUFPLENBQUMsdUJBQXVCLENBQVM7SUFFeEMsWUFDbUIsT0FBTyxFQUFFLGFBQWEsRUFDdEIsV0FBVyxFQUFFLDBCQUEwQixFQUN2QyxLQUFLLEVBQUUsOEJBQThCLEVBQ3JDLGNBQWMsRUFBRSxFQUFFLEVBQ2xCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLGtCQUFrQixHQUFFLE9BQWMsRUFDbEMsYUFBYSxHQUFFLGFBQTBDLEVBQ3pELFVBQVUsR0FBRSxnQkFBZ0QsRUFDM0U7SUFFSjs7T0FFRztJQUNILE9BQWMsTUFBTSxDQUNsQixPQUFPLEVBQUUsYUFBYSxFQUN0QixXQUFXLEVBQUUsMEJBQTBCLEVBQ3ZDLEtBQUssRUFBRSw4QkFBOEIsRUFDckMsY0FBYyxFQUFFLEVBQUUsRUFDbEIsU0FBUyxFQUFFLE1BQU0sR0FDaEIsNkJBQTZCLENBRS9CO0lBRUQ7O09BRUc7SUFDVSxJQUFJLDJDQVloQjtJQUVEOztPQUVHO0lBQ1UsS0FBSyxDQUFDLFdBQVcsRUFBRSw2QkFBNkIsaUJBRTVEO0lBRUQ7O09BRUc7SUFDVSxNQUFNLENBQUMsV0FBVyxFQUFFLDZCQUE2QixpQkFFN0Q7WUFFYSxNQUFNO0lBbUJwQjs7Ozs7O09BTUc7SUFDVSxZQUFZLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsYUFBYSxVQUFRLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVlsSDtJQUVNLGFBQWEsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUVyRTtJQUVEOzs7Ozs7T0FNRztJQUNVLFdBQVcsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQVU3RTtJQUdEOzs7Ozs7O09BT0c7SUFDVSxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBZ0JqSDtJQUVEOzs7T0FHRztJQUNVLGFBQWEsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlyRjtJQUVEOzs7T0FHRztJQUNVLG1CQUFtQixDQUFDLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlsRTtJQUVEOzs7T0FHRztJQUNVLG1CQUFtQixDQUFDLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1sRTtJQUVEOzs7OztPQUtHO0lBQ1Usb0JBQW9CLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FhaEc7SUFFRDs7OztPQUlHO0lBQ1UsY0FBYyxDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLEVBQUUsaUJBSXZFO0lBRUQ7OztPQUdHO0lBQ1Usb0JBQW9CLENBQUMsZUFBZSxFQUFFLEVBQUUsaUJBb0JwRDtJQUVEOzs7OztPQUtHO0lBQ1Usd0JBQXdCLENBQUMsT0FBTyxFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FnQnJGO0lBRUQ7Ozs7O09BS0c7SUFDSSxrQkFBa0IsQ0FBQyxlQUFlLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsUUFHbEY7SUFFRDs7O09BR0c7SUFDSSx3QkFBd0IsQ0FBQyxhQUFhLEVBQUUsbUJBQW1CLFFBTWpFO0lBRU0sYUFBYSxDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsUUFFakc7SUFFTSx3QkFBd0IsQ0FBQyxXQUFXLEVBQUUsTUFBTSxRQUVsRDtJQUVNLHNCQUFzQixXQUU1QjtJQUVNLE9BQU8sSUFBSSxRQUFRLEVBQUUsQ0FFM0I7SUFFRDs7OztPQUlHO0lBQ0ksY0FBYyxDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxRQUc3RDtJQUVEOzs7O09BSUc7SUFDVSxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyw0QkFBNEIsR0FBRyxTQUFTLENBQUMsQ0F1Q2pIO1lBRWEsOEJBQThCO1lBaUU5QixnQkFBZ0I7SUE2QjlCOztPQUVHO0lBQ1UsV0FBVyxDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsQ0FzQm5GO0lBRVksMEJBQTBCLENBQUMsY0FBYyxFQUFFLHVCQUF1QixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFaEc7SUFFWSxnQ0FBZ0MsQ0FDM0MsY0FBYyxFQUFFLHVCQUF1QixHQUN0QyxPQUFPLENBQUM7UUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO1FBQUMsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQyxDQUV6RTtJQUVZLE9BQU8sQ0FBQyxNQUFNLEVBQUUsWUFBWSxFQUFFLGNBQWMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUVoRjtJQUVZLGdCQUFnQixJQUFJLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FFdEQ7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state_manager.d.ts","sourceRoot":"","sources":["../../../src/public/state_manager/state_manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"state_manager.d.ts","sourceRoot":"","sources":["../../../src/public/state_manager/state_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ import { SerializableContractInstance } from '@aztec/stdlib/contract';
|
|
|
8
8
|
import { DelayedPublicMutableValues, DelayedPublicMutableValuesWithHash } from '@aztec/stdlib/delayed-public-mutable';
|
|
9
9
|
import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
|
|
10
10
|
import { strict as assert } from 'assert';
|
|
11
|
-
import { getPublicFunctionDebugName } from '../debug_fn_name.js';
|
|
11
|
+
import { getPublicFunctionDebugName, getPublicFunctionSelectorAndName } from '../debug_fn_name.js';
|
|
12
12
|
import { L1ToL2MessageIndexOutOfRangeError, MaxCallsToUniqueContractClassIdsError, NoteHashIndexOutOfRangeError, NullifierCollisionError } from '../side_effect_errors.js';
|
|
13
13
|
import { NullifierManager } from './nullifiers.js';
|
|
14
14
|
import { PublicStorage } from './public_storage.js';
|
|
@@ -380,6 +380,9 @@ import { PublicStorage } from './public_storage.js';
|
|
|
380
380
|
async getPublicFunctionDebugName(avmEnvironment) {
|
|
381
381
|
return await getPublicFunctionDebugName(this.contractsDB, avmEnvironment.address, avmEnvironment.calldata);
|
|
382
382
|
}
|
|
383
|
+
async getPublicFunctionSelectorAndName(avmEnvironment) {
|
|
384
|
+
return await getPublicFunctionSelectorAndName(this.contractsDB, avmEnvironment.address, avmEnvironment.calldata);
|
|
385
|
+
}
|
|
383
386
|
async padTree(treeId, leavesToInsert) {
|
|
384
387
|
await this.treesDB.padTree(treeId, leavesToInsert);
|
|
385
388
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/simulator",
|
|
3
|
-
"version": "3.0.0-nightly.
|
|
3
|
+
"version": "3.0.0-nightly.20251207",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./server": "./dest/server.js",
|
|
@@ -64,26 +64,26 @@
|
|
|
64
64
|
]
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@aztec/constants": "3.0.0-nightly.
|
|
68
|
-
"@aztec/foundation": "3.0.0-nightly.
|
|
69
|
-
"@aztec/native": "3.0.0-nightly.
|
|
70
|
-
"@aztec/noir-acvm_js": "3.0.0-nightly.
|
|
71
|
-
"@aztec/noir-noirc_abi": "3.0.0-nightly.
|
|
72
|
-
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.
|
|
73
|
-
"@aztec/noir-types": "3.0.0-nightly.
|
|
74
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
75
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
76
|
-
"@aztec/telemetry-client": "3.0.0-nightly.
|
|
77
|
-
"@aztec/world-state": "3.0.0-nightly.
|
|
67
|
+
"@aztec/constants": "3.0.0-nightly.20251207",
|
|
68
|
+
"@aztec/foundation": "3.0.0-nightly.20251207",
|
|
69
|
+
"@aztec/native": "3.0.0-nightly.20251207",
|
|
70
|
+
"@aztec/noir-acvm_js": "3.0.0-nightly.20251207",
|
|
71
|
+
"@aztec/noir-noirc_abi": "3.0.0-nightly.20251207",
|
|
72
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251207",
|
|
73
|
+
"@aztec/noir-types": "3.0.0-nightly.20251207",
|
|
74
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251207",
|
|
75
|
+
"@aztec/stdlib": "3.0.0-nightly.20251207",
|
|
76
|
+
"@aztec/telemetry-client": "3.0.0-nightly.20251207",
|
|
77
|
+
"@aztec/world-state": "3.0.0-nightly.20251207",
|
|
78
78
|
"lodash.clonedeep": "^4.5.0",
|
|
79
79
|
"lodash.merge": "^4.6.2",
|
|
80
80
|
"tslib": "^2.4.0"
|
|
81
81
|
},
|
|
82
82
|
"devDependencies": {
|
|
83
|
-
"@aztec/kv-store": "3.0.0-nightly.
|
|
84
|
-
"@aztec/merkle-tree": "3.0.0-nightly.
|
|
85
|
-
"@aztec/noir-contracts.js": "3.0.0-nightly.
|
|
86
|
-
"@aztec/noir-test-contracts.js": "3.0.0-nightly.
|
|
83
|
+
"@aztec/kv-store": "3.0.0-nightly.20251207",
|
|
84
|
+
"@aztec/merkle-tree": "3.0.0-nightly.20251207",
|
|
85
|
+
"@aztec/noir-contracts.js": "3.0.0-nightly.20251207",
|
|
86
|
+
"@aztec/noir-test-contracts.js": "3.0.0-nightly.20251207",
|
|
87
87
|
"@jest/globals": "^30.0.0",
|
|
88
88
|
"@types/jest": "^30.0.0",
|
|
89
89
|
"@types/lodash.clonedeep": "^4.5.7",
|
|
@@ -104,7 +104,7 @@ export class AvmSimulator implements AvmSimulatorInterface {
|
|
|
104
104
|
|
|
105
105
|
if (!bytecode) {
|
|
106
106
|
return await this.handleFailureToRetrieveBytecode(
|
|
107
|
-
`No bytecode found, or limit encountered for max calls to unique contract class IDs. Contract address: ${this.context.environment.address}. Reverting...`,
|
|
107
|
+
`No bytecode found. Contract is not deployed, or limit encountered for max calls to unique contract class IDs. Contract address: ${this.context.environment.address}. Reverting...`,
|
|
108
108
|
);
|
|
109
109
|
}
|
|
110
110
|
|
|
@@ -177,7 +177,7 @@ export class AvmSimulator implements AvmSimulatorInterface {
|
|
|
177
177
|
|
|
178
178
|
if (machineState.pc >= bytecode.length) {
|
|
179
179
|
this.log.warn('Passed end of program');
|
|
180
|
-
throw new InvalidProgramCounterError(machineState.pc, /*max=*/ bytecode.length);
|
|
180
|
+
throw new InvalidProgramCounterError(machineState.pc, /*max=*/ bytecode.length - 1);
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
183
|
|
|
@@ -235,12 +235,15 @@ export class AvmSimulator implements AvmSimulatorInterface {
|
|
|
235
235
|
|
|
236
236
|
private async handleFailureToRetrieveBytecode(message: string): Promise<AvmContractCallResult> {
|
|
237
237
|
// revert, consuming all gas
|
|
238
|
-
const
|
|
238
|
+
const { functionSelector, functionName } = await this.context.persistableState.getPublicFunctionSelectorAndName(
|
|
239
|
+
this.context.environment,
|
|
240
|
+
);
|
|
239
241
|
const revertReason = new AvmRevertReason(
|
|
240
242
|
message,
|
|
241
243
|
/*failingFunction=*/ {
|
|
242
244
|
contractAddress: this.context.environment.address,
|
|
243
|
-
|
|
245
|
+
functionSelector,
|
|
246
|
+
functionName,
|
|
244
247
|
},
|
|
245
248
|
/*noirCallStack=*/ [],
|
|
246
249
|
);
|
package/src/public/avm/errors.ts
CHANGED
|
@@ -58,7 +58,7 @@ export class AvmParsingError extends AvmExecutionError {
|
|
|
58
58
|
*/
|
|
59
59
|
export class InvalidTagValueError extends AvmExecutionError {
|
|
60
60
|
constructor(tagValue: number) {
|
|
61
|
-
super(`Tag value ${tagValue} is invalid.`);
|
|
61
|
+
super(`Tag check failed: Tag value ${tagValue} is invalid.`);
|
|
62
62
|
this.name = 'InvalidTagValueError';
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -77,6 +77,12 @@ export class InstructionExecutionError extends AvmExecutionError {
|
|
|
77
77
|
* Error thrown on failed AVM memory tag check.
|
|
78
78
|
*/
|
|
79
79
|
export class TagCheckError extends AvmExecutionError {
|
|
80
|
+
public static forBaseAddress(gotTag: string): TagCheckError {
|
|
81
|
+
return new TagCheckError(`Base address (mem[0]) is not a valid address (has tag ${gotTag})`);
|
|
82
|
+
}
|
|
83
|
+
public static forIndirectAddress(address: number, gotTag: string): TagCheckError {
|
|
84
|
+
return new TagCheckError(`Address after indirection is not a valid address (address ${address} has tag ${gotTag})`);
|
|
85
|
+
}
|
|
80
86
|
public static forOffset(offset: number, gotTag: string, expectedTag: string): TagCheckError {
|
|
81
87
|
return new TagCheckError(`Tag mismatch at offset ${offset}, got ${gotTag}, expected ${expectedTag}`);
|
|
82
88
|
}
|
|
@@ -97,7 +103,7 @@ export class TagCheckError extends AvmExecutionError {
|
|
|
97
103
|
*/
|
|
98
104
|
export class RelativeAddressOutOfRangeError extends AvmExecutionError {
|
|
99
105
|
constructor(baseAddr: number, relOffset: number) {
|
|
100
|
-
super(`
|
|
106
|
+
super(`Relative address out of range. Base address ${baseAddr}, relative offset ${relOffset}`);
|
|
101
107
|
this.name = 'RelativeAddressOutOfRangeError';
|
|
102
108
|
}
|
|
103
109
|
}
|
|
@@ -161,3 +167,11 @@ export class AvmRevertReason extends ExecutionError {
|
|
|
161
167
|
super(message, failingFunction, noirCallStack, options);
|
|
162
168
|
}
|
|
163
169
|
}
|
|
170
|
+
|
|
171
|
+
/**
|
|
172
|
+
* Helper to annotate errors occurring during instruction fetching.
|
|
173
|
+
*/
|
|
174
|
+
export function duringInstrFetch(error: Error, pc: number) {
|
|
175
|
+
error.message = `Instruction fetching error at pc ${pc}: ${error.message}`;
|
|
176
|
+
return error;
|
|
177
|
+
}
|
|
@@ -83,7 +83,7 @@ export class Addressing {
|
|
|
83
83
|
baseAddr = mem.get(0);
|
|
84
84
|
const baseAddrTag = baseAddr.getTag();
|
|
85
85
|
if (!TaggedMemory.isValidMemoryAddressTag(baseAddrTag!)) {
|
|
86
|
-
throw TagCheckError.
|
|
86
|
+
throw TagCheckError.forBaseAddress(TypeTag[baseAddrTag!]);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
// Here we know that resolved[i] is at most 32 bits and baseAddr is at most 32 bits.
|
|
@@ -100,7 +100,7 @@ export class Addressing {
|
|
|
100
100
|
|
|
101
101
|
// Final check.
|
|
102
102
|
if (!TaggedMemory.isValidMemoryAddressTag(resolvedTag)) {
|
|
103
|
-
throw TagCheckError.
|
|
103
|
+
throw TagCheckError.forIndirectAddress(resolved[i], TypeTag[resolvedTag]);
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
resolved[i] = Number(resolvedValue.toBigInt());
|
|
@@ -56,11 +56,11 @@ export class DebugLog extends Instruction {
|
|
|
56
56
|
const memoryReads = 1 /* level */ + 1 /* fieldsSize */ + this.messageSize /* message */ + fieldsSize; /* fields */
|
|
57
57
|
if (
|
|
58
58
|
context.persistableState.getDebugLogMemoryReads() + memoryReads >
|
|
59
|
-
context.environment.config.maxDebugLogMemoryReads
|
|
59
|
+
context.environment.config.collectionLimits.maxDebugLogMemoryReads
|
|
60
60
|
) {
|
|
61
61
|
// Regular error on purpose: this is not a recoverable error.
|
|
62
62
|
throw new Error(
|
|
63
|
-
`Max debug log memory reads exceeded: ${context.persistableState.getDebugLogMemoryReads() + memoryReads} > ${context.environment.config.maxDebugLogMemoryReads}`,
|
|
63
|
+
`Max debug log memory reads exceeded: ${context.persistableState.getDebugLogMemoryReads() + memoryReads} > ${context.environment.config.collectionLimits.maxDebugLogMemoryReads}`,
|
|
64
64
|
);
|
|
65
65
|
}
|
|
66
66
|
context.persistableState.writeDebugLogMemoryReads(memoryReads);
|
|
@@ -18,13 +18,16 @@ async function createRevertReason(message: string, revertData: Fr[], context: Av
|
|
|
18
18
|
message = context.machineState.collectedRevertInfo.recursiveRevertReason.message;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
const
|
|
21
|
+
const { functionSelector, functionName } = await context.persistableState.getPublicFunctionSelectorAndName(
|
|
22
|
+
context.environment,
|
|
23
|
+
);
|
|
22
24
|
|
|
23
25
|
return new AvmRevertReason(
|
|
24
26
|
message,
|
|
25
27
|
/*failingFunction=*/ {
|
|
26
28
|
contractAddress: context.environment.address,
|
|
27
|
-
|
|
29
|
+
functionSelector,
|
|
30
|
+
functionName,
|
|
28
31
|
},
|
|
29
32
|
/*noirCallStack=*/ [...internalCallStack, context.machineState.pc].map(pc => `0.${pc}`),
|
|
30
33
|
/*options=*/ { cause: nestedError },
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
AvmExecutionError,
|
|
5
|
+
AvmParsingError,
|
|
6
|
+
InvalidOpcodeError,
|
|
7
|
+
InvalidProgramCounterError,
|
|
8
|
+
InvalidTagValueError,
|
|
9
|
+
duringInstrFetch,
|
|
10
|
+
} from '../errors.js';
|
|
4
11
|
import {
|
|
5
12
|
Add,
|
|
6
13
|
And,
|
|
@@ -172,7 +179,7 @@ export function decodeInstructionFromBytecode(
|
|
|
172
179
|
instructionSet: InstructionSet = INSTRUCTION_SET,
|
|
173
180
|
): [Instruction, number] {
|
|
174
181
|
if (pc >= bytecode.length) {
|
|
175
|
-
throw new InvalidProgramCounterError(pc, bytecode.length);
|
|
182
|
+
throw new InvalidProgramCounterError(pc, bytecode.length - 1);
|
|
176
183
|
}
|
|
177
184
|
|
|
178
185
|
try {
|
|
@@ -182,7 +189,7 @@ export function decodeInstructionFromBytecode(
|
|
|
182
189
|
|
|
183
190
|
if (opcode > MAX_OPCODE_VALUE) {
|
|
184
191
|
throw new InvalidOpcodeError(
|
|
185
|
-
`Opcode ${opcode} (0x${opcode.toString(16)}) value is not in the range of valid opcodes.`,
|
|
192
|
+
`Opcode ${opcode} (0x${opcode.toString(16)}) value is not in the range of valid opcodes (at PC ${pc}).`,
|
|
186
193
|
);
|
|
187
194
|
}
|
|
188
195
|
|
|
@@ -192,13 +199,17 @@ export function decodeInstructionFromBytecode(
|
|
|
192
199
|
}
|
|
193
200
|
|
|
194
201
|
const instructionDeserializer: InstructionDeserializer = instructionDeserializerOrUndef;
|
|
202
|
+
|
|
195
203
|
const instruction = instructionDeserializer(cursor);
|
|
196
204
|
return [instruction, cursor.position() - startingPosition];
|
|
197
205
|
} catch (error) {
|
|
198
|
-
if (error instanceof
|
|
199
|
-
throw error;
|
|
206
|
+
if (error instanceof InvalidTagValueError || error instanceof InvalidOpcodeError) {
|
|
207
|
+
throw duringInstrFetch(error, pc);
|
|
208
|
+
} else if (error instanceof AvmExecutionError) {
|
|
209
|
+
throw new AvmParsingError(`Instruction parsing error at pc ${pc}: ${error.message}`);
|
|
200
210
|
} else {
|
|
201
|
-
|
|
211
|
+
const msg = error instanceof Error ? `: ${error.message}` : '';
|
|
212
|
+
throw new AvmParsingError(`Instruction fetching error at pc ${pc}${msg}`);
|
|
202
213
|
}
|
|
203
214
|
}
|
|
204
215
|
}
|
|
@@ -16,3 +16,28 @@ export async function getPublicFunctionDebugName(
|
|
|
16
16
|
const selector = FunctionSelector.fromField(calldata[0]);
|
|
17
17
|
return (await db.getDebugFunctionName(contractAddress, selector)) ?? selector.toString();
|
|
18
18
|
}
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Get the function selector and optional debug name for a public function.
|
|
22
|
+
* Returns the selector and name separately, with name only populated if a debug name is available.
|
|
23
|
+
* @param db - The contracts database
|
|
24
|
+
* @param contractAddress - The contract address
|
|
25
|
+
* @param calldata - The calldata (selector is in calldata[0])
|
|
26
|
+
* @returns An object with functionSelector (always if calldata[0] exists) and functionName (only if debug name found)
|
|
27
|
+
*/
|
|
28
|
+
export async function getPublicFunctionSelectorAndName(
|
|
29
|
+
db: PublicContractsDBInterface,
|
|
30
|
+
contractAddress: AztecAddress,
|
|
31
|
+
calldata: Fr[],
|
|
32
|
+
): Promise<{ functionSelector?: FunctionSelector; functionName?: string }> {
|
|
33
|
+
// Public function is dispatched and therefore the target function is passed in the first argument.
|
|
34
|
+
if (!calldata[0]) {
|
|
35
|
+
return {};
|
|
36
|
+
}
|
|
37
|
+
const selector = FunctionSelector.fromField(calldata[0]);
|
|
38
|
+
const debugName = await db.getDebugFunctionName(contractAddress, selector);
|
|
39
|
+
return {
|
|
40
|
+
functionSelector: selector,
|
|
41
|
+
functionName: debugName ?? undefined,
|
|
42
|
+
};
|
|
43
|
+
}
|