@aztec/simulator 0.71.0 → 0.73.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dest/acvm/oracle/oracle.d.ts +0 -1
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +1 -5
- package/dest/acvm/oracle/typed_oracle.d.ts +0 -1
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +1 -4
- package/dest/avm/avm_simulator.d.ts +0 -1
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +4 -19
- package/dest/avm/avm_tree.d.ts +9 -8
- package/dest/avm/avm_tree.d.ts.map +1 -1
- package/dest/avm/avm_tree.js +35 -30
- package/dest/avm/errors.d.ts +6 -0
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +10 -1
- package/dest/avm/fixtures/avm_simulation_tester.d.ts +21 -0
- package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +1 -0
- package/dest/avm/fixtures/avm_simulation_tester.js +74 -0
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts +35 -0
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +1 -0
- package/dest/avm/fixtures/base_avm_simulation_tester.js +76 -0
- package/dest/avm/fixtures/index.d.ts +6 -2
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +28 -14
- package/dest/avm/fixtures/simple_contract_data_source.d.ts +31 -0
- package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +1 -0
- package/dest/avm/fixtures/simple_contract_data_source.js +75 -0
- package/dest/avm/journal/journal.d.ts +5 -6
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +28 -26
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +4 -3
- package/dest/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/avm/opcodes/conversion.js +10 -7
- package/dest/avm/opcodes/ec_add.js +2 -2
- package/dest/avm/opcodes/hashing.js +2 -2
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +9 -7
- package/dest/avm/test_utils.d.ts +1 -1
- package/dest/avm/test_utils.d.ts.map +1 -1
- package/dest/avm/test_utils.js +4 -3
- package/dest/client/client_execution_context.d.ts +2 -6
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +23 -26
- package/dest/client/execution_note_cache.d.ts +3 -3
- package/dest/client/execution_note_cache.d.ts.map +1 -1
- package/dest/client/execution_note_cache.js +10 -10
- package/dest/client/pick_notes.js +5 -5
- package/dest/client/simulator.js +4 -4
- package/dest/client/view_data_oracle.js +2 -2
- package/dest/common/hashed_values_cache.d.ts +1 -1
- package/dest/common/hashed_values_cache.d.ts.map +1 -1
- package/dest/common/hashed_values_cache.js +5 -5
- package/dest/providers/acvm_wasm.d.ts +2 -0
- package/dest/providers/acvm_wasm.d.ts.map +1 -1
- package/dest/providers/acvm_wasm.js +15 -2
- package/dest/public/execution.d.ts +8 -26
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +3 -3
- package/dest/public/fee_payment.d.ts +2 -2
- package/dest/public/fee_payment.d.ts.map +1 -1
- package/dest/public/fee_payment.js +3 -3
- package/dest/public/fixtures/index.d.ts +2 -37
- package/dest/public/fixtures/index.d.ts.map +1 -1
- package/dest/public/fixtures/index.js +3 -247
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts +21 -0
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +1 -0
- package/dest/public/fixtures/public_tx_simulation_tester.js +89 -0
- package/dest/public/fixtures/utils.d.ts +17 -0
- package/dest/public/fixtures/utils.d.ts.map +1 -0
- package/dest/public/fixtures/utils.js +66 -0
- package/dest/public/index.d.ts +1 -1
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +2 -2
- package/dest/public/public_db_sources.d.ts +2 -1
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +27 -21
- package/dest/public/public_processor.d.ts +4 -5
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +28 -28
- package/dest/public/public_tx_context.d.ts +5 -5
- package/dest/public/public_tx_context.d.ts.map +1 -1
- package/dest/public/public_tx_context.js +44 -18
- package/dest/public/public_tx_simulator.d.ts.map +1 -1
- package/dest/public/public_tx_simulator.js +9 -12
- package/dest/public/{enqueued_call_side_effect_trace.d.ts → side_effect_trace.d.ts} +12 -15
- package/dest/public/side_effect_trace.d.ts.map +1 -0
- package/dest/public/side_effect_trace.js +350 -0
- package/dest/public/side_effect_trace_interface.d.ts +4 -5
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/test/utils.d.ts +1 -1
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +3 -3
- package/package.json +10 -10
- package/src/acvm/oracle/oracle.ts +0 -5
- package/src/acvm/oracle/typed_oracle.ts +0 -4
- package/src/avm/avm_simulator.ts +3 -27
- package/src/avm/avm_tree.ts +39 -37
- package/src/avm/errors.ts +10 -0
- package/src/avm/fixtures/avm_simulation_tester.ts +105 -0
- package/src/avm/fixtures/base_avm_simulation_tester.ts +104 -0
- package/src/avm/fixtures/index.ts +46 -17
- package/src/avm/fixtures/simple_contract_data_source.ts +98 -0
- package/src/avm/journal/journal.ts +28 -26
- package/src/avm/opcodes/accrued_substate.ts +3 -2
- package/src/avm/opcodes/conversion.ts +15 -6
- package/src/avm/opcodes/ec_add.ts +1 -1
- package/src/avm/opcodes/hashing.ts +1 -1
- package/src/avm/opcodes/multi_scalar_mul.ts +8 -6
- package/src/avm/test_utils.ts +3 -4
- package/src/client/client_execution_context.ts +29 -30
- package/src/client/execution_note_cache.ts +19 -14
- package/src/client/pick_notes.ts +4 -4
- package/src/client/simulator.ts +3 -3
- package/src/client/view_data_oracle.ts +1 -1
- package/src/common/hashed_values_cache.ts +4 -4
- package/src/providers/acvm_wasm.ts +13 -2
- package/src/public/execution.ts +10 -34
- package/src/public/fee_payment.ts +2 -2
- package/src/public/fixtures/index.ts +2 -381
- package/src/public/fixtures/public_tx_simulation_tester.ts +174 -0
- package/src/public/fixtures/utils.ts +110 -0
- package/src/public/index.ts +1 -1
- package/src/public/public_db_sources.ts +31 -20
- package/src/public/public_processor.ts +32 -30
- package/src/public/public_tx_context.ts +87 -28
- package/src/public/public_tx_simulator.ts +7 -14
- package/src/public/{enqueued_call_side_effect_trace.ts → side_effect_trace.ts} +29 -41
- package/src/public/side_effect_trace_interface.ts +4 -4
- package/src/test/utils.ts +2 -2
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +0 -1
- package/dest/public/enqueued_call_side_effect_trace.js +0 -357
- package/dest/public/transitional_adapters.d.ts +0 -4
- package/dest/public/transitional_adapters.d.ts.map +0 -1
- package/dest/public/transitional_adapters.js +0 -29
- package/src/public/transitional_adapters.ts +0 -113
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
3
|
import { GlobalVariables } from '@aztec/circuits.js';
|
|
4
|
-
import { type FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';
|
|
4
|
+
import { type ContractArtifact, type FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi';
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
6
|
import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js';
|
|
7
7
|
import { type WorldStateDB } from '../../server.js';
|
|
@@ -14,6 +14,7 @@ import { type AvmRevertReason } from '../errors.js';
|
|
|
14
14
|
import { AvmPersistableStateManager } from '../journal/journal.js';
|
|
15
15
|
import { NullifierManager } from '../journal/nullifiers.js';
|
|
16
16
|
import { PublicStorage } from '../journal/public_storage.js';
|
|
17
|
+
export declare const PUBLIC_DISPATCH_FN_NAME = "public_dispatch";
|
|
17
18
|
/**
|
|
18
19
|
* Create a new AVM context with default values.
|
|
19
20
|
*/
|
|
@@ -52,7 +53,10 @@ export declare function randomMemoryBytes(length: number): Uint8[];
|
|
|
52
53
|
export declare function randomMemoryUint32s(length: number): Uint32[];
|
|
53
54
|
export declare function randomMemoryUint64s(length: number): Uint64[];
|
|
54
55
|
export declare function randomMemoryFields(length: number): Field[];
|
|
55
|
-
export declare function
|
|
56
|
+
export declare function getFunctionSelector(functionName: string, contractArtifact: ContractArtifact): Promise<FunctionSelector>;
|
|
57
|
+
export declare function getContractFunctionArtifact(functionName: string, contractArtifact: ContractArtifact): FunctionArtifact | undefined;
|
|
58
|
+
export declare function resolveContractAssertionMessage(functionName: string, revertReason: AvmRevertReason, output: Fr[], contractArtifact: ContractArtifact): string | undefined;
|
|
59
|
+
export declare function getAvmTestContractFunctionSelector(functionName: string): Promise<FunctionSelector>;
|
|
56
60
|
export declare function getAvmTestContractArtifact(functionName: string): FunctionArtifact;
|
|
57
61
|
export declare function getAvmTestContractBytecode(functionName: string): Buffer;
|
|
58
62
|
export declare function resolveAvmTestContractAssertionMessage(functionName: string, revertReason: AvmRevertReason, output: Fr[]): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/avm/fixtures/index.ts"],"names":[],"mappings":";;AACA,OAAO,EAAW,eAAe,EAAoC,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/avm/fixtures/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ import { Field, Uint8, Uint32, Uint64 } from '../avm_memory_types.js';
|
|
|
16
16
|
import { AvmPersistableStateManager } from '../journal/journal.js';
|
|
17
17
|
import { NullifierManager } from '../journal/nullifiers.js';
|
|
18
18
|
import { PublicStorage } from '../journal/public_storage.js';
|
|
19
|
+
export const PUBLIC_DISPATCH_FN_NAME = 'public_dispatch';
|
|
19
20
|
/**
|
|
20
21
|
* Create a new AVM context with default values.
|
|
21
22
|
*/
|
|
@@ -66,14 +67,34 @@ export function randomMemoryUint64s(length) {
|
|
|
66
67
|
export function randomMemoryFields(length) {
|
|
67
68
|
return [...Array(length)].map(_ => new Field(Fr.random()));
|
|
68
69
|
}
|
|
70
|
+
export function getFunctionSelector(functionName, contractArtifact) {
|
|
71
|
+
const fnArtifact = contractArtifact.functions.find(f => f.name === functionName);
|
|
72
|
+
assert(!!fnArtifact, `Function ${functionName} not found in ${contractArtifact.name}`);
|
|
73
|
+
const params = fnArtifact.parameters;
|
|
74
|
+
return FunctionSelector.fromNameAndParameters(fnArtifact.name, params);
|
|
75
|
+
}
|
|
76
|
+
export function getContractFunctionArtifact(functionName, contractArtifact) {
|
|
77
|
+
const artifact = contractArtifact.functions.find(f => f.name === functionName);
|
|
78
|
+
if (!artifact) {
|
|
79
|
+
return undefined;
|
|
80
|
+
}
|
|
81
|
+
return artifact;
|
|
82
|
+
}
|
|
83
|
+
export function resolveContractAssertionMessage(functionName, revertReason, output, contractArtifact) {
|
|
84
|
+
traverseCauseChain(revertReason, cause => {
|
|
85
|
+
revertReason = cause;
|
|
86
|
+
});
|
|
87
|
+
const functionArtifact = contractArtifact.functions.find(f => f.name === functionName);
|
|
88
|
+
if (!functionArtifact || !revertReason.noirCallStack || !isNoirCallStackUnresolved(revertReason.noirCallStack)) {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
return resolveAssertionMessageFromRevertData(output, functionArtifact);
|
|
92
|
+
}
|
|
69
93
|
export function getAvmTestContractFunctionSelector(functionName) {
|
|
70
|
-
|
|
71
|
-
assert(!!artifact, `Function ${functionName} not found in AvmTestContractArtifact`);
|
|
72
|
-
const params = artifact.parameters;
|
|
73
|
-
return FunctionSelector.fromNameAndParameters(artifact.name, params);
|
|
94
|
+
return getFunctionSelector(functionName, AvmTestContractArtifact);
|
|
74
95
|
}
|
|
75
96
|
export function getAvmTestContractArtifact(functionName) {
|
|
76
|
-
const artifact =
|
|
97
|
+
const artifact = getContractFunctionArtifact(functionName, AvmTestContractArtifact);
|
|
77
98
|
assert(!!artifact?.bytecode, `No bytecode found for function ${functionName}. Try re-running bootstrap.sh on the repository root.`);
|
|
78
99
|
return artifact;
|
|
79
100
|
}
|
|
@@ -82,13 +103,6 @@ export function getAvmTestContractBytecode(functionName) {
|
|
|
82
103
|
return artifact.bytecode;
|
|
83
104
|
}
|
|
84
105
|
export function resolveAvmTestContractAssertionMessage(functionName, revertReason, output) {
|
|
85
|
-
|
|
86
|
-
revertReason = cause;
|
|
87
|
-
});
|
|
88
|
-
const functionArtifact = AvmTestContractArtifact.functions.find(f => f.name === functionName);
|
|
89
|
-
if (!functionArtifact || !revertReason.noirCallStack || !isNoirCallStackUnresolved(revertReason.noirCallStack)) {
|
|
90
|
-
return undefined;
|
|
91
|
-
}
|
|
92
|
-
return resolveAssertionMessageFromRevertData(output, functionArtifact);
|
|
106
|
+
return resolveContractAssertionMessage(functionName, revertReason, output, AvmTestContractArtifact);
|
|
93
107
|
}
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL2ZpeHR1cmVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLGdDQUFnQyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEcsT0FBTyxFQUFnRCxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3ZHLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRTNFLE9BQU8sRUFBRSxNQUFNLElBQUksTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMxQyxPQUFPLEtBQUssTUFBTSxjQUFjLENBQUM7QUFFakMsT0FBTyxFQUFFLHFDQUFxQyxFQUFFLGtCQUFrQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHNUYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQy9DLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHdEUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkUsT0FBTyxFQUFFLGdCQUFn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
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress, type FunctionSelector, type PublicFunction } from '@aztec/circuits.js';
|
|
2
|
+
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
3
|
+
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
|
+
import { type Fr } from '@aztec/foundation/fields';
|
|
5
|
+
/**
|
|
6
|
+
* This class is used during public/avm testing to function as a database of
|
|
7
|
+
* contract contract classes and instances. Tests can populate it with classes
|
|
8
|
+
* and instances and then probe it via the ContractDataSource interface.
|
|
9
|
+
*
|
|
10
|
+
* This class does not include any real merkle trees & merkle operations.
|
|
11
|
+
*/
|
|
12
|
+
export declare class SimpleContractDataSource implements ContractDataSource {
|
|
13
|
+
logger: import("@aztec/foundation/log").Logger;
|
|
14
|
+
private contractClasses;
|
|
15
|
+
private contractInstances;
|
|
16
|
+
private contractArtifacts;
|
|
17
|
+
getFirstContractInstance(): ContractInstanceWithAddress;
|
|
18
|
+
addContractArtifact(classId: Fr, artifact: ContractArtifact): void;
|
|
19
|
+
getPublicFunction(_address: AztecAddress, _selector: FunctionSelector): Promise<PublicFunction>;
|
|
20
|
+
getBlockNumber(): Promise<number>;
|
|
21
|
+
getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
|
|
22
|
+
getBytecodeCommitment(id: Fr): Promise<Fr | undefined>;
|
|
23
|
+
getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
|
|
24
|
+
getContractClassIds(): Promise<Fr[]>;
|
|
25
|
+
getContractArtifact(address: AztecAddress): Promise<ContractArtifact | undefined>;
|
|
26
|
+
getContractFunctionName(_address: AztecAddress, _selector: FunctionSelector): Promise<string>;
|
|
27
|
+
registerContractFunctionSignatures(_address: AztecAddress, _signatures: string[]): Promise<void>;
|
|
28
|
+
addContractClass(contractClass: ContractClassPublic): Promise<void>;
|
|
29
|
+
addContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void>;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=simple_contract_data_source.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"simple_contract_data_source.d.ts","sourceRoot":"","sources":["../../../src/avm/fixtures/simple_contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAKnD;;;;;;GAMG;AACH,qBAAa,wBAAyB,YAAW,kBAAkB;IAC1D,MAAM,yCAA+C;IAG5D,OAAO,CAAC,eAAe,CAA+C;IAEtE,OAAO,CAAC,iBAAiB,CAAuD;IAEhF,OAAO,CAAC,iBAAiB,CAA4C;IAIrE,wBAAwB,IAAI,2BAA2B;IAIvD,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAMlE,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;IAI/F,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAI5D,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAK5D,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAIpF,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAI9B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAWvF,uBAAuB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAI7F,kCAAkC,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhG,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnE,mBAAmB,CAAC,gBAAgB,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;CAIlF"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { computePublicBytecodeCommitment, } from '@aztec/circuits.js';
|
|
2
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { PUBLIC_DISPATCH_FN_NAME } from './index.js';
|
|
4
|
+
/**
|
|
5
|
+
* This class is used during public/avm testing to function as a database of
|
|
6
|
+
* contract contract classes and instances. Tests can populate it with classes
|
|
7
|
+
* and instances and then probe it via the ContractDataSource interface.
|
|
8
|
+
*
|
|
9
|
+
* This class does not include any real merkle trees & merkle operations.
|
|
10
|
+
*/
|
|
11
|
+
export class SimpleContractDataSource {
|
|
12
|
+
constructor() {
|
|
13
|
+
this.logger = createLogger('simple-contract-data-source');
|
|
14
|
+
// maps contract class ID to class
|
|
15
|
+
this.contractClasses = new Map();
|
|
16
|
+
// maps contract instance address to instance
|
|
17
|
+
this.contractInstances = new Map();
|
|
18
|
+
// maps contract instance address to address
|
|
19
|
+
this.contractArtifacts = new Map();
|
|
20
|
+
}
|
|
21
|
+
/////////////////////////////////////////////////////////////
|
|
22
|
+
// Helper functions not in the contract data source interface
|
|
23
|
+
getFirstContractInstance() {
|
|
24
|
+
return this.contractInstances.values().next().value;
|
|
25
|
+
}
|
|
26
|
+
addContractArtifact(classId, artifact) {
|
|
27
|
+
this.contractArtifacts.set(classId.toString(), artifact);
|
|
28
|
+
}
|
|
29
|
+
/////////////////////////////////////////////////////////////
|
|
30
|
+
// ContractDataSource function impelementations
|
|
31
|
+
getPublicFunction(_address, _selector) {
|
|
32
|
+
throw new Error('Method not implemented.');
|
|
33
|
+
}
|
|
34
|
+
getBlockNumber() {
|
|
35
|
+
throw new Error('Method not implemented.');
|
|
36
|
+
}
|
|
37
|
+
getContractClass(id) {
|
|
38
|
+
return Promise.resolve(this.contractClasses.get(id.toString()));
|
|
39
|
+
}
|
|
40
|
+
async getBytecodeCommitment(id) {
|
|
41
|
+
const contractClass = await this.getContractClass(id);
|
|
42
|
+
return Promise.resolve(computePublicBytecodeCommitment(contractClass.packedBytecode));
|
|
43
|
+
}
|
|
44
|
+
getContract(address) {
|
|
45
|
+
return Promise.resolve(this.contractInstances.get(address.toString()));
|
|
46
|
+
}
|
|
47
|
+
getContractClassIds() {
|
|
48
|
+
throw new Error('Method not implemented.');
|
|
49
|
+
}
|
|
50
|
+
async getContractArtifact(address) {
|
|
51
|
+
const contractInstance = await this.getContract(address);
|
|
52
|
+
if (!contractInstance) {
|
|
53
|
+
this.logger.warn(`Contract not found at address: ${address}`);
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
56
|
+
this.logger.debug(`Retrieved contract artifact for address: ${address}`);
|
|
57
|
+
this.logger.debug(`Contract class ID: ${contractInstance.contractClassId}`);
|
|
58
|
+
return Promise.resolve(this.contractArtifacts.get(contractInstance.contractClassId.toString()));
|
|
59
|
+
}
|
|
60
|
+
getContractFunctionName(_address, _selector) {
|
|
61
|
+
return Promise.resolve(PUBLIC_DISPATCH_FN_NAME);
|
|
62
|
+
}
|
|
63
|
+
registerContractFunctionSignatures(_address, _signatures) {
|
|
64
|
+
return Promise.resolve();
|
|
65
|
+
}
|
|
66
|
+
addContractClass(contractClass) {
|
|
67
|
+
this.contractClasses.set(contractClass.id.toString(), contractClass);
|
|
68
|
+
return Promise.resolve();
|
|
69
|
+
}
|
|
70
|
+
addContractInstance(contractInstance) {
|
|
71
|
+
this.contractInstances.set(contractInstance.address.toString(), contractInstance);
|
|
72
|
+
return Promise.resolve();
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2ltcGxlX2NvbnRyYWN0X2RhdGFfc291cmNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F2bS9maXh0dXJlcy9zaW1wbGVfY29udHJhY3RfZGF0YV9zb3VyY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQU1MLCtCQUErQixHQUNoQyxNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVyRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFckQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxPQUFPLHdCQUF3QjtJQUFyQztRQUNTLFdBQU0sR0FBRyxZQUFZLENBQUMsNkJBQTZCLENBQUMsQ0FBQztRQUU1RCxrQ0FBa0M7UUFDMUIsb0JBQWUsR0FBcUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUN0RSw2Q0FBNkM7UUFDckMsc0JBQWlCLEdBQTZDLElBQUksR0FBRyxFQUFFLENBQUM7UUFDaEYsNENBQTRDO1FBQ3BDLHNCQUFpQixHQUFrQyxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBbUV2RSxDQUFDO0lBakVDLDZEQUE2RDtJQUM3RCw2REFBNkQ7SUFDN0Qsd0JBQXdCO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztJQUN0RCxDQUFDO0lBRUQsbUJBQW1CLENBQUMsT0FBVyxFQUFFLFFBQTBCO1FBQ3pELElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQzNELENBQUM7SUFFRCw2REFBNkQ7SUFDN0QsK0NBQStDO0lBQy9DLGlCQUFpQixDQUFDLFFBQXNCLEVBQUUsU0FBMkI7UUFDbkUsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQzdD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
|
|
@@ -98,17 +98,17 @@ export declare class AvmPersistableStateManager {
|
|
|
98
98
|
* Write a raw note hash, silo it and make it unique, then trace the write.
|
|
99
99
|
* @param noteHash - the unsiloed note hash to write
|
|
100
100
|
*/
|
|
101
|
-
writeNoteHash(contractAddress: AztecAddress, noteHash: Fr): void
|
|
101
|
+
writeNoteHash(contractAddress: AztecAddress, noteHash: Fr): Promise<void>;
|
|
102
102
|
/**
|
|
103
103
|
* Write a note hash, make it unique, trace the write.
|
|
104
104
|
* @param noteHash - the non unique note hash to write
|
|
105
105
|
*/
|
|
106
|
-
writeSiloedNoteHash(noteHash: Fr): void
|
|
106
|
+
writeSiloedNoteHash(noteHash: Fr): Promise<void>;
|
|
107
107
|
/**
|
|
108
108
|
* Write a note hash, trace the write.
|
|
109
109
|
* @param noteHash - the siloed unique hash to write
|
|
110
110
|
*/
|
|
111
|
-
writeUniqueNoteHash(noteHash: Fr): void
|
|
111
|
+
writeUniqueNoteHash(noteHash: Fr): Promise<void>;
|
|
112
112
|
/**
|
|
113
113
|
* Check if a nullifier exists, trace the check.
|
|
114
114
|
* @param contractAddress - address of the contract that the nullifier is associated with
|
|
@@ -155,12 +155,11 @@ export declare class AvmPersistableStateManager {
|
|
|
155
155
|
*/
|
|
156
156
|
writeL2ToL1Message(contractAddress: AztecAddress, recipient: Fr, content: Fr): void;
|
|
157
157
|
/**
|
|
158
|
-
* Write
|
|
158
|
+
* Write a public log
|
|
159
159
|
* @param contractAddress - address of the contract that emitted the log
|
|
160
|
-
* @param event - log event selector
|
|
161
160
|
* @param log - log contents
|
|
162
161
|
*/
|
|
163
|
-
|
|
162
|
+
writePublicLog(contractAddress: AztecAddress, log: Fr[]): void;
|
|
164
163
|
/**
|
|
165
164
|
* Get a contract instance.
|
|
166
165
|
* @param contractAddress - address of the contract instance to retrieve.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal.d.ts","sourceRoot":"","sources":["../../../src/avm/journal/journal.ts"],"names":[],"mappings":";;AACA,OAAO,EACL,YAAY,EAMZ,KAAK,iBAAiB,EAItB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAO9C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,KAAK,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AAClG,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAA2B,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;;;;;;GAQG;AACH,qBAAa,0BAA0B;IAOnC,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,wBAAwB;aAER,KAAK,EAAE,8BAA8B;IACrD,8CAA8C;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,kEAAkE;IAClE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,iDAAiD;IAC1C,WAAW,EAAE,kBAAkB;aACtB,cAAc,EAAE,EAAE;IAlBpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IAEnE,sDAAsD;IACtD,OAAO,CAAC,uBAAuB,CAAS;;IAGtC,gCAAgC;IACf,YAAY,EAAE,YAAY;IAC3C,wBAAwB;IAER,KAAK,EAAE,8BAA8B;IACrD,8CAA8C;IAC7B,aAAa,EAAE,aAA+C;IAC/E,kEAAkE;IACjD,UAAU,EAAE,gBAAqD,EACjE,kBAAkB,EAAE,OAAe;IACpD,iDAAiD;IAC1C,WAAW,EAAE,kBAAkB,EACtB,cAAc,EAAE,EAAE;IAGpC;;OAEG;WACiB,MAAM,CACxB,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,8BAA8B,EACrC,kBAAkB,qBAAiB,EACnC,cAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"journal.d.ts","sourceRoot":"","sources":["../../../src/avm/journal/journal.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,10 +79,11 @@ export class AvmPersistableStateManager {
|
|
|
79
79
|
this.trace.merge(forkedState.trace, reverted);
|
|
80
80
|
if (reverted) {
|
|
81
81
|
if (this.doMerkleOperations) {
|
|
82
|
-
this.log.
|
|
82
|
+
this.log.trace(`Rolled back nullifier tree to root ${this.merkleTrees.treeMap.get(MerkleTreeId.NULLIFIER_TREE).getRoot()}`);
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
else {
|
|
86
|
+
this.log.trace('Merging forked state into parent...');
|
|
86
87
|
this.merkleTrees = forkedState.merkleTrees;
|
|
87
88
|
}
|
|
88
89
|
}
|
|
@@ -95,7 +96,7 @@ export class AvmPersistableStateManager {
|
|
|
95
96
|
*/
|
|
96
97
|
async writeStorage(contractAddress, slot, value, protocolWrite = false) {
|
|
97
98
|
this.log.debug(`Storage write (address=${contractAddress}, slot=${slot}): value=${value}`);
|
|
98
|
-
const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
99
|
+
const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
99
100
|
this.log.debug(`leafSlot=${leafSlot}`);
|
|
100
101
|
// Cache storage writes for later reference/reads
|
|
101
102
|
this.publicStorage.write(contractAddress, slot, value);
|
|
@@ -113,10 +114,10 @@ export class AvmPersistableStateManager {
|
|
|
113
114
|
insertionPath = result.insertionPath;
|
|
114
115
|
assert(newLeafPreimage.value.equals(value), `Value mismatch when performing public data write (got value: ${value}, value in ephemeral tree: ${newLeafPreimage.value})`);
|
|
115
116
|
}
|
|
116
|
-
this.trace.tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage, new Fr(lowLeafIndex), lowLeafPath, newLeafPreimage, insertionPath);
|
|
117
|
+
await this.trace.tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage, new Fr(lowLeafIndex), lowLeafPath, newLeafPreimage, insertionPath);
|
|
117
118
|
}
|
|
118
119
|
else {
|
|
119
|
-
this.trace.tracePublicStorageWrite(contractAddress, slot, value, protocolWrite);
|
|
120
|
+
await this.trace.tracePublicStorageWrite(contractAddress, slot, value, protocolWrite);
|
|
120
121
|
}
|
|
121
122
|
}
|
|
122
123
|
/**
|
|
@@ -129,7 +130,7 @@ export class AvmPersistableStateManager {
|
|
|
129
130
|
async readStorage(contractAddress, slot) {
|
|
130
131
|
const { value, cached } = await this.publicStorage.read(contractAddress, slot);
|
|
131
132
|
this.log.debug(`Storage read (address=${contractAddress}, slot=${slot}): value=${value}, cached=${cached}`);
|
|
132
|
-
const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
133
|
+
const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, slot);
|
|
133
134
|
this.log.debug(`leafSlot=${leafSlot}`);
|
|
134
135
|
if (this.doMerkleOperations) {
|
|
135
136
|
// Get leaf if present, low leaf if absent
|
|
@@ -199,29 +200,29 @@ export class AvmPersistableStateManager {
|
|
|
199
200
|
* Write a raw note hash, silo it and make it unique, then trace the write.
|
|
200
201
|
* @param noteHash - the unsiloed note hash to write
|
|
201
202
|
*/
|
|
202
|
-
writeNoteHash(contractAddress, noteHash) {
|
|
203
|
-
const siloedNoteHash = siloNoteHash(contractAddress, noteHash);
|
|
204
|
-
this.writeSiloedNoteHash(siloedNoteHash);
|
|
203
|
+
async writeNoteHash(contractAddress, noteHash) {
|
|
204
|
+
const siloedNoteHash = await siloNoteHash(contractAddress, noteHash);
|
|
205
|
+
await this.writeSiloedNoteHash(siloedNoteHash);
|
|
205
206
|
}
|
|
206
207
|
/**
|
|
207
208
|
* Write a note hash, make it unique, trace the write.
|
|
208
209
|
* @param noteHash - the non unique note hash to write
|
|
209
210
|
*/
|
|
210
|
-
writeSiloedNoteHash(noteHash) {
|
|
211
|
-
const nonce = computeNoteHashNonce(this.firstNullifier, this.trace.getNoteHashCount());
|
|
212
|
-
const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
|
|
213
|
-
this.writeUniqueNoteHash(uniqueNoteHash);
|
|
211
|
+
async writeSiloedNoteHash(noteHash) {
|
|
212
|
+
const nonce = await computeNoteHashNonce(this.firstNullifier, this.trace.getNoteHashCount());
|
|
213
|
+
const uniqueNoteHash = await computeUniqueNoteHash(nonce, noteHash);
|
|
214
|
+
await this.writeUniqueNoteHash(uniqueNoteHash);
|
|
214
215
|
}
|
|
215
216
|
/**
|
|
216
217
|
* Write a note hash, trace the write.
|
|
217
218
|
* @param noteHash - the siloed unique hash to write
|
|
218
219
|
*/
|
|
219
|
-
writeUniqueNoteHash(noteHash) {
|
|
220
|
+
async writeUniqueNoteHash(noteHash) {
|
|
220
221
|
this.log.debug(`noteHashes += @${noteHash}.`);
|
|
221
222
|
if (this.doMerkleOperations) {
|
|
222
223
|
// Should write a helper for this
|
|
223
224
|
const leafIndex = new Fr(this.merkleTrees.treeMap.get(MerkleTreeId.NOTE_HASH_TREE).leafCount);
|
|
224
|
-
const insertionPath = this.merkleTrees.appendNoteHash(noteHash);
|
|
225
|
+
const insertionPath = await this.merkleTrees.appendNoteHash(noteHash);
|
|
225
226
|
this.trace.traceNewNoteHash(noteHash, leafIndex, insertionPath);
|
|
226
227
|
}
|
|
227
228
|
else {
|
|
@@ -236,7 +237,7 @@ export class AvmPersistableStateManager {
|
|
|
236
237
|
*/
|
|
237
238
|
async checkNullifierExists(contractAddress, nullifier) {
|
|
238
239
|
this.log.debug(`Checking existence of nullifier (address=${contractAddress}, nullifier=${nullifier})`);
|
|
239
|
-
const siloedNullifier = siloNullifier(contractAddress, nullifier);
|
|
240
|
+
const siloedNullifier = await siloNullifier(contractAddress, nullifier);
|
|
240
241
|
const [exists, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = await this.getNullifierMembership(siloedNullifier);
|
|
241
242
|
if (this.doMerkleOperations) {
|
|
242
243
|
this.trace.traceNullifierCheck(siloedNullifier, exists, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath);
|
|
@@ -288,7 +289,7 @@ export class AvmPersistableStateManager {
|
|
|
288
289
|
*/
|
|
289
290
|
async writeNullifier(contractAddress, nullifier) {
|
|
290
291
|
this.log.debug(`Inserting new nullifier (address=${nullifier}, nullifier=${contractAddress})`);
|
|
291
|
-
const siloedNullifier = siloNullifier(contractAddress, nullifier);
|
|
292
|
+
const siloedNullifier = await siloNullifier(contractAddress, nullifier);
|
|
292
293
|
await this.writeSiloedNullifier(siloedNullifier);
|
|
293
294
|
}
|
|
294
295
|
/**
|
|
@@ -316,11 +317,13 @@ export class AvmPersistableStateManager {
|
|
|
316
317
|
// Cache pending nullifiers for later access
|
|
317
318
|
await this.nullifiers.append(siloedNullifier);
|
|
318
319
|
// We append the new nullifier
|
|
319
|
-
this.log.debug(`Nullifier tree root before insertion ${this.merkleTrees.treeMap
|
|
320
|
+
this.log.debug(`Nullifier tree root before insertion ${await this.merkleTrees.treeMap
|
|
320
321
|
.get(MerkleTreeId.NULLIFIER_TREE)
|
|
321
322
|
.getRoot()}`);
|
|
322
323
|
const appendResult = await this.merkleTrees.appendNullifier(siloedNullifier);
|
|
323
|
-
this.log.debug(`Nullifier tree root after insertion ${this.merkleTrees.treeMap
|
|
324
|
+
this.log.debug(`Nullifier tree root after insertion ${await this.merkleTrees.treeMap
|
|
325
|
+
.get(MerkleTreeId.NULLIFIER_TREE)
|
|
326
|
+
.getRoot()}`);
|
|
324
327
|
const lowLeafPreimage = appendResult.lowWitness.preimage;
|
|
325
328
|
const lowLeafIndex = appendResult.lowWitness.index;
|
|
326
329
|
const lowLeafPath = appendResult.lowWitness.siblingPath;
|
|
@@ -372,14 +375,13 @@ export class AvmPersistableStateManager {
|
|
|
372
375
|
this.trace.traceNewL2ToL1Message(contractAddress, recipient, content);
|
|
373
376
|
}
|
|
374
377
|
/**
|
|
375
|
-
* Write
|
|
378
|
+
* Write a public log
|
|
376
379
|
* @param contractAddress - address of the contract that emitted the log
|
|
377
|
-
* @param event - log event selector
|
|
378
380
|
* @param log - log contents
|
|
379
381
|
*/
|
|
380
|
-
|
|
381
|
-
this.log.debug(`
|
|
382
|
-
this.trace.
|
|
382
|
+
writePublicLog(contractAddress, log) {
|
|
383
|
+
this.log.debug(`PublicLog(${contractAddress}) += event with ${log.length} fields.`);
|
|
384
|
+
this.trace.tracePublicLog(contractAddress, log);
|
|
383
385
|
}
|
|
384
386
|
/**
|
|
385
387
|
* Get a contract instance.
|
|
@@ -397,7 +399,7 @@ export class AvmPersistableStateManager {
|
|
|
397
399
|
new Array(),
|
|
398
400
|
];
|
|
399
401
|
if (!contractAddressIsCanonical(contractAddress)) {
|
|
400
|
-
const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractAddress.toField());
|
|
402
|
+
const contractAddressNullifier = await siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractAddress.toField());
|
|
401
403
|
[existsInTree, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = await this.getNullifierMembership(
|
|
402
404
|
/*siloedNullifier=*/ contractAddressNullifier);
|
|
403
405
|
assert(exists == existsInTree, 'WorldStateDB contains contract instance, but nullifier tree does not contain contract address (or vice versa).... This is a bug!');
|
|
@@ -439,7 +441,7 @@ export class AvmPersistableStateManager {
|
|
|
439
441
|
new Array(),
|
|
440
442
|
];
|
|
441
443
|
if (!contractAddressIsCanonical(contractAddress)) {
|
|
442
|
-
const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractAddress.toField());
|
|
444
|
+
const contractAddressNullifier = await siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractAddress.toField());
|
|
443
445
|
[existsInTree, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = await this.getNullifierMembership(
|
|
444
446
|
/*siloedNullifier=*/ contractAddressNullifier);
|
|
445
447
|
assert(exists == existsInTree, 'WorldStateDB contains contract instance, but nullifier tree does not contain contract address (or vice versa).... This is a bug!');
|
|
@@ -494,4 +496,4 @@ function contractAddressIsCanonical(contractAddress) {
|
|
|
494
496
|
contractAddress.equals(AztecAddress.fromNumber(FEE_JUICE_ADDRESS)) ||
|
|
495
497
|
contractAddress.equals(AztecAddress.fromNumber(ROUTER_ADDRESS)));
|
|
496
498
|
}
|
|
497
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../../src/avm/journal/journal.ts"],"names":[],"mappings":"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"}
|
|
499
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../../src/avm/journal/journal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EACL,YAAY,EACZ,+BAA+B,EAC/B,yBAAyB,EACzB,iBAAiB,EACjB,6BAA6B,EAC7B,qBAAqB,EAGrB,2BAA2B,EAC3B,cAAc,EACd,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC7B,qBAAqB,EACrB,YAAY,EACZ,aAAa,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAI3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;;;;;;GAQG;AACH,MAAM,OAAO,0BAA0B;IAMrC;IACE,gCAAgC;IACf,YAA0B;IAC3C,wBAAwB;IACxB,+DAA+D;IAC/C,KAAqC;IACrD,8CAA8C;IAC7B,gBAA+B,IAAI,aAAa,CAAC,YAAY,CAAC;IAC/E,kEAAkE;IACjD,aAA+B,IAAI,gBAAgB,CAAC,YAAY,CAAC,EACjE,qBAA8B,KAAK;IACpD,iDAAiD;IAC1C,WAA+B,EACtB,cAAkB;QAXjB,iBAAY,GAAZ,YAAY,CAAc;QAG3B,UAAK,GAAL,KAAK,CAAgC;QAEpC,kBAAa,GAAb,aAAa,CAAiD;QAE9D,eAAU,GAAV,UAAU,CAAuD;QACjE,uBAAkB,GAAlB,kBAAkB,CAAiB;QAE7C,gBAAW,GAAX,WAAW,CAAoB;QACtB,mBAAc,GAAd,cAAc,CAAI;QAlBnB,QAAG,GAAG,YAAY,CAAC,6BAA6B,CAAC,CAAC;QAEnE,sDAAsD;QAC9C,4BAAuB,GAAG,KAAK,CAAC;IAgBrC,CAAC;IAEJ;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,YAA0B,EAC1B,KAAqC,EACrC,qBAA8B,KAAK,EACnC,cAAkB;QAElB,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC3F,OAAO,IAAI,0BAA0B,CACnC,YAAY,EACZ,KAAK;QACL,kBAAkB,CAAC,IAAI,aAAa,CAAC,YAAY,CAAC;QAClD,eAAe,CAAC,IAAI,gBAAgB,CAAC,YAAY,CAAC;QAClD,uBAAuB,CAAC,kBAAkB,EAC1C,eAAe,EACf,cAAc,CACf,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,IAAI;QACT,OAAO,IAAI,0BAA0B,CACnC,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EACjB,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EACzB,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EACtB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EACvB,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,WAAuC;QAClD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,WAAuC;QACnD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAEO,MAAM,CAAC,WAAuC,EAAE,QAAiB;QACvE,4DAA4D;QAC5D,MAAM,CACJ,CAAC,WAAW,CAAC,uBAAuB,EACpC,yEAAyE,CAC1E,CAAC;QACF,WAAW,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAC3C,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAC7D,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,sCAAsC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAE,CAAC,OAAO,EAAE,EAAE,CAC7G,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACtD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;QAC7C,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,YAAY,CAAC,eAA6B,EAAE,IAAQ,EAAE,KAAS,EAAE,aAAa,GAAG,KAAK;QACjG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,eAAe,UAAU,IAAI,YAAY,KAAK,EAAE,CAAC,CAAC;QAC3F,MAAM,QAAQ,GAAG,MAAM,6BAA6B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,QAAQ,EAAE,CAAC,CAAC;QACvC,iDAAiD;QACjD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAEvD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC1E,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,iFAAiF,CAAC,CAAC;YAChH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8CAA8C,QAAQ,YAAY,KAAK,EAAE,CAAC,CAAC;YAE1F,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC;YACtC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAsC,CAAC;YACjF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC;YACvC,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;YAE5C,MAAM,eAAe,GAAG,MAAM,CAAC,OAAqC,CAAC;YACrE,IAAI,aAA+B,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;gBACrC,MAAM,CACJ,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EACnC,gEAAgE,KAAK,8BAA8B,eAAe,CAAC,KAAK,GAAG,CAC5H,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CACtC,eAAe,EACf,IAAI,EACJ,KAAK,EACL,aAAa,EACb,eAAe,EACf,IAAI,EAAE,CAAC,YAAY,CAAC,EACpB,WAAW,EACX,eAAe,EACf,aAAa,CACd,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,WAAW,CAAC,eAA6B,EAAE,IAAQ;QAC9D,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,eAAe,UAAU,IAAI,YAAY,KAAK,YAAY,MAAM,EAAE,CAAC,CAAC;QAC7G,MAAM,QAAQ,GAAG,MAAM,6BAA6B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,QAAQ,EAAE,CAAC,CAAC;QAEvC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,0CAA0C;YAC1C,yEAAyE;YACzE,MAAM,EACJ,QAAQ,EACR,KAAK,EAAE,SAAS,EAChB,cAAc,GACf,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YACzF,gHAAgH;YAChH,2HAA2H;YAC3H,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;YACjG,MAAM,YAAY,GAAG,QAAsC,CAAC;YAE5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,YAAY,CAAC,IAAI,yBAAyB,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;YACrG,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,0BAA0B,YAAY,CAAC,QAAQ,6BAA6B,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAC7G,CAAC;YAEF,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,CACJ,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAChC,+DAA+D,KAAK,8BAA8B,YAAY,CAAC,KAAK,GAAG,CACxH,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACtD,+EAA+E;gBAC/E,MAAM,CACJ,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE;oBAChD,CAAC,YAAY,CAAC,SAAS,KAAK,EAAE,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAC3F,qHAAqH,CACtH,CAAC;YACJ,CAAC;YACD,2FAA2F;YAC3F,4FAA4F;YAC5F,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC7G,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,eAAe,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,WAAW,CAAC,eAA6B,EAAE,IAAQ;QAC9D,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,eAAe,UAAU,IAAI,YAAY,KAAK,aAAa,MAAM,EAAE,CAAC,CAAC;QAC9G,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,mDAAmD;IACnD;;;;;;;OAOG;IACI,KAAK,CAAC,mBAAmB,CAAC,eAA6B,EAAE,QAAY,EAAE,SAAa;QACzF,MAAM,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC;QACnG,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,cAAc,eAAe,KAAK,QAAQ,kBAAkB,SAAS,oBAAoB,YAAY,aAAa,MAAM,GAAG,CAC5H,CAAC;QACF,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,oHAAoH;YACpH,kFAAkF;YAClF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACxF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,aAAa,CAAC,eAA6B,EAAE,QAAY;QACpE,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAErE,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,mBAAmB,CAAC,QAAY;QAC3C,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAC7F,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEpE,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,mBAAmB,CAAC,QAAY;QAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,QAAQ,GAAG,CAAC,CAAC;QAE9C,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,iCAAiC;YACjC,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAE,CAAC,SAAS,CAAC,CAAC;YAC/F,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YACtE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,oBAAoB,CAAC,eAA6B,EAAE,SAAa;QAC5E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,eAAe,eAAe,SAAS,GAAG,CAAC,CAAC;QACvG,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAC9G,eAAe,CAChB,CAAC;QAEF,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAC5B,eAAe,EACf,MAAM,EACN,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;;;;;OAUG;IACK,KAAK,CAAC,sBAAsB,CAClC,eAAmB;QASnB,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAClF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,eAAe,YAAY,MAAM,cAAc,SAAS,EAAE,CAAC,CAAC;QAEvG,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,0CAA0C;YAC1C,yEAAyE;YACzE,MAAM,EACJ,QAAQ,EACR,KAAK,EAAE,SAAS,EAChB,cAAc,GACf,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,YAAY,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YAC9F,MAAM,YAAY,GAAG,QAAiC,CAAC;YACvD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAE/F,MAAM,CACJ,cAAc,IAAI,MAAM,EACxB,mGAAmG,CACpG,CAAC;YAEF,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,eAAe,wBAAwB,SAAS,EAAE,CAAC,CAAC;YACzF,CAAC;iBAAM,CAAC;gBACN,gFAAgF;gBAChF,MAAM,CACJ,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,eAAe,CAAC,QAAQ,EAAE;oBAC5D,CAAC,YAAY,CAAC,SAAS,KAAK,EAAE,IAAI,YAAY,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC,EACvG,oGAAoG,CACrG,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,EAAE,qBAAqB,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,cAAc,CAAC,eAA6B,EAAE,SAAa;QACtE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,SAAS,eAAe,eAAe,GAAG,CAAC,CAAC;QAC/F,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACnD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,oBAAoB,CAAC,eAAmB;QACnD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,eAAe,EAAE,CAAC,CAAC;QAEhE,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,kHAAkH;YAClH,kEAAkE;YAClE,qEAAqE;YACrE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CACrF,YAAY,CAAC,cAAc,EAC3B,eAAe,CAChB,CAAC;YACF,IAAI,cAAc,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,eAAe,qCAAqC,KAAK,GAAG,CAAC,CAAC;gBACnG,qEAAqE;gBACrE,gDAAgD;gBAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;gBACvF,0CAA0C;gBAC1C,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAC5B,eAAe;gBACf,WAAW,CAAC,cAAc,EAC1B,QAAiC,EACjC,IAAI,EAAE,CAAC,KAAK,CAAC,EACb,IAAI,CACL,CAAC;gBACF,MAAM,IAAI,uBAAuB,CAC/B,oBAAoB,eAAe,0CAA0C,CAC9E,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,4CAA4C;gBAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC9C,8BAA8B;gBAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,wCAAwC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO;qBACnE,GAAG,CAAC,YAAY,CAAC,cAAc,CAAE;qBACjC,OAAO,EAAE,EAAE,CACf,CAAC;gBACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;gBAC7E,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,uCAAuC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO;qBAClE,GAAG,CAAC,YAAY,CAAC,cAAc,CAAE;qBACjC,OAAO,EAAE,EAAE,CACf,CAAC;gBACF,MAAM,eAAe,GAAG,YAAY,CAAC,UAAU,CAAC,QAAiC,CAAC;gBAClF,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC;gBACnD,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC;gBACxD,MAAM,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;gBACjD,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAC1B,eAAe,EACf,eAAe,EACf,IAAI,EAAE,CAAC,YAAY,CAAC,EACpB,WAAW,EACX,aAAa,CACd,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,4CAA4C;YAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC9C,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,gCAAgC,CAAC,gBAAsB;QAClE,KAAK,MAAM,eAAe,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YACzE,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,wBAAwB,CACnC,eAA6B,EAC7B,OAAW,EACX,YAAgB;QAEhB,MAAM,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC;QACtG,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,mBAAmB,YAAY,gBAAgB,MAAM,eAAe,OAAO,YAAY,YAAY,GAAG,CACvG,CAAC;QAEF,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,4GAA4G;YAC5G,kFAAkF;YAClF,wCAAwC;YACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CACvD,YAAY,CAAC,qBAAqB,EAClC,YAAY,CAAC,QAAQ,EAAE,CACxB,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3G,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,eAA6B,EAAE,SAAa,EAAE,OAAW;QACjF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,eAAe,oBAAoB,SAAS,cAAc,OAAO,IAAI,CAAC,CAAC;QACxG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAED;;;;OAIG;IACI,cAAc,CAAC,eAA6B,EAAE,GAAS;QAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,eAAe,mBAAmB,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;QACpF,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,mBAAmB,CAAC,eAA6B;QAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,eAAe,EAAE,CAAC,CAAC;QAC3E,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACzF,MAAM,MAAM,GAAG,mBAAmB,KAAK,SAAS,CAAC;QAEjD,IAAI,CAAC,YAAY,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,GAAG;YACjF,MAAM;YACN,qBAAqB,CAAC,KAAK,EAAE;YAC7B,EAAE,CAAC,IAAI;YACP,IAAI,KAAK,EAAM;SAChB,CAAC;QACF,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,EAAE,CAAC;YACjD,MAAM,wBAAwB,GAAG,MAAM,aAAa,CAClD,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAClD,eAAe,CAAC,OAAO,EAAE,CAC1B,CAAC;YACF,CAAC,YAAY,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,GAAG,MAAM,IAAI,CAAC,sBAAsB;YAC9G,oBAAoB,CAAC,wBAAwB,CAC9C,CAAC;YACF,MAAM,CACJ,MAAM,IAAI,YAAY,EACtB,kIAAkI,CACnI,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,IAAI,4BAA4B,CAAC,mBAAmB,CAAC,CAAC;YACvE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,kCAAkC,eAAe,aAAa,MAAM,cAAc,aAAa,CAAC,QAAQ,CAAC,EAAE,CAC5G,CAAC;YACF,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,wBAAwB,CACjC,eAAe,EACf,MAAM,EACN,QAAQ,EACR,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YACzE,CAAC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAwC,eAAe,GAAG,CAAC,CAAC;YAC3E,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,wBAAwB,CACjC,eAAe,EACf,MAAM;gBACN,aAAa,CAAC,SAAS,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YAC/D,CAAC;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,WAAW,CAAC,eAA6B;QACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,eAAe,EAAE,CAAC,CAAC;QAC3E,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACzF,MAAM,MAAM,GAAG,mBAAmB,KAAK,SAAS,CAAC;QAEjD,IAAI,CAAC,YAAY,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,GAAG;YACjF,MAAM;YACN,qBAAqB,CAAC,KAAK,EAAE;YAC7B,EAAE,CAAC,IAAI;YACP,IAAI,KAAK,EAAM;SAChB,CAAC;QACF,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,EAAE,CAAC;YACjD,MAAM,wBAAwB,GAAG,MAAM,aAAa,CAClD,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAClD,eAAe,CAAC,OAAO,EAAE,CAC1B,CAAC;YACF,CAAC,YAAY,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,iBAAiB,CAAC,GAAG,MAAM,IAAI,CAAC,sBAAsB;YAC9G,oBAAoB,CAAC,wBAAwB,CAC9C,CAAC;YACF,MAAM,CACJ,MAAM,IAAI,YAAY,EACtB,kIAAkI,CACnI,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,IAAI,4BAA4B,CAAC,mBAAmB,CAAC,CAAC;YACvE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YACzF,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAEnG,MAAM,CACJ,aAAa,EACb,yFAAyF,QAAQ,CAAC,eAAe,4BAA4B,CAC9I,CAAC;YAEF,MAAM,CACJ,kBAAkB,EAClB,+DAA+D,QAAQ,CAAC,eAAe,4BAA4B,CACpH,CAAC;YAEF,MAAM,qBAAqB,GAAG;gBAC5B,YAAY,EAAE,aAAa,CAAC,YAAY;gBACxC,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;gBACxD,wBAAwB,EAAE,kBAAkB;aAC7C,CAAC;YAEF,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,gBAAgB,CACzB,eAAe,EACf,MAAM,EACN,aAAa,CAAC,cAAc,EAC5B,QAAQ,EACR,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,gBAAgB,CACzB,eAAe,EACf,MAAM,EACN,aAAa,CAAC,cAAc,EAC5B,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACJ,CAAC;YAED,OAAO,aAAa,CAAC,cAAc,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,6EAA6E;YAC7E,sHAAsH;YACtH,4HAA4H;YAC5H,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,gBAAgB,CACzB,eAAe,EACf,MAAM;gBACN,aAAa,CAAC,SAAS;gBACvB,kBAAkB,CAAC,SAAS;gBAC5B,aAAa,CAAC,SAAS,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,sCAAsC;YAC9F,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEM,iBAAiB,CAAC,iBAAoC,EAAE,QAAc,EAAE,QAAiB;QAC9F,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,cAAuC;QAC7E,OAAO,MAAM,0BAA0B,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,OAAO,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC9G,CAAC;CACF;AAED,SAAS,0BAA0B,CAAC,eAA6B;IAC/D,OAAO,CACL,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAC;QAChF,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;QAC1E,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC;QAC5E,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC;QAC9E,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;QAClE,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAChE,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accrued_substate.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,cAAe,SAAQ,WAAW;IAa3C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAoB;IACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAyB;IAEvD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBzD;AAED,qBAAa,YAAa,SAAQ,WAAW;IAM/B,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,cAAc;IAL5D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAkB;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAuB;IAErD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAA8D;gBAEpE,QAAQ,EAAE,MAAM,EAAU,cAAc,EAAE,MAAM;IAIvD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBzD;AAED,qBAAa,eAAgB,SAAQ,WAAW;IAa5C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA0B;IAExD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBzD;AAED,qBAAa,aAAc,SAAQ,WAAW;IAMhC,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,eAAe;IAL7D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAmB;IACtC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAwB;IAEtD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAA8D;gBAEpE,QAAQ,EAAE,MAAM,EAAU,eAAe,EAAE,MAAM;IAIxD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA6BzD;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAahD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA0B;IAExD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBzD;AAED,qBAAa,kBAAmB,SAAQ,WAAW;
|
|
1
|
+
{"version":3,"file":"accrued_substate.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,cAAe,SAAQ,WAAW;IAa3C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAoB;IACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAyB;IAEvD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBzD;AAED,qBAAa,YAAa,SAAQ,WAAW;IAM/B,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,cAAc;IAL5D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAkB;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAuB;IAErD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAA8D;gBAEpE,QAAQ,EAAE,MAAM,EAAU,cAAc,EAAE,MAAM;IAIvD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBzD;AAED,qBAAa,eAAgB,SAAQ,WAAW;IAa5C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA0B;IAExD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAiBzD;AAED,qBAAa,aAAc,SAAQ,WAAW;IAMhC,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,eAAe;IAL7D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAmB;IACtC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAwB;IAEtD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAA8D;gBAEpE,QAAQ,EAAE,MAAM,EAAU,eAAe,EAAE,MAAM;IAIxD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA6BzD;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAahD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA0B;IAExD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBzD;AAED,qBAAa,kBAAmB,SAAQ,WAAW;IAOrC,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,SAAS;IAAU,OAAO,CAAC,aAAa;IALtF,MAAM,CAAC,IAAI,EAAE,MAAM,CAAwB;IAC3C,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA6B;IAE3D,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAAkF;gBAExF,QAAQ,EAAE,MAAM,EAAU,SAAS,EAAE,MAAM,EAAU,aAAa,EAAE,MAAM;IAIjF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBzD;AAED,qBAAa,iBAAkB,SAAQ,WAAW;IAMpC,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,eAAe;IAAU,OAAO,CAAC,aAAa;IAL5F,MAAM,CAAC,IAAI,EAAE,MAAM,CAAmB;IACtC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAwB;IAEtD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAAkF;gBAExF,QAAQ,EAAE,MAAM,EAAU,eAAe,EAAE,MAAM,EAAU,aAAa,EAAE,MAAM;IAIvF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAmBzD"}
|