@aztec/simulator 0.35.1 → 0.37.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/dest/acvm/oracle/oracle.d.ts +7 -5
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +50 -23
- package/dest/acvm/oracle/typed_oracle.d.ts +17 -22
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +13 -10
- package/dest/avm/avm_execution_environment.d.ts +1 -5
- package/dest/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/avm/avm_execution_environment.js +5 -8
- package/dest/avm/avm_gas.d.ts +1 -9
- package/dest/avm/avm_gas.d.ts.map +1 -1
- package/dest/avm/avm_gas.js +6 -13
- package/dest/avm/avm_machine_state.d.ts +1 -3
- package/dest/avm/avm_machine_state.d.ts.map +1 -1
- package/dest/avm/avm_machine_state.js +8 -9
- package/dest/avm/avm_simulator.js +2 -2
- package/dest/avm/fixtures/index.d.ts +2 -6
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +3 -12
- package/dest/avm/journal/journal.d.ts +2 -1
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +8 -17
- package/dest/avm/journal/trace.d.ts +3 -1
- package/dest/avm/journal/trace.d.ts.map +1 -1
- package/dest/avm/journal/trace.js +11 -1
- package/dest/avm/journal/trace_types.d.ts +4 -0
- package/dest/avm/journal/trace_types.d.ts.map +1 -1
- package/dest/avm/journal/trace_types.js +1 -1
- package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/avm/opcodes/arithmetic.js +1 -1
- package/dest/avm/opcodes/context_getters.d.ts +0 -5
- package/dest/avm/opcodes/context_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/context_getters.js +1 -8
- package/dest/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/avm/opcodes/contract.js +1 -3
- package/dest/avm/opcodes/environment_getters.d.ts +0 -15
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +1 -35
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +5 -6
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +3 -3
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +1 -1
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +3 -8
- package/dest/avm/serialization/instruction_serialization.d.ts +42 -47
- package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/instruction_serialization.js +43 -48
- package/dest/client/client_execution_context.d.ts +13 -16
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +36 -34
- package/dest/client/db_oracle.d.ts +13 -17
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/db_oracle.js +1 -1
- package/dest/client/execution_note_cache.d.ts +6 -2
- package/dest/client/execution_note_cache.d.ts.map +1 -1
- package/dest/client/execution_note_cache.js +10 -7
- package/dest/client/execution_result.d.ts +10 -5
- package/dest/client/execution_result.d.ts.map +1 -1
- package/dest/client/execution_result.js +7 -1
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +4 -10
- package/dest/client/simulator.d.ts +1 -3
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +5 -9
- package/dest/client/view_data_oracle.d.ts +14 -11
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +17 -14
- package/dest/mocks/fixtures.d.ts +1 -1
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +9 -5
- package/dest/public/abstract_phase_manager.d.ts +4 -4
- package/dest/public/abstract_phase_manager.d.ts.map +1 -1
- package/dest/public/abstract_phase_manager.js +28 -43
- package/dest/public/app_logic_phase_manager.d.ts +1 -7
- package/dest/public/app_logic_phase_manager.d.ts.map +1 -1
- package/dest/public/app_logic_phase_manager.js +1 -7
- package/dest/public/db.d.ts +6 -7
- package/dest/public/db.d.ts.map +1 -1
- package/dest/public/execution.d.ts +15 -6
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +7 -9
- package/dest/public/executor.d.ts +2 -2
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +19 -10
- package/dest/public/hints_builder.d.ts +10 -8
- package/dest/public/hints_builder.d.ts.map +1 -1
- package/dest/public/hints_builder.js +29 -35
- package/dest/public/public_execution_context.d.ts +8 -13
- package/dest/public/public_execution_context.d.ts.map +1 -1
- package/dest/public/public_execution_context.js +12 -29
- package/dest/public/public_executor.d.ts +2 -2
- package/dest/public/public_executor.d.ts.map +1 -1
- package/dest/public/public_executor.js +4 -5
- package/dest/public/public_processor.d.ts +1 -2
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +1 -1
- package/dest/public/setup_phase_manager.d.ts +0 -6
- package/dest/public/setup_phase_manager.d.ts.map +1 -1
- package/dest/public/setup_phase_manager.js +1 -7
- package/dest/public/state_actions.d.ts.map +1 -1
- package/dest/public/state_actions.js +3 -1
- package/dest/public/tail_phase_manager.d.ts +3 -6
- package/dest/public/tail_phase_manager.d.ts.map +1 -1
- package/dest/public/tail_phase_manager.js +47 -16
- package/dest/public/teardown_phase_manager.d.ts +3 -7
- package/dest/public/teardown_phase_manager.d.ts.map +1 -1
- package/dest/public/teardown_phase_manager.js +14 -7
- package/dest/public/transitional_adaptors.d.ts +2 -2
- package/dest/public/transitional_adaptors.d.ts.map +1 -1
- package/dest/public/transitional_adaptors.js +19 -21
- package/dest/public/utils.d.ts.map +1 -1
- package/dest/public/utils.js +4 -2
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +3 -5
- package/package.json +16 -8
- package/src/acvm/oracle/oracle.ts +63 -22
- package/src/acvm/oracle/typed_oracle.ts +23 -27
- package/src/avm/avm_execution_environment.ts +0 -13
- package/src/avm/avm_gas.ts +6 -14
- package/src/avm/avm_machine_state.ts +8 -11
- package/src/avm/avm_simulator.ts +1 -1
- package/src/avm/fixtures/index.ts +2 -24
- package/src/avm/journal/journal.ts +14 -25
- package/src/avm/journal/trace.ts +12 -0
- package/src/avm/journal/trace_types.ts +7 -0
- package/src/avm/opcodes/arithmetic.ts +2 -2
- package/src/avm/opcodes/context_getters.ts +0 -9
- package/src/avm/opcodes/contract.ts +0 -2
- package/src/avm/opcodes/environment_getters.ts +0 -45
- package/src/avm/opcodes/external_calls.ts +5 -6
- package/src/avm/opcodes/memory.ts +5 -5
- package/src/avm/opcodes/storage.ts +1 -1
- package/src/avm/serialization/bytecode_serialization.ts +2 -10
- package/src/avm/serialization/instruction_serialization.ts +1 -6
- package/src/client/client_execution_context.ts +79 -54
- package/src/client/db_oracle.ts +14 -18
- package/src/client/execution_note_cache.ts +16 -7
- package/src/client/execution_result.ts +17 -6
- package/src/client/private_execution.ts +4 -9
- package/src/client/simulator.ts +3 -15
- package/src/client/view_data_oracle.ts +35 -29
- package/src/mocks/fixtures.ts +7 -16
- package/src/public/abstract_phase_manager.ts +45 -56
- package/src/public/app_logic_phase_manager.ts +6 -6
- package/src/public/db.ts +7 -8
- package/src/public/execution.ts +22 -18
- package/src/public/executor.ts +31 -5
- package/src/public/hints_builder.ts +62 -62
- package/src/public/public_execution_context.ts +30 -36
- package/src/public/public_executor.ts +4 -6
- package/src/public/public_processor.ts +1 -1
- package/src/public/setup_phase_manager.ts +6 -6
- package/src/public/state_actions.ts +2 -0
- package/src/public/tail_phase_manager.ts +98 -23
- package/src/public/teardown_phase_manager.ts +24 -6
- package/src/public/transitional_adaptors.ts +25 -19
- package/src/public/utils.ts +3 -1
- package/src/test/utils.ts +2 -4
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { strict as assert } from 'assert';
|
|
2
2
|
import { BufferCursor } from './buffer_cursor.js';
|
|
3
3
|
/**
|
|
4
|
-
* All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp).
|
|
4
|
+
* All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp and rs in opcodes.rs).
|
|
5
5
|
* Source: https://yp-aztec.netlify.app/docs/public-vm/instruction-set
|
|
6
6
|
*/
|
|
7
7
|
export var Opcode;
|
|
@@ -25,58 +25,53 @@ export var Opcode;
|
|
|
25
25
|
// Execution environment
|
|
26
26
|
Opcode[Opcode["ADDRESS"] = 15] = "ADDRESS";
|
|
27
27
|
Opcode[Opcode["STORAGEADDRESS"] = 16] = "STORAGEADDRESS";
|
|
28
|
-
Opcode[Opcode["
|
|
29
|
-
Opcode[Opcode["
|
|
30
|
-
Opcode[Opcode["
|
|
31
|
-
Opcode[Opcode["
|
|
32
|
-
Opcode[Opcode["
|
|
33
|
-
Opcode[Opcode["
|
|
34
|
-
Opcode[Opcode["
|
|
35
|
-
Opcode[Opcode["
|
|
36
|
-
Opcode[Opcode["
|
|
37
|
-
Opcode[Opcode["
|
|
38
|
-
Opcode[Opcode["
|
|
39
|
-
Opcode[Opcode["
|
|
40
|
-
Opcode[Opcode["BLOCKL1GASLIMIT"] = 29] = "BLOCKL1GASLIMIT";
|
|
41
|
-
Opcode[Opcode["BLOCKL2GASLIMIT"] = 30] = "BLOCKL2GASLIMIT";
|
|
42
|
-
Opcode[Opcode["BLOCKDAGASLIMIT"] = 31] = "BLOCKDAGASLIMIT";
|
|
43
|
-
Opcode[Opcode["CALLDATACOPY"] = 32] = "CALLDATACOPY";
|
|
28
|
+
Opcode[Opcode["SENDER"] = 17] = "SENDER";
|
|
29
|
+
Opcode[Opcode["FEEPERL2GAS"] = 18] = "FEEPERL2GAS";
|
|
30
|
+
Opcode[Opcode["FEEPERDAGAS"] = 19] = "FEEPERDAGAS";
|
|
31
|
+
Opcode[Opcode["CONTRACTCALLDEPTH"] = 20] = "CONTRACTCALLDEPTH";
|
|
32
|
+
Opcode[Opcode["CHAINID"] = 21] = "CHAINID";
|
|
33
|
+
Opcode[Opcode["VERSION"] = 22] = "VERSION";
|
|
34
|
+
Opcode[Opcode["BLOCKNUMBER"] = 23] = "BLOCKNUMBER";
|
|
35
|
+
Opcode[Opcode["TIMESTAMP"] = 24] = "TIMESTAMP";
|
|
36
|
+
Opcode[Opcode["COINBASE"] = 25] = "COINBASE";
|
|
37
|
+
Opcode[Opcode["BLOCKL2GASLIMIT"] = 26] = "BLOCKL2GASLIMIT";
|
|
38
|
+
Opcode[Opcode["BLOCKDAGASLIMIT"] = 27] = "BLOCKDAGASLIMIT";
|
|
39
|
+
Opcode[Opcode["CALLDATACOPY"] = 28] = "CALLDATACOPY";
|
|
44
40
|
// Gas
|
|
45
|
-
Opcode[Opcode["
|
|
46
|
-
Opcode[Opcode["
|
|
47
|
-
Opcode[Opcode["DAGASLEFT"] = 35] = "DAGASLEFT";
|
|
41
|
+
Opcode[Opcode["L2GASLEFT"] = 29] = "L2GASLEFT";
|
|
42
|
+
Opcode[Opcode["DAGASLEFT"] = 30] = "DAGASLEFT";
|
|
48
43
|
// Control flow
|
|
49
|
-
Opcode[Opcode["JUMP"] =
|
|
50
|
-
Opcode[Opcode["JUMPI"] =
|
|
51
|
-
Opcode[Opcode["INTERNALCALL"] =
|
|
52
|
-
Opcode[Opcode["INTERNALRETURN"] =
|
|
44
|
+
Opcode[Opcode["JUMP"] = 31] = "JUMP";
|
|
45
|
+
Opcode[Opcode["JUMPI"] = 32] = "JUMPI";
|
|
46
|
+
Opcode[Opcode["INTERNALCALL"] = 33] = "INTERNALCALL";
|
|
47
|
+
Opcode[Opcode["INTERNALRETURN"] = 34] = "INTERNALRETURN";
|
|
53
48
|
// Memory
|
|
54
|
-
Opcode[Opcode["SET"] =
|
|
55
|
-
Opcode[Opcode["MOV"] =
|
|
56
|
-
Opcode[Opcode["CMOV"] =
|
|
49
|
+
Opcode[Opcode["SET"] = 35] = "SET";
|
|
50
|
+
Opcode[Opcode["MOV"] = 36] = "MOV";
|
|
51
|
+
Opcode[Opcode["CMOV"] = 37] = "CMOV";
|
|
57
52
|
// World state
|
|
58
|
-
Opcode[Opcode["SLOAD"] =
|
|
59
|
-
Opcode[Opcode["SSTORE"] =
|
|
60
|
-
Opcode[Opcode["NOTEHASHEXISTS"] =
|
|
61
|
-
Opcode[Opcode["EMITNOTEHASH"] =
|
|
62
|
-
Opcode[Opcode["NULLIFIEREXISTS"] =
|
|
63
|
-
Opcode[Opcode["EMITNULLIFIER"] =
|
|
64
|
-
Opcode[Opcode["L1TOL2MSGEXISTS"] =
|
|
65
|
-
Opcode[Opcode["HEADERMEMBER"] =
|
|
66
|
-
Opcode[Opcode["GETCONTRACTINSTANCE"] =
|
|
67
|
-
Opcode[Opcode["EMITUNENCRYPTEDLOG"] =
|
|
68
|
-
Opcode[Opcode["SENDL2TOL1MSG"] =
|
|
53
|
+
Opcode[Opcode["SLOAD"] = 38] = "SLOAD";
|
|
54
|
+
Opcode[Opcode["SSTORE"] = 39] = "SSTORE";
|
|
55
|
+
Opcode[Opcode["NOTEHASHEXISTS"] = 40] = "NOTEHASHEXISTS";
|
|
56
|
+
Opcode[Opcode["EMITNOTEHASH"] = 41] = "EMITNOTEHASH";
|
|
57
|
+
Opcode[Opcode["NULLIFIEREXISTS"] = 42] = "NULLIFIEREXISTS";
|
|
58
|
+
Opcode[Opcode["EMITNULLIFIER"] = 43] = "EMITNULLIFIER";
|
|
59
|
+
Opcode[Opcode["L1TOL2MSGEXISTS"] = 44] = "L1TOL2MSGEXISTS";
|
|
60
|
+
Opcode[Opcode["HEADERMEMBER"] = 45] = "HEADERMEMBER";
|
|
61
|
+
Opcode[Opcode["GETCONTRACTINSTANCE"] = 46] = "GETCONTRACTINSTANCE";
|
|
62
|
+
Opcode[Opcode["EMITUNENCRYPTEDLOG"] = 47] = "EMITUNENCRYPTEDLOG";
|
|
63
|
+
Opcode[Opcode["SENDL2TOL1MSG"] = 48] = "SENDL2TOL1MSG";
|
|
69
64
|
// External calls
|
|
70
|
-
Opcode[Opcode["CALL"] =
|
|
71
|
-
Opcode[Opcode["STATICCALL"] =
|
|
72
|
-
Opcode[Opcode["DELEGATECALL"] =
|
|
73
|
-
Opcode[Opcode["RETURN"] =
|
|
74
|
-
Opcode[Opcode["REVERT"] =
|
|
65
|
+
Opcode[Opcode["CALL"] = 49] = "CALL";
|
|
66
|
+
Opcode[Opcode["STATICCALL"] = 50] = "STATICCALL";
|
|
67
|
+
Opcode[Opcode["DELEGATECALL"] = 51] = "DELEGATECALL";
|
|
68
|
+
Opcode[Opcode["RETURN"] = 52] = "RETURN";
|
|
69
|
+
Opcode[Opcode["REVERT"] = 53] = "REVERT";
|
|
75
70
|
// Gadgets
|
|
76
|
-
Opcode[Opcode["KECCAK"] =
|
|
77
|
-
Opcode[Opcode["POSEIDON2"] =
|
|
78
|
-
Opcode[Opcode["SHA256"] =
|
|
79
|
-
Opcode[Opcode["PEDERSEN"] =
|
|
71
|
+
Opcode[Opcode["KECCAK"] = 54] = "KECCAK";
|
|
72
|
+
Opcode[Opcode["POSEIDON2"] = 55] = "POSEIDON2";
|
|
73
|
+
Opcode[Opcode["SHA256"] = 56] = "SHA256";
|
|
74
|
+
Opcode[Opcode["PEDERSEN"] = 57] = "PEDERSEN";
|
|
80
75
|
})(Opcode || (Opcode = {}));
|
|
81
76
|
// Possible types for an instruction's operand in its wire format. (Keep in sync with CPP code.
|
|
82
77
|
// See vm/avm_trace/avm_deserialization.cpp)
|
|
@@ -159,4 +154,4 @@ export function serialize(operands, cls) {
|
|
|
159
154
|
}
|
|
160
155
|
return Buffer.concat(chunks);
|
|
161
156
|
}
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1Y3Rpb25fc2VyaWFsaXphdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vc2VyaWFsaXphdGlvbi9pbnN0cnVjdGlvbl9zZXJpYWxpemF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLElBQUksTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRTFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVsRDs7O0dBR0c7QUFDSCxNQUFNLENBQU4sSUFBWSxNQW1FWDtBQW5FRCxXQUFZLE1BQU07SUFDaEIsVUFBVTtJQUNWLGlDQUFHLENBQUE7SUFDSCxpQ0FBRyxDQUFBO0lBQ0gsaUNBQUcsQ0FBQTtJQUNILGlDQUFHLENBQUE7SUFDSCxtQ0FBSSxDQUFBO0lBQ0osK0JBQUUsQ0FBQTtJQUNGLCtCQUFFLENBQUE7SUFDRixpQ0FBRyxDQUFBO0lBQ0gsaUNBQUcsQ0FBQTtJQUNILCtCQUFFLENBQUE7SUFDRixrQ0FBRyxDQUFBO0lBQ0gsa0NBQUcsQ0FBQTtJQUNILGtDQUFHLENBQUE7SUFDSCxrQ0FBRyxDQUFBO0lBQ0gsb0NBQUksQ0FBQTtJQUNKLHdCQUF3QjtJQUN4QiwwQ0FBTyxDQUFBO0lBQ1Asd0RBQWMsQ0FBQTtJQUNkLHdDQUFNLENBQUE7SUFDTixrREFBVyxDQUFBO0lBQ1gsa0RBQVcsQ0FBQTtJQUNYLDhEQUFpQixDQUFBO0lBQ2pCLDBDQUFPLENBQUE7SUFDUCwwQ0FBTyxDQUFBO0lBQ1Asa0RBQVcsQ0FBQTtJQUNYLDhDQUFTLENBQUE7SUFDVCw0Q0FBUSxDQUFBO0lBQ1IsMERBQWUsQ0FBQTtJQUNmLDBEQUFlLENBQUE7SUFDZixvREFBWSxDQUFBO0lBQ1osTUFBTTtJQUNOLDhDQUFTLENBQUE7SUFDVCw4Q0FBUyxDQUFBO0lBQ1QsZUFBZTtJQUNmLG9DQUFJLENBQUE7SUFDSixzQ0FBSyxDQUFBO0lBQ0wsb0RBQVksQ0FB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
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
1
2
|
import { type AuthWitness, type AztecNode, EncryptedFunctionL2Logs, type NoteStatus, UnencryptedFunctionL2Logs, type UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
|
-
import { CallContext, FunctionSelector, type Header, NoteHashReadRequestMembershipWitness, PublicCallRequest, type SideEffect, TxContext } from '@aztec/circuits.js';
|
|
3
|
-
import { type Grumpkin } from '@aztec/circuits.js/barretenberg';
|
|
3
|
+
import { CallContext, FunctionSelector, type Header, NoteHashReadRequestMembershipWitness, PublicCallRequest, type SideEffect, type TxContext } from '@aztec/circuits.js';
|
|
4
4
|
import { type FunctionAbi } from '@aztec/foundation/abi';
|
|
5
5
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
6
6
|
import { Fr, type Point } from '@aztec/foundation/fields';
|
|
@@ -8,28 +8,22 @@ import { type NoteData } from '../acvm/index.js';
|
|
|
8
8
|
import { type PackedValuesCache } from '../common/packed_values_cache.js';
|
|
9
9
|
import { type DBOracle } from './db_oracle.js';
|
|
10
10
|
import { type ExecutionNoteCache } from './execution_note_cache.js';
|
|
11
|
-
import { type ExecutionResult, type NoteAndSlot } from './execution_result.js';
|
|
11
|
+
import { type ExecutionResult, type NoteAndSlot, type NullifiedNoteHashCounter } from './execution_result.js';
|
|
12
12
|
import { ViewDataOracle } from './view_data_oracle.js';
|
|
13
13
|
/**
|
|
14
14
|
* The execution context for a client tx simulation.
|
|
15
15
|
*/
|
|
16
16
|
export declare class ClientExecutionContext extends ViewDataOracle {
|
|
17
17
|
#private;
|
|
18
|
-
protected readonly contractAddress: AztecAddress;
|
|
19
18
|
private readonly argsHash;
|
|
20
19
|
private readonly txContext;
|
|
21
20
|
private readonly callContext;
|
|
22
21
|
/** Header of a block whose state is used during private execution (not the block the transaction is included in). */
|
|
23
22
|
protected readonly historicalHeader: Header;
|
|
24
|
-
/** List of transient auth witnesses to be used during this simulation */
|
|
25
|
-
protected readonly authWitnesses: AuthWitness[];
|
|
26
23
|
private readonly packedValuesCache;
|
|
27
24
|
private readonly noteCache;
|
|
28
|
-
protected readonly db: DBOracle;
|
|
29
|
-
private readonly curve;
|
|
30
25
|
private node;
|
|
31
26
|
protected sideEffectCounter: number;
|
|
32
|
-
protected log: import("@aztec/foundation/log").Logger;
|
|
33
27
|
/**
|
|
34
28
|
* New notes created during this execution.
|
|
35
29
|
* It's possible that a note in this list has been nullified (in the same or other executions) and doesn't exist in the ExecutionNoteCache and the final proof data.
|
|
@@ -48,6 +42,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
48
42
|
* They should act as references for the read requests output by an app circuit via public inputs.
|
|
49
43
|
*/
|
|
50
44
|
private gotNotes;
|
|
45
|
+
private nullifiedNoteHashCounters;
|
|
51
46
|
private encryptedLogs;
|
|
52
47
|
private unencryptedLogs;
|
|
53
48
|
private nestedExecutions;
|
|
@@ -56,7 +51,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
56
51
|
/** Header of a block whose state is used during private execution (not the block the transaction is included in). */
|
|
57
52
|
historicalHeader: Header,
|
|
58
53
|
/** List of transient auth witnesses to be used during this simulation */
|
|
59
|
-
authWitnesses: AuthWitness[], packedValuesCache: PackedValuesCache, noteCache: ExecutionNoteCache, db: DBOracle,
|
|
54
|
+
authWitnesses: AuthWitness[], packedValuesCache: PackedValuesCache, noteCache: ExecutionNoteCache, db: DBOracle, node: AztecNode, sideEffectCounter?: number, log?: import("@aztec/foundation/log").Logger);
|
|
60
55
|
/**
|
|
61
56
|
* Writes the function inputs to the initial witness.
|
|
62
57
|
* @param abi - The function ABI.
|
|
@@ -78,6 +73,7 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
78
73
|
* @param innerNoteHashes - Inner note hashes for the notes.
|
|
79
74
|
*/
|
|
80
75
|
getNewNotes(): NoteAndSlot[];
|
|
76
|
+
getNullifiedNoteHashCounters(): NullifiedNoteHashCounter[];
|
|
81
77
|
/**
|
|
82
78
|
* Return the encrypted logs emitted during this execution.
|
|
83
79
|
*/
|
|
@@ -95,10 +91,10 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
95
91
|
*/
|
|
96
92
|
getEnqueuedPublicFunctionCalls(): PublicCallRequest[];
|
|
97
93
|
/**
|
|
98
|
-
* Pack the given arguments.
|
|
94
|
+
* Pack the given array of arguments.
|
|
99
95
|
* @param args - Arguments to pack
|
|
100
96
|
*/
|
|
101
|
-
|
|
97
|
+
packArgumentsArray(args: Fr[]): Promise<Fr>;
|
|
102
98
|
/**
|
|
103
99
|
* Pack the given returns.
|
|
104
100
|
* @param returns - Returns to pack
|
|
@@ -140,14 +136,14 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
140
136
|
* @param innerNoteHash - The inner note hash of the new note.
|
|
141
137
|
* @returns
|
|
142
138
|
*/
|
|
143
|
-
notifyCreatedNote(storageSlot: Fr, noteTypeId: Fr, noteItems: Fr[], innerNoteHash: Fr): void;
|
|
139
|
+
notifyCreatedNote(storageSlot: Fr, noteTypeId: Fr, noteItems: Fr[], innerNoteHash: Fr, counter: number): void;
|
|
144
140
|
/**
|
|
145
141
|
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
146
142
|
* within the current transaction/execution.
|
|
147
143
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
148
144
|
* @param innerNoteHash - The inner note hash of the new note.
|
|
149
145
|
*/
|
|
150
|
-
notifyNullifiedNote(innerNullifier: Fr, innerNoteHash: Fr): Promise<void>;
|
|
146
|
+
notifyNullifiedNote(innerNullifier: Fr, innerNoteHash: Fr, counter: number): Promise<void>;
|
|
151
147
|
/**
|
|
152
148
|
* Encrypt a note and emit it as a log.
|
|
153
149
|
* @param contractAddress - The contract address of the note.
|
|
@@ -156,12 +152,12 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
156
152
|
* @param publicKey - The public key of the account that can decrypt the log.
|
|
157
153
|
* @param log - The log contents.
|
|
158
154
|
*/
|
|
159
|
-
emitEncryptedLog(contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: Fr, publicKey: Point, log: Fr[]):
|
|
155
|
+
emitEncryptedLog(contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: Fr, publicKey: Point, log: Fr[]): Fr;
|
|
160
156
|
/**
|
|
161
157
|
* Emit an unencrypted log.
|
|
162
158
|
* @param log - The unencrypted log to be emitted.
|
|
163
159
|
*/
|
|
164
|
-
emitUnencryptedLog(log: UnencryptedL2Log):
|
|
160
|
+
emitUnencryptedLog(log: UnencryptedL2Log): Fr;
|
|
165
161
|
/**
|
|
166
162
|
* Calls a private function as a nested execution.
|
|
167
163
|
* @param targetContractAddress - The address of the contract to call.
|
|
@@ -201,5 +197,6 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
201
197
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
202
198
|
*/
|
|
203
199
|
storageRead(startStorageSlot: Fr, numberOfElements: number): Promise<Fr[]>;
|
|
200
|
+
aes128Encrypt(input: Buffer, initializationVector: Buffer, key: Buffer): Buffer;
|
|
204
201
|
}
|
|
205
202
|
//# sourceMappingURL=client_execution_context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_execution_context.d.ts","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,uBAAuB,EAIvB,KAAK,UAAU,EAEf,yBAAyB,EACzB,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,WAAW,EAEX,gBAAgB,EAChB,KAAK,MAAM,EACX,oCAAoC,
|
|
1
|
+
{"version":3,"file":"client_execution_context.d.ts","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,uBAAuB,EAIvB,KAAK,UAAU,EAEf,yBAAyB,EACzB,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,WAAW,EAEX,gBAAgB,EAChB,KAAK,MAAM,EACX,oCAAoC,EAEpC,iBAAiB,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,WAAW,EAA6C,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,KAAK,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,KAAK,QAAQ,EAAiB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAG9G,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,cAAc;;IA2BtD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,qHAAqH;IACrH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM;IAG3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,IAAI;IACZ,SAAS,CAAC,iBAAiB,EAAE,MAAM;IArCrC;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAqB;IACrC;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,yBAAyB,CAAkC;IACnE,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,gBAAgB,CAAyB;IACjD,OAAO,CAAC,2BAA2B,CAA2B;gBAG5D,eAAe,EAAE,YAAY,EACZ,QAAQ,EAAE,EAAE,EACZ,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW;IACzC,qHAAqH;IAClG,gBAAgB,EAAE,MAAM;IAC3C,yEAAyE;IACzE,aAAa,EAAE,WAAW,EAAE,EACX,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,kBAAkB,EAC9C,EAAE,EAAE,QAAQ,EACJ,IAAI,EAAE,SAAS,EACb,iBAAiB,GAAE,MAAU,EACvC,GAAG,yCAAgE;IAOrE;;;;OAIG;IACI,iBAAiB,CAAC,GAAG,EAAE,WAAW;IAoBzC;;;;;;;;OAQG;IACI,sCAAsC,CAAC,oBAAoB,EAAE,UAAU,EAAE;IAWhF;;;OAGG;IACI,WAAW,IAAI,WAAW,EAAE;IAI5B,4BAA4B;IAInC;;OAEG;IACI,gBAAgB;IAIvB;;OAEG;IACI,kBAAkB;IAIzB;;OAEG;IACI,mBAAmB;IAI1B;;OAEG;IACI,8BAA8B;IAIrC;;;OAGG;IACa,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAI3D;;;OAGG;IACa,WAAW,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAIvD;;;OAGG;IACa,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAI7D;;;;;;;;;;;;;;;;;;;OAmBG;IACmB,QAAQ,CAC5B,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EAAE,EACzB,eAAe,EAAE,MAAM,EAAE,EACzB,eAAe,EAAE,MAAM,EAAE,EACzB,YAAY,EAAE,EAAE,EAAE,EAClB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,aAAa,EAAE,MAAM,EAAE,EACvB,aAAa,EAAE,MAAM,EAAE,EACvB,aAAa,EAAE,MAAM,EAAE,EACvB,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,QAAQ,EAAE,CAAC;IA0CtB;;;;;;;;;OASG;IACa,iBAAiB,CAC/B,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,EAAE,EAAE,EACf,aAAa,EAAE,EAAE,EACjB,OAAO,EAAE,MAAM;IAqBjB;;;;;OAKG;IACa,mBAAmB,CAAC,cAAc,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM;IAY1F;;;;;;;OAOG;IACa,gBAAgB,CAC9B,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,UAAU,EAAE,EAAE,EACd,SAAS,EAAE,KAAK,EAChB,GAAG,EAAE,EAAE,EAAE;IAWX;;;OAGG;IACa,kBAAkB,CAAC,GAAG,EAAE,gBAAgB;IAmBxD;;;;;;;;;OASG;IACY,mBAAmB,CAChC,qBAAqB,EAAE,YAAY,EACnC,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,EAAE,EACZ,iBAAiB,EAAE,MAAM,EACzB,YAAY,EAAE,OAAO,EACrB,cAAc,EAAE,OAAO;IAmDzB;;;;;;;;;;OAUG;IACmB,yBAAyB,CAC7C,qBAAqB,EAAE,YAAY,EACnC,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,EAAE,EACZ,iBAAiB,EAAE,MAAM,EACzB,YAAY,EAAE,OAAO,EACrB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAiC7B;;;;;;;;OAQG;IACH,OAAO,CAAC,iBAAiB;IAiBzB;;;;OAIG;IACmB,WAAW,CAAC,gBAAgB,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAoBhF,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;CAIhG"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
var _ClientExecutionContext_instances, _ClientExecutionContext_checkValidStaticCall;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
3
|
import { EncryptedFunctionL2Logs, EncryptedL2Log, L1NotePayload, Note, TaggedNote, UnencryptedFunctionL2Logs, } from '@aztec/circuit-types';
|
|
4
|
-
import { CallContext, FunctionData, FunctionSelector, NoteHashReadRequestMembershipWitness,
|
|
5
|
-
import {
|
|
4
|
+
import { CallContext, FunctionData, FunctionSelector, NoteHashReadRequestMembershipWitness, PrivateContextInputs, PublicCallRequest, } from '@aztec/circuits.js';
|
|
5
|
+
import { Aes128 } from '@aztec/circuits.js/barretenberg';
|
|
6
|
+
import { computePublicDataTreeLeafSlot, computeUniqueNoteHash, siloNoteHash } from '@aztec/circuits.js/hash';
|
|
6
7
|
import { countArgumentsSize } from '@aztec/foundation/abi';
|
|
7
8
|
import { Fr } from '@aztec/foundation/fields';
|
|
8
9
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
@@ -18,22 +19,17 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
18
19
|
/** Header of a block whose state is used during private execution (not the block the transaction is included in). */
|
|
19
20
|
historicalHeader,
|
|
20
21
|
/** List of transient auth witnesses to be used during this simulation */
|
|
21
|
-
authWitnesses, packedValuesCache, noteCache, db,
|
|
22
|
+
authWitnesses, packedValuesCache, noteCache, db, node, sideEffectCounter = 0, log = createDebugLogger('aztec:simulator:client_execution_context')) {
|
|
22
23
|
super(contractAddress, authWitnesses, db, node, log);
|
|
23
24
|
_ClientExecutionContext_instances.add(this);
|
|
24
|
-
this.contractAddress = contractAddress;
|
|
25
25
|
this.argsHash = argsHash;
|
|
26
26
|
this.txContext = txContext;
|
|
27
27
|
this.callContext = callContext;
|
|
28
28
|
this.historicalHeader = historicalHeader;
|
|
29
|
-
this.authWitnesses = authWitnesses;
|
|
30
29
|
this.packedValuesCache = packedValuesCache;
|
|
31
30
|
this.noteCache = noteCache;
|
|
32
|
-
this.db = db;
|
|
33
|
-
this.curve = curve;
|
|
34
31
|
this.node = node;
|
|
35
32
|
this.sideEffectCounter = sideEffectCounter;
|
|
36
|
-
this.log = log;
|
|
37
33
|
/**
|
|
38
34
|
* New notes created during this execution.
|
|
39
35
|
* It's possible that a note in this list has been nullified (in the same or other executions) and doesn't exist in the ExecutionNoteCache and the final proof data.
|
|
@@ -52,6 +48,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
52
48
|
* They should act as references for the read requests output by an app circuit via public inputs.
|
|
53
49
|
*/
|
|
54
50
|
this.gotNotes = new Map();
|
|
51
|
+
this.nullifiedNoteHashCounters = [];
|
|
55
52
|
this.encryptedLogs = [];
|
|
56
53
|
this.unencryptedLogs = [];
|
|
57
54
|
this.nestedExecutions = [];
|
|
@@ -70,14 +67,8 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
70
67
|
if (args.length !== argumentsSize) {
|
|
71
68
|
throw new Error('Invalid arguments size');
|
|
72
69
|
}
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
...this.historicalHeader.toFields(),
|
|
76
|
-
this.txContext.chainId,
|
|
77
|
-
this.txContext.version,
|
|
78
|
-
new Fr(this.sideEffectCounter),
|
|
79
|
-
...args,
|
|
80
|
-
];
|
|
70
|
+
const privateContextInputs = new PrivateContextInputs(this.callContext, this.historicalHeader, this.txContext, this.sideEffectCounter);
|
|
71
|
+
const fields = [...privateContextInputs.toFields(), ...args];
|
|
81
72
|
return toACVMWitness(0, fields);
|
|
82
73
|
}
|
|
83
74
|
/**
|
|
@@ -106,6 +97,9 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
106
97
|
getNewNotes() {
|
|
107
98
|
return this.newNotes;
|
|
108
99
|
}
|
|
100
|
+
getNullifiedNoteHashCounters() {
|
|
101
|
+
return this.nullifiedNoteHashCounters;
|
|
102
|
+
}
|
|
109
103
|
/**
|
|
110
104
|
* Return the encrypted logs emitted during this execution.
|
|
111
105
|
*/
|
|
@@ -131,10 +125,10 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
131
125
|
return this.enqueuedPublicFunctionCalls;
|
|
132
126
|
}
|
|
133
127
|
/**
|
|
134
|
-
* Pack the given arguments.
|
|
128
|
+
* Pack the given array of arguments.
|
|
135
129
|
* @param args - Arguments to pack
|
|
136
130
|
*/
|
|
137
|
-
|
|
131
|
+
packArgumentsArray(args) {
|
|
138
132
|
return Promise.resolve(this.packedValuesCache.pack(args));
|
|
139
133
|
}
|
|
140
134
|
/**
|
|
@@ -196,7 +190,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
196
190
|
notes.forEach(n => {
|
|
197
191
|
if (n.index !== undefined) {
|
|
198
192
|
const siloedNoteHash = siloNoteHash(n.contractAddress, n.innerNoteHash);
|
|
199
|
-
const uniqueSiloedNoteHash =
|
|
193
|
+
const uniqueSiloedNoteHash = computeUniqueNoteHash(n.nonce, siloedNoteHash);
|
|
200
194
|
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386)
|
|
201
195
|
// Should always be uniqueSiloedNoteHash when publicly created notes include nonces.
|
|
202
196
|
const noteHashForReadRequest = n.nonce.isZero() ? siloedNoteHash : uniqueSiloedNoteHash;
|
|
@@ -215,7 +209,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
215
209
|
* @param innerNoteHash - The inner note hash of the new note.
|
|
216
210
|
* @returns
|
|
217
211
|
*/
|
|
218
|
-
notifyCreatedNote(storageSlot, noteTypeId, noteItems, innerNoteHash) {
|
|
212
|
+
notifyCreatedNote(storageSlot, noteTypeId, noteItems, innerNoteHash, counter) {
|
|
219
213
|
const note = new Note(noteItems);
|
|
220
214
|
this.noteCache.addNewNote({
|
|
221
215
|
contractAddress: this.callContext.storageContractAddress,
|
|
@@ -224,7 +218,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
224
218
|
note,
|
|
225
219
|
siloedNullifier: undefined, // Siloed nullifier cannot be known for newly created note.
|
|
226
220
|
innerNoteHash,
|
|
227
|
-
});
|
|
221
|
+
}, counter);
|
|
228
222
|
this.newNotes.push({
|
|
229
223
|
storageSlot,
|
|
230
224
|
noteTypeId,
|
|
@@ -237,8 +231,11 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
237
231
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
238
232
|
* @param innerNoteHash - The inner note hash of the new note.
|
|
239
233
|
*/
|
|
240
|
-
notifyNullifiedNote(innerNullifier, innerNoteHash) {
|
|
241
|
-
this.noteCache.nullifyNote(this.callContext.storageContractAddress, innerNullifier, innerNoteHash);
|
|
234
|
+
notifyNullifiedNote(innerNullifier, innerNoteHash, counter) {
|
|
235
|
+
const nullifiedNoteHashCounter = this.noteCache.nullifyNote(this.callContext.storageContractAddress, innerNullifier, innerNoteHash);
|
|
236
|
+
if (nullifiedNoteHashCounter !== undefined) {
|
|
237
|
+
this.nullifiedNoteHashCounters.push({ noteHashCounter: nullifiedNoteHashCounter, nullifierCounter: counter });
|
|
238
|
+
}
|
|
242
239
|
return Promise.resolve();
|
|
243
240
|
}
|
|
244
241
|
/**
|
|
@@ -253,8 +250,10 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
253
250
|
const note = new Note(log);
|
|
254
251
|
const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
|
|
255
252
|
const taggedNote = new TaggedNote(l1NotePayload);
|
|
256
|
-
const encryptedNote = taggedNote.toEncryptedBuffer(publicKey
|
|
257
|
-
|
|
253
|
+
const encryptedNote = taggedNote.toEncryptedBuffer(publicKey);
|
|
254
|
+
const encryptedLog = new EncryptedL2Log(encryptedNote);
|
|
255
|
+
this.encryptedLogs.push(encryptedLog);
|
|
256
|
+
return Fr.fromBuffer(encryptedLog.hash());
|
|
258
257
|
}
|
|
259
258
|
/**
|
|
260
259
|
* Emit an unencrypted log.
|
|
@@ -264,6 +263,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
264
263
|
this.unencryptedLogs.push(log);
|
|
265
264
|
const text = log.toHumanReadable();
|
|
266
265
|
this.log.verbose(`Emitted unencrypted log: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`);
|
|
266
|
+
return Fr.fromBuffer(log.hash());
|
|
267
267
|
}
|
|
268
268
|
/**
|
|
269
269
|
* Calls a private function as a nested execution.
|
|
@@ -280,9 +280,9 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
280
280
|
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
281
281
|
const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
|
|
282
282
|
const targetFunctionData = FunctionData.fromAbi(targetArtifact);
|
|
283
|
-
const derivedTxContext =
|
|
284
|
-
const derivedCallContext =
|
|
285
|
-
const context = new ClientExecutionContext(targetContractAddress, argsHash, derivedTxContext, derivedCallContext, this.historicalHeader, this.authWitnesses, this.packedValuesCache, this.noteCache, this.db, this.
|
|
283
|
+
const derivedTxContext = this.txContext.clone();
|
|
284
|
+
const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, sideEffectCounter, isDelegateCall, isStaticCall);
|
|
285
|
+
const context = new ClientExecutionContext(targetContractAddress, argsHash, derivedTxContext, derivedCallContext, this.historicalHeader, this.authWitnesses, this.packedValuesCache, this.noteCache, this.db, this.node, sideEffectCounter);
|
|
286
286
|
const childExecutionResult = await executePrivateFunction(context, targetArtifact, targetContractAddress, targetFunctionData);
|
|
287
287
|
if (isStaticCall) {
|
|
288
288
|
__classPrivateFieldGet(this, _ClientExecutionContext_instances, "m", _ClientExecutionContext_checkValidStaticCall).call(this, childExecutionResult);
|
|
@@ -304,7 +304,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
304
304
|
async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, isDelegateCall) {
|
|
305
305
|
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
306
306
|
const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
|
|
307
|
-
const derivedCallContext =
|
|
307
|
+
const derivedCallContext = this.deriveCallContext(targetContractAddress, targetArtifact, sideEffectCounter, isDelegateCall, isStaticCall);
|
|
308
308
|
const args = this.packedValuesCache.unpack(argsHash);
|
|
309
309
|
const enqueuedRequest = PublicCallRequest.from({
|
|
310
310
|
args,
|
|
@@ -330,10 +330,8 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
330
330
|
* @param isStaticCall - Whether the call is a static call.
|
|
331
331
|
* @returns The derived call context.
|
|
332
332
|
*/
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
return new CallContext(isDelegateCall ? this.callContext.msgSender : this.contractAddress, isDelegateCall ? this.contractAddress : targetContractAddress, portalContractAddress, FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters), this.callContext.gasLeft, // TODO(palla/gas): We should deduct DA and L1 gas used for the derived context
|
|
336
|
-
isDelegateCall, isStaticCall, startSideEffectCounter, this.callContext.gasSettings, this.callContext.transactionFee);
|
|
333
|
+
deriveCallContext(targetContractAddress, targetArtifact, startSideEffectCounter, isDelegateCall = false, isStaticCall = false) {
|
|
334
|
+
return new CallContext(isDelegateCall ? this.callContext.msgSender : this.contractAddress, isDelegateCall ? this.contractAddress : targetContractAddress, FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters), isDelegateCall, isStaticCall, startSideEffectCounter);
|
|
337
335
|
}
|
|
338
336
|
/**
|
|
339
337
|
* Read the public storage data.
|
|
@@ -358,6 +356,10 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
358
356
|
}
|
|
359
357
|
return values;
|
|
360
358
|
}
|
|
359
|
+
aes128Encrypt(input, initializationVector, key) {
|
|
360
|
+
const aes128 = new Aes128();
|
|
361
|
+
return aes128.encryptBufferCBC(input, initializationVector, key);
|
|
362
|
+
}
|
|
361
363
|
}
|
|
362
364
|
_ClientExecutionContext_instances = new WeakSet(), _ClientExecutionContext_checkValidStaticCall = function _ClientExecutionContext_checkValidStaticCall(childExecutionResult) {
|
|
363
365
|
if (childExecutionResult.callStackItem.publicInputs.newNoteHashes.some(item => !item.isEmpty()) ||
|
|
@@ -368,4 +370,4 @@ _ClientExecutionContext_instances = new WeakSet(), _ClientExecutionContext_check
|
|
|
368
370
|
throw new Error(`Static call cannot create new notes, emit L2->L1 messages or generate logs`);
|
|
369
371
|
}
|
|
370
372
|
};
|
|
371
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":";;AAAA,OAAO,EAGL,uBAAuB,EACvB,cAAc,EACd,aAAa,EACb,IAAI,EAEJ,UAAU,EACV,yBAAyB,GAE1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,WAAW,EACX,YAAY,EACZ,gBAAgB,EAEhB,oCAAoC,EACpC,iBAAiB,EAEjB,SAAS,GACV,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC/G,OAAO,EAA2C,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEpG,OAAO,EAAE,EAAE,EAAc,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAiB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKhE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;GAEG;AACH,MAAM,OAAO,sBAAuB,SAAQ,cAAc;IAwBxD,YACqB,eAA6B,EAC/B,QAAY,EACZ,SAAoB,EACpB,WAAwB;IACzC,qHAAqH;IAClG,gBAAwB;IAC3C,yEAAyE;IACtD,aAA4B,EAC9B,iBAAoC,EACpC,SAA6B,EAC3B,EAAY,EACd,KAAe,EACxB,IAAe,EACb,oBAA4B,CAAC,EAC7B,MAAM,iBAAiB,CAAC,0CAA0C,CAAC;QAE7E,KAAK,CAAC,eAAe,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;;QAhBlC,oBAAe,GAAf,eAAe,CAAc;QAC/B,aAAQ,GAAR,QAAQ,CAAI;QACZ,cAAS,GAAT,SAAS,CAAW;QACpB,gBAAW,GAAX,WAAW,CAAa;QAEtB,qBAAgB,GAAhB,gBAAgB,CAAQ;QAExB,kBAAa,GAAb,aAAa,CAAe;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAoB;QAC3B,OAAE,GAAF,EAAE,CAAU;QACd,UAAK,GAAL,KAAK,CAAU;QACxB,SAAI,GAAJ,IAAI,CAAW;QACb,sBAAiB,GAAjB,iBAAiB,CAAY;QAC7B,QAAG,GAAH,GAAG,CAAgE;QAtC/E;;;;;;WAMG;QACK,aAAQ,GAAkB,EAAE,CAAC;QACrC;;;;;;;;WAQG;QACK,aAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;QAC1C,kBAAa,GAAqB,EAAE,CAAC;QACrC,oBAAe,GAAuB,EAAE,CAAC;QACzC,qBAAgB,GAAsB,EAAE,CAAC;QACzC,gCAA2B,GAAwB,EAAE,CAAC;IAoB9D,CAAC;IAED,iGAAiG;IACjG,8FAA8F;IAC9F;;;;OAIG;IACI,iBAAiB,CAAC,GAAgB;QACvC,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAE9C,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE1D,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,MAAM,GAAG;YACb,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;YAC9B,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YAEnC,IAAI,CAAC,SAAS,CAAC,OAAO;YACtB,IAAI,CAAC,SAAS,CAAC,OAAO;YAEtB,IAAI,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC;YAE9B,GAAG,IAAI;SACR,CAAC;QAEF,OAAO,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;;OAQG;IACI,sCAAsC,CAAC,oBAAkC;QAC9E,OAAO,oBAAoB;aACxB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;aACzB,GAAG,CAAC,CAAC,CAAC,EAAE;YACP,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,OAAO,KAAK,KAAK,SAAS;gBACxB,CAAC,CAAC,oCAAoC,CAAC,KAAK,CAAC,KAAK,CAAC;gBACnD,CAAC,CAAC,oCAAoC,CAAC,cAAc,EAAE,CAAC;QAC5D,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;OAEG;IACI,gBAAgB;QACrB,OAAO,IAAI,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACzD,CAAC;IAED;;OAEG;IACI,kBAAkB;QACvB,OAAO,IAAI,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACI,mBAAmB;QACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;OAEG;IACI,8BAA8B;QACnC,OAAO,IAAI,CAAC,2BAA2B,CAAC;IAC1C,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,IAAU;QAC7B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;OAGG;IACI,WAAW,CAAC,OAAa;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,WAAe;QAClC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;IACrE,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACI,KAAK,CAAC,QAAQ,CACnB,WAAe,EACf,UAAkB,EAClB,eAAyB,EACzB,eAAyB,EACzB,eAAyB,EACzB,YAAkB,EAClB,iBAA2B,EAC3B,aAAuB,EACvB,aAAuB,EACvB,aAAuB,EACvB,SAAmB,EACnB,KAAa,EACb,MAAc,EACd,MAAkB;QAElB,6DAA6D;QAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;QAEnG,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC;QAChG,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QACrG,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAE,CAAC,CAAC,eAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;QAErG,MAAM,KAAK,GAAG,SAAS,CAAW,CAAC,GAAG,eAAe,EAAE,GAAG,YAAY,CAAC,EAAE;YACvE,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC/D,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE;gBAC3E,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC;gBACtB,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC;aACjC,CAAC,CAAC;YACH,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACtC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE;gBACvE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;aACpB,CAAC,CAAC;YACH,KAAK;YACL,MAAM;SACP,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,aAAa,KAAK,CAAC,MAAM,cAAc,IAAI,CAAC,WAAW,CAAC,sBAAsB,OAAO,WAAW,KAAK,KAAK;aACvG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;aACpF,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;QAEF,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAChB,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC;gBACxE,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;gBAC9E,oEAAoE;gBACpE,oFAAoF;gBACpF,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAoB,CAAC;gBACxF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;;OASG;IACI,iBAAiB,CAAC,WAAe,EAAE,UAAc,EAAE,SAAe,EAAE,aAAiB;QAC1F,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YACxB,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,sBAAsB;YACxD,WAAW;YACX,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,kDAAkD;YAClE,IAAI;YACJ,eAAe,EAAE,SAAS,EAAE,2DAA2D;YACvF,aAAa;SACd,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,WAAW;YACX,UAAU;YACV,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACI,mBAAmB,CAAC,cAAkB,EAAE,aAAiB;QAC9D,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QACnG,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;;;;;OAOG;IACI,gBAAgB,CAAC,eAA6B,EAAE,WAAe,EAAE,UAAc,EAAE,SAAgB,EAAE,GAAS;QACjH,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;QACxF,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,CAAC;QACjD,MAAM,aAAa,GAAG,UAAU,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1E,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,GAAqB;QAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,6BAA6B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1G,CAAC;IAcD;;;;;;;;;OASG;IACH,KAAK,CAAC,mBAAmB,CACvB,qBAAmC,EACnC,gBAAkC,EAClC,QAAY,EACZ,iBAAyB,EACzB,YAAqB,EACrB,cAAuB;QAEvB,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4BAA4B,IAAI,CAAC,eAAe,IAAI,gBAAgB,SAAS,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,CACvH,CAAC;QAEF,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;QAE7D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;QAClG,MAAM,kBAAkB,GAAG,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEhE,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAErG,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACrD,qBAAqB,EACrB,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,YAAY,CACb,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,sBAAsB,CACxC,qBAAqB,EACrB,QAAQ,EACR,gBAAgB,EAChB,kBAAkB,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,IAAI,EACT,iBAAiB,CAClB,CAAC;QAEF,MAAM,oBAAoB,GAAG,MAAM,sBAAsB,CACvD,OAAO,EACP,cAAc,EACd,qBAAqB,EACrB,kBAAkB,CACnB,CAAC;QAEF,IAAI,YAAY,EAAE,CAAC;YACjB,uBAAA,IAAI,uFAAsB,MAA1B,IAAI,EAAuB,oBAAoB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEjD,OAAO,oBAAoB,CAAC,aAAa,CAAC;IAC5C,CAAC;IAED;;;;;;;;;;OAUG;IACI,KAAK,CAAC,yBAAyB,CACpC,qBAAmC,EACnC,gBAAkC,EAClC,QAAY,EACZ,iBAAyB,EACzB,YAAqB,EACrB,cAAuB;QAEvB,YAAY,GAAG,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;QAE7D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;QAClG,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACrD,qBAAqB,EACrB,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,YAAY,CACb,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC;YAC7C,IAAI;YACJ,WAAW,EAAE,kBAAkB;YAC/B,iBAAiB,EAAE,IAAI,CAAC,WAAW;YACnC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC;YAClD,eAAe,EAAE,qBAAqB;SACvC,CAAC,CAAC;QAEH,kEAAkE;QAClE,wEAAwE;QACxE,wEAAwE;QACxE,mEAAmE;QACnE,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,+DAA+D,iBAAiB,KAAK,qBAAqB,IAAI,gBAAgB,IAAI,cAAc,CAAC,IAAI,GAAG,CACzJ,CAAC;QAEF,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEvD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,iBAAiB,CAC7B,qBAAmC,EACnC,cAAgC,EAChC,sBAA8B,EAC9B,cAAc,GAAG,KAAK,EACtB,YAAY,GAAG,KAAK;QAEpB,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,CAAC;QAC5F,OAAO,IAAI,WAAW,CACpB,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAClE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,qBAAqB,EAC7D,qBAAqB,EACrB,gBAAgB,CAAC,qBAAqB,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,EACtF,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,+EAA+E;QACzG,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,IAAI,CAAC,WAAW,CAAC,WAAW,EAC5B,IAAI,CAAC,WAAW,CAAC,cAAc,CAChC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,WAAW,CAAC,gBAAoB,EAAE,gBAAwB;QACrE,oGAAoG;QACpG,uCAAuC;QACvC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC;QAE1C,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,gBAAgB,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3C,MAAM,WAAW,GAAG,IAAI,EAAE,CAAC,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACvD,MAAM,QAAQ,GAAG,6BAA6B,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;YACrG,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACrE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,uBAAuB,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACnE,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,WAAW,CAAC,QAAQ,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YACrF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;wJA1LuB,oBAAqC;IACzD,IACE,oBAAoB,CAAC,aAAa,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3F,oBAAoB,CAAC,aAAa,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3F,oBAAoB,CAAC,aAAa,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3F,CAAC,oBAAoB,CAAC,aAAa,CAAC,YAAY,CAAC,2BAA2B,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9F,CAAC,oBAAoB,CAAC,aAAa,CAAC,YAAY,CAAC,6BAA6B,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAChG,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;IAChG,CAAC;AACH,CAAC"}
|
|
373
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,9 @@ import { type L2Block, type MerkleTreeId, type NoteStatus, type NullifierMembers
|
|
|
2
2
|
import { type CompleteAddress, type Header } from '@aztec/circuits.js';
|
|
3
3
|
import { type FunctionArtifactWithDebugMetadata, type FunctionSelector } from '@aztec/foundation/abi';
|
|
4
4
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
|
-
import { type
|
|
6
|
-
import { type Fr } from '@aztec/foundation/fields';
|
|
5
|
+
import { type Fr, type Point } from '@aztec/foundation/fields';
|
|
7
6
|
import { type ContractInstance } from '@aztec/types/contracts';
|
|
8
|
-
import { type
|
|
7
|
+
import { type NoteData, type NullifierKeys } from '../acvm/index.js';
|
|
9
8
|
import { type CommitmentsDB } from '../public/db.js';
|
|
10
9
|
/**
|
|
11
10
|
* Error thrown when a contract is not found in the database.
|
|
@@ -48,16 +47,21 @@ export interface DBOracle extends CommitmentsDB {
|
|
|
48
47
|
*/
|
|
49
48
|
popCapsule(): Promise<Fr[]>;
|
|
50
49
|
/**
|
|
51
|
-
*
|
|
52
|
-
* The
|
|
53
|
-
*
|
|
50
|
+
* Gets public keys for an address.
|
|
51
|
+
* @param The address to look up
|
|
52
|
+
* @returns The public keys for a specific address
|
|
53
|
+
* TODO(#5834): Replace with `getCompleteAddress`.
|
|
54
|
+
*/
|
|
55
|
+
getPublicKeysForAddress(address: AztecAddress): Promise<Point[]>;
|
|
56
|
+
/**
|
|
57
|
+
* Retrieve nullifier keys associated with a specific account and app/contract address.
|
|
54
58
|
*
|
|
55
59
|
* @param accountAddress - The account address.
|
|
56
60
|
* @param contractAddress - The contract address.
|
|
57
|
-
* @returns A Promise that resolves to
|
|
58
|
-
* @throws An
|
|
61
|
+
* @returns A Promise that resolves to nullifier keys of a requested account and contract.
|
|
62
|
+
* @throws An error if the account is not registered in the database.
|
|
59
63
|
*/
|
|
60
|
-
|
|
64
|
+
getNullifierKeys(accountAddress: AztecAddress, contractAddress: AztecAddress): Promise<NullifierKeys>;
|
|
61
65
|
/**
|
|
62
66
|
* Retrieves a set of notes stored in the database for a given contract address and storage slot.
|
|
63
67
|
* The query result is paginated using 'limit' and 'offset' values.
|
|
@@ -87,14 +91,6 @@ export interface DBOracle extends CommitmentsDB {
|
|
|
87
91
|
* @returns The corresponding function's artifact as an object.
|
|
88
92
|
*/
|
|
89
93
|
getFunctionArtifactByName(contractAddress: AztecAddress, functionName: string): Promise<FunctionArtifactWithDebugMetadata | undefined>;
|
|
90
|
-
/**
|
|
91
|
-
* Retrieves the portal contract address associated with the given contract address.
|
|
92
|
-
* Throws an error if the input contract address is not found or invalid.
|
|
93
|
-
*
|
|
94
|
-
* @param contractAddress - The address of the contract whose portal address is to be fetched.
|
|
95
|
-
* @returns A Promise that resolves to an EthAddress instance, representing the portal contract address.
|
|
96
|
-
*/
|
|
97
|
-
getPortalContractAddress(contractAddress: AztecAddress): Promise<EthAddress>;
|
|
98
94
|
/**
|
|
99
95
|
* Gets the index of a nullifier in the nullifier tree.
|
|
100
96
|
* @param nullifier - The nullifier.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db_oracle.d.ts","sourceRoot":"","sources":["../../src/client/db_oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,0BAA0B,EAC/B,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,KAAK,iCAAiC,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACtG,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"db_oracle.d.ts","sourceRoot":"","sources":["../../src/client/db_oracle.ts"],"names":[],"mappings":"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"}
|
package/dest/client/db_oracle.js
CHANGED
|
@@ -14,4 +14,4 @@ export class ContractClassNotFoundError extends Error {
|
|
|
14
14
|
super(`DB has no contract class with id ${contractClassId}`);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGJfb3JhY2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9kYl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHFCQUFzQixTQUFRLEtBQUs7SUFDOUMsWUFBWSxlQUF1QjtRQUNqQyxLQUFLLENBQUMsbUNBQW1DLGVBQWUsRUFBRSxDQUFDLENBQUM7SUFDOUQsQ0FBQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sMEJBQTJCLFNBQVEsS0FBSztJQUNuRCxZQUFZLGVBQXVCO1FBQ2pDLEtBQUssQ0FBQyxvQ0FBb0MsZUFBZSxFQUFFLENBQUMsQ0FBQztJQUMvRCxDQUFDO0NBQ0YifQ==
|