@aztec/simulator 0.0.1-commit.d1f2d6c → 0.0.1-commit.e61ad554
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_context.d.ts +3 -3
- package/dest/public/avm/avm_context.d.ts.map +1 -1
- package/dest/public/avm/avm_contract_call_result.d.ts +6 -6
- package/dest/public/avm/avm_contract_call_result.d.ts.map +1 -1
- package/dest/public/avm/avm_contract_call_result.js +3 -3
- package/dest/public/avm/avm_execution_environment.d.ts +6 -5
- package/dest/public/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/public/avm/avm_machine_state.d.ts +6 -5
- package/dest/public/avm/avm_machine_state.d.ts.map +1 -1
- package/dest/public/avm/avm_machine_state.js +3 -2
- package/dest/public/avm/avm_simulator.d.ts +3 -2
- package/dest/public/avm/avm_simulator.d.ts.map +1 -1
- package/dest/public/avm/avm_simulator.js +5 -4
- package/dest/public/avm/calldata.d.ts +51 -0
- package/dest/public/avm/calldata.d.ts.map +1 -0
- package/dest/public/avm/calldata.js +63 -0
- package/dest/public/avm/fixtures/avm_simulation_tester.d.ts +1 -1
- package/dest/public/avm/fixtures/avm_simulation_tester.d.ts.map +1 -1
- package/dest/public/avm/fixtures/avm_simulation_tester.js +3 -2
- package/dest/public/avm/fixtures/initializers.d.ts +1 -1
- package/dest/public/avm/fixtures/initializers.d.ts.map +1 -1
- package/dest/public/avm/fixtures/initializers.js +2 -1
- package/dest/public/avm/opcodes/accrued_substate.d.ts +1 -1
- package/dest/public/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/public/avm/opcodes/accrued_substate.js +4 -0
- package/dest/public/avm/opcodes/external_calls.d.ts +1 -1
- package/dest/public/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/public/avm/opcodes/external_calls.js +7 -7
- package/dest/public/avm/opcodes/memory.js +1 -1
- package/dest/public/debug_fn_name.d.ts +4 -4
- package/dest/public/debug_fn_name.d.ts.map +1 -1
- package/dest/public/debug_fn_name.js +7 -5
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts +1 -1
- package/dest/public/public_tx_simulator/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator/public_tx_simulator.js +4 -3
- package/package.json +16 -16
- package/src/public/avm/avm_context.ts +2 -2
- package/src/public/avm/avm_contract_call_result.ts +8 -6
- package/src/public/avm/avm_execution_environment.ts +9 -4
- package/src/public/avm/avm_machine_state.ts +6 -5
- package/src/public/avm/avm_simulator.ts +8 -5
- package/src/public/avm/calldata.ts +100 -0
- package/src/public/avm/fixtures/avm_simulation_tester.ts +8 -2
- package/src/public/avm/fixtures/initializers.ts +2 -1
- package/src/public/avm/opcodes/accrued_substate.ts +6 -0
- package/src/public/avm/opcodes/external_calls.ts +8 -7
- package/src/public/avm/opcodes/memory.ts +1 -1
- package/src/public/debug_fn_name.ts +10 -8
- package/src/public/public_tx_simulator/public_tx_simulator.ts +8 -3
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
1
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
3
2
|
import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
|
|
4
3
|
import type { AvmExecutionEnvironment } from './avm_execution_environment.js';
|
|
5
4
|
import { type Gas } from './avm_gas.js';
|
|
6
5
|
import { AvmMachineState } from './avm_machine_state.js';
|
|
7
6
|
import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
|
|
7
|
+
import type { CallData } from './calldata.js';
|
|
8
8
|
/**
|
|
9
9
|
* An execution context includes the information necessary to initiate AVM
|
|
10
10
|
* execution along with all state maintained by the AVM throughout execution.
|
|
@@ -36,6 +36,6 @@ export declare class AvmContext {
|
|
|
36
36
|
* @param callType - Type of call (CALL or STATICCALL)
|
|
37
37
|
* @returns new AvmContext instance
|
|
38
38
|
*/
|
|
39
|
-
createNestedContractCallContext(address: AztecAddress, calldata:
|
|
39
|
+
createNestedContractCallContext(address: AztecAddress, calldata: CallData, allocatedGas: Gas, callType: 'CALL' | 'STATICCALL'): Promise<AvmContext>;
|
|
40
40
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRleHQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2F2bV9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDdkYsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUM5RSxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQWdCLE1BQU0sY0FBYyxDQUFDO0FBQ3RELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUU5Qzs7O0dBR0c7QUFDSCxxQkFBYSxVQUFVO0lBU1osZ0JBQWdCLEVBQUUsNkJBQTZCO0lBQy9DLFdBQVcsRUFBRSx1QkFBdUI7SUFDcEMsWUFBWSxFQUFFLGVBQWU7SUFWdEM7Ozs7OztPQU1HO0lBQ0gsWUFDUyxnQkFBZ0IsRUFBRSw2QkFBNkIsRUFDL0MsV0FBVyxFQUFFLHVCQUF1QixFQUNwQyxZQUFZLEVBQUUsZUFBZSxFQUNsQztJQUlHLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxLQUFLLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBRWxGOzs7Ozs7Ozs7Ozs7O09BYUc7SUFDVSwrQkFBK0IsQ0FDMUMsT0FBTyxFQUFFLFlBQVksRUFDckIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsWUFBWSxFQUFFLEdBQUcsRUFDakIsUUFBUSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQzlCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FTckI7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_context.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"avm_context.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,KAAK,GAAG,EAAgB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;GAGG;AACH,qBAAa,UAAU;IASZ,gBAAgB,EAAE,6BAA6B;IAC/C,WAAW,EAAE,uBAAuB;IACpC,YAAY,EAAE,eAAe;IAVtC;;;;;;OAMG;IACH,YACS,gBAAgB,EAAE,6BAA6B,EAC/C,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,eAAe,EAClC;IAIG,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAElF;;;;;;;;;;;;;OAaG;IACU,+BAA+B,CAC1C,OAAO,EAAE,YAAY,EACrB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EACjB,QAAQ,EAAE,MAAM,GAAG,YAAY,GAC9B,OAAO,CAAC,UAAU,CAAC,CASrB;CACF"}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
1
|
import type { SimulationError } from '@aztec/stdlib/errors';
|
|
3
2
|
import { Gas } from '@aztec/stdlib/gas';
|
|
4
3
|
import type { Gas as AvmGas } from './avm_gas.js';
|
|
4
|
+
import type { ReturnData } from './calldata.js';
|
|
5
5
|
import type { AvmRevertReason } from './errors.js';
|
|
6
6
|
/**
|
|
7
7
|
* Results of an contract call's execution in the AVM.
|
|
8
8
|
*/
|
|
9
9
|
export declare class AvmContractCallResult {
|
|
10
10
|
reverted: boolean;
|
|
11
|
-
output:
|
|
11
|
+
output: ReturnData;
|
|
12
12
|
gasLeft: AvmGas;
|
|
13
13
|
revertReason?: AvmRevertReason | undefined;
|
|
14
14
|
totalInstructions: number;
|
|
15
|
-
constructor(reverted: boolean, output:
|
|
15
|
+
constructor(reverted: boolean, output: ReturnData, gasLeft: AvmGas, revertReason?: AvmRevertReason | undefined, totalInstructions?: number);
|
|
16
16
|
toString(): string;
|
|
17
17
|
finalize(): AvmFinalizedCallResult;
|
|
18
18
|
}
|
|
@@ -22,11 +22,11 @@ export declare class AvmContractCallResult {
|
|
|
22
22
|
*/
|
|
23
23
|
export declare class AvmFinalizedCallResult {
|
|
24
24
|
reverted: boolean;
|
|
25
|
-
output:
|
|
25
|
+
output: ReturnData;
|
|
26
26
|
gasLeft: Gas;
|
|
27
27
|
revertReason?: SimulationError | undefined;
|
|
28
28
|
totalInstructions: number;
|
|
29
|
-
constructor(reverted: boolean, output:
|
|
29
|
+
constructor(reverted: boolean, output: ReturnData, gasLeft: Gas, revertReason?: SimulationError | undefined, totalInstructions?: number);
|
|
30
30
|
toString(): string;
|
|
31
31
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2NvbnRyYWN0X2NhbGxfcmVzdWx0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2F2bS9hdm1fY29udHJhY3RfY2FsbF9yZXN1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBS3hDLE9BQU8sS0FBSyxFQUFFLEdBQUcsSUFBSSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVuRDs7R0FFRztBQUNILHFCQUFhLHFCQUFxQjtJQUV2QixRQUFRLEVBQUUsT0FBTztJQUNqQixNQUFNLEVBQUUsVUFBVTtJQUNsQixPQUFPLEVBQUUsTUFBTTtJQUNmLFlBQVksQ0FBQztJQUNiLGlCQUFpQixFQUFFLE1BQU07SUFMbEMsWUFDUyxRQUFRLEVBQUUsT0FBTyxFQUNqQixNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsTUFBTSxFQUNmLFlBQVksQ0FBQyw2QkFBaUIsRUFDOUIsaUJBQWlCLEdBQUUsTUFBVSxFQUNsQztJQUVKLFFBQVEsSUFBSSxNQUFNLENBUWpCO0lBRUQsUUFBUSxJQUFJLHNCQUFzQixDQVdqQztDQUNGO0FBRUQ7OztHQUdHO0FBQ0gscUJBQWEsc0JBQXNCO0lBRXhCLFFBQVEsRUFBRSxPQUFPO0lBQ2pCLE1BQU0sRUFBRSxVQUFVO0lBQ2xCLE9BQU8sRUFBRSxHQUFHO0lBQ1osWUFBWSxDQUFDO0lBQ2IsaUJBQWlCLEVBQUUsTUFBTTtJQUxsQyxZQUNTLFFBQVEsRUFBRSxPQUFPLEVBQ2pCLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxHQUFHLEVBQ1osWUFBWSxDQUFDLDZCQUFpQixFQUM5QixpQkFBaUIsR0FBRSxNQUFVLEVBQ2xDO0lBRUosUUFBUSxJQUFJLE1BQU0sQ0FRakI7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_contract_call_result.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_contract_call_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"avm_contract_call_result.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_contract_call_result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAKxC,OAAO,KAAK,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,qBAAa,qBAAqB;IAEvB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,MAAM;IACf,YAAY,CAAC;IACb,iBAAiB,EAAE,MAAM;IALlC,YACS,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,6BAAiB,EAC9B,iBAAiB,GAAE,MAAU,EAClC;IAEJ,QAAQ,IAAI,MAAM,CAQjB;IAED,QAAQ,IAAI,sBAAsB,CAWjC;CACF;AAED;;;GAGG;AACH,qBAAa,sBAAsB;IAExB,QAAQ,EAAE,OAAO;IACjB,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,GAAG;IACZ,YAAY,CAAC;IACb,iBAAiB,EAAE,MAAM;IALlC,YACS,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,GAAG,EACZ,YAAY,CAAC,6BAAiB,EAC9B,iBAAiB,GAAE,MAAU,EAClC;IAEJ,QAAQ,IAAI,MAAM,CAQjB;CACF"}
|
|
@@ -17,14 +17,14 @@ import { createSimulationError } from '../../common/errors.js';
|
|
|
17
17
|
this.totalInstructions = totalInstructions;
|
|
18
18
|
}
|
|
19
19
|
toString() {
|
|
20
|
-
let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
|
|
20
|
+
let resultsStr = `reverted: ${this.reverted}, output: ${this.output.bestEffortReadAll(10)}${this.output.length() > 10 ? ' ...' : ''}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
|
|
21
21
|
if (this.revertReason) {
|
|
22
22
|
resultsStr += `, revertReason: ${this.revertReason.message}`;
|
|
23
23
|
}
|
|
24
24
|
return resultsStr;
|
|
25
25
|
}
|
|
26
26
|
finalize() {
|
|
27
|
-
const revertReason = this.revertReason ? createSimulationError(this.revertReason, this.output) : undefined;
|
|
27
|
+
const revertReason = this.revertReason ? createSimulationError(this.revertReason, this.output.bestEffortReadAll()) : undefined;
|
|
28
28
|
return new AvmFinalizedCallResult(this.reverted, this.output, Gas.from(this.gasLeft), revertReason, this.totalInstructions);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -45,7 +45,7 @@ import { createSimulationError } from '../../common/errors.js';
|
|
|
45
45
|
this.totalInstructions = totalInstructions;
|
|
46
46
|
}
|
|
47
47
|
toString() {
|
|
48
|
-
let resultsStr = `reverted: ${this.reverted}, output: ${this.output}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
|
|
48
|
+
let resultsStr = `reverted: ${this.reverted}, output: ${this.output.bestEffortReadAll(10)}${this.output.length() > 10 ? ' ...' : ''}, gasLeft: ${inspect(this.gasLeft)}, totalInstructions: ${this.totalInstructions}`;
|
|
49
49
|
if (this.revertReason) {
|
|
50
50
|
resultsStr += `, revertReason: ${this.revertReason.message}`;
|
|
51
51
|
}
|
|
@@ -2,6 +2,7 @@ import { Fr } from '@aztec/foundation/curves/bn254';
|
|
|
2
2
|
import type { PublicSimulatorConfig } from '@aztec/stdlib/avm';
|
|
3
3
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
4
4
|
import type { GlobalVariables } from '@aztec/stdlib/tx';
|
|
5
|
+
import type { CallData } from './calldata.js';
|
|
5
6
|
/**
|
|
6
7
|
* Contains variables that remain constant during AVM execution
|
|
7
8
|
* These variables are provided by the public kernel circuit
|
|
@@ -13,11 +14,11 @@ export declare class AvmExecutionEnvironment {
|
|
|
13
14
|
readonly transactionFee: Fr;
|
|
14
15
|
readonly globals: GlobalVariables;
|
|
15
16
|
readonly isStaticCall: boolean;
|
|
16
|
-
readonly calldata:
|
|
17
|
+
readonly calldata: CallData;
|
|
17
18
|
readonly config: PublicSimulatorConfig;
|
|
18
|
-
constructor(address: AztecAddress, sender: AztecAddress, contractCallDepth: Fr, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata:
|
|
19
|
+
constructor(address: AztecAddress, sender: AztecAddress, contractCallDepth: Fr, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: CallData, config: PublicSimulatorConfig);
|
|
19
20
|
private deriveEnvironmentForNestedCallInternal;
|
|
20
|
-
deriveEnvironmentForNestedCall(targetAddress: AztecAddress, calldata:
|
|
21
|
-
deriveEnvironmentForNestedStaticCall(targetAddress: AztecAddress, calldata:
|
|
21
|
+
deriveEnvironmentForNestedCall(targetAddress: AztecAddress, calldata: CallData): AvmExecutionEnvironment;
|
|
22
|
+
deriveEnvironmentForNestedStaticCall(targetAddress: AztecAddress, calldata: CallData): AvmExecutionEnvironment;
|
|
22
23
|
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX2V4ZWN1dGlvbl9lbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFOUM7OztHQUdHO0FBQ0gscUJBQWEsdUJBQXVCO2FBRWhCLE9BQU8sRUFBRSxZQUFZO2FBQ3JCLE1BQU0sRUFBRSxZQUFZO2FBQ3BCLGlCQUFpQixFQUFFLEVBQUU7YUFDckIsY0FBYyxFQUFFLEVBQUU7YUFDbEIsT0FBTyxFQUFFLGVBQWU7YUFDeEIsWUFBWSxFQUFFLE9BQU87YUFDckIsUUFBUSxFQUFFLFFBQVE7YUFDbEIsTUFBTSxFQUFFLHFCQUFxQjtJQVIvQyxZQUNrQixPQUFPLEVBQUUsWUFBWSxFQUNyQixNQUFNLEVBQUUsWUFBWSxFQUNwQixpQkFBaUIsRUFBRSxFQUFFLEVBQ3JCLGNBQWMsRUFBRSxFQUFFLEVBQ2xCLE9BQU8sRUFBRSxlQUFlLEVBQ3hCLFlBQVksRUFBRSxPQUFPLEVBQ3JCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLE1BQU0sRUFBRSxxQkFBcUIsRUFDM0M7SUFFSixPQUFPLENBQUMsc0NBQXNDO0lBaUJ2Qyw4QkFBOEIsQ0FBQyxhQUFhLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxRQUFRLEdBQUcsdUJBQXVCLENBRTlHO0lBRU0sb0NBQW9DLENBQ3pDLGFBQWEsRUFBRSxZQUFZLEVBQzNCLFFBQVEsRUFBRSxRQUFRLEdBQ2pCLHVCQUF1QixDQUV6QjtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_execution_environment.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_execution_environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;;GAGG;AACH,qBAAa,uBAAuB;aAEhB,OAAO,EAAE,YAAY;aACrB,MAAM,EAAE,YAAY;aACpB,iBAAiB,EAAE,EAAE;aACrB,cAAc,EAAE,EAAE;aAClB,OAAO,EAAE,eAAe;aACxB,YAAY,EAAE,OAAO;aACrB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"avm_execution_environment.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_execution_environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;GAGG;AACH,qBAAa,uBAAuB;aAEhB,OAAO,EAAE,YAAY;aACrB,MAAM,EAAE,YAAY;aACpB,iBAAiB,EAAE,EAAE;aACrB,cAAc,EAAE,EAAE;aAClB,OAAO,EAAE,eAAe;aACxB,YAAY,EAAE,OAAO;aACrB,QAAQ,EAAE,QAAQ;aAClB,MAAM,EAAE,qBAAqB;IAR/C,YACkB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,iBAAiB,EAAE,EAAE,EACrB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,qBAAqB,EAC3C;IAEJ,OAAO,CAAC,sCAAsC;IAiBvC,8BAA8B,CAAC,aAAa,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,GAAG,uBAAuB,CAE9G;IAEM,oCAAoC,CACzC,aAAa,EAAE,YAAY,EAC3B,QAAQ,EAAE,QAAQ,GACjB,uBAAuB,CAEzB;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
2
|
import type { Gas } from './avm_gas.js';
|
|
3
3
|
import { TaggedMemory } from './avm_memory_types.js';
|
|
4
|
+
import { type ReturnData } from './calldata.js';
|
|
4
5
|
import { type AvmRevertReason } from './errors.js';
|
|
5
6
|
/**
|
|
6
7
|
* A few fields of machine state are initialized from AVM session inputs or call instruction arguments
|
|
@@ -34,7 +35,7 @@ export declare class AvmMachineState {
|
|
|
34
35
|
/** program counter of the next instruction, byte based */
|
|
35
36
|
nextPc: number;
|
|
36
37
|
/** return/revertdata of the last nested call. */
|
|
37
|
-
nestedReturndata:
|
|
38
|
+
nestedReturndata: ReturnData;
|
|
38
39
|
/** Tracks whether the last external call was successful */
|
|
39
40
|
nestedCallSuccess: boolean;
|
|
40
41
|
/**
|
|
@@ -78,20 +79,20 @@ export declare class AvmMachineState {
|
|
|
78
79
|
* Output data must NOT be modified once it is set
|
|
79
80
|
* @param output
|
|
80
81
|
*/
|
|
81
|
-
return(output:
|
|
82
|
+
return(output: ReturnData): void;
|
|
82
83
|
/**
|
|
83
84
|
* Halt as reverted
|
|
84
85
|
* Output data must NOT be modified once it is set
|
|
85
86
|
* @param output
|
|
86
87
|
*/
|
|
87
|
-
revert(output:
|
|
88
|
+
revert(output: ReturnData): void;
|
|
88
89
|
getHalted(): boolean;
|
|
89
90
|
getReverted(): boolean;
|
|
90
|
-
getOutput():
|
|
91
|
+
getOutput(): ReturnData;
|
|
91
92
|
/**
|
|
92
93
|
* Flag an exceptional halt. Clears gas left and sets the reverted flag. No output data.
|
|
93
94
|
*/
|
|
94
95
|
private exceptionalHalt;
|
|
95
96
|
}
|
|
96
97
|
export {};
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX21hY2hpbmVfc3RhdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2F2bV9tYWNoaW5lX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssVUFBVSxFQUFtQixNQUFNLGVBQWUsQ0FBQztBQUNqRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQWlCLE1BQU0sYUFBYSxDQUFDO0FBRWxFOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHNCQUFzQixHQUFHO0lBQ25DLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztDQUNuQixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILEtBQUssaUJBQWlCLEdBQUc7SUFDdkIsd0JBQXdCLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDL0IscUJBQXFCLEVBQUUsZUFBZSxDQUFDO0NBQ3hDLENBQUM7QUFFRixLQUFLLGNBQWMsR0FBRztJQUNwQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsUUFBUSxFQUFFLE1BQU0sQ0FBQztDQUNsQixDQUFDO0FBRUY7O0dBRUc7QUFDSCxxQkFBYSxlQUFlO0lBQzFCLDZEQUE2RDtJQUN0RCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDekIsa0NBQWtDO0lBQzNCLEVBQUUsRUFBRSxNQUFNLENBQUs7SUFDdEIsMERBQTBEO0lBQ25ELE1BQU0sRUFBRSxNQUFNLENBQUs7SUFDMUIsaURBQWlEO0lBQzFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBMkI7SUFDOUQsMkRBQTJEO0lBQ3BELGlCQUFpQixFQUFFLE9BQU8sQ0FBUztJQUMxQzs7OztPQUlHO0lBQ0ksbUJBQW1CLEVBQUUsaUJBQWlCLEdBQUcsU0FBUyxDQUFDO0lBRTFEOzs7T0FHRztJQUNJLGlCQUFpQixFQUFFLGNBQWMsRUFBRSxDQUFNO0lBRWhELHFDQUFxQztJQUNyQyxTQUFnQixNQUFNLEVBQUUsWUFBWSxDQUFzQjtJQUUxRDs7O09BR0c7SUFDSCxPQUFPLENBQUMsTUFBTSxDQUFrQjtJQUNoQywyRkFBMkY7SUFDM0YsT0FBTyxDQUFDLFFBQVEsQ0FBa0I7SUFDbEMsc0RBQXNEO0lBQ3RELE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBR3JELGtEQUFrRDtJQUMzQyxZQUFZLEVBQUUsTUFBTSxDQUFLO0lBR2hDLFlBQVksT0FBTyxFQUFFLEdBQUcsRUFBRTtJQUMxQixZQUFZLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRTtJQVVsRCxJQUFXLE9BQU8sSUFBSSxHQUFHLENBRXhCO0lBRUQsT0FBYyxTQUFTLENBQUMsS0FBSyxFQUFFLHNCQUFzQixHQUFHLGVBQWUsQ0FFdEU7SUFFRDs7OztPQUlHO0lBQ0ksVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBbUJ0QztJQUVELHVEQUF1RDtJQUNoRCxTQUFTLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFHdkM7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLE1BQU0sRUFBRSxVQUFVLFFBRy9CO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsVUFBVSxRQUkvQjtJQUVNLFNBQVMsSUFBSSxPQUFPLENBRTFCO0lBRU0sV0FBVyxJQUFJLE9BQU8sQ0FFNUI7SUFFTSxTQUFTLElBQUksVUFBVSxDQUU3QjtJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGVBQWU7Q0FNeEIifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_machine_state.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_machine_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,aAAa,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,KAAK,iBAAiB,GAAG;IACvB,wBAAwB,EAAE,EAAE,EAAE,CAAC;IAC/B,qBAAqB,EAAE,eAAe,CAAC;CACxC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAe;IAC1B,6DAA6D;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IACzB,kCAAkC;IAC3B,EAAE,EAAE,MAAM,CAAK;IACtB,0DAA0D;IACnD,MAAM,EAAE,MAAM,CAAK;IAC1B,iDAAiD;IAC1C,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"avm_machine_state.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_machine_state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,aAAa,CAAC;AAElE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,KAAK,iBAAiB,GAAG;IACvB,wBAAwB,EAAE,EAAE,EAAE,CAAC;IAC/B,qBAAqB,EAAE,eAAe,CAAC;CACxC,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAe;IAC1B,6DAA6D;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IACzB,kCAAkC;IAC3B,EAAE,EAAE,MAAM,CAAK;IACtB,0DAA0D;IACnD,MAAM,EAAE,MAAM,CAAK;IAC1B,iDAAiD;IAC1C,gBAAgB,EAAE,UAAU,CAA2B;IAC9D,2DAA2D;IACpD,iBAAiB,EAAE,OAAO,CAAS;IAC1C;;;;OAIG;IACI,mBAAmB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAE1D;;;OAGG;IACI,iBAAiB,EAAE,cAAc,EAAE,CAAM;IAEhD,qCAAqC;IACrC,SAAgB,MAAM,EAAE,YAAY,CAAsB;IAE1D;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAkB;IAChC,2FAA2F;IAC3F,OAAO,CAAC,QAAQ,CAAkB;IAClC,sDAAsD;IACtD,OAAO,CAAC,MAAM,CAAuC;IAGrD,kDAAkD;IAC3C,YAAY,EAAE,MAAM,CAAK;IAGhC,YAAY,OAAO,EAAE,GAAG,EAAE;IAC1B,YAAY,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE;IAUlD,IAAW,OAAO,IAAI,GAAG,CAExB;IAED,OAAc,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,eAAe,CAEtE;IAED;;;;OAIG;IACI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAmBtC;IAED,uDAAuD;IAChD,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,QAGvC;IAED;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,UAAU,QAG/B;IAED;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,UAAU,QAI/B;IAEM,SAAS,IAAI,OAAO,CAE1B;IAEM,WAAW,IAAI,OAAO,CAE5B;IAEM,SAAS,IAAI,UAAU,CAE7B;IAED;;OAEG;IACH,OAAO,CAAC,eAAe;CAMxB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { TaggedMemory } from './avm_memory_types.js';
|
|
2
|
+
import { ReturnDataArray } from './calldata.js';
|
|
2
3
|
import { OutOfGasError } from './errors.js';
|
|
3
4
|
/**
|
|
4
5
|
* Avm state modified on an instruction-per-instruction basis.
|
|
@@ -7,7 +8,7 @@ import { OutOfGasError } from './errors.js';
|
|
|
7
8
|
daGasLeft;
|
|
8
9
|
/** program counter, byte based */ pc = 0;
|
|
9
10
|
/** program counter of the next instruction, byte based */ nextPc = 0;
|
|
10
|
-
/** return/revertdata of the last nested call. */ nestedReturndata = [];
|
|
11
|
+
/** return/revertdata of the last nested call. */ nestedReturndata = new ReturnDataArray([]);
|
|
11
12
|
/** Tracks whether the last external call was successful */ nestedCallSuccess = false;
|
|
12
13
|
/**
|
|
13
14
|
* Used to track the call stack and revert data of nested calls.
|
|
@@ -24,7 +25,7 @@ import { OutOfGasError } from './errors.js';
|
|
|
24
25
|
* AvmContext execution continues executing instructions until the machine state signals "halted"
|
|
25
26
|
*/ halted = false;
|
|
26
27
|
/** Signals that execution has reverted normally (this does not cover exceptional halts) */ reverted = false;
|
|
27
|
-
/** Output data must NOT be modified once it is set */ output = [];
|
|
28
|
+
/** Output data must NOT be modified once it is set */ output = new ReturnDataArray([]);
|
|
28
29
|
// Metrics only - not needed for execution
|
|
29
30
|
/** instruction counter, including nested calls */ instrCounter = 0;
|
|
30
31
|
constructor(gasLeftOrL2GasLeft, daGasLeft){
|
|
@@ -7,6 +7,7 @@ import { AvmContext } from './avm_context.js';
|
|
|
7
7
|
import { AvmContractCallResult } from './avm_contract_call_result.js';
|
|
8
8
|
import type { Gas } from './avm_gas.js';
|
|
9
9
|
import type { AvmSimulatorInterface } from './avm_simulator_interface.js';
|
|
10
|
+
import { type CallData } from './calldata.js';
|
|
10
11
|
import { type InstructionSet } from './serialization/bytecode_serialization.js';
|
|
11
12
|
export declare class AvmSimulator implements AvmSimulatorInterface {
|
|
12
13
|
private context;
|
|
@@ -19,7 +20,7 @@ export declare class AvmSimulator implements AvmSimulatorInterface {
|
|
|
19
20
|
private tallyInstructionFunction;
|
|
20
21
|
constructor(context: AvmContext, instructionSet?: InstructionSet, enableTallying?: boolean);
|
|
21
22
|
static build(context: AvmContext): Promise<AvmSimulator>;
|
|
22
|
-
static create(stateManager: PublicPersistableStateManager, address: AztecAddress, sender: AztecAddress, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata:
|
|
23
|
+
static create(stateManager: PublicPersistableStateManager, address: AztecAddress, sender: AztecAddress, transactionFee: Fr, globals: GlobalVariables, isStaticCall: boolean, calldata: CallData, allocatedGas: Gas, config: PublicSimulatorConfig): Promise<AvmSimulator>;
|
|
23
24
|
/**
|
|
24
25
|
* Fetch the bytecode and execute it in the current context.
|
|
25
26
|
*/
|
|
@@ -37,4 +38,4 @@ export declare class AvmSimulator implements AvmSimulatorInterface {
|
|
|
37
38
|
private tallyInstruction;
|
|
38
39
|
private printOpcodeTallies;
|
|
39
40
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vYXZtX3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUt4RCxPQUFPLEtBQUssRUFBRSw2QkFBNkIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUV0RSxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFeEMsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUMxRSxPQUFPLEVBQUUsS0FBSyxRQUFRLEVBQW1CLE1BQU0sZUFBZSxDQUFDO0FBSS9ELE9BQU8sRUFFTCxLQUFLLGNBQWMsRUFFcEIsTUFBTSwyQ0FBMkMsQ0FBQztBQU9uRCxxQkFBYSxZQUFhLFlBQVcscUJBQXFCO0lBYXRELE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLGNBQWM7SUFieEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUNwQixPQUFPLENBQUMsUUFBUSxDQUFxQjtJQUNyQyxPQUFPLENBQUMsYUFBYSxDQUF1QztJQUU1RCxPQUFPLENBQUMsNkJBQTZCLENBQWlEO0lBRXRGLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBWTtJQUN0QyxPQUFPLENBQUMsd0JBQXdCLENBQStCO0lBSS9ELFlBQ1UsT0FBTyxFQUFFLFVBQVUsRUFDbkIsY0FBYyxHQUFFLGNBQWdDLEVBQ3hELGNBQWMsVUFBUSxFQVd2QjtJQUlELE9BQW9CLEtBQUssQ0FBQyxPQUFPLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FNcEU7SUFFRCxPQUFvQixNQUFNLENBQ3hCLFlBQVksRUFBRSw2QkFBNkIsRUFDM0MsT0FBTyxFQUFFLFlBQVksRUFDckIsTUFBTSxFQUFFLFlBQVksRUFDcEIsY0FBYyxFQUFFLEVBQUUsRUFDbEIsT0FBTyxFQUFFLGVBQWUsRUFDeEIsWUFBWSxFQUFFLE9BQU8sRUFDckIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsWUFBWSxFQUFFLEdBQUcsRUFDakIsTUFBTSxFQUFFLHFCQUFxQix5QkFnQjlCO0lBRUQ7O09BRUc7SUFDVSxPQUFPLElBQUksT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBWXJEO0lBRUQ7O09BRUc7SUFDSSxXQUFXLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FFdkM7SUFFRDs7O09BR0c7SUFDVSxlQUFlLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0ErRzdFO1lBRWEsK0JBQStCO0lBdUI3QyxPQUFPLENBQUMsZ0JBQWdCO0lBUXhCLE9BQU8sQ0FBQyxrQkFBa0I7Q0FTM0IifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../../src/public/avm/avm_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKxD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,KAAK,QAAQ,EAAmB,MAAM,eAAe,CAAC;AAI/D,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2CAA2C,CAAC;AAOnD,qBAAa,YAAa,YAAW,qBAAqB;IAatD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IAbxB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,aAAa,CAAuC;IAE5D,OAAO,CAAC,6BAA6B,CAAiD;IAEtF,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,wBAAwB,CAA+B;IAI/D,YACU,OAAO,EAAE,UAAU,EACnB,cAAc,GAAE,cAAgC,EACxD,cAAc,UAAQ,EAWvB;IAID,OAAoB,KAAK,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAMpE;IAED,OAAoB,MAAM,CACxB,YAAY,EAAE,6BAA6B,EAC3C,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,YAAY,EACpB,cAAc,EAAE,EAAE,EAClB,OAAO,EAAE,eAAe,EACxB,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,EACjB,MAAM,EAAE,qBAAqB,yBAgB9B;IAED;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAYrD;IAED;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEvC;IAED;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA+G7E;YAEa,+BAA+B;IAuB7C,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,kBAAkB;CAS3B"}
|
|
@@ -7,6 +7,7 @@ import { AvmContext } from './avm_context.js';
|
|
|
7
7
|
import { AvmContractCallResult } from './avm_contract_call_result.js';
|
|
8
8
|
import { AvmExecutionEnvironment } from './avm_execution_environment.js';
|
|
9
9
|
import { AvmMachineState } from './avm_machine_state.js';
|
|
10
|
+
import { ReturnDataArray } from './calldata.js';
|
|
10
11
|
import { AvmRevertReason, InvalidProgramCounterError } from './errors.js';
|
|
11
12
|
import { revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert } from './revert_reason.js';
|
|
12
13
|
import { INSTRUCTION_SET, decodeInstructionFromBytecode } from './serialization/bytecode_serialization.js';
|
|
@@ -32,7 +33,7 @@ export class AvmSimulator {
|
|
|
32
33
|
// This will be used by the CALL opcode to create a new simulator. It is required to
|
|
33
34
|
// avoid a dependency cycle.
|
|
34
35
|
context.provideSimulator = AvmSimulator.build;
|
|
35
|
-
this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata
|
|
36
|
+
this.log = createLogger(`simulator:avm(calldata[0]: ${context.environment.calldata.read(0)})`);
|
|
36
37
|
// Turn on tallying if explicitly enabled or if trace logging
|
|
37
38
|
if (enableTallying || this.log.isLevelEnabled('trace')) {
|
|
38
39
|
this.tallyPrintFunction = this.printOpcodeTallies;
|
|
@@ -119,7 +120,7 @@ export class AvmSimulator {
|
|
|
119
120
|
}
|
|
120
121
|
const output = machineState.getOutput();
|
|
121
122
|
const reverted = machineState.getReverted();
|
|
122
|
-
const revertReason = reverted ? await revertReasonFromExplicitRevert(output, this.context) : undefined;
|
|
123
|
+
const revertReason = reverted ? await revertReasonFromExplicitRevert(output.bestEffortReadAll(), this.context) : undefined;
|
|
123
124
|
const results = new AvmContractCallResult(reverted, output, machineState.gasLeft, revertReason, machineState.instrCounter);
|
|
124
125
|
this.log.debug(`Context execution results: ${results.toString()}`);
|
|
125
126
|
const totalGasUsed = {
|
|
@@ -145,7 +146,7 @@ export class AvmSimulator {
|
|
|
145
146
|
daGas: 0
|
|
146
147
|
};
|
|
147
148
|
// Note: "exceptional halts" cannot return data, hence [].
|
|
148
|
-
const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], noGasLeft, revertReason, machineState.instrCounter);
|
|
149
|
+
const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ new ReturnDataArray([]), noGasLeft, revertReason, machineState.instrCounter);
|
|
149
150
|
this.log.debug(`Context execution results: ${results.toString()}`);
|
|
150
151
|
this.tallyPrintFunction();
|
|
151
152
|
// Return results for processing by calling context
|
|
@@ -161,7 +162,7 @@ export class AvmSimulator {
|
|
|
161
162
|
functionName
|
|
162
163
|
}, /*noirCallStack=*/ []);
|
|
163
164
|
this.log.warn(message);
|
|
164
|
-
return new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], /*gasLeft=*/ {
|
|
165
|
+
return new AvmContractCallResult(/*reverted=*/ true, /*output=*/ new ReturnDataArray([]), /*gasLeft=*/ {
|
|
165
166
|
l2Gas: 0,
|
|
166
167
|
daGas: 0
|
|
167
168
|
}, revertReason);
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import type { Fr } from '@aztec/foundation/schemas';
|
|
2
|
+
import { TaggedMemory } from './avm_memory_types.js';
|
|
3
|
+
export interface LazyReader {
|
|
4
|
+
bestEffortReadAll(readCap?: number): Fr[];
|
|
5
|
+
readAll(): Fr[];
|
|
6
|
+
read(idx: number): Fr | undefined;
|
|
7
|
+
slice(start: number, end: number): Fr[];
|
|
8
|
+
length(): number;
|
|
9
|
+
}
|
|
10
|
+
export declare class LazyReaderMemory implements LazyReader {
|
|
11
|
+
private memory;
|
|
12
|
+
private offset;
|
|
13
|
+
private size;
|
|
14
|
+
constructor(memory: TaggedMemory, offset: number, size: number);
|
|
15
|
+
bestEffortReadAll(readCap?: number): Fr[];
|
|
16
|
+
read(idx: number): Fr | undefined;
|
|
17
|
+
slice(start: number, end: number): Fr[];
|
|
18
|
+
readAll(): Fr[];
|
|
19
|
+
length(): number;
|
|
20
|
+
}
|
|
21
|
+
export declare class LazyReaderArray implements LazyReader {
|
|
22
|
+
private array;
|
|
23
|
+
constructor(array: Fr[]);
|
|
24
|
+
bestEffortReadAll(readCap?: number): Fr[];
|
|
25
|
+
read(idx: number): Fr | undefined;
|
|
26
|
+
slice(start: number, end: number): Fr[];
|
|
27
|
+
readAll(): Fr[];
|
|
28
|
+
length(): number;
|
|
29
|
+
}
|
|
30
|
+
declare const CallDataBrand: unique symbol;
|
|
31
|
+
declare const ReturnDataBrand: unique symbol;
|
|
32
|
+
export type CallData = LazyReader & {
|
|
33
|
+
readonly [CallDataBrand]: true;
|
|
34
|
+
};
|
|
35
|
+
export type ReturnData = LazyReader & {
|
|
36
|
+
readonly [ReturnDataBrand]: true;
|
|
37
|
+
};
|
|
38
|
+
export declare class CallDataArray extends LazyReaderArray implements CallData {
|
|
39
|
+
readonly [CallDataBrand]: true;
|
|
40
|
+
}
|
|
41
|
+
export declare class CallDataMemory extends LazyReaderMemory implements CallData {
|
|
42
|
+
readonly [CallDataBrand]: true;
|
|
43
|
+
}
|
|
44
|
+
export declare class ReturnDataArray extends LazyReaderArray implements ReturnData {
|
|
45
|
+
readonly [ReturnDataBrand]: true;
|
|
46
|
+
}
|
|
47
|
+
export declare class ReturnDataMemory extends LazyReaderMemory implements ReturnData {
|
|
48
|
+
readonly [ReturnDataBrand]: true;
|
|
49
|
+
}
|
|
50
|
+
export {};
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsbGRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wdWJsaWMvYXZtL2NhbGxkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUtyRCxNQUFNLFdBQVcsVUFBVTtJQUN6QixpQkFBaUIsQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLENBQUM7SUFDMUMsT0FBTyxJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLElBQUksQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsR0FBRyxTQUFTLENBQUM7SUFDbEMsS0FBSyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sR0FBRyxFQUFFLEVBQUUsQ0FBQztJQUN4QyxNQUFNLElBQUksTUFBTSxDQUFDO0NBQ2xCO0FBRUQscUJBQWEsZ0JBQWlCLFlBQVcsVUFBVTtJQUUvQyxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLElBQUk7SUFIZCxZQUNVLE1BQU0sRUFBRSxZQUFZLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLE1BQU0sRUFDbEI7SUFFRyxpQkFBaUIsQ0FBQyxPQUFPLFNBQStCLEdBQUcsRUFBRSxFQUFFLENBR3JFO0lBRU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FLdkM7SUFFTSxLQUFLLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsRUFBRSxDQUk3QztJQUVNLE9BQU8sSUFBSSxFQUFFLEVBQUUsQ0FFckI7SUFFTSxNQUFNLElBQUksTUFBTSxDQUV0QjtDQUNGO0FBRUQscUJBQWEsZUFBZ0IsWUFBVyxVQUFVO0lBQ3BDLE9BQU8sQ0FBQyxLQUFLO0lBQXpCLFlBQW9CLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBSTtJQUU1QixpQkFBaUIsQ0FBQyxPQUFPLFNBQStCLEdBQUcsRUFBRSxFQUFFLENBRXJFO0lBRU0sSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FFdkM7SUFFTSxLQUFLLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxHQUFHLEVBQUUsRUFBRSxDQUU3QztJQUVNLE9BQU8sSUFBSSxFQUFFLEVBQUUsQ0FFckI7SUFFTSxNQUFNLElBQUksTUFBTSxDQUV0QjtDQUNGO0FBR0QsT0FBTyxDQUFDLE1BQU0sYUFBYSxFQUFFLE9BQU8sTUFBTSxDQUFDO0FBQzNDLE9BQU8sQ0FBQyxNQUFNLGVBQWUsRUFBRSxPQUFPLE1BQU0sQ0FBQztBQUU3QyxNQUFNLE1BQU0sUUFBUSxHQUFHLFVBQVUsR0FBRztJQUNsQyxRQUFRLENBQUMsQ0FBQyxhQUFhLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDaEMsQ0FBQztBQUVGLE1BQU0sTUFBTSxVQUFVLEdBQUcsVUFBVSxHQUFHO0lBQ3BDLFFBQVEsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxFQUFFLElBQUksQ0FBQztDQUNsQyxDQUFDO0FBRUYscUJBQWEsYUFBYyxTQUFRLGVBQWdCLFlBQVcsUUFBUTtJQUNwRSxTQUFpQixDQUFDLGFBQWEsQ0FBQyxFQUFFLElBQUksQ0FBQztDQUN4QztBQUVELHFCQUFhLGNBQWUsU0FBUSxnQkFBaUIsWUFBVyxRQUFRO0lBQ3RFLFNBQWlCLENBQUMsYUFBYSxDQUFDLEVBQUUsSUFBSSxDQUFDO0NBQ3hDO0FBRUQscUJBQWEsZUFBZ0IsU0FBUSxlQUFnQixZQUFXLFVBQVU7SUFDeEUsU0FBaUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDMUM7QUFFRCxxQkFBYSxnQkFBaUIsU0FBUSxnQkFBaUIsWUFBVyxVQUFVO0lBQzFFLFNBQWlCLENBQUMsZUFBZSxDQUFDLEVBQUUsSUFBSSxDQUFDO0NBQzFDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"calldata.d.ts","sourceRoot":"","sources":["../../../src/public/avm/calldata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKrD,MAAM,WAAW,UAAU;IACzB,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,CAAC;IAC1C,OAAO,IAAI,EAAE,EAAE,CAAC;IAChB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS,CAAC;IAClC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,CAAC;IACxC,MAAM,IAAI,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAiB,YAAW,UAAU;IAE/C,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IAHd,YACU,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAClB;IAEG,iBAAiB,CAAC,OAAO,SAA+B,GAAG,EAAE,EAAE,CAGrE;IAEM,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS,CAKvC;IAEM,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,CAI7C;IAEM,OAAO,IAAI,EAAE,EAAE,CAErB;IAEM,MAAM,IAAI,MAAM,CAEtB;CACF;AAED,qBAAa,eAAgB,YAAW,UAAU;IACpC,OAAO,CAAC,KAAK;IAAzB,YAAoB,KAAK,EAAE,EAAE,EAAE,EAAI;IAE5B,iBAAiB,CAAC,OAAO,SAA+B,GAAG,EAAE,EAAE,CAErE;IAEM,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS,CAEvC;IAEM,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,CAE7C;IAEM,OAAO,IAAI,EAAE,EAAE,CAErB;IAEM,MAAM,IAAI,MAAM,CAEtB;CACF;AAGD,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAE7C,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG;IAClC,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG;IACpC,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CAClC,CAAC;AAEF,qBAAa,aAAc,SAAQ,eAAgB,YAAW,QAAQ;IACpE,SAAiB,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CACxC;AAED,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,QAAQ;IACtE,SAAiB,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CACxC;AAED,qBAAa,eAAgB,SAAQ,eAAgB,YAAW,UAAU;IACxE,SAAiB,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CAC1C;AAED,qBAAa,gBAAiB,SAAQ,gBAAiB,YAAW,UAAU;IAC1E,SAAiB,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CAC1C"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { TaggedMemory } from './avm_memory_types.js';
|
|
2
|
+
// Allow reading up to 300 kB of return data when unspecified.
|
|
3
|
+
const DEFAULT_BEST_EFFORT_READ_CAP = 10000;
|
|
4
|
+
export class LazyReaderMemory {
|
|
5
|
+
memory;
|
|
6
|
+
offset;
|
|
7
|
+
size;
|
|
8
|
+
constructor(memory, offset, size){
|
|
9
|
+
this.memory = memory;
|
|
10
|
+
this.offset = offset;
|
|
11
|
+
this.size = size;
|
|
12
|
+
}
|
|
13
|
+
bestEffortReadAll(readCap = DEFAULT_BEST_EFFORT_READ_CAP) {
|
|
14
|
+
const size = Math.min(this.size, readCap, TaggedMemory.MAX_MEMORY_SIZE - this.offset);
|
|
15
|
+
return this.memory.getSlice(this.offset, size).map((word)=>word.toFr());
|
|
16
|
+
}
|
|
17
|
+
read(idx) {
|
|
18
|
+
if (idx >= this.size) {
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
return this.memory.get(this.offset + idx).toFr();
|
|
22
|
+
}
|
|
23
|
+
slice(start, end) {
|
|
24
|
+
const clampedEnd = Math.min(end, this.size);
|
|
25
|
+
const length = Math.max(0, clampedEnd - start);
|
|
26
|
+
return this.memory.getSlice(this.offset + start, length).map((word)=>word.toFr());
|
|
27
|
+
}
|
|
28
|
+
readAll() {
|
|
29
|
+
return this.memory.getSlice(this.offset, this.size).map((word)=>word.toFr());
|
|
30
|
+
}
|
|
31
|
+
length() {
|
|
32
|
+
return this.size;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
export class LazyReaderArray {
|
|
36
|
+
array;
|
|
37
|
+
constructor(array){
|
|
38
|
+
this.array = array;
|
|
39
|
+
}
|
|
40
|
+
bestEffortReadAll(readCap = DEFAULT_BEST_EFFORT_READ_CAP) {
|
|
41
|
+
return this.array.slice(0, readCap);
|
|
42
|
+
}
|
|
43
|
+
read(idx) {
|
|
44
|
+
return this.array[idx];
|
|
45
|
+
}
|
|
46
|
+
slice(start, end) {
|
|
47
|
+
return this.array.slice(start, end);
|
|
48
|
+
}
|
|
49
|
+
readAll() {
|
|
50
|
+
return this.array;
|
|
51
|
+
}
|
|
52
|
+
length() {
|
|
53
|
+
return this.array.length;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
export class CallDataArray extends LazyReaderArray {
|
|
57
|
+
}
|
|
58
|
+
export class CallDataMemory extends LazyReaderMemory {
|
|
59
|
+
}
|
|
60
|
+
export class ReturnDataArray extends LazyReaderArray {
|
|
61
|
+
}
|
|
62
|
+
export class ReturnDataMemory extends LazyReaderMemory {
|
|
63
|
+
}
|
|
@@ -19,4 +19,4 @@ export declare class AvmSimulationTester extends BaseAvmSimulationTester {
|
|
|
19
19
|
*/
|
|
20
20
|
simulateCall(sender: AztecAddress, address: AztecAddress, fnName: string, args: any[], isStaticCall?: boolean): Promise<AvmContractCallResult>;
|
|
21
21
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRpb25fdGVzdGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHVibGljL2F2bS9maXh0dXJlcy9hdm1fc2ltdWxhdGlvbl90ZXN0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUc3RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ25GLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBRXpGLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBR3JGLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBVzFFOzs7O0dBSUc7QUFDSCxxQkFBYSxtQkFBb0IsU0FBUSx1QkFBdUI7SUFJNUQsT0FBTyxDQUFDLFlBQVk7SUFIdEIsWUFDRSxrQkFBa0IsRUFBRSx3QkFBd0IsRUFDNUMsV0FBVyxFQUFFLHlCQUF5QixFQUM5QixZQUFZLEVBQUUsNkJBQTZCLEVBR3BEO0lBRUQsT0FBYSxNQUFNLENBQ2pCLGlCQUFpQixFQUFFLHVCQUF1QixHQUN6QyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FnQjlCO0lBRUQ7O09BRUc7SUFDRyxZQUFZLENBQ2hCLE1BQU0sRUFBRSxZQUFZLEVBQ3BCLE9BQU8sRUFBRSxZQUFZLEVBQ3JCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLFlBQVksVUFBUSxHQUNuQixPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FrRGhDO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_simulation_tester.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/fixtures/avm_simulation_tester.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAEzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"avm_simulation_tester.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/fixtures/avm_simulation_tester.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAEzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAGrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAW1E;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,uBAAuB;IAI5D,OAAO,CAAC,YAAY;IAHtB,YACE,kBAAkB,EAAE,wBAAwB,EAC5C,WAAW,EAAE,yBAAyB,EAC9B,YAAY,EAAE,6BAA6B,EAGpD;IAED,OAAa,MAAM,CACjB,iBAAiB,EAAE,uBAAuB,GACzC,OAAO,CAAC,mBAAmB,CAAC,CAgB9B;IAED;;OAEG;IACG,YAAY,CAChB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,EAAE,EACX,YAAY,UAAQ,GACnB,OAAO,CAAC,qBAAqB,CAAC,CAkDhC;CACF"}
|
|
@@ -8,6 +8,7 @@ import { SimpleContractDataSource } from '../../fixtures/simple_contract_data_so
|
|
|
8
8
|
import { PublicContractsDB, PublicTreesDB } from '../../public_db_sources.js';
|
|
9
9
|
import { PublicPersistableStateManager } from '../../state_manager/state_manager.js';
|
|
10
10
|
import { AvmSimulator } from '../avm_simulator.js';
|
|
11
|
+
import { CallDataArray } from '../calldata.js';
|
|
11
12
|
import { BaseAvmSimulationTester } from './base_avm_simulation_tester.js';
|
|
12
13
|
import { initContext, initExecutionEnvironment } from './initializers.js';
|
|
13
14
|
import { DEFAULT_TIMESTAMP, getContractFunctionAbi, getFunctionSelector, resolveContractAssertionMessage } from './utils.js';
|
|
@@ -56,7 +57,7 @@ const DEFAULT_GAS_FEES = new GasFees(2, 3);
|
|
|
56
57
|
collectCallMetadata: true
|
|
57
58
|
});
|
|
58
59
|
const environment = initExecutionEnvironment({
|
|
59
|
-
calldata,
|
|
60
|
+
calldata: new CallDataArray(calldata),
|
|
60
61
|
globals,
|
|
61
62
|
address,
|
|
62
63
|
sender,
|
|
@@ -73,7 +74,7 @@ const DEFAULT_GAS_FEES = new GasFees(2, 3);
|
|
|
73
74
|
const result = await simulator.execute();
|
|
74
75
|
if (result.reverted) {
|
|
75
76
|
this.logger.error(`Error in ${fnName}:`);
|
|
76
|
-
this.logger.error(resolveContractAssertionMessage(fnName, result.revertReason, result.output, contractArtifact));
|
|
77
|
+
this.logger.error(resolveContractAssertionMessage(fnName, result.revertReason, result.output.bestEffortReadAll(), contractArtifact));
|
|
77
78
|
} else {
|
|
78
79
|
this.logger.info(`Simulation of function ${fnName} succeeded!`);
|
|
79
80
|
await this.stateManager.merge(persistableState);
|
|
@@ -39,4 +39,4 @@ export declare function initGlobalVariables(overrides?: Partial<GlobalVariables>
|
|
|
39
39
|
* Create an empty instance of the Machine State where all values are set to a large enough amount, unless overridden in the overrides object
|
|
40
40
|
*/
|
|
41
41
|
export declare function initMachineState(overrides?: Partial<AvmMachineState>): AvmMachineState;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdGlhbGl6ZXJzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcHVibGljL2F2bS9maXh0dXJlcy9pbml0aWFsaXplcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBS3BELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUlsRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNuRixPQUFPLEtBQUssRUFBRSw4QkFBOEIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQzNGLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNyRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDL0MsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDMUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSzFEOztHQUVHO0FBQ0gsd0JBQWdCLFdBQVcsQ0FBQyxTQUFTLENBQUMsRUFBRTtJQUN0QyxnQkFBZ0IsQ0FBQyxFQUFFLDZCQUE2QixDQUFDO0lBQ2pELEdBQUcsQ0FBQyxFQUFFLHVCQUF1QixDQUFDO0lBQzlCLFlBQVksQ0FBQyxFQUFFLGVBQWUsQ0FBQztDQUNoQyxHQUFHLFVBQVUsQ0FRYjtBQUVELCtEQUErRDtBQUMvRCx3QkFBZ0IsMkJBQTJCLENBQUMsU0FBUyxDQUFDLEVBQUU7SUFDdEQsT0FBTyxDQUFDLEVBQUUsYUFBYSxDQUFDO0lBQ3hCLFdBQVcsQ0FBQyxFQUFFLGlCQUFpQixDQUFDO0lBQ2hDLEtBQUssQ0FBQyxFQUFFLDhCQUE4QixDQUFDO0lBQ3ZDLGFBQWEsQ0FBQyxFQUFFLGFBQWEsQ0FBQztJQUM5QixVQUFVLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztJQUM5QixjQUFjLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDcEIsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3BCLEdBQUcsNkJBQTZCLENBVWhDO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0Isd0JBQXdCLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxDQUFDLHVCQUF1QixDQUFDLEdBQUcsdUJBQXVCLENBVzlHO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0IsbUJBQW1CLENBQUMsU0FBUyxDQUFDLEVBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHLGVBQWUsQ0FXekY7QUFFRDs7R0FFRztBQUNILHdCQUFnQixnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsRUFBRSxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUcsZUFBZSxDQUt0RiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializers.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/fixtures/initializers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAKpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACnF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"initializers.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/fixtures/initializers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAKpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACnF,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK1D;;GAEG;AACH,wBAAgB,WAAW,CAAC,SAAS,CAAC,EAAE;IACtC,gBAAgB,CAAC,EAAE,6BAA6B,CAAC;IACjD,GAAG,CAAC,EAAE,uBAAuB,CAAC;IAC9B,YAAY,CAAC,EAAE,eAAe,CAAC;CAChC,GAAG,UAAU,CAQb;AAED,+DAA+D;AAC/D,wBAAgB,2BAA2B,CAAC,SAAS,CAAC,EAAE;IACtD,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,KAAK,CAAC,EAAE,8BAA8B,CAAC;IACvC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,cAAc,CAAC,EAAE,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,6BAA6B,CAUhC;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,uBAAuB,CAW9G;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAWzF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAKtF"}
|
|
@@ -12,6 +12,7 @@ import { AvmContext } from '../avm_context.js';
|
|
|
12
12
|
import { AvmExecutionEnvironment } from '../avm_execution_environment.js';
|
|
13
13
|
import { AvmMachineState } from '../avm_machine_state.js';
|
|
14
14
|
import { AvmSimulator } from '../avm_simulator.js';
|
|
15
|
+
import { CallDataArray } from '../calldata.js';
|
|
15
16
|
import { DEFAULT_TIMESTAMP } from './utils.js';
|
|
16
17
|
/**
|
|
17
18
|
* Create a new AVM context with default values.
|
|
@@ -27,7 +28,7 @@ import { DEFAULT_TIMESTAMP } from './utils.js';
|
|
|
27
28
|
/**
|
|
28
29
|
* Create an empty instance of the Execution Environment where all values are zero, unless overridden in the overrides object
|
|
29
30
|
*/ export function initExecutionEnvironment(overrides) {
|
|
30
|
-
return new AvmExecutionEnvironment(overrides?.address ?? AztecAddress.zero(), overrides?.sender ?? AztecAddress.zero(), overrides?.contractCallDepth ?? Fr.zero(), overrides?.transactionFee ?? Fr.zero(), overrides?.globals ?? GlobalVariables.empty(), overrides?.isStaticCall ?? false, overrides?.calldata ?? [], overrides?.config ?? PublicSimulatorConfig.empty());
|
|
31
|
+
return new AvmExecutionEnvironment(overrides?.address ?? AztecAddress.zero(), overrides?.sender ?? AztecAddress.zero(), overrides?.contractCallDepth ?? Fr.zero(), overrides?.transactionFee ?? Fr.zero(), overrides?.globals ?? GlobalVariables.empty(), overrides?.isStaticCall ?? false, overrides?.calldata ?? new CallDataArray([]), overrides?.config ?? PublicSimulatorConfig.empty());
|
|
31
32
|
}
|
|
32
33
|
/**
|
|
33
34
|
* Create an empty instance of the Execution Environment where all values are zero, unless overridden in the overrides object
|
|
@@ -72,4 +72,4 @@ export declare class SendL2ToL1Message extends Instruction {
|
|
|
72
72
|
constructor(addressingMode: number, recipientOffset: number, contentOffset: number);
|
|
73
73
|
execute(context: AvmContext): Promise<void>;
|
|
74
74
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjcnVlZF9zdWJzdGF0ZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3B1YmxpYy9hdm0vb3Bjb2Rlcy9hY2NydWVkX3N1YnN0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBR3BELE9BQU8sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFFcEYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHFCQUFhLGNBQWUsU0FBUSxXQUFXO0lBYTNDLE9BQU8sQ0FBQyxjQUFjO0lBQ3RCLE9BQU8sQ0FBQyxjQUFjO0lBQ3RCLE9BQU8sQ0FBQyxlQUFlO0lBQ3ZCLE9BQU8sQ0FBQyxZQUFZO0lBZnRCLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFvQjtJQUN2QyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQXlCO0lBRXZELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxnQkFNeEI7SUFFRixZQUNVLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLFlBQVksRUFBRSxNQUFNLEVBRzdCO0lBRVksT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQWtCdkQ7Q0FDRjtBQUVELHFCQUFhLFlBQWEsU0FBUSxXQUFXO0lBT3pDLE9BQU8sQ0FBQyxjQUFjO0lBQ3RCLE9BQU8sQ0FBQyxjQUFjO0lBUHhCLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFrQjtJQUNyQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQXVCO0lBRXJELE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxnQkFBOEQ7SUFFeEYsWUFDVSxjQUFjLEVBQUUs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accrued_substate.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accrued_substate.d.ts","sourceRoot":"","sources":["../../../../src/public/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { MAX_ETH_ADDRESS_VALUE } from '@aztec/constants';
|
|
1
2
|
import { NullifierCollisionError } from '../../side_effect_errors.js';
|
|
2
3
|
import { TypeTag, Uint1 } from '../avm_memory_types.js';
|
|
3
4
|
import { InstructionExecutionError, StaticCallAlterationError } from '../errors.js';
|
|
@@ -249,6 +250,9 @@ export class SendL2ToL1Message extends Instruction {
|
|
|
249
250
|
const [recipientOffset, contentOffset] = addressing.resolve(operands, memory);
|
|
250
251
|
memory.checkTags(TypeTag.FIELD, recipientOffset, contentOffset);
|
|
251
252
|
const recipient = memory.get(recipientOffset).toFr();
|
|
253
|
+
if (recipient.toBigInt() > MAX_ETH_ADDRESS_VALUE) {
|
|
254
|
+
throw new InstructionExecutionError(`SENDL2TOL1MSG: Recipient address is too large`);
|
|
255
|
+
}
|
|
252
256
|
const content = memory.get(contentOffset).toFr();
|
|
253
257
|
context.persistableState.writeL2ToL1Message(context.environment.address, recipient, content);
|
|
254
258
|
}
|