@aztec/pxe 0.59.0 → 0.61.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/contract_data_oracle/index.d.ts +1 -0
- package/dest/contract_data_oracle/index.d.ts.map +1 -1
- package/dest/contract_data_oracle/private_functions_tree.d.ts +1 -0
- package/dest/contract_data_oracle/private_functions_tree.d.ts.map +1 -1
- package/dest/database/deferred_note_dao.d.ts +7 -19
- package/dest/database/deferred_note_dao.d.ts.map +1 -1
- package/dest/database/deferred_note_dao.js +8 -18
- package/dest/database/incoming_note_dao.d.ts +2 -1
- package/dest/database/incoming_note_dao.d.ts.map +1 -1
- package/dest/database/incoming_note_dao.js +3 -3
- package/dest/database/kv_pxe_database.d.ts +5 -3
- package/dest/database/kv_pxe_database.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.js +22 -8
- package/dest/database/outgoing_note_dao.d.ts +2 -1
- package/dest/database/outgoing_note_dao.d.ts.map +1 -1
- package/dest/database/outgoing_note_dao.js +3 -3
- package/dest/database/pxe_database.d.ts +6 -4
- package/dest/database/pxe_database.d.ts.map +1 -1
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts.map +1 -1
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.js +9 -9
- package/dest/kernel_prover/kernel_prover.js +6 -6
- package/dest/kernel_prover/test/test_circuit_prover.d.ts +1 -0
- package/dest/kernel_prover/test/test_circuit_prover.d.ts.map +1 -1
- package/dest/note_processor/note_processor.d.ts +1 -5
- package/dest/note_processor/note_processor.d.ts.map +1 -1
- package/dest/note_processor/note_processor.js +56 -58
- package/dest/note_processor/utils/add_public_values_to_payload.d.ts +10 -0
- package/dest/note_processor/utils/add_public_values_to_payload.d.ts.map +1 -0
- package/dest/note_processor/utils/add_public_values_to_payload.js +48 -0
- package/dest/note_processor/utils/brute_force_note_info.d.ts +8 -3
- package/dest/note_processor/utils/brute_force_note_info.d.ts.map +1 -1
- package/dest/note_processor/utils/brute_force_note_info.js +6 -3
- package/dest/note_processor/utils/produce_note_daos.d.ts.map +1 -1
- package/dest/note_processor/utils/produce_note_daos.js +2 -4
- package/dest/note_processor/utils/produce_note_daos_for_key.d.ts +3 -3
- package/dest/note_processor/utils/produce_note_daos_for_key.d.ts.map +1 -1
- package/dest/note_processor/utils/produce_note_daos_for_key.js +7 -61
- package/dest/pxe_http/pxe_http_server.js +3 -3
- package/dest/pxe_service/error_enriching.d.ts +11 -0
- package/dest/pxe_service/error_enriching.d.ts.map +1 -0
- package/dest/pxe_service/error_enriching.js +68 -0
- package/dest/pxe_service/index.d.ts +1 -0
- package/dest/pxe_service/index.d.ts.map +1 -1
- package/dest/pxe_service/index.js +2 -1
- package/dest/pxe_service/pxe_service.d.ts +1 -1
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +27 -66
- package/dest/simulator_oracle/index.d.ts +17 -1
- package/dest/simulator_oracle/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.js +40 -1
- package/dest/synchronizer/synchronizer.d.ts +1 -1
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +3 -3
- package/package.json +14 -14
- package/src/database/deferred_note_dao.ts +6 -19
- package/src/database/incoming_note_dao.ts +2 -1
- package/src/database/kv_pxe_database.ts +26 -6
- package/src/database/outgoing_note_dao.ts +2 -1
- package/src/database/pxe_database.ts +8 -4
- package/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts +8 -14
- package/src/kernel_prover/kernel_prover.ts +6 -6
- package/src/note_processor/note_processor.ts +89 -88
- package/src/note_processor/utils/add_public_values_to_payload.ts +63 -0
- package/src/note_processor/utils/brute_force_note_info.ts +11 -3
- package/src/note_processor/utils/produce_note_daos.ts +5 -7
- package/src/note_processor/utils/produce_note_daos_for_key.ts +19 -114
- package/src/pxe_http/pxe_http_server.ts +2 -2
- package/src/pxe_service/error_enriching.ts +91 -0
- package/src/pxe_service/index.ts +1 -0
- package/src/pxe_service/pxe_service.ts +29 -78
- package/src/simulator_oracle/index.ts +51 -0
- package/src/synchronizer/synchronizer.ts +2 -2
- package/dest/note_processor/utils/add_nullable_field_to_payload.d.ts +0 -12
- package/dest/note_processor/utils/add_nullable_field_to_payload.d.ts.map +0 -1
- package/dest/note_processor/utils/add_nullable_field_to_payload.js +0 -46
- package/src/note_processor/utils/add_nullable_field_to_payload.ts +0 -67
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
3
|
import { type AztecAddress, type ContractClass, type ContractInstance } from '@aztec/circuits.js';
|
|
3
4
|
import { type ContractArtifact, type FunctionArtifact, type FunctionDebugMetadata, type FunctionSelector } from '@aztec/foundation/abi';
|
|
4
5
|
import { type Fr } from '@aztec/foundation/fields';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract_data_oracle/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract_data_oracle/index.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAClG,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EAEtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AAG9F;;;;;;GAMG;AACH,qBAAa,kBAAkB;IAMjB,OAAO,CAAC,EAAE;IALtB,2DAA2D;IAC3D,OAAO,CAAC,eAAe,CAAgD;IACvE,6CAA6C;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEjD,EAAE,EAAE,wBAAwB,GAAG,wBAAwB;IAE3E,4EAA4E;IAC/D,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAW1F,0EAA0E;IAC7D,gBAAgB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAK7D,mBAAmB,CAAC,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAKhF;;;;;;;;OAQG;IACU,mBAAmB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAK1F;;;;;;;;OAQG;IACU,yBAAyB,CACpC,eAAe,EAAE,YAAY,EAC7B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAKxC;;;;;;;;;OASG;IACU,wBAAwB,CACnC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAM7C;;;;;;;;;OASG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAKlF;;;;;;;;OAQG;IACU,4BAA4B,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAKtF,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAO3F;;;;;;;;;OASG;YACW,iBAAiB;IAY/B;;;;;;;;;OASG;YACW,iBAAiB;CAIhC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
3
|
import { type ContractClassWithId, FUNCTION_TREE_HEIGHT, MembershipWitness } from '@aztec/circuits.js';
|
|
3
4
|
import { type MerkleTree } from '@aztec/circuits.js/merkle';
|
|
4
5
|
import { type ContractArtifact, type FunctionSelector } from '@aztec/foundation/abi';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_functions_tree.d.ts","sourceRoot":"","sources":["../../src/contract_data_oracle/private_functions_tree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"private_functions_tree.d.ts","sourceRoot":"","sources":["../../src/contract_data_oracle/private_functions_tree.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,oBAAoB,EACpB,iBAAiB,EAIlB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C;;;;;GAKG;AACH,qBAAa,oBAAoB;IAInB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAHrC,OAAO,CAAC,IAAI,CAAC,CAAa;IAC1B,OAAO,CAAC,aAAa,CAAsB;gBAEd,QAAQ,EAAE,gBAAgB;IAIvD;;;;;;;OAOG;IACI,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB;IAYrD;;;;;;;OAOG;IACI,WAAW,CAAC,QAAQ,EAAE,gBAAgB;IAI7C;;;;;;OAMG;IACI,mBAAmB;IAI1B,yCAAyC;IAClC,gBAAgB;IAIvB,qCAAqC;IAC9B,WAAW;IAIlB;;OAEG;IACI,kBAAkB;IAIzB;;;;;;;;OAQG;IACI,4BAA4B,CACjC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC;IAkB1D,OAAO,CAAC,OAAO;CAOhB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
+
import { L1NotePayload, TxHash, UnencryptedTxL2Logs } from '@aztec/circuit-types';
|
|
4
|
+
import { Fr, type PublicKey } from '@aztec/circuits.js';
|
|
5
5
|
import { BufferReader } from '@aztec/foundation/serialize';
|
|
6
6
|
/**
|
|
7
7
|
* A note that is intended for us, but we cannot decode it yet because the contract is not yet in our database.
|
|
@@ -11,14 +11,8 @@ import { BufferReader } from '@aztec/foundation/serialize';
|
|
|
11
11
|
export declare class DeferredNoteDao {
|
|
12
12
|
/** IvpkM or OvpkM (depending on if incoming or outgoing) the note was encrypted with. */
|
|
13
13
|
publicKey: PublicKey;
|
|
14
|
-
/** The note
|
|
15
|
-
|
|
16
|
-
/** The contract address this note is created in. */
|
|
17
|
-
contractAddress: AztecAddress;
|
|
18
|
-
/** The specific storage location of the note on the contract. */
|
|
19
|
-
storageSlot: Fr;
|
|
20
|
-
/** The type ID of the note on the contract. */
|
|
21
|
-
noteTypeId: NoteSelector;
|
|
14
|
+
/** The note payload delivered via L1. */
|
|
15
|
+
payload: L1NotePayload;
|
|
22
16
|
/** The hash of the tx the note was created in. Equal to the first nullifier */
|
|
23
17
|
txHash: TxHash;
|
|
24
18
|
/** New note hashes in this transaction, one of which belongs to this note */
|
|
@@ -30,14 +24,8 @@ export declare class DeferredNoteDao {
|
|
|
30
24
|
constructor(
|
|
31
25
|
/** IvpkM or OvpkM (depending on if incoming or outgoing) the note was encrypted with. */
|
|
32
26
|
publicKey: PublicKey,
|
|
33
|
-
/** The note
|
|
34
|
-
|
|
35
|
-
/** The contract address this note is created in. */
|
|
36
|
-
contractAddress: AztecAddress,
|
|
37
|
-
/** The specific storage location of the note on the contract. */
|
|
38
|
-
storageSlot: Fr,
|
|
39
|
-
/** The type ID of the note on the contract. */
|
|
40
|
-
noteTypeId: NoteSelector,
|
|
27
|
+
/** The note payload delivered via L1. */
|
|
28
|
+
payload: L1NotePayload,
|
|
41
29
|
/** The hash of the tx the note was created in. Equal to the first nullifier */
|
|
42
30
|
txHash: TxHash,
|
|
43
31
|
/** New note hashes in this transaction, one of which belongs to this note */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deferred_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/deferred_note_dao.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deferred_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/deferred_note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAE,EAAE,EAAS,KAAK,SAAS,EAAU,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E;;;;GAIG;AACH,qBAAa,eAAe;IAExB,yFAAyF;IAClF,SAAS,EAAE,SAAS;IAC3B,yCAAyC;IAClC,OAAO,EAAE,aAAa;IAC7B,+EAA+E;IACxE,MAAM,EAAE,MAAM;IACrB,6EAA6E;IACtE,UAAU,EAAE,EAAE,EAAE;IACvB,gFAAgF;IACzE,mBAAmB,EAAE,MAAM;IAClC,4EAA4E;IACrE,eAAe,EAAE,mBAAmB;;IAX3C,yFAAyF;IAClF,SAAS,EAAE,SAAS;IAC3B,yCAAyC;IAClC,OAAO,EAAE,aAAa;IAC7B,+EAA+E;IACxE,MAAM,EAAE,MAAM;IACrB,6EAA6E;IACtE,UAAU,EAAE,EAAE,EAAE;IACvB,gFAAgF;IACzE,mBAAmB,EAAE,MAAM;IAClC,4EAA4E;IACrE,eAAe,EAAE,mBAAmB;IAG7C,QAAQ,IAAI,MAAM;IAUlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;CAWhD"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { NoteSelector } from '@aztec/foundation/abi';
|
|
1
|
+
import { L1NotePayload, TxHash, UnencryptedTxL2Logs } from '@aztec/circuit-types';
|
|
2
|
+
import { Fr, Point, Vector } from '@aztec/circuits.js';
|
|
4
3
|
import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
5
4
|
/**
|
|
6
5
|
* A note that is intended for us, but we cannot decode it yet because the contract is not yet in our database.
|
|
@@ -11,14 +10,8 @@ export class DeferredNoteDao {
|
|
|
11
10
|
constructor(
|
|
12
11
|
/** IvpkM or OvpkM (depending on if incoming or outgoing) the note was encrypted with. */
|
|
13
12
|
publicKey,
|
|
14
|
-
/** The note
|
|
15
|
-
|
|
16
|
-
/** The contract address this note is created in. */
|
|
17
|
-
contractAddress,
|
|
18
|
-
/** The specific storage location of the note on the contract. */
|
|
19
|
-
storageSlot,
|
|
20
|
-
/** The type ID of the note on the contract. */
|
|
21
|
-
noteTypeId,
|
|
13
|
+
/** The note payload delivered via L1. */
|
|
14
|
+
payload,
|
|
22
15
|
/** The hash of the tx the note was created in. Equal to the first nullifier */
|
|
23
16
|
txHash,
|
|
24
17
|
/** New note hashes in this transaction, one of which belongs to this note */
|
|
@@ -28,21 +21,18 @@ export class DeferredNoteDao {
|
|
|
28
21
|
/** Unencrypted logs for the transaction (used to complete partial notes) */
|
|
29
22
|
unencryptedLogs) {
|
|
30
23
|
this.publicKey = publicKey;
|
|
31
|
-
this.
|
|
32
|
-
this.contractAddress = contractAddress;
|
|
33
|
-
this.storageSlot = storageSlot;
|
|
34
|
-
this.noteTypeId = noteTypeId;
|
|
24
|
+
this.payload = payload;
|
|
35
25
|
this.txHash = txHash;
|
|
36
26
|
this.noteHashes = noteHashes;
|
|
37
27
|
this.dataStartIndexForTx = dataStartIndexForTx;
|
|
38
28
|
this.unencryptedLogs = unencryptedLogs;
|
|
39
29
|
}
|
|
40
30
|
toBuffer() {
|
|
41
|
-
return serializeToBuffer(this.publicKey, this.
|
|
31
|
+
return serializeToBuffer(this.publicKey, this.payload, this.txHash, new Vector(this.noteHashes), this.dataStartIndexForTx, this.unencryptedLogs);
|
|
42
32
|
}
|
|
43
33
|
static fromBuffer(buffer) {
|
|
44
34
|
const reader = BufferReader.asReader(buffer);
|
|
45
|
-
return new DeferredNoteDao(reader.readObject(Point), reader.readObject(
|
|
35
|
+
return new DeferredNoteDao(reader.readObject(Point), reader.readObject(L1NotePayload), reader.readObject(TxHash), reader.readVector(Fr), reader.readNumber(), reader.readObject(UnencryptedTxL2Logs));
|
|
46
36
|
}
|
|
47
37
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmZXJyZWRfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2UvZGVmZXJyZWRfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRixPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBa0IsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDdkUsT0FBTyxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTlFOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQUMxQjtJQUNFLHlGQUF5RjtJQUNsRixTQUFvQjtJQUMzQix5Q0FBeUM7SUFDbEMsT0FBc0I7SUFDN0IsK0VBQStFO0lBQ3hFLE1BQWM7SUFDckIsNkVBQTZFO0lBQ3RFLFVBQWdCO0lBQ3ZCLGdGQUFnRjtJQUN6RSxtQkFBMkI7SUFDbEMsNEVBQTRFO0lBQ3JFLGVBQW9DO1FBVnBDLGNBQVMsR0FBVCxTQUFTLENBQVc7UUFFcEIsWUFBTyxHQUFQLE9BQU8sQ0FBZTtRQUV0QixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBRWQsZUFBVSxHQUFWLFVBQVUsQ0FBTTtRQUVoQix3QkFBbUIsR0FBbkIsbUJBQW1CLENBQVE7UUFFM0Isb0JBQWUsR0FBZixlQUFlLENBQXFCO0lBQzFDLENBQUM7SUFFSixRQUFRO1FBQ04sT0FBTyxpQkFBaUIsQ0FDdEIsSUFBSSxDQUFDLFNBQVMsRUFDZCxJQUFJLENBQUMsT0FBTyxFQUNaLElBQUksQ0FBQyxNQUFNLEVBQ1gsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUMzQixJQUFJLENBQUMsbUJBQW1CLEVBQ3hCLElBQUksQ0FBQyxlQUFlLENBQ3JCLENBQUM7SUFDSixDQUFDO0lBQ0QsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUE2QjtRQUM3QyxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzdDLE9BQU8sSUFBSSxlQUFlLENBQ3hCLE1BQU0sQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQ3hCLE1BQU0sQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQ2hDLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQ3pCLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQ3JCLE1BQU0sQ0FBQyxVQUFVLEVBQUUsRUFDbkIsTUFBTSxDQUFDLFVBQVUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUN2QyxDQUFDO0lBQ0osQ0FBQztDQUNGIn0=
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
3
|
import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
|
|
3
4
|
import { AztecAddress, Fr, type PublicKey } from '@aztec/circuits.js';
|
|
4
5
|
import { NoteSelector } from '@aztec/foundation/abi';
|
|
@@ -62,7 +63,7 @@ export declare class IncomingNoteDao implements NoteData {
|
|
|
62
63
|
index: bigint,
|
|
63
64
|
/** The public key with which the note was encrypted. */
|
|
64
65
|
ivpkM: PublicKey);
|
|
65
|
-
static fromPayloadAndNoteInfo(payload: L1NotePayload, noteInfo: NoteInfo, dataStartIndexForTx: number, ivpkM: PublicKey): IncomingNoteDao;
|
|
66
|
+
static fromPayloadAndNoteInfo(note: Note, payload: L1NotePayload, noteInfo: NoteInfo, dataStartIndexForTx: number, ivpkM: PublicKey): IncomingNoteDao;
|
|
66
67
|
toBuffer(): Buffer;
|
|
67
68
|
static fromBuffer(buffer: Buffer | BufferReader): IncomingNoteDao;
|
|
68
69
|
toString(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incoming_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/incoming_note_dao.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"incoming_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/incoming_note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAS,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAEjE;;GAEG;AACH,qBAAa,eAAgB,YAAW,QAAQ;IAE5C,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAC1B,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IAzBvB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB;;;OAGG;IACI,eAAe,EAAE,EAAE;IAC1B,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,MAAM,CAAC,sBAAsB,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,SAAS;IAiBlB,QAAQ,IAAI,MAAM;IAclB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA4B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;CAKf"}
|
|
@@ -45,9 +45,9 @@ export class IncomingNoteDao {
|
|
|
45
45
|
this.index = index;
|
|
46
46
|
this.ivpkM = ivpkM;
|
|
47
47
|
}
|
|
48
|
-
static fromPayloadAndNoteInfo(payload, noteInfo, dataStartIndexForTx, ivpkM) {
|
|
48
|
+
static fromPayloadAndNoteInfo(note, payload, noteInfo, dataStartIndexForTx, ivpkM) {
|
|
49
49
|
const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
|
|
50
|
-
return new IncomingNoteDao(
|
|
50
|
+
return new IncomingNoteDao(note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, noteInfo.txHash, noteInfo.nonce, noteInfo.noteHash, noteInfo.siloedNullifier, noteHashIndexInTheWholeTree, ivpkM);
|
|
51
51
|
}
|
|
52
52
|
toBuffer() {
|
|
53
53
|
return serializeToBuffer([
|
|
@@ -94,4 +94,4 @@ export class IncomingNoteDao {
|
|
|
94
94
|
return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 4 + TxHash.SIZE + Point.SIZE_IN_BYTES + indexSize;
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21pbmdfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2UvaW5jb21pbmdfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFzQixJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFrQixNQUFNLG9CQUFvQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBSzlFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGVBQWU7SUFDMUI7SUFDRSxrREFBa0Q7SUFDM0MsSUFBVTtJQUNqQixvREFBb0Q7SUFDN0MsZUFBNkI7SUFDcEMsaUVBQWlFO0lBQzFELFdBQWU7SUFDdEIsaURBQWlEO0lBQzFDLFVBQXdCO0lBQy9CLGtEQUFrRDtJQUMzQyxNQUFjO0lBQ3JCLDZCQUE2QjtJQUN0QixLQUFTO0lBQ2hCOzs7T0FHRztJQUNJLFFBQVk7SUFDbkI7OztPQUdHO0lBQ0ksZUFBbUI7SUFDMUIsK0RBQStEO0lBQ3hELEtBQWE7SUFDcEIsd0RBQXdEO0lBQ2pELEtBQWdCO1FBeEJoQixTQUFJLEdBQUosSUFBSSxDQUFNO1FBRVYsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFFN0IsZ0JBQVcsR0FBWCxXQUFXLENBQUk7UUFFZixlQUFVLEdBQVYsVUFBVSxDQUFjO1FBRXhCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFFZCxVQUFLLEdBQUwsS0FBSyxDQUFJO1FBS1QsYUFBUSxHQUFSLFFBQVEsQ0FBSTtRQUtaLG9CQUFlLEdBQWYsZUFBZSxDQUFJO1FBRW5CLFVBQUssR0FBTCxLQUFL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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type IncomingNotesFilter, type OutgoingNotesFilter, type PublicKey } from '@aztec/circuit-types';
|
|
2
2
|
import { AztecAddress, CompleteAddress, type ContractInstanceWithAddress, Header } from '@aztec/circuits.js';
|
|
3
3
|
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
|
-
import { Fr
|
|
4
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
6
6
|
import { DeferredNoteDao } from './deferred_note_dao.js';
|
|
7
7
|
import { IncomingNoteDao } from './incoming_note_dao.js';
|
|
@@ -44,8 +44,10 @@ export declare class KVPxeDatabase implements PxeDatabase {
|
|
|
44
44
|
addCompleteAddress(completeAddress: CompleteAddress): Promise<boolean>;
|
|
45
45
|
getCompleteAddress(account: AztecAddress): Promise<CompleteAddress | undefined>;
|
|
46
46
|
getCompleteAddresses(): Promise<CompleteAddress[]>;
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
getSynchedBlockNumberForAccount(account: AztecAddress): number | undefined;
|
|
48
|
+
setSynchedBlockNumberForAccount(account: AztecAddress, blockNumber: number): Promise<void>;
|
|
49
49
|
estimateSize(): Promise<number>;
|
|
50
|
+
incrementTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<void>;
|
|
51
|
+
getTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<number[]>;
|
|
50
52
|
}
|
|
51
53
|
//# sourceMappingURL=kv_pxe_database.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kv_pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EAGxB,KAAK,mBAAmB,EACxB,KAAK,SAAS,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EACZ,eAAe,EACf,KAAK,2BAA2B,EAChC,MAAM,EAEP,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"kv_pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EAGxB,KAAK,mBAAmB,EACxB,KAAK,SAAS,EACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EACZ,eAAe,EACf,KAAK,2BAA2B,EAChC,MAAM,EAEP,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAEL,KAAK,YAAY,EAKlB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;GAEG;AACH,qBAAa,aAAc,YAAW,WAAW;;IAmCnC,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;IAiDvB,WAAW,CACtB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,CAAC,2BAA2B,GAAG,gBAAgB,CAAC,GAAG,SAAS,CAAC;IAS3D,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E,mBAAmB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAMnE,mBAAmB,CAAC,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/E,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAK5F,qBAAqB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI1C,cAAc,CAAC,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnE,cAAc,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC;IAKpD,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,UAAU,IAAI,OAAO,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC;IAKvC,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,QAAQ,CACZ,aAAa,EAAE,eAAe,EAAE,EAChC,aAAa,EAAE,eAAe,EAAE,EAChC,KAAK,GAAE,YAAgC,GACtC,OAAO,CAAC,IAAI,CAAC;IAgCV,gBAAgB,CAAC,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvE,0BAA0B,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAgBrF;;;;OAIG;IACH,6BAA6B,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAqBxF,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAwFzE,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAkDzE,oBAAoB,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAmDrF,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,cAAc,IAAI,MAAM,GAAG,SAAS;IASpC,SAAS,IAAI,MAAM;IAyBb,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAqC5E,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAI/E,oBAAoB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAIlD,+BAA+B,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS;IAI1E,+BAA+B,CAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpF,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAoB/B,8BAA8B,CAAC,iBAAiB,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5E,wBAAwB,CAAC,iBAAiB,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAKrE"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_addresses, _KVPxeDatabase_addressIndex, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_nullifierToNoteId, _KVPxeDatabase_nullifiedNotesByContract, _KVPxeDatabase_nullifiedNotesByStorageSlot, _KVPxeDatabase_nullifiedNotesByTxHash, _KVPxeDatabase_nullifiedNotesByIvpkM, _KVPxeDatabase_deferredNotes, _KVPxeDatabase_deferredNotesByContract, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_contractArtifacts, _KVPxeDatabase_contractInstances, _KVPxeDatabase_db, _KVPxeDatabase_outgoingNotes, _KVPxeDatabase_outgoingNotesByContract, _KVPxeDatabase_outgoingNotesByStorageSlot, _KVPxeDatabase_outgoingNotesByTxHash, _KVPxeDatabase_outgoingNotesByOvpkM, _KVPxeDatabase_scopes, _KVPxeDatabase_notesByContractAndScope, _KVPxeDatabase_notesByStorageSlotAndScope, _KVPxeDatabase_notesByTxHashAndScope, _KVPxeDatabase_notesByIvpkMAndScope, _KVPxeDatabase_addScope, _KVPxeDatabase_getCompleteAddress;
|
|
1
|
+
var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_addresses, _KVPxeDatabase_addressIndex, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_nullifierToNoteId, _KVPxeDatabase_nullifiedNotesByContract, _KVPxeDatabase_nullifiedNotesByStorageSlot, _KVPxeDatabase_nullifiedNotesByTxHash, _KVPxeDatabase_nullifiedNotesByIvpkM, _KVPxeDatabase_deferredNotes, _KVPxeDatabase_deferredNotesByContract, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_contractArtifacts, _KVPxeDatabase_contractInstances, _KVPxeDatabase_db, _KVPxeDatabase_outgoingNotes, _KVPxeDatabase_outgoingNotesByContract, _KVPxeDatabase_outgoingNotesByStorageSlot, _KVPxeDatabase_outgoingNotesByTxHash, _KVPxeDatabase_outgoingNotesByOvpkM, _KVPxeDatabase_scopes, _KVPxeDatabase_notesByContractAndScope, _KVPxeDatabase_notesByStorageSlotAndScope, _KVPxeDatabase_notesByTxHashAndScope, _KVPxeDatabase_notesByIvpkMAndScope, _KVPxeDatabase_taggingSecretIndexes, _KVPxeDatabase_addScope, _KVPxeDatabase_getCompleteAddress;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { MerkleTreeId, NoteStatus, } from '@aztec/circuit-types';
|
|
4
4
|
import { AztecAddress, CompleteAddress, Header, SerializableContractInstance, } from '@aztec/circuits.js';
|
|
@@ -43,6 +43,7 @@ export class KVPxeDatabase {
|
|
|
43
43
|
_KVPxeDatabase_notesByStorageSlotAndScope.set(this, void 0);
|
|
44
44
|
_KVPxeDatabase_notesByTxHashAndScope.set(this, void 0);
|
|
45
45
|
_KVPxeDatabase_notesByIvpkMAndScope.set(this, void 0);
|
|
46
|
+
_KVPxeDatabase_taggingSecretIndexes.set(this, void 0);
|
|
46
47
|
__classPrivateFieldSet(this, _KVPxeDatabase_db, db, "f");
|
|
47
48
|
__classPrivateFieldSet(this, _KVPxeDatabase_addresses, db.openArray('addresses'), "f");
|
|
48
49
|
__classPrivateFieldSet(this, _KVPxeDatabase_addressIndex, db.openMap('address_index'), "f");
|
|
@@ -77,6 +78,7 @@ export class KVPxeDatabase {
|
|
|
77
78
|
__classPrivateFieldGet(this, _KVPxeDatabase_notesByTxHashAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_tx_hash`));
|
|
78
79
|
__classPrivateFieldGet(this, _KVPxeDatabase_notesByIvpkMAndScope, "f").set(scope, db.openMultiMap(`${scope}:notes_by_ivpk_m`));
|
|
79
80
|
}
|
|
81
|
+
__classPrivateFieldSet(this, _KVPxeDatabase_taggingSecretIndexes, db.openMap('tagging_secret_indices'), "f");
|
|
80
82
|
}
|
|
81
83
|
async getContract(address) {
|
|
82
84
|
const instance = await this.getContractInstance(address);
|
|
@@ -153,7 +155,7 @@ export class KVPxeDatabase {
|
|
|
153
155
|
const newLength = await __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").push(...deferredNotes.map(note => note.toBuffer()));
|
|
154
156
|
for (const [index, note] of deferredNotes.entries()) {
|
|
155
157
|
const noteId = newLength - deferredNotes.length + index;
|
|
156
|
-
await __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").set(note.contractAddress.toString(), noteId);
|
|
158
|
+
await __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").set(note.payload.contractAddress.toString(), noteId);
|
|
157
159
|
}
|
|
158
160
|
}
|
|
159
161
|
getDeferredNotesByContract(contractAddress) {
|
|
@@ -394,11 +396,11 @@ export class KVPxeDatabase {
|
|
|
394
396
|
getCompleteAddresses() {
|
|
395
397
|
return Promise.resolve(Array.from(__classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f")).map(v => CompleteAddress.fromBuffer(v)));
|
|
396
398
|
}
|
|
397
|
-
|
|
398
|
-
return __classPrivateFieldGet(this, _KVPxeDatabase_syncedBlockPerPublicKey, "f").get(
|
|
399
|
+
getSynchedBlockNumberForAccount(account) {
|
|
400
|
+
return __classPrivateFieldGet(this, _KVPxeDatabase_syncedBlockPerPublicKey, "f").get(account.toString());
|
|
399
401
|
}
|
|
400
|
-
|
|
401
|
-
return __classPrivateFieldGet(this, _KVPxeDatabase_syncedBlockPerPublicKey, "f").set(
|
|
402
|
+
setSynchedBlockNumberForAccount(account, blockNumber) {
|
|
403
|
+
return __classPrivateFieldGet(this, _KVPxeDatabase_syncedBlockPerPublicKey, "f").set(account.toString(), blockNumber);
|
|
402
404
|
}
|
|
403
405
|
async estimateSize() {
|
|
404
406
|
const incomingNotesSize = Array.from(await this.getIncomingNotes({})).reduce((sum, note) => sum + note.getSize(), 0);
|
|
@@ -408,8 +410,20 @@ export class KVPxeDatabase {
|
|
|
408
410
|
const treeRootsSize = Object.keys(MerkleTreeId).length * Fr.SIZE_IN_BYTES;
|
|
409
411
|
return incomingNotesSize + outgoingNotesSize + treeRootsSize + authWitsSize + addressesSize;
|
|
410
412
|
}
|
|
413
|
+
async incrementTaggingSecretsIndexes(appTaggingSecrets) {
|
|
414
|
+
const indexes = await this.getTaggingSecretsIndexes(appTaggingSecrets);
|
|
415
|
+
await this.db.transaction(() => {
|
|
416
|
+
indexes.forEach(index => {
|
|
417
|
+
const nextIndex = index ? index + 1 : 1;
|
|
418
|
+
void __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexes, "f").set(appTaggingSecrets.toString(), nextIndex);
|
|
419
|
+
});
|
|
420
|
+
});
|
|
421
|
+
}
|
|
422
|
+
getTaggingSecretsIndexes(appTaggingSecrets) {
|
|
423
|
+
return this.db.transaction(() => appTaggingSecrets.map(secret => __classPrivateFieldGet(this, _KVPxeDatabase_taggingSecretIndexes, "f").get(secret.toString()) ?? 0));
|
|
424
|
+
}
|
|
411
425
|
}
|
|
412
|
-
_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new WeakMap(), _KVPxeDatabase_addressIndex = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByIvpkM = new WeakMap(), _KVPxeDatabase_deferredNotes = new WeakMap(), _KVPxeDatabase_deferredNotesByContract = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_outgoingNotes = new WeakMap(), _KVPxeDatabase_outgoingNotesByContract = new WeakMap(), _KVPxeDatabase_outgoingNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_outgoingNotesByTxHash = new WeakMap(), _KVPxeDatabase_outgoingNotesByOvpkM = new WeakMap(), _KVPxeDatabase_scopes = new WeakMap(), _KVPxeDatabase_notesByContractAndScope = new WeakMap(), _KVPxeDatabase_notesByStorageSlotAndScope = new WeakMap(), _KVPxeDatabase_notesByTxHashAndScope = new WeakMap(), _KVPxeDatabase_notesByIvpkMAndScope = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_addScope = async function _KVPxeDatabase_addScope(scope) {
|
|
426
|
+
_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new WeakMap(), _KVPxeDatabase_addressIndex = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_nullifierToNoteId = new WeakMap(), _KVPxeDatabase_nullifiedNotesByContract = new WeakMap(), _KVPxeDatabase_nullifiedNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_nullifiedNotesByTxHash = new WeakMap(), _KVPxeDatabase_nullifiedNotesByIvpkM = new WeakMap(), _KVPxeDatabase_deferredNotes = new WeakMap(), _KVPxeDatabase_deferredNotesByContract = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_contractArtifacts = new WeakMap(), _KVPxeDatabase_contractInstances = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_outgoingNotes = new WeakMap(), _KVPxeDatabase_outgoingNotesByContract = new WeakMap(), _KVPxeDatabase_outgoingNotesByStorageSlot = new WeakMap(), _KVPxeDatabase_outgoingNotesByTxHash = new WeakMap(), _KVPxeDatabase_outgoingNotesByOvpkM = new WeakMap(), _KVPxeDatabase_scopes = new WeakMap(), _KVPxeDatabase_notesByContractAndScope = new WeakMap(), _KVPxeDatabase_notesByStorageSlotAndScope = new WeakMap(), _KVPxeDatabase_notesByTxHashAndScope = new WeakMap(), _KVPxeDatabase_notesByIvpkMAndScope = new WeakMap(), _KVPxeDatabase_taggingSecretIndexes = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_addScope = async function _KVPxeDatabase_addScope(scope) {
|
|
413
427
|
const scopeString = scope.toString();
|
|
414
428
|
if (__classPrivateFieldGet(this, _KVPxeDatabase_scopes, "f").has(scopeString)) {
|
|
415
429
|
return false;
|
|
@@ -428,4 +442,4 @@ _KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new
|
|
|
428
442
|
const value = __classPrivateFieldGet(this, _KVPxeDatabase_addresses, "f").at(index);
|
|
429
443
|
return value ? CompleteAddress.fromBuffer(value) : undefined;
|
|
430
444
|
};
|
|
431
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}
|
|
445
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kv_pxe_database.js","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
3
|
import { type L1NotePayload, Note, TxHash } from '@aztec/circuit-types';
|
|
3
4
|
import { AztecAddress, Fr, type PublicKey } from '@aztec/circuits.js';
|
|
4
5
|
import { NoteSelector } from '@aztec/foundation/abi';
|
|
@@ -51,7 +52,7 @@ export declare class OutgoingNoteDao {
|
|
|
51
52
|
index: bigint,
|
|
52
53
|
/** The public key with which the note was encrypted. */
|
|
53
54
|
ovpkM: PublicKey);
|
|
54
|
-
static fromPayloadAndNoteInfo(payload: L1NotePayload, noteInfo: NoteInfo, dataStartIndexForTx: number, ivpkM: PublicKey): OutgoingNoteDao;
|
|
55
|
+
static fromPayloadAndNoteInfo(note: Note, payload: L1NotePayload, noteInfo: NoteInfo, dataStartIndexForTx: number, ivpkM: PublicKey): OutgoingNoteDao;
|
|
55
56
|
toBuffer(): Buffer;
|
|
56
57
|
static fromBuffer(buffer: Buffer | BufferReader): OutgoingNoteDao;
|
|
57
58
|
toString(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outgoing_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/outgoing_note_dao.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"outgoing_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/outgoing_note_dao.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAS,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAEjE;;GAEG;AACH,qBAAa,eAAe;IAExB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;;IApBvB,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,iDAAiD;IAC1C,UAAU,EAAE,YAAY;IAC/B,kDAAkD;IAC3C,MAAM,EAAE,MAAM;IACrB,6BAA6B;IACtB,KAAK,EAAE,EAAE;IAChB;;;OAGG;IACI,QAAQ,EAAE,EAAE;IACnB,+DAA+D;IACxD,KAAK,EAAE,MAAM;IACpB,wDAAwD;IACjD,KAAK,EAAE,SAAS;IAGzB,MAAM,CAAC,sBAAsB,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,SAAS;IAgBlB,QAAQ,IAAI,MAAM;IAalB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IA0B/C,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAK7B;;;OAGG;IACI,OAAO;CAIf"}
|
|
@@ -39,9 +39,9 @@ export class OutgoingNoteDao {
|
|
|
39
39
|
this.index = index;
|
|
40
40
|
this.ovpkM = ovpkM;
|
|
41
41
|
}
|
|
42
|
-
static fromPayloadAndNoteInfo(payload, noteInfo, dataStartIndexForTx, ivpkM) {
|
|
42
|
+
static fromPayloadAndNoteInfo(note, payload, noteInfo, dataStartIndexForTx, ivpkM) {
|
|
43
43
|
const noteHashIndexInTheWholeTree = BigInt(dataStartIndexForTx + noteInfo.noteHashIndex);
|
|
44
|
-
return new OutgoingNoteDao(
|
|
44
|
+
return new OutgoingNoteDao(note, payload.contractAddress, payload.storageSlot, payload.noteTypeId, noteInfo.txHash, noteInfo.nonce, noteInfo.noteHash, noteHashIndexInTheWholeTree, ivpkM);
|
|
45
45
|
}
|
|
46
46
|
toBuffer() {
|
|
47
47
|
return serializeToBuffer([
|
|
@@ -85,4 +85,4 @@ export class OutgoingNoteDao {
|
|
|
85
85
|
return noteSize + AztecAddress.SIZE_IN_BYTES + Fr.SIZE_IN_BYTES * 2 + TxHash.SIZE + Point.SIZE_IN_BYTES;
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0Z29pbmdfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2Uvb3V0Z29pbmdfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFzQixJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDeEUsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFrQixNQUFNLG9CQUFvQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBSTlFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGVBQWU7SUFDMUI7SUFDRSxrREFBa0Q7SUFDM0MsSUFBVTtJQUNqQixvREFBb0Q7SUFDN0MsZUFBNkI7SUFDcEMsaUVBQWlFO0lBQzFELFdBQWU7SUFDdEIsaURBQWlEO0lBQzFDLFVBQXdCO0lBQy9CLGtEQUFrRDtJQUMzQyxNQUFjO0lBQ3JCLDZCQUE2QjtJQUN0QixLQUFTO0lBQ2hCOzs7T0FHRztJQUNJLFFBQVk7SUFDbkIsK0RBQStEO0lBQ3hELEtBQWE7SUFDcEIsd0RBQXdEO0lBQ2pELEtBQWdCO1FBbkJoQixTQUFJLEdBQUosSUFBSSxDQUFNO1FBRVYsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFFN0IsZ0JBQVcsR0FBWCxXQUFXLENBQUk7UUFFZixlQUFVLEdBQVYsVUFBVSxDQUFjO1FBRXhCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFFZCxVQUFLLEdBQUwsS0FBSyxDQUFJO1FBS1QsYUFBUSxHQUFSLFFBQVEsQ0FBSTtRQUVaLFVBQUssR0FBTCxLQUFLLENBQVE7UUFFYixVQUFLLEdBQUwsS0FBSyxDQUFXO0lBQ3RCLENBQUM7SUFFSixNQUFNLENBQUMsc0JBQXNCLENBQzNCLElBQVUsRUFDVixPQUFzQixFQUN0QixRQUFrQixFQUNsQixtQkFBMkIsRUFDM0IsS0FBZ0I7UUFFaEIsTUFBTSwyQkFBMkIsR0FBRyxNQUFNLENBQUMsbUJBQW1CLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3pGLE9BQU8sSUFBSSxlQUFlLENBQ3hCLElBQUksRUFDSixPQUFPLENBQUMsZUFBZSxFQUN2QixPQUFPLENBQUMsV0FBVyxFQUNuQixPQUFPLENBQUMsVUFBVSxFQUNsQixRQUFRLENBQUMsTUFBTSxFQUNmLFFBQVEsQ0FBQyxLQUFLLEVBQ2QsUUFBUSxDQUFDLFFBQVEsRUFDakIsMkJBQTJCLEVBQzNCLEtBQUssQ0FDTixDQUFDO0lBQ0osQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLGlCQUFpQixDQUFDO1lBQ3ZCLElBQUksQ0FBQyxJQUFJO1lBQ1QsSUFBSSxDQUFDLGVBQWU7WUFDcEIsSUFBSSxDQUFDLFdBQVc7WUFDaEIsSUFBSSxDQUFDLFVBQVU7WUFDZixJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU07WUFDbEIsSUFBSSxDQUFDLEtBQUs7WUFDVixJQUFJLENBQUMsUUFBUTtZQUNiLElBQUksQ0FBQyxLQUFLO1lBQ1YsSUFBSSxDQUFDLEtBQUs7U0FDWCxDQUFDLENBQUM7SUFDTCxDQUFDO0lBQ0QsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUE2QjtRQUM3QyxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTdDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDckMsTUFBTSxlQUFlLEdBQUcsWUFBWSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN4RCxNQUFNLFdBQVcsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzFDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDbkQsTUFBTSxNQUFNLEdBQUcsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUN6RCxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3BDLE1BQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDdkMsTUFBTSxLQUFLLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUMvQyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTNDLE9BQU8sSUFBSSxlQUFlLENBQ3hCLElBQUksRUFDSixlQUFlLEVBQ2YsV0FBVyxFQUNYLFVBQVUsRUFDVixNQUFNLEVBQ04sS0FBSyxFQUNMLFFBQVEsRUFDUixLQUFLLEVBQ0wsU0FBUyxDQUNWLENBQUM7SUFDSixDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sSUFBSSxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBVztRQUMzQixNQUFNLEdBQUcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNuQyxPQUFPLGVBQWUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksT0FBTztRQUNaLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FBQztRQUMvRCxPQUFPLFFBQVEsR0FBRyxZQUFZLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQyxhQUFhLEdBQUcsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxJQUFJLEdBQUcsS0FBSyxDQUFDLGFBQWEsQ0FBQztJQUMxRyxDQUFDO0NBQ0YifQ==
|
|
@@ -142,19 +142,21 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
|
|
|
142
142
|
getCompleteAddresses(): Promise<CompleteAddress[]>;
|
|
143
143
|
/**
|
|
144
144
|
* Updates up to which block number we have processed notes for a given public key.
|
|
145
|
-
* @param
|
|
145
|
+
* @param account - The account to set the synched block number for.
|
|
146
146
|
* @param blockNumber - The block number to set.
|
|
147
147
|
*/
|
|
148
|
-
|
|
148
|
+
setSynchedBlockNumberForAccount(account: AztecAddress, blockNumber: number): Promise<void>;
|
|
149
149
|
/**
|
|
150
150
|
* Get the synched block number for a given public key.
|
|
151
|
-
* @param
|
|
151
|
+
* @param account - The account to get the synched block number for.
|
|
152
152
|
*/
|
|
153
|
-
|
|
153
|
+
getSynchedBlockNumberForAccount(account: AztecAddress): number | undefined;
|
|
154
154
|
/**
|
|
155
155
|
* Returns the estimated size in bytes of this db.
|
|
156
156
|
* @returns The estimated size in bytes of this db.
|
|
157
157
|
*/
|
|
158
158
|
estimateSize(): Promise<number>;
|
|
159
|
+
getTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<number[]>;
|
|
160
|
+
incrementTaggingSecretsIndexes(appTaggingSecrets: Fr[]): Promise<void>;
|
|
159
161
|
}
|
|
160
162
|
//# sourceMappingURL=pxe_database.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/pxe_database.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/pxe_database.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build_private_kernel_reset_private_inputs.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,2BAA2B,EAAiB,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAWL,KAAK,gCAAgC,EAErC,sCAAsC,EAqBvC,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"build_private_kernel_reset_private_inputs.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,2BAA2B,EAAiB,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAWL,KAAK,gCAAgC,EAErC,sCAAsC,EAqBvC,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAiDnE,qBAAa,sCAAsC;IAY/C,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,8BAA8B;IAdxC,OAAO,CAAC,cAAc,CAAmC;IAEzD,OAAO,CAAC,aAAa,CAAC,CAA6B;IAEnD,OAAO,CAAC,mBAAmB,CAAoE;IAC/F,OAAO,CAAC,oBAAoB,CAAoE;IAChG,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,uBAAuB,CAA8D;IAC7F,OAAO,CAAC,mBAAmB,CAA+B;gBAGhD,oBAAoB,EAAE,2BAA2B,CAAC,gCAAgC,CAAC,EACnF,cAAc,EAAE,sBAAsB,EAAE,EACxC,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,8BAA8B,EAAE,MAAM;IAahD,UAAU,IAAI,OAAO;IAwBf,KAAK,CAAC,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAgEhF,OAAO,CAAC,uBAAuB;IA2B/B,OAAO,CAAC,8BAA8B;IAoDtC,OAAO,CAAC,+BAA+B;IAoDvC,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,uBAAuB;IAmE/B,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,kBAAkB;CAW3B"}
|