@aztec/simulator 0.71.0 → 0.73.0
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/README.md +1 -1
- package/dest/acvm/oracle/oracle.d.ts +0 -1
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +1 -5
- package/dest/acvm/oracle/typed_oracle.d.ts +0 -1
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +1 -4
- package/dest/avm/avm_simulator.d.ts +0 -1
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +4 -19
- package/dest/avm/avm_tree.d.ts +9 -8
- package/dest/avm/avm_tree.d.ts.map +1 -1
- package/dest/avm/avm_tree.js +35 -30
- package/dest/avm/errors.d.ts +6 -0
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +10 -1
- package/dest/avm/fixtures/avm_simulation_tester.d.ts +21 -0
- package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +1 -0
- package/dest/avm/fixtures/avm_simulation_tester.js +74 -0
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts +35 -0
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -0
- package/dest/avm/fixtures/base_avm_simulation_tester.js +76 -0
- package/dest/avm/fixtures/index.d.ts +6 -2
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +28 -14
- package/dest/avm/fixtures/simple_contract_data_source.d.ts +31 -0
- package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +1 -0
- package/dest/avm/fixtures/simple_contract_data_source.js +75 -0
- package/dest/avm/journal/journal.d.ts +5 -6
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +28 -26
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +4 -3
- package/dest/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/avm/opcodes/conversion.js +10 -7
- package/dest/avm/opcodes/ec_add.js +2 -2
- package/dest/avm/opcodes/hashing.js +2 -2
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +9 -7
- package/dest/avm/test_utils.d.ts +1 -1
- package/dest/avm/test_utils.d.ts.map +1 -1
- package/dest/avm/test_utils.js +4 -3
- package/dest/client/client_execution_context.d.ts +2 -6
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +23 -26
- package/dest/client/execution_note_cache.d.ts +3 -3
- package/dest/client/execution_note_cache.d.ts.map +1 -1
- package/dest/client/execution_note_cache.js +10 -10
- package/dest/client/pick_notes.js +5 -5
- package/dest/client/simulator.js +4 -4
- package/dest/client/view_data_oracle.js +2 -2
- package/dest/common/hashed_values_cache.d.ts +1 -1
- package/dest/common/hashed_values_cache.d.ts.map +1 -1
- package/dest/common/hashed_values_cache.js +5 -5
- package/dest/providers/acvm_wasm.d.ts +2 -0
- package/dest/providers/acvm_wasm.d.ts.map +1 -1
- package/dest/providers/acvm_wasm.js +15 -2
- package/dest/public/execution.d.ts +8 -26
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +3 -3
- package/dest/public/fee_payment.d.ts +2 -2
- package/dest/public/fee_payment.d.ts.map +1 -1
- package/dest/public/fee_payment.js +3 -3
- package/dest/public/fixtures/index.d.ts +2 -37
- package/dest/public/fixtures/index.d.ts.map +1 -1
- package/dest/public/fixtures/index.js +3 -247
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts +21 -0
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -0
- package/dest/public/fixtures/public_tx_simulation_tester.js +89 -0
- package/dest/public/fixtures/utils.d.ts +17 -0
- package/dest/public/fixtures/utils.d.ts.map +1 -0
- package/dest/public/fixtures/utils.js +66 -0
- package/dest/public/index.d.ts +1 -1
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +2 -2
- package/dest/public/public_db_sources.d.ts +2 -1
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +27 -21
- package/dest/public/public_processor.d.ts +4 -5
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +28 -28
- package/dest/public/public_tx_context.d.ts +5 -5
- package/dest/public/public_tx_context.d.ts.map +1 -1
- package/dest/public/public_tx_context.js +44 -18
- package/dest/public/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator.js +9 -12
- package/dest/public/{enqueued_call_side_effect_trace.d.ts → side_effect_trace.d.ts} +12 -15
- package/dest/public/side_effect_trace.d.ts.map +1 -0
- package/dest/public/side_effect_trace.js +350 -0
- package/dest/public/side_effect_trace_interface.d.ts +4 -5
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/test/utils.d.ts +1 -1
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +3 -3
- package/package.json +10 -10
- package/src/acvm/oracle/oracle.ts +0 -5
- package/src/acvm/oracle/typed_oracle.ts +0 -4
- package/src/avm/avm_simulator.ts +3 -27
- package/src/avm/avm_tree.ts +39 -37
- package/src/avm/errors.ts +10 -0
- package/src/avm/fixtures/avm_simulation_tester.ts +105 -0
- package/src/avm/fixtures/base_avm_simulation_tester.ts +104 -0
- package/src/avm/fixtures/index.ts +46 -17
- package/src/avm/fixtures/simple_contract_data_source.ts +98 -0
- package/src/avm/journal/journal.ts +28 -26
- package/src/avm/opcodes/accrued_substate.ts +3 -2
- package/src/avm/opcodes/conversion.ts +15 -6
- package/src/avm/opcodes/ec_add.ts +1 -1
- package/src/avm/opcodes/hashing.ts +1 -1
- package/src/avm/opcodes/multi_scalar_mul.ts +8 -6
- package/src/avm/test_utils.ts +3 -4
- package/src/client/client_execution_context.ts +29 -30
- package/src/client/execution_note_cache.ts +19 -14
- package/src/client/pick_notes.ts +4 -4
- package/src/client/simulator.ts +3 -3
- package/src/client/view_data_oracle.ts +1 -1
- package/src/common/hashed_values_cache.ts +4 -4
- package/src/providers/acvm_wasm.ts +13 -2
- package/src/public/execution.ts +10 -34
- package/src/public/fee_payment.ts +2 -2
- package/src/public/fixtures/index.ts +2 -381
- package/src/public/fixtures/public_tx_simulation_tester.ts +174 -0
- package/src/public/fixtures/utils.ts +110 -0
- package/src/public/index.ts +1 -1
- package/src/public/public_db_sources.ts +31 -20
- package/src/public/public_processor.ts +32 -30
- package/src/public/public_tx_context.ts +87 -28
- package/src/public/public_tx_simulator.ts +7 -14
- package/src/public/{enqueued_call_side_effect_trace.ts → side_effect_trace.ts} +29 -41
- package/src/public/side_effect_trace_interface.ts +4 -4
- package/src/test/utils.ts +2 -2
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +0 -1
- package/dest/public/enqueued_call_side_effect_trace.js +0 -357
- package/dest/public/transitional_adapters.d.ts +0 -4
- package/dest/public/transitional_adapters.d.ts.map +0 -1
- package/dest/public/transitional_adapters.js +0 -29
- package/src/public/transitional_adapters.ts +0 -113
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
1
2
|
import { foreignCallHandler } from '@aztec/noir-protocol-circuits-types/client';
|
|
2
3
|
import initACVM, { executeCircuit } from '@noir-lang/acvm_js';
|
|
3
4
|
import initAbi from '@noir-lang/noirc_abi';
|
|
4
5
|
import { acvm } from '../acvm/acvm.js';
|
|
5
6
|
import { parseErrorPayload } from '../common/simulation_provider.js';
|
|
6
7
|
export class WASMSimulator {
|
|
8
|
+
constructor(log = createLogger('wasm-simulator')) {
|
|
9
|
+
this.log = log;
|
|
10
|
+
}
|
|
7
11
|
async init() {
|
|
8
12
|
// If these are available, then we are in the
|
|
9
13
|
// web environment. For the node environment, this
|
|
@@ -14,6 +18,7 @@ export class WASMSimulator {
|
|
|
14
18
|
}
|
|
15
19
|
}
|
|
16
20
|
async executeProtocolCircuit(input, compiledCircuit) {
|
|
21
|
+
this.log.debug('init', { hash: compiledCircuit.hash });
|
|
17
22
|
await this.init();
|
|
18
23
|
// Execute the circuit on those initial witness values
|
|
19
24
|
//
|
|
@@ -23,13 +28,21 @@ export class WASMSimulator {
|
|
|
23
28
|
// Execute the circuit
|
|
24
29
|
try {
|
|
25
30
|
const _witnessMap = await executeCircuit(decodedBytecode, input, foreignCallHandler);
|
|
31
|
+
this.log.debug('execution successful', { hash: compiledCircuit.hash });
|
|
26
32
|
return _witnessMap;
|
|
27
33
|
}
|
|
28
34
|
catch (err) {
|
|
29
35
|
// Typescript types catched errors as unknown or any, so we need to narrow its type to check if it has raw assertion payload.
|
|
30
36
|
if (typeof err === 'object' && err !== null && 'rawAssertionPayload' in err) {
|
|
31
|
-
|
|
37
|
+
const parsed = parseErrorPayload(compiledCircuit.abi, err);
|
|
38
|
+
this.log.debug('execution failed', {
|
|
39
|
+
hash: compiledCircuit.hash,
|
|
40
|
+
error: parsed,
|
|
41
|
+
message: parsed.message,
|
|
42
|
+
});
|
|
43
|
+
throw parsed;
|
|
32
44
|
}
|
|
45
|
+
this.log.debug('execution failed', { hash: compiledCircuit.hash, error: err });
|
|
33
46
|
throw new Error(`Circuit execution failed: ${err}`);
|
|
34
47
|
}
|
|
35
48
|
}
|
|
@@ -38,4 +51,4 @@ export class WASMSimulator {
|
|
|
38
51
|
return acvm(acir, initialWitness, callback);
|
|
39
52
|
}
|
|
40
53
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN2bV93YXNtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpZGVycy9hY3ZtX3dhc20udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBR2hGLE9BQU8sUUFBUSxFQUFFLEVBQXVCLGNBQWMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ25GLE9BQU8sT0FBTyxNQUFNLHNCQUFzQixDQUFDO0FBRzNDLE9BQU8sRUFBcUIsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFMUQsT0FBTyxFQUEyQixpQkFBaUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRTlGLE1BQU0sT0FBTyxhQUFhO0lBQ3hCLFlBQXNCLE1BQU0sWUFBWSxDQUFDLGdCQUFnQixDQUFDO1FBQXBDLFFBQUcsR0FBSCxHQUFHLENBQWlDO0lBQUcsQ0FBQztJQUU5RCxLQUFLLENBQUMsSUFBSTtRQUNSLDZDQUE2QztRQUM3QyxrREFBa0Q7UUFDbEQsY0FBYztRQUNkLElBQUksT0FBTyxPQUFPLEtBQUssVUFBVSxFQUFFLENBQUM7WUFDbEMsOEZBQThGO1lBQzlGLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUM3QyxDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxLQUFpQixFQUFFLGVBQW9DO1FBQ2xGLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxlQUFlLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUN2RCxNQUFNLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNsQixzREFBc0Q7UUFDdEQsRUFBRTtRQUNGLHFGQUFxRjtRQUNyRixNQUFNLGVBQWUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDeEUsRUFBRTtRQUNGLHNCQUFzQjtRQUN0QixJQUFJLENBQUM7WUFDSCxNQUFNLFdBQVcsR0FBRyxNQUFNLGNBQWMsQ0FDdEMsZUFBZSxFQUNmLEtBQUssRUFDTCxrQkFBa0IsQ0FDbkIsQ0FBQztZQUNGLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLHNCQUFzQixFQUFFLEVBQUUsSUFBSSxFQUFFLGVBQWUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ3ZFLE9BQU8sV0FBVyxDQUFDO1FBQ3JCLENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsNkhBQTZIO1lBQzdILElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxJQUFJLEdBQUcsS0FBSyxJQUFJLElBQUkscUJBQXFCLElBQUksR0FBRyxFQUFFLENBQUM7Z0JBQzVFLE1BQU0sTUFBTSxHQUFHLGlCQUFpQixDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBcUIsQ0FBQyxDQUFDO2dCQUM3RSxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRTtvQkFDakMsSUFBSSxFQUFFLGVBQWUsQ0FBQyxJQUFJO29CQUMxQixLQUFLLEVBQUUsTUFBTTtvQkFDYixPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU87aUJBQ3hCLENBQUMsQ0FBQztnQkFDSCxNQUFNLE1BQU0sQ0FBQztZQUNmLENBQUM7WUFDRCxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxFQUFFLElBQUksRUFBRSxlQUFlLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQy9FLE1BQU0sSUFBSSxLQUFLLENBQUMsNkJBQTZCLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDdEQsQ0FBQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsSUFBWSxFQUFFLGNBQTJCLEVBQUUsUUFBc0I7UUFDeEYsTUFBTSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDbEIsT0FBTyxJQUFJLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUM5QyxDQUFDO0NBQ0YifQ==
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
-
import { type PublicExecutionRequest, type SimulationError
|
|
4
|
-
import { type AvmExecutionHints, type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, Gas, type L2ToL1Message, type
|
|
3
|
+
import { type PublicExecutionRequest, type SimulationError } from '@aztec/circuit-types';
|
|
4
|
+
import { type AvmExecutionHints, type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, Gas, type L2ToL1Message, type NoteHash, type Nullifier, type PublicDataUpdateRequest, PublicInnerCallRequest, type PublicLog, type ReadRequest, type ScopedL2ToL1Message, type TreeLeafReadRequest } from '@aztec/circuits.js';
|
|
5
5
|
export interface PublicSideEffects {
|
|
6
6
|
/** The contract storage update requests performed. */
|
|
7
7
|
publicDataWrites: PublicDataUpdateRequest[];
|
|
@@ -11,16 +11,8 @@ export interface PublicSideEffects {
|
|
|
11
11
|
nullifiers: Nullifier[];
|
|
12
12
|
/** The new l2 to l1 messages generated to be inserted into the messages tree. */
|
|
13
13
|
l2ToL1Messages: ScopedL2ToL1Message[];
|
|
14
|
-
/**
|
|
15
|
-
|
|
16
|
-
* Note: required as we don't track the counter anywhere else.
|
|
17
|
-
*/
|
|
18
|
-
unencryptedLogsHashes: ScopedLogHash[];
|
|
19
|
-
/**
|
|
20
|
-
* Unencrypted logs emitted during execution.
|
|
21
|
-
* Note: These are preimages to `unencryptedLogsHashes`.
|
|
22
|
-
*/
|
|
23
|
-
unencryptedLogs: UnencryptedFunctionL2Logs;
|
|
14
|
+
/** Public logs emitted during execution. */
|
|
15
|
+
publicLogs: PublicLog[];
|
|
24
16
|
}
|
|
25
17
|
export interface EnqueuedPublicCallExecutionResult {
|
|
26
18
|
/** How much gas was left after this public execution. */
|
|
@@ -93,20 +85,10 @@ export interface PublicFunctionCallResult {
|
|
|
93
85
|
/** L1 to L2 message read requests emitted in this call. */
|
|
94
86
|
l1ToL2MsgReadRequests: TreeLeafReadRequest[];
|
|
95
87
|
/**
|
|
96
|
-
* The
|
|
97
|
-
* Note:
|
|
98
|
-
*/
|
|
99
|
-
unencryptedLogsHashes: LogHash[];
|
|
100
|
-
/**
|
|
101
|
-
* Unencrypted logs emitted during execution of this function call.
|
|
102
|
-
* Note: These are preimages to `unencryptedLogsHashes`.
|
|
103
|
-
*/
|
|
104
|
-
unencryptedLogs: UnencryptedFunctionL2Logs;
|
|
105
|
-
/**
|
|
106
|
-
* Unencrypted logs emitted during this call AND any nested calls.
|
|
107
|
-
* Useful for maintaining correct ordering in ts.
|
|
88
|
+
* The public logs emitted in this call.
|
|
89
|
+
* Note: PublicLog has no counter - unsure if this is needed bc this struct is unused
|
|
108
90
|
*/
|
|
109
|
-
|
|
91
|
+
publicLogs: PublicLog[];
|
|
110
92
|
/** The requests to call public functions made by this call. */
|
|
111
93
|
publicCallRequests: PublicInnerCallRequest[];
|
|
112
94
|
/** The results of nested calls. */
|
|
@@ -116,5 +98,5 @@ export interface PublicFunctionCallResult {
|
|
|
116
98
|
/** The name of the function that was executed. Only used for logging. */
|
|
117
99
|
functionName: string;
|
|
118
100
|
}
|
|
119
|
-
export declare function resultToPublicCallRequest(result: PublicFunctionCallResult): PublicInnerCallRequest
|
|
101
|
+
export declare function resultToPublicCallRequest(result: PublicFunctionCallResult): Promise<PublicInnerCallRequest>;
|
|
120
102
|
//# sourceMappingURL=execution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":";;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,GAAG,EACH,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,SAAS,EAEd,KAAK,uBAAuB,EAC5B,sBAAsB,EACtB,KAAK,SAAS,EACd,KAAK,WAAW,EAEhB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAG5B,MAAM,WAAW,iBAAiB;IAChC,sDAAsD;IACtD,gBAAgB,EAAE,uBAAuB,EAAE,CAAC;IAC5C,oEAAoE;IACpE,UAAU,EAAE,QAAQ,EAAE,CAAC;IACvB,iEAAiE;IACjE,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,iFAAiF;IACjF,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,4CAA4C;IAC5C,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,iCAAiC;IAChD,yDAAyD;IACzD,UAAU,EAAE,GAAG,CAAC;IAChB,8CAA8C;IAC9C,oBAAoB,EAAE,EAAE,CAAC;IAEzB,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,sCAAsC;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB,mDAAmD;IACnD,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC;AAED,MAAM,WAAW,gDAAgD;IAC/D,yDAAyD;IACzD,UAAU,EAAE,GAAG,CAAC;IAChB,8CAA8C;IAC9C,oBAAoB,EAAE,EAAE,CAAC;IAEzB,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,sCAAsC;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB,mDAAmD;IACnD,YAAY,CAAC,EAAE,eAAe,CAAC;IAE/B,+CAA+C;IAC/C,WAAW,EAAE,iBAAiB,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,wDAAwD;IACxD,gBAAgB,EAAE,sBAAsB,CAAC;IAEzC,iEAAiE;IACjE,sBAAsB,EAAE,EAAE,CAAC;IAC3B,iEAAiE;IACjE,oBAAoB,EAAE,EAAE,CAAC;IACzB,4DAA4D;IAC5D,YAAY,EAAE,GAAG,CAAC;IAClB,yDAAyD;IACzD,UAAU,EAAE,GAAG,CAAC;IAChB,uCAAuC;IACvC,cAAc,EAAE,EAAE,CAAC;IAEnB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,QAAQ,EAAE,EAAE,EAAE,CAAC;IACf,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,sCAAsC;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB,mDAAmD;IACnD,YAAY,CAAC,EAAE,eAAe,CAAC;IAE/B,4DAA4D;IAC5D,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,sEAAsE;IACtE,6BAA6B,EAAE,4BAA4B,EAAE,CAAC;IAC9D,oEAAoE;IACpE,UAAU,EAAE,QAAQ,EAAE,CAAC;IACvB,wDAAwD;IACxD,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,iEAAiE;IACjE,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,wDAAwD;IACxD,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,2DAA2D;IAC3D,qBAAqB,EAAE,mBAAmB,EAAE,CAAC;IAC7C;;;OAGG;IACH,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,+DAA+D;IAC/D,kBAAkB,EAAE,sBAAsB,EAAE,CAAC;IAC7C,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAEzB,uCAAuC;IACvC,eAAe,EAAE,iBAAiB,CAAC;IAEnC,yEAAyE;IACzE,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,wBAAwB,mCAa/E"}
|
package/dest/public/execution.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Gas, PublicCallStackItemCompressed, PublicInnerCallRequest, RevertCode, } from '@aztec/circuits.js';
|
|
2
2
|
import { computeVarArgsHash } from '@aztec/circuits.js/hash';
|
|
3
|
-
export function resultToPublicCallRequest(result) {
|
|
3
|
+
export async function resultToPublicCallRequest(result) {
|
|
4
4
|
const request = result.executionRequest;
|
|
5
|
-
const item = new PublicCallStackItemCompressed(request.callContext.contractAddress, request.callContext, computeVarArgsHash(request.args), computeVarArgsHash(result.returnValues),
|
|
5
|
+
const item = new PublicCallStackItemCompressed(request.callContext.contractAddress, request.callContext, await computeVarArgsHash(request.args), await computeVarArgsHash(result.returnValues),
|
|
6
6
|
// TODO(@just-mitch): need better mapping from simulator to revert code.
|
|
7
7
|
result.reverted ? RevertCode.APP_LOGIC_REVERTED : RevertCode.OK, Gas.from(result.startGasLeft), Gas.from(result.endGasLeft));
|
|
8
8
|
return new PublicInnerCallRequest(item, result.startSideEffectCounter.toNumber());
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUtMLEdBQUcsRUFJSCw2QkFBNkIsRUFFN0Isc0JBQXNCLEVBR3RCLFVBQVUsR0FHWCxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBOEc3RCxNQUFNLENBQUMsS0FBSyxVQUFVLHlCQUF5QixDQUFDLE1BQWdDO0lBQzlFLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQztJQUN4QyxNQUFNLElBQUksR0FBRyxJQUFJLDZCQUE2QixDQUM1QyxPQUFPLENBQUMsV0FBVyxDQUFDLGVBQWUsRUFDbkMsT0FBTyxDQUFDLFdBQVcsRUFDbkIsTUFBTSxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQ3RDLE1BQU0sa0JBQWtCLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQztJQUM3Qyx3RUFBd0U7SUFDeEUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsRUFBRSxFQUMvRCxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsRUFDN0IsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQzVCLENBQUM7SUFDRixPQUFPLElBQUksc0JBQXNCLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0FBQ3BGLENBQUMifQ==
|
|
@@ -3,9 +3,9 @@ import { Fr } from '@aztec/foundation/fields';
|
|
|
3
3
|
/**
|
|
4
4
|
* Computes the storage slot within the Fee Juice contract for the balance of the fee payer.
|
|
5
5
|
*/
|
|
6
|
-
export declare function computeFeePayerBalanceStorageSlot(feePayer: AztecAddress): Fr
|
|
6
|
+
export declare function computeFeePayerBalanceStorageSlot(feePayer: AztecAddress): Promise<Fr>;
|
|
7
7
|
/**
|
|
8
8
|
* Computes the leaf slot in the public data tree for the balance of the fee payer in the Fee Juice.
|
|
9
9
|
*/
|
|
10
|
-
export declare function computeFeePayerBalanceLeafSlot(feePayer: AztecAddress): Fr
|
|
10
|
+
export declare function computeFeePayerBalanceLeafSlot(feePayer: AztecAddress): Promise<Fr>;
|
|
11
11
|
//# sourceMappingURL=fee_payment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fee_payment.d.ts","sourceRoot":"","sources":["../../src/public/fee_payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"fee_payment.d.ts","sourceRoot":"","sources":["../../src/public/fee_payment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,eAEvE;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC,CAMxF"}
|
|
@@ -11,11 +11,11 @@ export function computeFeePayerBalanceStorageSlot(feePayer) {
|
|
|
11
11
|
/**
|
|
12
12
|
* Computes the leaf slot in the public data tree for the balance of the fee payer in the Fee Juice.
|
|
13
13
|
*/
|
|
14
|
-
export function computeFeePayerBalanceLeafSlot(feePayer) {
|
|
14
|
+
export async function computeFeePayerBalanceLeafSlot(feePayer) {
|
|
15
15
|
if (feePayer.isZero()) {
|
|
16
16
|
return Fr.ZERO;
|
|
17
17
|
}
|
|
18
|
-
const balanceSlot = computeFeePayerBalanceStorageSlot(feePayer);
|
|
18
|
+
const balanceSlot = await computeFeePayerBalanceStorageSlot(feePayer);
|
|
19
19
|
return computePublicDataTreeLeafSlot(ProtocolContractAddress.FeeJuice, balanceSlot);
|
|
20
20
|
}
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3BheW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2ZlZV9wYXltZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWhHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUV2RTs7R0FFRztBQUNILE1BQU0sVUFBVSxpQ0FBaUMsQ0FBQyxRQUFzQjtJQUN0RSxPQUFPLHNCQUFzQixDQUFDLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0FBQ3hGLENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsOEJBQThCLENBQUMsUUFBc0I7SUFDekUsSUFBSSxRQUFRLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQztRQUN0QixPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUM7SUFDakIsQ0FBQztJQUNELE1BQU0sV0FBVyxHQUFHLE1BQU0saUNBQWlDLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEUsT0FBTyw2QkFBNkIsQ0FBQyx1QkFBdUIsQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDdEYsQ0FBQyJ9
|
|
@@ -1,38 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
6
|
-
export declare function simulateAvmTestContractGenerateCircuitInputs(setupFunctionNames: string[], setupArgs: Fr[][] | undefined, appFunctionNames: string[], appArgs?: Fr[][], teardownFunctionName?: string, teardownArgs?: Fr[], expectRevert?: boolean, contractDataSource?: MockedAvmTestContractDataSource, assertionErrString?: string): Promise<AvmCircuitInputs>;
|
|
7
|
-
export declare function simulateAvmTestContractCall(functionName: string, args?: Fr[], expectRevert?: boolean, contractDataSource?: MockedAvmTestContractDataSource): Promise<void>;
|
|
8
|
-
/**
|
|
9
|
-
* Craft a carrier transaction for some public calls for simulation by PublicTxSimulator.
|
|
10
|
-
*/
|
|
11
|
-
export declare function createTxForPublicCalls(setupExecutionRequests: PublicExecutionRequest[], appExecutionRequests: PublicExecutionRequest[], teardownExecutionRequest?: PublicExecutionRequest, gasUsedByPrivate?: Gas): Tx;
|
|
12
|
-
export declare class MockedAvmTestContractDataSource implements ContractDataSource {
|
|
13
|
-
private skipContractDeployments;
|
|
14
|
-
private fnName;
|
|
15
|
-
fnSelector: FunctionSelector;
|
|
16
|
-
private bytecode;
|
|
17
|
-
private publicFn;
|
|
18
|
-
private bytecodeCommitment;
|
|
19
|
-
private contractClasses;
|
|
20
|
-
contractInstances: Map<string, ContractInstanceWithAddress>;
|
|
21
|
-
firstContractInstance: ContractInstanceWithAddress;
|
|
22
|
-
instanceSameClassAsFirstContract: ContractInstanceWithAddress;
|
|
23
|
-
otherContractInstance: ContractInstanceWithAddress;
|
|
24
|
-
constructor(skipContractDeployments?: boolean);
|
|
25
|
-
deployContracts(merkleTrees: MerkleTreeWriteOperations): Promise<void>;
|
|
26
|
-
static create(merkleTrees: MerkleTreeWriteOperations, skipContractDeployments?: boolean): Promise<MockedAvmTestContractDataSource>;
|
|
27
|
-
getPublicFunction(_address: AztecAddress, _selector: FunctionSelector): Promise<PublicFunction>;
|
|
28
|
-
getBlockNumber(): Promise<number>;
|
|
29
|
-
getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
|
|
30
|
-
getBytecodeCommitment(_id: Fr): Promise<Fr>;
|
|
31
|
-
addContractClass(_contractClass: ContractClassPublic): Promise<void>;
|
|
32
|
-
getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
|
|
33
|
-
getContractClassIds(): Promise<Fr[]>;
|
|
34
|
-
getContractArtifact(_address: AztecAddress): Promise<ContractArtifact | undefined>;
|
|
35
|
-
getContractFunctionName(_address: AztecAddress, _selector: FunctionSelector): Promise<string>;
|
|
36
|
-
registerContractFunctionSignatures(_address: AztecAddress, _signatures: string[]): Promise<void>;
|
|
37
|
-
}
|
|
1
|
+
export * from './public_tx_simulation_tester.js';
|
|
2
|
+
export * from './utils.js';
|
|
38
3
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAC;AACjD,cAAc,YAAY,CAAC"}
|
|
@@ -1,247 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
|
|
5
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
6
|
-
import { Fr, Point } from '@aztec/foundation/fields';
|
|
7
|
-
import { openTmpStore } from '@aztec/kv-store/lmdb';
|
|
8
|
-
import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
|
|
9
|
-
import { MerkleTrees } from '@aztec/world-state';
|
|
10
|
-
import { strict as assert } from 'assert';
|
|
11
|
-
import { initContext, initExecutionEnvironment, initPersistableStateManager } from '../../avm/fixtures/index.js';
|
|
12
|
-
import { AvmEphemeralForest, AvmSimulator } from '../../server.js';
|
|
13
|
-
import { PublicEnqueuedCallSideEffectTrace } from '../enqueued_call_side_effect_trace.js';
|
|
14
|
-
import { WorldStateDB } from '../public_db_sources.js';
|
|
15
|
-
import { PublicTxSimulator } from '../public_tx_simulator.js';
|
|
16
|
-
const TIMESTAMP = new Fr(99833);
|
|
17
|
-
export async function simulateAvmTestContractGenerateCircuitInputs(setupFunctionNames, setupArgs = [], appFunctionNames, appArgs = [], teardownFunctionName, teardownArgs = [], expectRevert = false, contractDataSource = new MockedAvmTestContractDataSource(), assertionErrString) {
|
|
18
|
-
const globals = GlobalVariables.empty();
|
|
19
|
-
globals.timestamp = TIMESTAMP;
|
|
20
|
-
const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
|
|
21
|
-
await contractDataSource.deployContracts(merkleTrees);
|
|
22
|
-
const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
|
|
23
|
-
const simulator = new PublicTxSimulator(merkleTrees, worldStateDB, globals, /*doMerkleOperations=*/ true);
|
|
24
|
-
const sender = AztecAddress.random();
|
|
25
|
-
const callContext = new CallContext(sender, contractDataSource.firstContractInstance.address, contractDataSource.fnSelector,
|
|
26
|
-
/*isStaticCall=*/ false);
|
|
27
|
-
const setupExecutionRequests = [];
|
|
28
|
-
for (let i = 0; i < setupFunctionNames.length; i++) {
|
|
29
|
-
const functionSelector = getAvmTestContractFunctionSelector(setupFunctionNames[i]);
|
|
30
|
-
const fnArgs = [functionSelector.toField(), ...setupArgs[i]];
|
|
31
|
-
const executionRequest = new PublicExecutionRequest(callContext, fnArgs);
|
|
32
|
-
setupExecutionRequests.push(executionRequest);
|
|
33
|
-
}
|
|
34
|
-
const appExecutionRequests = [];
|
|
35
|
-
for (let i = 0; i < appFunctionNames.length; i++) {
|
|
36
|
-
const functionSelector = getAvmTestContractFunctionSelector(appFunctionNames[i]);
|
|
37
|
-
const fnArgs = [functionSelector.toField(), ...appArgs[i]];
|
|
38
|
-
const executionRequest = new PublicExecutionRequest(callContext, fnArgs);
|
|
39
|
-
appExecutionRequests.push(executionRequest);
|
|
40
|
-
}
|
|
41
|
-
let teardownExecutionRequest = undefined;
|
|
42
|
-
if (teardownFunctionName) {
|
|
43
|
-
const functionSelector = getAvmTestContractFunctionSelector(teardownFunctionName);
|
|
44
|
-
const fnArgs = [functionSelector.toField(), ...teardownArgs];
|
|
45
|
-
teardownExecutionRequest = new PublicExecutionRequest(callContext, fnArgs);
|
|
46
|
-
}
|
|
47
|
-
const tx = createTxForPublicCalls(setupExecutionRequests, appExecutionRequests, teardownExecutionRequest);
|
|
48
|
-
const avmResult = await simulator.simulate(tx);
|
|
49
|
-
if (!expectRevert) {
|
|
50
|
-
expect(avmResult.revertCode.isOK()).toBe(true);
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
// Explicit revert when an assertion failed.
|
|
54
|
-
expect(avmResult.revertCode.isOK()).toBe(false);
|
|
55
|
-
expect(avmResult.revertReason).toBeDefined();
|
|
56
|
-
if (assertionErrString !== undefined) {
|
|
57
|
-
expect(avmResult.revertReason?.getMessage()).toContain(assertionErrString);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
const avmCircuitInputs = avmResult.avmProvingRequest.inputs;
|
|
61
|
-
return avmCircuitInputs;
|
|
62
|
-
}
|
|
63
|
-
export async function simulateAvmTestContractCall(functionName, args = [], expectRevert = false, contractDataSource = new MockedAvmTestContractDataSource()) {
|
|
64
|
-
const globals = GlobalVariables.empty();
|
|
65
|
-
globals.timestamp = TIMESTAMP;
|
|
66
|
-
const merkleTrees = await (await MerkleTrees.new(openTmpStore())).fork();
|
|
67
|
-
await contractDataSource.deployContracts(merkleTrees);
|
|
68
|
-
const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
|
|
69
|
-
const trace = new PublicEnqueuedCallSideEffectTrace();
|
|
70
|
-
const ephemeralTrees = await AvmEphemeralForest.create(worldStateDB.getMerkleInterface());
|
|
71
|
-
const persistableState = initPersistableStateManager({
|
|
72
|
-
worldStateDB,
|
|
73
|
-
trace,
|
|
74
|
-
merkleTrees: ephemeralTrees,
|
|
75
|
-
doMerkleOperations: true,
|
|
76
|
-
});
|
|
77
|
-
const sender = AztecAddress.random();
|
|
78
|
-
const functionSelector = getAvmTestContractFunctionSelector(functionName);
|
|
79
|
-
args = [functionSelector.toField(), ...args];
|
|
80
|
-
const environment = initExecutionEnvironment({
|
|
81
|
-
calldata: args,
|
|
82
|
-
globals,
|
|
83
|
-
address: contractDataSource.firstContractInstance.address,
|
|
84
|
-
sender,
|
|
85
|
-
});
|
|
86
|
-
const context = initContext({ env: environment, persistableState });
|
|
87
|
-
// First we simulate (though it's not needed in this simple case).
|
|
88
|
-
const simulator = new AvmSimulator(context);
|
|
89
|
-
const results = await simulator.execute();
|
|
90
|
-
expect(results.reverted).toBe(expectRevert);
|
|
91
|
-
}
|
|
92
|
-
/**
|
|
93
|
-
* Craft a carrier transaction for some public calls for simulation by PublicTxSimulator.
|
|
94
|
-
*/
|
|
95
|
-
export function createTxForPublicCalls(setupExecutionRequests, appExecutionRequests, teardownExecutionRequest, gasUsedByPrivate = Gas.empty()) {
|
|
96
|
-
assert(setupExecutionRequests.length > 0 || appExecutionRequests.length > 0 || teardownExecutionRequest !== undefined, "Can't create public tx with no enqueued calls");
|
|
97
|
-
const setupCallRequests = setupExecutionRequests.map(er => er.toCallRequest());
|
|
98
|
-
const appCallRequests = appExecutionRequests.map(er => er.toCallRequest());
|
|
99
|
-
// use max limits
|
|
100
|
-
const gasLimits = new Gas(DEFAULT_GAS_LIMIT, MAX_L2_GAS_PER_TX_PUBLIC_PORTION);
|
|
101
|
-
const forPublic = PartialPrivateTailPublicInputsForPublic.empty();
|
|
102
|
-
// TODO(#9269): Remove this fake nullifier method as we move away from 1st nullifier as hash.
|
|
103
|
-
forPublic.nonRevertibleAccumulatedData.nullifiers[0] = Fr.random(); // fake tx nullifier
|
|
104
|
-
// We reverse order because the simulator expects it to be like a "stack" of calls to pop from
|
|
105
|
-
for (let i = setupCallRequests.length - 1; i >= 0; i--) {
|
|
106
|
-
forPublic.nonRevertibleAccumulatedData.publicCallRequests[i] = setupCallRequests[i];
|
|
107
|
-
}
|
|
108
|
-
for (let i = appCallRequests.length - 1; i >= 0; i--) {
|
|
109
|
-
forPublic.revertibleAccumulatedData.publicCallRequests[i] = appCallRequests[i];
|
|
110
|
-
}
|
|
111
|
-
if (teardownExecutionRequest) {
|
|
112
|
-
forPublic.publicTeardownCallRequest = teardownExecutionRequest.toCallRequest();
|
|
113
|
-
}
|
|
114
|
-
const teardownGasLimits = teardownExecutionRequest ? gasLimits : Gas.empty();
|
|
115
|
-
const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty(), GasFees.empty());
|
|
116
|
-
const txContext = new TxContext(Fr.zero(), Fr.zero(), gasSettings);
|
|
117
|
-
const constantData = new TxConstantData(BlockHeader.empty(), txContext, Fr.zero(), Fr.zero());
|
|
118
|
-
const txData = new PrivateKernelTailCircuitPublicInputs(constantData, RollupValidationRequests.empty(),
|
|
119
|
-
/*gasUsed=*/ gasUsedByPrivate, AztecAddress.zero(), forPublic);
|
|
120
|
-
const tx = Tx.newWithTxData(txData, teardownExecutionRequest);
|
|
121
|
-
// Reverse order because the simulator expects it to be like a "stack" of calls to pop from.
|
|
122
|
-
// Also push app calls before setup calls for this reason.
|
|
123
|
-
for (let i = appExecutionRequests.length - 1; i >= 0; i--) {
|
|
124
|
-
tx.enqueuedPublicFunctionCalls.push(appExecutionRequests[i]);
|
|
125
|
-
}
|
|
126
|
-
for (let i = setupExecutionRequests.length - 1; i >= 0; i--) {
|
|
127
|
-
tx.enqueuedPublicFunctionCalls.push(setupExecutionRequests[i]);
|
|
128
|
-
}
|
|
129
|
-
return tx;
|
|
130
|
-
}
|
|
131
|
-
export class MockedAvmTestContractDataSource {
|
|
132
|
-
constructor(skipContractDeployments = false) {
|
|
133
|
-
this.skipContractDeployments = skipContractDeployments;
|
|
134
|
-
this.fnName = 'public_dispatch';
|
|
135
|
-
this.fnSelector = getAvmTestContractFunctionSelector(this.fnName);
|
|
136
|
-
// maps contract class ID to class
|
|
137
|
-
this.contractClasses = new Map();
|
|
138
|
-
// maps contract instance address to instance
|
|
139
|
-
this.contractInstances = new Map();
|
|
140
|
-
this.firstContractInstance = SerializableContractInstance.default().withAddress(AztecAddress.fromNumber(0));
|
|
141
|
-
this.instanceSameClassAsFirstContract = SerializableContractInstance.default().withAddress(AztecAddress.fromNumber(0));
|
|
142
|
-
this.bytecode = getAvmTestContractBytecode(this.fnName);
|
|
143
|
-
this.fnSelector = getAvmTestContractFunctionSelector(this.fnName);
|
|
144
|
-
this.publicFn = { bytecode: this.bytecode, selector: this.fnSelector };
|
|
145
|
-
this.bytecodeCommitment = computePublicBytecodeCommitment(this.bytecode);
|
|
146
|
-
// create enough unique classes to hit the limit (plus two extra)
|
|
147
|
-
for (let i = 0; i < MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS + 1; i++) {
|
|
148
|
-
const contractClass = makeContractClassPublic(/*seed=*/ i, this.publicFn);
|
|
149
|
-
const contractInstance = makeContractInstanceFromClassId(contractClass.id, /*seed=*/ i);
|
|
150
|
-
this.contractClasses.set(contractClass.id.toString(), contractClass);
|
|
151
|
-
this.contractInstances.set(contractInstance.address.toString(), contractInstance);
|
|
152
|
-
if (i === 0) {
|
|
153
|
-
this.firstContractInstance = contractInstance;
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
// a contract with the same class but different instance/address as the first contract
|
|
157
|
-
this.instanceSameClassAsFirstContract = makeContractInstanceFromClassId(this.firstContractInstance.contractClassId,
|
|
158
|
-
/*seed=*/ 1000);
|
|
159
|
-
// The values here should match those in `avm_simulator.test.ts`
|
|
160
|
-
// Used for GETCONTRACTINSTANCE test
|
|
161
|
-
this.otherContractInstance = new SerializableContractInstance({
|
|
162
|
-
version: 1,
|
|
163
|
-
salt: new Fr(0x123),
|
|
164
|
-
deployer: new AztecAddress(new Fr(0x456)),
|
|
165
|
-
contractClassId: new Fr(0x789),
|
|
166
|
-
initializationHash: new Fr(0x101112),
|
|
167
|
-
publicKeys: new PublicKeys(new Point(new Fr(0x131415), new Fr(0x161718), false), new Point(new Fr(0x192021), new Fr(0x222324), false), new Point(new Fr(0x252627), new Fr(0x282930), false), new Point(new Fr(0x313233), new Fr(0x343536), false)),
|
|
168
|
-
}).withAddress(AztecAddress.fromNumber(0x4444));
|
|
169
|
-
}
|
|
170
|
-
async deployContracts(merkleTrees) {
|
|
171
|
-
if (!this.skipContractDeployments) {
|
|
172
|
-
for (const contractInstance of this.contractInstances.values()) {
|
|
173
|
-
const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractInstance.address.toField());
|
|
174
|
-
await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()], 0);
|
|
175
|
-
}
|
|
176
|
-
const instanceSameClassAsFirstContractNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), this.instanceSameClassAsFirstContract.address.toField());
|
|
177
|
-
await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [instanceSameClassAsFirstContractNullifier.toBuffer()], 0);
|
|
178
|
-
// other contract address used by the bulk test's GETCONTRACTINSTANCE test
|
|
179
|
-
const otherContractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), this.otherContractInstance.address.toField());
|
|
180
|
-
await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [otherContractAddressNullifier.toBuffer()], 0);
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
static async create(merkleTrees, skipContractDeployments = false) {
|
|
184
|
-
const dataSource = new MockedAvmTestContractDataSource(skipContractDeployments);
|
|
185
|
-
if (!skipContractDeployments) {
|
|
186
|
-
await dataSource.deployContracts(merkleTrees);
|
|
187
|
-
}
|
|
188
|
-
return dataSource;
|
|
189
|
-
}
|
|
190
|
-
getPublicFunction(_address, _selector) {
|
|
191
|
-
return Promise.resolve(this.publicFn);
|
|
192
|
-
}
|
|
193
|
-
getBlockNumber() {
|
|
194
|
-
throw new Error('Method not implemented.');
|
|
195
|
-
}
|
|
196
|
-
getContractClass(id) {
|
|
197
|
-
return Promise.resolve(this.contractClasses.get(id.toString()));
|
|
198
|
-
}
|
|
199
|
-
getBytecodeCommitment(_id) {
|
|
200
|
-
return Promise.resolve(this.bytecodeCommitment);
|
|
201
|
-
}
|
|
202
|
-
addContractClass(_contractClass) {
|
|
203
|
-
return Promise.resolve();
|
|
204
|
-
}
|
|
205
|
-
getContract(address) {
|
|
206
|
-
if (!this.skipContractDeployments) {
|
|
207
|
-
if (address.equals(this.otherContractInstance.address)) {
|
|
208
|
-
return Promise.resolve(this.otherContractInstance);
|
|
209
|
-
}
|
|
210
|
-
else if (address.equals(this.instanceSameClassAsFirstContract.address)) {
|
|
211
|
-
return Promise.resolve(this.instanceSameClassAsFirstContract);
|
|
212
|
-
}
|
|
213
|
-
else {
|
|
214
|
-
return Promise.resolve(this.contractInstances.get(address.toString()));
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
return Promise.resolve(undefined);
|
|
218
|
-
}
|
|
219
|
-
getContractClassIds() {
|
|
220
|
-
throw new Error('Method not implemented.');
|
|
221
|
-
}
|
|
222
|
-
getContractArtifact(_address) {
|
|
223
|
-
throw new Error('Method not implemented.');
|
|
224
|
-
}
|
|
225
|
-
getContractFunctionName(_address, _selector) {
|
|
226
|
-
return Promise.resolve(this.fnName);
|
|
227
|
-
}
|
|
228
|
-
registerContractFunctionSignatures(_address, _signatures) {
|
|
229
|
-
return Promise.resolve();
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
function getAvmTestContractFunctionSelector(functionName) {
|
|
233
|
-
const artifact = AvmTestContractArtifact.functions.find(f => f.name === functionName);
|
|
234
|
-
assert(!!artifact, `Function ${functionName} not found in AvmTestContractArtifact`);
|
|
235
|
-
const params = artifact.parameters;
|
|
236
|
-
return FunctionSelector.fromNameAndParameters(artifact.name, params);
|
|
237
|
-
}
|
|
238
|
-
function getAvmTestContractArtifact(functionName) {
|
|
239
|
-
const artifact = AvmTestContractArtifact.functions.find(f => f.name === functionName);
|
|
240
|
-
assert(!!artifact?.bytecode, `No bytecode found for function ${functionName}. Try re-running bootstrap.sh on the repository root.`);
|
|
241
|
-
return artifact;
|
|
242
|
-
}
|
|
243
|
-
function getAvmTestContractBytecode(functionName) {
|
|
244
|
-
const artifact = getAvmTestContractArtifact(functionName);
|
|
245
|
-
return artifact.bytecode;
|
|
246
|
-
}
|
|
247
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
export * from './public_tx_simulation_tester.js';
|
|
2
|
+
export * from './utils.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2ZpeHR1cmVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyxZQUFZLENBQUMifQ==
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
2
|
+
import { BaseAvmSimulationTester } from '../../avm/fixtures/base_avm_simulation_tester.js';
|
|
3
|
+
import { type PublicTxResult } from '../public_tx_simulator.js';
|
|
4
|
+
export type TestEnqueuedCall = {
|
|
5
|
+
address: AztecAddress;
|
|
6
|
+
fnName: string;
|
|
7
|
+
args: any[];
|
|
8
|
+
isStaticCall?: boolean;
|
|
9
|
+
};
|
|
10
|
+
/**
|
|
11
|
+
* A test class that extends the BaseAvmSimulationTester to enable real-app testing of the PublicTxSimulator.
|
|
12
|
+
* It provides an interface for simulating one transaction at a time and maintains state between subsequent
|
|
13
|
+
* transactions.
|
|
14
|
+
*/
|
|
15
|
+
export declare class PublicTxSimulationTester extends BaseAvmSimulationTester {
|
|
16
|
+
private txCount;
|
|
17
|
+
static create(skipContractDeployments?: boolean): Promise<PublicTxSimulationTester>;
|
|
18
|
+
simulateTx(sender: AztecAddress, setupCalls?: TestEnqueuedCall[], appCalls?: TestEnqueuedCall[], teardownCall?: TestEnqueuedCall, feePayer?: AztecAddress): Promise<PublicTxResult>;
|
|
19
|
+
private commitTxStateUpdates;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=public_tx_simulation_tester.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"public_tx_simulation_tester.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/public_tx_simulation_tester.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAO/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAI3F,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,2BAA2B,CAAC;AAMnF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,wBAAyB,SAAQ,uBAAuB;IACnE,OAAO,CAAC,OAAO,CAAK;WAEA,MAAM,CAAC,uBAAuB,UAAQ,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAMjF,UAAU,CACrB,MAAM,EAAE,YAAY,EACpB,UAAU,GAAE,gBAAgB,EAAO,EACnC,QAAQ,GAAE,gBAAgB,EAAO,EACjC,YAAY,CAAC,EAAE,gBAAgB,EAC/B,QAAQ,GAAE,YAAkC,GAC3C,OAAO,CAAC,cAAc,CAAC;YAwEZ,oBAAoB;CAqBnC"}
|