@aztec/pxe 0.17.0 → 0.18.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/bin/index.js +2 -2
- package/dest/config/index.js +2 -2
- package/dest/contract_data_oracle/index.d.ts +8 -5
- package/dest/contract_data_oracle/index.d.ts.map +1 -1
- package/dest/contract_data_oracle/index.js +13 -10
- package/dest/contract_database/memory_contract_database.d.ts +1 -1
- package/dest/contract_database/memory_contract_database.d.ts.map +1 -1
- package/dest/contract_tree/index.d.ts +1 -1
- package/dest/contract_tree/index.d.ts.map +1 -1
- package/dest/contract_tree/index.js +2 -2
- package/dest/database/deferred_note_dao.d.ts +43 -0
- package/dest/database/deferred_note_dao.d.ts.map +1 -0
- package/dest/database/deferred_note_dao.js +41 -0
- package/dest/database/kv_pxe_database.d.ts +15 -1
- package/dest/database/kv_pxe_database.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.js +59 -4
- package/dest/database/memory_db.d.ts +6 -1
- package/dest/database/memory_db.d.ts.map +1 -1
- package/dest/database/memory_db.js +21 -2
- package/dest/database/note_dao.d.ts +4 -2
- package/dest/database/note_dao.d.ts.map +1 -1
- package/dest/database/note_dao.js +3 -2
- package/dest/database/pxe_database.d.ts +18 -1
- package/dest/database/pxe_database.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.js +2 -2
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -2
- package/dest/kernel_oracle/index.d.ts +1 -1
- package/dest/kernel_oracle/index.d.ts.map +1 -1
- package/dest/kernel_oracle/index.js +2 -2
- package/dest/kernel_prover/kernel_prover.d.ts +1 -0
- package/dest/kernel_prover/kernel_prover.d.ts.map +1 -1
- package/dest/kernel_prover/kernel_prover.js +24 -5
- package/dest/kernel_prover/proof_creator.d.ts.map +1 -1
- package/dest/kernel_prover/proof_creator.js +1 -1
- package/dest/note_processor/note_processor.d.ts +20 -18
- package/dest/note_processor/note_processor.d.ts.map +1 -1
- package/dest/note_processor/note_processor.js +66 -83
- package/dest/note_processor/produce_note_dao.d.ts +21 -0
- package/dest/note_processor/produce_note_dao.d.ts.map +1 -0
- package/dest/note_processor/produce_note_dao.js +92 -0
- package/dest/pxe_http/pxe_http_server.d.ts +1 -1
- package/dest/pxe_http/pxe_http_server.d.ts.map +1 -1
- package/dest/pxe_http/pxe_http_server.js +2 -2
- package/dest/pxe_service/create_pxe_service.d.ts +1 -1
- package/dest/pxe_service/create_pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/create_pxe_service.js +1 -1
- package/dest/pxe_service/pxe_service.d.ts +3 -2
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +14 -10
- package/dest/pxe_service/test/pxe_test_suite.d.ts +1 -1
- package/dest/pxe_service/test/pxe_test_suite.d.ts.map +1 -1
- package/dest/pxe_service/test/pxe_test_suite.js +2 -2
- package/dest/simulator/index.d.ts +1 -1
- package/dest/simulator/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.d.ts +2 -2
- package/dest/simulator_oracle/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.js +2 -2
- package/dest/synchronizer/synchronizer.d.ts +22 -5
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +147 -60
- package/package.json +11 -10
package/dest/bin/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
|
+
import { createAztecNodeClient } from '@aztec/circuit-types';
|
|
2
3
|
import { init } from '@aztec/foundation/crypto';
|
|
3
4
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { createAztecNodeClient } from '@aztec/types';
|
|
5
5
|
import { getPXEServiceConfig } from '../config/index.js';
|
|
6
6
|
import { startPXEHttpServer } from '../pxe_http/index.js';
|
|
7
7
|
import { createPXEService } from '../pxe_service/index.js';
|
|
@@ -30,4 +30,4 @@ main().catch(err => {
|
|
|
30
30
|
logger.error(err);
|
|
31
31
|
process.exit(1);
|
|
32
32
|
});
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmluL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDaEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFMUQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFM0QsTUFBTSxFQUFFLFFBQVEsR0FBRyxJQUFJLEVBQUUsY0FBYyxHQUFHLHVCQUF1QixFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztBQUVsRixNQUFNLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0FBRXREOztHQUVHO0FBQ0gsS0FBSyxVQUFVLElBQUk7SUFDakIsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBRWpDLE1BQU0sSUFBSSxFQUFFLENBQUM7SUFFYixNQUFNLFNBQVMsR0FBRyxtQkFBbUIsRUFBRSxDQUFDO0lBQ3hDLE1BQU0sYUFBYSxHQUFHLHFCQUFxQixDQUFDLGNBQWMsQ0FBQyxDQUFDO0lBQzVELE1BQU0sVUFBVSxHQUFHLE1BQU0sZ0JBQWdCLENBQUMsYUFBYSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBRXBFLE1BQU0sUUFBUSxHQUFHLEtBQUssSUFBSSxFQUFFO1FBQzFCLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUNoQyxNQUFNLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN4QixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xCLENBQUMsQ0FBQztJQUVGLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBRWxDLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUN6QyxNQUFNLENBQUMsSUFBSSxDQUFDLHlCQUF5QixRQUFRLEVBQUUsQ0FBQyxDQUFDO0FBQ25ELENBQUM7QUFFRCxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7SUFDakIsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNsQixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2xCLENBQUMsQ0FBQyxDQUFDIn0=
|
package/dest/config/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { INITIAL_L2_BLOCK_NUM } from '@aztec/types';
|
|
1
|
+
import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuit-types';
|
|
2
2
|
import { readFileSync } from 'fs';
|
|
3
3
|
import { dirname, resolve } from 'path';
|
|
4
4
|
import { fileURLToPath } from 'url';
|
|
@@ -21,4 +21,4 @@ export function getPackageInfo() {
|
|
|
21
21
|
const { version, name } = JSON.parse(readFileSync(packageJsonPath).toString());
|
|
22
22
|
return { version, name };
|
|
23
23
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRTVELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDbEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDeEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLEtBQUssQ0FBQztBQWVwQzs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUI7SUFDakMsTUFBTSxFQUFFLDZCQUE2QixFQUFFLHFCQUFxQixFQUFFLGNBQWMsRUFBRSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7SUFFN0YsT0FBTztRQUNMLHdCQUF3QixFQUFFLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxJQUFJO1FBQy9GLGVBQWUsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsb0JBQW9CO1FBQ3RGLGFBQWEsRUFBRSxjQUFjO0tBQzlCLENBQUM7QUFDSixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsY0FBYztJQUM1QixNQUFNLGVBQWUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztJQUMvRixNQUFNLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFFL0UsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztBQUMzQixDQUFDIn0=
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ContractDatabase, StateInfoProvider } from '@aztec/circuit-types';
|
|
2
|
+
import { AztecAddress, ContractFunctionDao, MembershipWitness } from '@aztec/circuits.js';
|
|
2
3
|
import { FunctionDebugMetadata, FunctionSelector } from '@aztec/foundation/abi';
|
|
3
|
-
import { ContractDatabase, StateInfoProvider } from '@aztec/types';
|
|
4
4
|
/**
|
|
5
5
|
* ContractDataOracle serves as a data manager and retriever for Aztec.nr contracts.
|
|
6
6
|
* It provides methods to obtain contract addresses, function ABI, bytecode, and membership witnesses
|
|
@@ -32,20 +32,22 @@ export declare class ContractDataOracle {
|
|
|
32
32
|
* @param selector - The function selector.
|
|
33
33
|
* @returns The corresponding function's artifact as an object.
|
|
34
34
|
*/
|
|
35
|
-
getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector): Promise<
|
|
35
|
+
getFunctionArtifact(contractAddress: AztecAddress, selector: FunctionSelector): Promise<ContractFunctionDao>;
|
|
36
36
|
/**
|
|
37
37
|
* Retrieves the artifact of a specified function within a given contract.
|
|
38
38
|
* The function is identified by its name, which is unique within a contract.
|
|
39
|
+
* Throws if the contract has not been added to the database.
|
|
39
40
|
*
|
|
40
41
|
* @param contractAddress - The AztecAddress representing the contract containing the function.
|
|
41
42
|
* @param functionName - The name of the function.
|
|
42
|
-
* @returns The corresponding function's artifact as an object
|
|
43
|
+
* @returns The corresponding function's artifact as an object
|
|
43
44
|
*/
|
|
44
|
-
getFunctionArtifactByName(contractAddress: AztecAddress, functionName: string): Promise<
|
|
45
|
+
getFunctionArtifactByName(contractAddress: AztecAddress, functionName: string): Promise<ContractFunctionDao | undefined>;
|
|
45
46
|
/**
|
|
46
47
|
* Retrieves the debug metadata of a specified function within a given contract.
|
|
47
48
|
* The function is identified by its selector, which is a unique code generated from the function's signature.
|
|
48
49
|
* Returns undefined if the debug metadata for the given function is not found.
|
|
50
|
+
* Throws if the contract has not been added to the database.
|
|
49
51
|
*
|
|
50
52
|
* @param contractAddress - The AztecAddress representing the contract containing the function.
|
|
51
53
|
* @param selector - The function selector.
|
|
@@ -60,6 +62,7 @@ export declare class ContractDataOracle {
|
|
|
60
62
|
* @param contractAddress - The contract's address.
|
|
61
63
|
* @param selector - The function selector.
|
|
62
64
|
* @returns A Promise that resolves to a Buffer containing the bytecode of the specified function.
|
|
65
|
+
* @throws Error if the contract address is unknown or not found.
|
|
63
66
|
*/
|
|
64
67
|
getBytecode(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string>;
|
|
65
68
|
/**
|
|
@@ -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":"AACA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,iBAAiB,EAAkB,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIhF;;;;;;GAMG;AACH,qBAAa,kBAAkB;IAGjB,OAAO,CAAC,EAAE;IAAoB,OAAO,CAAC,aAAa;IAF/D,OAAO,CAAC,KAAK,CAAsB;gBAEf,EAAE,EAAE,gBAAgB,EAAU,aAAa,EAAE,iBAAiB;IAElF;;;;;;;;OAQG;IACU,wBAAwB,CAAC,eAAe,EAAE,YAAY;IAKnE;;;;;;;;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,mBAAmB,GAAG,SAAS,CAAC;IAK3C;;;;;;;;;OASG;IACU,wBAAwB,CACnC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAW7C;;;;;;;;;OASG;IACU,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAKlF;;;;;;;;;OASG;IACU,4BAA4B,CAAC,eAAe,EAAE,YAAY;IAKvE;;;;;;;;OAQG;IACU,4BAA4B,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAKnG;;;;;;;;OAQG;IACU,sBAAsB;IAKnC;;;;;;;;;OASG;YACW,OAAO;CAatB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { ContractNotFoundError } from '@aztec/acir-simulator';
|
|
1
2
|
import { MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
2
|
-
import { getFunctionDebugMetadata } from '@aztec/foundation/abi';
|
|
3
3
|
import { ContractTree } from '../contract_tree/index.js';
|
|
4
4
|
/**
|
|
5
5
|
* ContractDataOracle serves as a data manager and retriever for Aztec.nr contracts.
|
|
@@ -43,31 +43,33 @@ export class ContractDataOracle {
|
|
|
43
43
|
/**
|
|
44
44
|
* Retrieves the artifact of a specified function within a given contract.
|
|
45
45
|
* The function is identified by its name, which is unique within a contract.
|
|
46
|
+
* Throws if the contract has not been added to the database.
|
|
46
47
|
*
|
|
47
48
|
* @param contractAddress - The AztecAddress representing the contract containing the function.
|
|
48
49
|
* @param functionName - The name of the function.
|
|
49
|
-
* @returns The corresponding function's artifact as an object
|
|
50
|
+
* @returns The corresponding function's artifact as an object
|
|
50
51
|
*/
|
|
51
52
|
async getFunctionArtifactByName(contractAddress, functionName) {
|
|
52
|
-
const
|
|
53
|
-
return contract
|
|
53
|
+
const tree = await this.getTree(contractAddress);
|
|
54
|
+
return tree.contract.getFunctionArtifactByName(functionName);
|
|
54
55
|
}
|
|
55
56
|
/**
|
|
56
57
|
* Retrieves the debug metadata of a specified function within a given contract.
|
|
57
58
|
* The function is identified by its selector, which is a unique code generated from the function's signature.
|
|
58
59
|
* Returns undefined if the debug metadata for the given function is not found.
|
|
60
|
+
* Throws if the contract has not been added to the database.
|
|
59
61
|
*
|
|
60
62
|
* @param contractAddress - The AztecAddress representing the contract containing the function.
|
|
61
63
|
* @param selector - The function selector.
|
|
62
64
|
* @returns The corresponding function's artifact as an object.
|
|
63
65
|
*/
|
|
64
66
|
async getFunctionDebugMetadata(contractAddress, selector) {
|
|
65
|
-
const
|
|
66
|
-
const functionArtifact = contract
|
|
67
|
-
if (!
|
|
67
|
+
const tree = await this.getTree(contractAddress);
|
|
68
|
+
const functionArtifact = tree.contract.getFunctionArtifact(selector);
|
|
69
|
+
if (!functionArtifact) {
|
|
68
70
|
return undefined;
|
|
69
71
|
}
|
|
70
|
-
return
|
|
72
|
+
return tree.contract.getFunctionDebugMetadataByName(functionArtifact.name);
|
|
71
73
|
}
|
|
72
74
|
/**
|
|
73
75
|
* Retrieve the bytecode of a specific function in a contract at the given address.
|
|
@@ -77,6 +79,7 @@ export class ContractDataOracle {
|
|
|
77
79
|
* @param contractAddress - The contract's address.
|
|
78
80
|
* @param selector - The function selector.
|
|
79
81
|
* @returns A Promise that resolves to a Buffer containing the bytecode of the specified function.
|
|
82
|
+
* @throws Error if the contract address is unknown or not found.
|
|
80
83
|
*/
|
|
81
84
|
async getBytecode(contractAddress, selector) {
|
|
82
85
|
const tree = await this.getTree(contractAddress);
|
|
@@ -137,7 +140,7 @@ export class ContractDataOracle {
|
|
|
137
140
|
if (!tree) {
|
|
138
141
|
const contract = await this.db.getContract(contractAddress);
|
|
139
142
|
if (!contract) {
|
|
140
|
-
throw new
|
|
143
|
+
throw new ContractNotFoundError(contractAddress.toString());
|
|
141
144
|
}
|
|
142
145
|
tree = new ContractTree(contract, this.stateProvider);
|
|
143
146
|
this.trees.push(tree);
|
|
@@ -145,4 +148,4 @@ export class ContractDataOracle {
|
|
|
145
148
|
return tree;
|
|
146
149
|
}
|
|
147
150
|
}
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RfZGF0YV9vcmFjbGUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFOUQsT0FBTyxFQUFxQyxpQkFBaUIsRUFBRSxjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUcxRyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFekQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQUc3QixZQUFvQixFQUFvQixFQUFVLGFBQWdDO1FBQTlELE9BQUUsR0FBRixFQUFFLENBQWtCO1FBQVUsa0JBQWEsR0FBYixhQUFhLENBQW1CO1FBRjFFLFVBQUssR0FBbUIsRUFBRSxDQUFDO0lBRWtELENBQUM7SUFFdEY7Ozs7Ozs7O09BUUc7SUFDSSxLQUFLLENBQUMsd0JBQXdCLENBQUMsZUFBNkI7UUFDakUsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2pELE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUM7SUFDdEMsQ0FBQztJQUVEOzs7Ozs7OztPQVFHO0lBQ0ksS0FBSyxDQUFDLG1CQUFtQixDQUFDLGVBQTZCLEVBQUUsUUFBMEI7UUFDeEYsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2pELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNJLEtBQUssQ0FBQyx5QkFBeUIsQ0FDcEMsZUFBNkIsRUFDN0IsWUFBb0I7UUFFcEIsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2pELE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyx5QkFBeUIsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0ksS0FBSyxDQUFDLHdCQUF3QixDQUNuQyxlQUE2QixFQUM3QixRQUEwQjtRQUUxQixNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDakQsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRXJFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRTtZQUNyQixPQUFPLFNBQVMsQ0FBQztTQUNsQjtRQUVELE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyw4QkFBOEIsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM3RSxDQUFDO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0ksS0FBSyxDQUFDLFdBQVcsQ0FBQyxlQUE2QixFQUFFLFFBQTBCO1FBQ2hGLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUNqRCxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNJLEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxlQUE2QjtRQUNyRSxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDakQsT0FBTyxJQUFJLENBQUMsNEJBQTRCLEVBQUUsQ0FBQztJQUM3QyxDQUFDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSSxLQUFLLENBQUMsNEJBQTRCLENBQUMsZUFBNkIsRUFBRSxRQUEwQjtRQUNqRyxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDakQsT0FBTyxJQUFJLENBQUMsNEJBQTRCLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVEOzs7Ozs7OztPQVFHO0lBQ0ksS0FBSyxDQUFDLHNCQUFzQjtRQUNqQyxPQUFPO1FBQ1AsT0FBTyxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUM7SUFDekUsQ0FBQztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNLLEtBQUssQ0FBQyxPQUFPLENBQUMsZUFBNkI7UUFDakQsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7UUFDNUYsSUFBSSxDQUFDLElBQUksRUFBRTtZQUNULE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDNUQsSUFBSSxDQUFDLFFBQVEsRUFBRTtnQkFDYixNQUFNLElBQUkscUJBQXFCLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7YUFDN0Q7WUFFRCxJQUFJLEdBQUcsSUFBSSxZQUFZLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztZQUN0RCxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUN2QjtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGIn0=
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { ContractDao, ContractDatabase } from '@aztec/circuit-types';
|
|
1
2
|
import { FunctionSelector } from '@aztec/circuits.js';
|
|
2
3
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
3
4
|
import { DebugLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { ContractDao, ContractDatabase } from '@aztec/types';
|
|
5
5
|
/**
|
|
6
6
|
* The MemoryContractDatabase class serves as an in-memory implementation of the ContractDatabase interface.
|
|
7
7
|
* It allows for storing and retrieving contract data, such as ContractDao objects and associated function bytecodes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_contract_database.d.ts","sourceRoot":"","sources":["../../src/contract_database/memory_contract_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"memory_contract_database.d.ts","sourceRoot":"","sources":["../../src/contract_database/memory_contract_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD;;;;;GAKG;AACH,qBAAa,sBAAuB,YAAW,gBAAgB;IAGjD,SAAS,CAAC,GAAG,EAAE,WAAW;IAFtC,OAAO,CAAC,SAAS,CAAqB;gBAEhB,GAAG,EAAE,WAAW;IAEtC;;;;;;OAMG;IACI,WAAW,CAAC,QAAQ,EAAE,WAAW;IAMxC;;;;;;OAMG;IACI,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAIpE,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAI7C;;;;;;;;OAQG;IACU,OAAO,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;CAI/E"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { AztecNode, ContractDao, PublicKey, StateInfoProvider } from '@aztec/circuit-types';
|
|
1
2
|
import { EthAddress, FUNCTION_TREE_HEIGHT, Fr, MembershipWitness, NewContractConstructor } from '@aztec/circuits.js';
|
|
2
3
|
import { ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
|
|
3
|
-
import { AztecNode, ContractDao, PublicKey, StateInfoProvider } from '@aztec/types';
|
|
4
4
|
/**
|
|
5
5
|
* The ContractTree class represents a Merkle tree of functions for a particular contract.
|
|
6
6
|
* It manages the construction of the function tree, computes its root, and generates membership witnesses
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract_tree/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,oBAAoB,EACpB,EAAE,EAEF,iBAAiB,EACjB,sBAAsB,EAOvB,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract_tree/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAgB,SAAS,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1G,OAAO,EAEL,UAAU,EACV,oBAAoB,EACpB,EAAE,EAEF,iBAAiB,EACjB,sBAAsB,EAOvB,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG3E;;;;;GAKG;AACH,qBAAa,YAAY;IAOrB;;OAEG;aACa,QAAQ,EAAE,WAAW;IACrC,OAAO,CAAC,iBAAiB;IACzB;;OAEG;aACa,sBAAsB,CAAC;IAdzC,OAAO,CAAC,cAAc,CAAC,CAAO;IAC9B,OAAO,CAAC,YAAY,CAAC,CAAO;IAC5B,OAAO,CAAC,gBAAgB,CAAC,CAAK;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAS;;IAG7B;;OAEG;IACa,QAAQ,EAAE,WAAW,EAC7B,iBAAiB,EAAE,iBAAiB;IAC5C;;OAEG;IACa,sBAAsB,CAAC,oCAAwB;IAGjE;;;;;;;;;;;;;;OAcG;WACW,GAAG,CACf,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,EAAE,EAAE,EACV,cAAc,EAAE,UAAU,EAC1B,mBAAmB,EAAE,EAAE,EACvB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,SAAS;IA+BjB;;;;;;;OAOG;IACI,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB;IAYrD;;;;;;;OAOG;IACI,WAAW,CAAC,QAAQ,EAAE,gBAAgB;IAI7C;;;;;;;;;;;OAWG;IACU,4BAA4B,CAAC,WAAW,GAAE,MAAM,GAAG,QAAmB;IAWnF;;;;;;OAMG;IACI,mBAAmB;IAQ1B;;;;;;;;OAQG;IACI,4BAA4B,CACjC,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC;IAqB1D;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;YAOX,gBAAgB;CAgB/B"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { ContractDao, MerkleTreeId } from '@aztec/circuit-types';
|
|
1
2
|
import { CONTRACT_TREE_HEIGHT, FUNCTION_TREE_HEIGHT, FunctionData, MembershipWitness, NewContractData, computeFunctionTreeData, generateFunctionLeaves, hashVKStr, isConstrained, isConstructor, } from '@aztec/circuits.js';
|
|
2
3
|
import { computeCompleteAddress, computeContractLeaf, computeFunctionTree, computeFunctionTreeRoot, computeVarArgsHash, hashConstructor, } from '@aztec/circuits.js/abis';
|
|
3
4
|
import { FunctionSelector } from '@aztec/foundation/abi';
|
|
4
5
|
import { assertLength } from '@aztec/foundation/serialize';
|
|
5
|
-
import { ContractDao, MerkleTreeId } from '@aztec/types';
|
|
6
6
|
/**
|
|
7
7
|
* The ContractTree class represents a Merkle tree of functions for a particular contract.
|
|
8
8
|
* It manages the construction of the function tree, computes its root, and generates membership witnesses
|
|
@@ -173,4 +173,4 @@ export class ContractTree {
|
|
|
173
173
|
return this.contractIndex;
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
176
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RfdHJlZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWEsV0FBVyxFQUFFLFlBQVksRUFBZ0MsTUFBTSxzQkFBc0IsQ0FBQztBQUMxRyxPQUFPLEVBQ0wsb0JBQW9CLEVBRXBCLG9CQUFvQixFQUVwQixZQUFZLEVBQ1osaUJBQWlCLEVBRWpCLGVBQWUsRUFDZix1QkFBdUIsRUFDdkIsc0JBQXNCLEVBQ3RCLFNBQVMsRUFDVCxhQUFhLEVBQ2IsYUFBYSxHQUNkLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUNMLHNCQUFzQixFQUN0QixtQkFBbUIsRUFDbkIsbUJBQW1CLEVBQ25CLHVCQUF1QixFQUN2QixrQkFBa0IsRUFDbEIsZUFBZSxHQUNoQixNQUFNLHlCQUF5QixDQUFDO0FBQ2pDLE9BQU8sRUFBb0IsZ0JBQWdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMzRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0Q7Ozs7O0dBS0c7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQU12QjtJQUNFOztPQUVHO0lBQ2EsUUFBcUIsRUFDN0IsaUJBQW9DO0lBQzVDOztPQUVHO0lBQ2Esc0JBQStDO1FBTC9DLGFBQVEsR0FBUixRQUFRLENBQWE7UUFDN0Isc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFtQjtRQUk1QiwyQkFBc0IsR0FBdEIsc0JBQXNCLENBQXlCO0lBQzlELENBQUM7SUFFSjs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNJLE1BQU0sQ0FBQyxHQUFHLENBQ2YsUUFBMEIsRUFDMUIsSUFBVSxFQUNWLGNBQTBCLEVBQzFCLG1CQUF1QixFQUN2QixJQUFlLEVBQ2YsSUFBZTtRQUVmLE1BQU0sbUJBQW1CLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDbkUsSUFBSSxDQUFDLG1CQUFtQixFQUFFO1lBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQztTQUMzQztRQUNELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUU7WUFDeEMsTUFBTSxJQUFJLEtBQUssQ0FBQywrQ0FBK0MsQ0FBQyxDQUFDO1NBQ2xFO1FBRUQsTUFBTSxTQUFTLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQzdDLEdBQUcsQ0FBQztZQUNKLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxVQUFVLENBQUM7U0FDdkUsQ0FBQyxDQUFDLENBQUM7UUFDSixNQUFNLE1BQU0sR0FBRyxzQkFBc0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNqRCxNQUFNLElBQUksR0FBRyx1QkFBdUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM3QyxNQUFNLFlBQVksR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDL0QsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLG1CQUFtQixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQzlELE1BQU0sUUFBUSxHQUFHLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFDLE1BQU0sZUFBZSxHQUFHLGVBQWUsQ0FBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRXhFLE1BQU0sZUFBZSxHQUFHLHNCQUFzQixDQUFDLElBQUksRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUUsZUFBZSxDQUFDLENBQUM7UUFFakcsTUFBTSxXQUFXLEdBQUcsSUFBSSxXQUFXLENBQUMsUUFBUSxFQUFFLGVBQWUsRUFBRSxjQUFjLENBQUMsQ0FBQztRQUMvRSxNQUFNLHNCQUFzQixHQUFHO1lBQzdCLFlBQVk7WUFDWixNQUFNO1NBQ1AsQ0FBQztRQUNGLE9BQU8sSUFBSSxZQUFZLENBQUMsV0FBVyxFQUFFLElBQUksRUFBRSxzQkFBc0IsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0ksbUJBQW1CLENBQUMsUUFBMEI7UUFDbkQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNoRixJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2IsTUFBTSxJQUFJLEtBQUssQ0FDYiw4QkFBOEIsUUFBUSxDQUFDLFFBQVEsRUFBRSwwQ0FBMEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxzQkFBc0IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTO2lCQUNyTCxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO2lCQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FDaEIsQ0FBQztTQUNIO1FBQ0QsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSSxXQUFXLENBQUMsUUFBMEI7UUFDM0MsT0FBTyxJQUFJLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDO0lBQ3JELENBQUM7SUFFRDs7Ozs7Ozs7Ozs7T0FXRztJQUNJLEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxjQUFpQyxRQUFRO1FBQ2pGLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFFNUMsTUFBTSxXQUFXLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsc0JBQXNCLENBQUMsV0FBVyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzVGLE9BQU8sSUFBSSxpQkFBaUIsQ0FDMUIsb0JBQW9CLEVBQ3BCLEtBQUssRUFDTCxZQUFZLENBQUMsV0FBVyxDQUFDLFlBQVksRUFBRSxFQUFFLG9CQUFvQixDQUFDLENBQy9ELENBQUM7SUFDSixDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksbUJBQW1CO1FBQ3hCLElBQUksQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUU7WUFDMUIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7WUFDeEMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLHVCQUF1QixDQUFDLE1BQU0sQ0FBQyxDQUFDO1NBQ3pEO1FBQ0QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNJLDRCQUE0QixDQUNqQyxRQUEwQjtRQUUxQixNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDdEUsTUFBTSxhQUFhLEdBQUcsZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDbEYsSUFBSSxhQUFhLEdBQUcsQ0FBQyxFQUFFO1lBQ3JCLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsb0JBQW9CLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQztTQUMzRTtRQUVELElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFO1lBQ3RCLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1lBQ3hDLElBQUksQ0FBQyxZQUFZLEdBQUcsbUJBQW1CLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDakQ7UUFDRCxNQUFNLGdCQUFnQixHQUFHLHVCQUF1QixDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFDbkYsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUNwQixJQUFJLGlCQUFpQixDQUNuQixvQkFBb0IsRUFDcEIsTUFBTSxDQUFDLGFBQWEsQ0FBQyxFQUNyQixZQUFZLENBQUMsZ0JBQWdCLENBQUMsV0FBVyxFQUFFLG9CQUFvQixDQUFDLENBQ2pFLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSyxpQkFBaUI7UUFDdkIsSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUU7WUFDeEIsSUFBSSxDQUFDLGNBQWMsR0FBRyxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQ3ZFO1FBQ0QsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDO0lBQzdCLENBQUM7SUFFTyxLQUFLLENBQUMsZ0JBQWdCO1FBQzVCLElBQUksSUFBSSxDQUFDLGFBQWEsS0FBSyxTQUFTLEVBQUU7WUFDcEMsTUFBTSxFQUFFLGVBQWUsRUFBRSxjQUFjLEVBQUUsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1lBQzFELE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7WUFDOUMsTUFBTSxlQUFlLEdBQUcsSUFBSSxlQUFlLENBQUMsZUFBZSxDQUFDLE9BQU8sRUFBRSxjQUFjLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDM0YsTUFBTSxVQUFVLEdBQUcsbUJBQW1CLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDeEQsSUFBSSxDQUFDLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLFlBQVksQ0FBQyxhQUFhLEVBQUUsVUFBVSxDQUFDLENBQUM7WUFDbEgsSUFBSSxJQUFJLENBQUMsYUFBYSxLQUFLLFNBQVMsRUFBRTtnQkFDcEMsTUFBTSxJQUFJLEtBQUssQ0FDYiw4QkFBOEIsZUFBZSxDQUFDLE9BQU8sZ0JBQWdCLGNBQWMsNEJBQTRCLFVBQVUsR0FBRyxDQUM3SCxDQUFDO2FBQ0g7WUFDRCxPQUFPLElBQUksQ0FBQyxhQUFhLENBQUM7U0FDM0I7UUFDRCxPQUFPLElBQUksQ0FBQyxhQUFhLENBQUM7SUFDNUIsQ0FBQztDQUNGIn0=
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
+
import { Note, TxHash } from '@aztec/circuit-types';
|
|
3
|
+
import { AztecAddress, Fr, PublicKey } from '@aztec/circuits.js';
|
|
4
|
+
import { BufferReader } from '@aztec/foundation/serialize';
|
|
5
|
+
/**
|
|
6
|
+
* A note that is intended for us, but we cannot decode it yet because the contract is not yet in our database.
|
|
7
|
+
*
|
|
8
|
+
* So keep the state that we need to decode it later.
|
|
9
|
+
*/
|
|
10
|
+
export declare class DeferredNoteDao {
|
|
11
|
+
/** The public key associated with this note */
|
|
12
|
+
publicKey: PublicKey;
|
|
13
|
+
/** The note as emitted from the Noir contract. */
|
|
14
|
+
note: Note;
|
|
15
|
+
/** The contract address this note is created in. */
|
|
16
|
+
contractAddress: AztecAddress;
|
|
17
|
+
/** The specific storage location of the note on the contract. */
|
|
18
|
+
storageSlot: Fr;
|
|
19
|
+
/** The hash of the tx the note was created in. Equal to the first nullifier */
|
|
20
|
+
txHash: TxHash;
|
|
21
|
+
/** New commitments in this transaction, one of which belongs to this note */
|
|
22
|
+
newCommitments: Fr[];
|
|
23
|
+
/** The next available leaf index for the note hash tree for this transaction */
|
|
24
|
+
dataStartIndexForTx: number;
|
|
25
|
+
constructor(
|
|
26
|
+
/** The public key associated with this note */
|
|
27
|
+
publicKey: PublicKey,
|
|
28
|
+
/** The note as emitted from the Noir contract. */
|
|
29
|
+
note: Note,
|
|
30
|
+
/** The contract address this note is created in. */
|
|
31
|
+
contractAddress: AztecAddress,
|
|
32
|
+
/** The specific storage location of the note on the contract. */
|
|
33
|
+
storageSlot: Fr,
|
|
34
|
+
/** The hash of the tx the note was created in. Equal to the first nullifier */
|
|
35
|
+
txHash: TxHash,
|
|
36
|
+
/** New commitments in this transaction, one of which belongs to this note */
|
|
37
|
+
newCommitments: Fr[],
|
|
38
|
+
/** The next available leaf index for the note hash tree for this transaction */
|
|
39
|
+
dataStartIndexForTx: number);
|
|
40
|
+
toBuffer(): Buffer;
|
|
41
|
+
static fromBuffer(buffer: Buffer | BufferReader): DeferredNoteDao;
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=deferred_note_dao.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deferred_note_dao.d.ts","sourceRoot":"","sources":["../../src/database/deferred_note_dao.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,EAAE,EAAS,SAAS,EAAU,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E;;;;GAIG;AACH,qBAAa,eAAe;IAExB,+CAA+C;IACxC,SAAS,EAAE,SAAS;IAC3B,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,+EAA+E;IACxE,MAAM,EAAE,MAAM;IACrB,6EAA6E;IACtE,cAAc,EAAE,EAAE,EAAE;IAC3B,gFAAgF;IACzE,mBAAmB,EAAE,MAAM;;IAblC,+CAA+C;IACxC,SAAS,EAAE,SAAS;IAC3B,kDAAkD;IAC3C,IAAI,EAAE,IAAI;IACjB,oDAAoD;IAC7C,eAAe,EAAE,YAAY;IACpC,iEAAiE;IAC1D,WAAW,EAAE,EAAE;IACtB,+EAA+E;IACxE,MAAM,EAAE,MAAM;IACrB,6EAA6E;IACtE,cAAc,EAAE,EAAE,EAAE;IAC3B,gFAAgF;IACzE,mBAAmB,EAAE,MAAM;IAGpC,QAAQ,IAAI,MAAM;IAWlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;CAYhD"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { Note, TxHash } from '@aztec/circuit-types';
|
|
2
|
+
import { AztecAddress, Fr, Point, Vector } from '@aztec/circuits.js';
|
|
3
|
+
import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
4
|
+
/**
|
|
5
|
+
* A note that is intended for us, but we cannot decode it yet because the contract is not yet in our database.
|
|
6
|
+
*
|
|
7
|
+
* So keep the state that we need to decode it later.
|
|
8
|
+
*/
|
|
9
|
+
export class DeferredNoteDao {
|
|
10
|
+
constructor(
|
|
11
|
+
/** The public key associated with this note */
|
|
12
|
+
publicKey,
|
|
13
|
+
/** The note as emitted from the Noir contract. */
|
|
14
|
+
note,
|
|
15
|
+
/** The contract address this note is created in. */
|
|
16
|
+
contractAddress,
|
|
17
|
+
/** The specific storage location of the note on the contract. */
|
|
18
|
+
storageSlot,
|
|
19
|
+
/** The hash of the tx the note was created in. Equal to the first nullifier */
|
|
20
|
+
txHash,
|
|
21
|
+
/** New commitments in this transaction, one of which belongs to this note */
|
|
22
|
+
newCommitments,
|
|
23
|
+
/** The next available leaf index for the note hash tree for this transaction */
|
|
24
|
+
dataStartIndexForTx) {
|
|
25
|
+
this.publicKey = publicKey;
|
|
26
|
+
this.note = note;
|
|
27
|
+
this.contractAddress = contractAddress;
|
|
28
|
+
this.storageSlot = storageSlot;
|
|
29
|
+
this.txHash = txHash;
|
|
30
|
+
this.newCommitments = newCommitments;
|
|
31
|
+
this.dataStartIndexForTx = dataStartIndexForTx;
|
|
32
|
+
}
|
|
33
|
+
toBuffer() {
|
|
34
|
+
return serializeToBuffer(this.publicKey.toBuffer(), this.note.toBuffer(), this.contractAddress.toBuffer(), this.storageSlot.toBuffer(), this.txHash.toBuffer(), new Vector(this.newCommitments), this.dataStartIndexForTx);
|
|
35
|
+
}
|
|
36
|
+
static fromBuffer(buffer) {
|
|
37
|
+
const reader = BufferReader.asReader(buffer);
|
|
38
|
+
return new DeferredNoteDao(reader.readObject(Point), reader.readObject(Note), reader.readObject(AztecAddress), reader.readObject(Fr), reader.readObject(TxHash), reader.readVector(Fr), reader.readNumber());
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmZXJyZWRfbm90ZV9kYW8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGF0YWJhc2UvZGVmZXJyZWRfbm90ZV9kYW8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQWEsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEYsT0FBTyxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTlFOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQUMxQjtJQUNFLCtDQUErQztJQUN4QyxTQUFvQjtJQUMzQixrREFBa0Q7SUFDM0MsSUFBVTtJQUNqQixvREFBb0Q7SUFDN0MsZUFBNkI7SUFDcEMsaUVBQWlFO0lBQzFELFdBQWU7SUFDdEIsK0VBQStFO0lBQ3hFLE1BQWM7SUFDckIsNkVBQTZFO0lBQ3RFLGNBQW9CO0lBQzNCLGdGQUFnRjtJQUN6RSxtQkFBMkI7UUFaM0IsY0FBUyxHQUFULFNBQVMsQ0FBVztRQUVwQixTQUFJLEdBQUosSUFBSSxDQUFNO1FBRVYsb0JBQWUsR0FBZixlQUFlLENBQWM7UUFFN0IsZ0JBQVcsR0FBWCxXQUFXLENBQUk7UUFFZixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBRWQsbUJBQWMsR0FBZCxjQUFjLENBQU07UUFFcEIsd0JBQW1CLEdBQW5CLG1CQUFtQixDQUFRO0lBQ2pDLENBQUM7SUFFSixRQUFRO1FBQ04sT0FBTyxpQkFBaUIsQ0FDdEIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsRUFDekIsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFDcEIsSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLEVBQUUsRUFDL0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFDM0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFDdEIsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxFQUMvQixJQUFJLENBQUMsbUJBQW1CLENBQ3pCLENBQUM7SUFDSixDQUFDO0lBQ0QsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUE2QjtRQUM3QyxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzdDLE9BQU8sSUFBSSxlQUFlLENBQ3hCLE1BQU0sQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQ3hCLE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQ3ZCLE1BQU0sQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDLEVBQy9CLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQ3JCLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQ3pCLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQ3JCLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FDcEIsQ0FBQztJQUNKLENBQUM7Q0FDRiJ9
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { ContractDao, MerkleTreeId, NoteFilter, PublicKey } from '@aztec/circuit-types';
|
|
1
2
|
import { AztecAddress, BlockHeader, CompleteAddress } from '@aztec/circuits.js';
|
|
2
3
|
import { Fr, Point } from '@aztec/foundation/fields';
|
|
3
4
|
import { AztecKVStore } from '@aztec/kv-store';
|
|
4
|
-
import {
|
|
5
|
+
import { DeferredNoteDao } from './deferred_note_dao.js';
|
|
5
6
|
import { NoteDao } from './note_dao.js';
|
|
6
7
|
import { PxeDatabase } from './pxe_database.js';
|
|
7
8
|
/**
|
|
@@ -16,6 +17,19 @@ export declare class KVPxeDatabase implements PxeDatabase {
|
|
|
16
17
|
popCapsule(): Promise<Fr[] | undefined>;
|
|
17
18
|
addNote(note: NoteDao): Promise<void>;
|
|
18
19
|
addNotes(notes: NoteDao[]): Promise<void>;
|
|
20
|
+
addDeferredNotes(deferredNotes: DeferredNoteDao[]): Promise<void>;
|
|
21
|
+
getDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
|
|
22
|
+
/**
|
|
23
|
+
* Removes all deferred notes for a given contract address.
|
|
24
|
+
* @param contractAddress - the contract address to remove deferred notes for
|
|
25
|
+
* @returns an array of the removed deferred notes
|
|
26
|
+
*
|
|
27
|
+
* @remarks We only remove indices from the deferred notes by contract map, but not the actual deferred notes.
|
|
28
|
+
* This is safe because our only getter for deferred notes is by contract address.
|
|
29
|
+
* If we should add a more general getter, we will need a delete vector for deferred notes as well,
|
|
30
|
+
* analogous to this.#nullifiedNotes.
|
|
31
|
+
*/
|
|
32
|
+
removeDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
|
|
19
33
|
getNotes(filter: NoteFilter): Promise<NoteDao[]>;
|
|
20
34
|
removeNullifiedNotes(nullifiers: Fr[], account: PublicKey): Promise<NoteDao[]>;
|
|
21
35
|
getTreeRoots(): Record<MerkleTreeId, Fr>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kv_pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAc,YAAY,EAA2C,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"kv_pxe_database.d.ts","sourceRoot":"","sources":["../../src/database/kv_pxe_database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAc,YAAY,EAA2C,MAAM,iBAAiB,CAAC;AAEpG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAYhD;;GAEG;AACH,qBAAa,aAAc,YAAW,WAAW;;gBAkBnC,EAAE,EAAE,YAAY;IAyBtB,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,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAazC,gBAAgB,CAAC,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvE,0BAA0B,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAgBrF;;;;;;;;;OASG;IACH,6BAA6B,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA8BlF,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAiDtD,oBAAoB,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA0B9E,YAAY,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC;IAgBlC,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAehF,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,cAAc,IAAI,WAAW;IAoB7B,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBtE,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAU/E,oBAAoB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAIlD,iCAAiC,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS;IAIvE,iCAAiC,CAAC,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1F,YAAY,IAAI,MAAM;IAYhB,WAAW,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKpE,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;CAGvC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_addresses, _KVPxeDatabase_addressIndex, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_contracts, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_notesByContract, _KVPxeDatabase_notesByStorageSlot, _KVPxeDatabase_notesByTxHash, _KVPxeDatabase_notesByOwner, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_db, _KVPxeDatabase_getAllNonNullifiedNotes;
|
|
1
|
+
var _KVPxeDatabase_instances, _KVPxeDatabase_synchronizedBlock, _KVPxeDatabase_addresses, _KVPxeDatabase_addressIndex, _KVPxeDatabase_authWitnesses, _KVPxeDatabase_capsules, _KVPxeDatabase_contracts, _KVPxeDatabase_notes, _KVPxeDatabase_nullifiedNotes, _KVPxeDatabase_notesByContract, _KVPxeDatabase_notesByStorageSlot, _KVPxeDatabase_notesByTxHash, _KVPxeDatabase_notesByOwner, _KVPxeDatabase_deferredNotes, _KVPxeDatabase_deferredNotesByContract, _KVPxeDatabase_syncedBlockPerPublicKey, _KVPxeDatabase_db, _KVPxeDatabase_getAllNonNullifiedNotes;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
+
import { ContractDao, MerkleTreeId } from '@aztec/circuit-types';
|
|
3
4
|
import { BlockHeader, CompleteAddress } from '@aztec/circuits.js';
|
|
4
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
|
-
import {
|
|
6
|
+
import { DeferredNoteDao } from './deferred_note_dao.js';
|
|
6
7
|
import { NoteDao } from './note_dao.js';
|
|
7
8
|
/**
|
|
8
9
|
* A PXE database backed by LMDB.
|
|
@@ -22,6 +23,8 @@ export class KVPxeDatabase {
|
|
|
22
23
|
_KVPxeDatabase_notesByStorageSlot.set(this, void 0);
|
|
23
24
|
_KVPxeDatabase_notesByTxHash.set(this, void 0);
|
|
24
25
|
_KVPxeDatabase_notesByOwner.set(this, void 0);
|
|
26
|
+
_KVPxeDatabase_deferredNotes.set(this, void 0);
|
|
27
|
+
_KVPxeDatabase_deferredNotesByContract.set(this, void 0);
|
|
25
28
|
_KVPxeDatabase_syncedBlockPerPublicKey.set(this, void 0);
|
|
26
29
|
_KVPxeDatabase_db.set(this, void 0);
|
|
27
30
|
__classPrivateFieldSet(this, _KVPxeDatabase_db, db, "f");
|
|
@@ -38,6 +41,8 @@ export class KVPxeDatabase {
|
|
|
38
41
|
__classPrivateFieldSet(this, _KVPxeDatabase_notesByStorageSlot, db.createMultiMap('notes_by_storage_slot'), "f");
|
|
39
42
|
__classPrivateFieldSet(this, _KVPxeDatabase_notesByTxHash, db.createMultiMap('notes_by_tx_hash'), "f");
|
|
40
43
|
__classPrivateFieldSet(this, _KVPxeDatabase_notesByOwner, db.createMultiMap('notes_by_owner'), "f");
|
|
44
|
+
__classPrivateFieldSet(this, _KVPxeDatabase_deferredNotes, db.createArray('deferred_notes'), "f");
|
|
45
|
+
__classPrivateFieldSet(this, _KVPxeDatabase_deferredNotesByContract, db.createMultiMap('deferred_notes_by_contract'), "f");
|
|
41
46
|
}
|
|
42
47
|
async addAuthWitness(messageHash, witness) {
|
|
43
48
|
await __classPrivateFieldGet(this, _KVPxeDatabase_authWitnesses, "f").set(messageHash.toString(), witness.map(w => w.toBuffer()));
|
|
@@ -68,6 +73,53 @@ export class KVPxeDatabase {
|
|
|
68
73
|
]);
|
|
69
74
|
}
|
|
70
75
|
}
|
|
76
|
+
async addDeferredNotes(deferredNotes) {
|
|
77
|
+
const newLength = await __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").push(...deferredNotes.map(note => note.toBuffer()));
|
|
78
|
+
for (const [index, note] of deferredNotes.entries()) {
|
|
79
|
+
const noteId = newLength - deferredNotes.length + index;
|
|
80
|
+
await __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").set(note.contractAddress.toString(), noteId);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
getDeferredNotesByContract(contractAddress) {
|
|
84
|
+
const noteIds = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").getValues(contractAddress.toString());
|
|
85
|
+
const notes = [];
|
|
86
|
+
for (const noteId of noteIds) {
|
|
87
|
+
const serializedNote = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").at(noteId);
|
|
88
|
+
if (!serializedNote) {
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
const note = DeferredNoteDao.fromBuffer(serializedNote);
|
|
92
|
+
notes.push(note);
|
|
93
|
+
}
|
|
94
|
+
return Promise.resolve(notes);
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* Removes all deferred notes for a given contract address.
|
|
98
|
+
* @param contractAddress - the contract address to remove deferred notes for
|
|
99
|
+
* @returns an array of the removed deferred notes
|
|
100
|
+
*
|
|
101
|
+
* @remarks We only remove indices from the deferred notes by contract map, but not the actual deferred notes.
|
|
102
|
+
* This is safe because our only getter for deferred notes is by contract address.
|
|
103
|
+
* If we should add a more general getter, we will need a delete vector for deferred notes as well,
|
|
104
|
+
* analogous to this.#nullifiedNotes.
|
|
105
|
+
*/
|
|
106
|
+
removeDeferredNotesByContract(contractAddress) {
|
|
107
|
+
return __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").transaction(() => {
|
|
108
|
+
const deferredNotes = [];
|
|
109
|
+
const indices = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").getValues(contractAddress.toString());
|
|
110
|
+
for (const index of indices) {
|
|
111
|
+
const deferredNoteBuffer = __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotes, "f").at(index);
|
|
112
|
+
if (!deferredNoteBuffer) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
deferredNotes.push(DeferredNoteDao.fromBuffer(deferredNoteBuffer));
|
|
117
|
+
}
|
|
118
|
+
void __classPrivateFieldGet(this, _KVPxeDatabase_deferredNotesByContract, "f").deleteValue(contractAddress.toString(), index);
|
|
119
|
+
}
|
|
120
|
+
return deferredNotes;
|
|
121
|
+
});
|
|
122
|
+
}
|
|
71
123
|
async getNotes(filter) {
|
|
72
124
|
const publicKey = filter.owner
|
|
73
125
|
? (await this.getCompleteAddress(filter.owner))?.publicKey
|
|
@@ -108,6 +160,9 @@ export class KVPxeDatabase {
|
|
|
108
160
|
return result;
|
|
109
161
|
}
|
|
110
162
|
removeNullifiedNotes(nullifiers, account) {
|
|
163
|
+
if (nullifiers.length === 0) {
|
|
164
|
+
return Promise.resolve([]);
|
|
165
|
+
}
|
|
111
166
|
const nullifierSet = new Set(nullifiers.map(n => n.toString()));
|
|
112
167
|
return __classPrivateFieldGet(this, _KVPxeDatabase_db, "f").transaction(() => {
|
|
113
168
|
const notesIds = __classPrivateFieldGet(this, _KVPxeDatabase_notesByOwner, "f").getValues(account.toString());
|
|
@@ -221,7 +276,7 @@ export class KVPxeDatabase {
|
|
|
221
276
|
return Promise.resolve(Array.from(__classPrivateFieldGet(this, _KVPxeDatabase_contracts, "f").values()).map(c => ContractDao.fromBuffer(c)));
|
|
222
277
|
}
|
|
223
278
|
}
|
|
224
|
-
_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new WeakMap(), _KVPxeDatabase_addressIndex = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_contracts = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_notesByContract = new WeakMap(), _KVPxeDatabase_notesByStorageSlot = new WeakMap(), _KVPxeDatabase_notesByTxHash = new WeakMap(), _KVPxeDatabase_notesByOwner = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_getAllNonNullifiedNotes = function* _KVPxeDatabase_getAllNonNullifiedNotes() {
|
|
279
|
+
_KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new WeakMap(), _KVPxeDatabase_addressIndex = new WeakMap(), _KVPxeDatabase_authWitnesses = new WeakMap(), _KVPxeDatabase_capsules = new WeakMap(), _KVPxeDatabase_contracts = new WeakMap(), _KVPxeDatabase_notes = new WeakMap(), _KVPxeDatabase_nullifiedNotes = new WeakMap(), _KVPxeDatabase_notesByContract = new WeakMap(), _KVPxeDatabase_notesByStorageSlot = new WeakMap(), _KVPxeDatabase_notesByTxHash = new WeakMap(), _KVPxeDatabase_notesByOwner = new WeakMap(), _KVPxeDatabase_deferredNotes = new WeakMap(), _KVPxeDatabase_deferredNotesByContract = new WeakMap(), _KVPxeDatabase_syncedBlockPerPublicKey = new WeakMap(), _KVPxeDatabase_db = new WeakMap(), _KVPxeDatabase_instances = new WeakSet(), _KVPxeDatabase_getAllNonNullifiedNotes = function* _KVPxeDatabase_getAllNonNullifiedNotes() {
|
|
225
280
|
for (const [index, serialized] of __classPrivateFieldGet(this, _KVPxeDatabase_notes, "f").entries()) {
|
|
226
281
|
if (__classPrivateFieldGet(this, _KVPxeDatabase_nullifiedNotes, "f").has(index)) {
|
|
227
282
|
continue;
|
|
@@ -229,4 +284,4 @@ _KVPxeDatabase_synchronizedBlock = new WeakMap(), _KVPxeDatabase_addresses = new
|
|
|
229
284
|
yield NoteDao.fromBuffer(serialized);
|
|
230
285
|
}
|
|
231
286
|
};
|
|
232
|
-
//# 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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"}
|
|
287
|
+
//# 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,8 +1,9 @@
|
|
|
1
|
+
import { MerkleTreeId, NoteFilter } from '@aztec/circuit-types';
|
|
1
2
|
import { BlockHeader, CompleteAddress, PublicKey } from '@aztec/circuits.js';
|
|
2
3
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
3
4
|
import { Fr, Point } from '@aztec/foundation/fields';
|
|
4
|
-
import { MerkleTreeId, NoteFilter } from '@aztec/types';
|
|
5
5
|
import { MemoryContractDatabase } from '../contract_database/index.js';
|
|
6
|
+
import { DeferredNoteDao } from './deferred_note_dao.js';
|
|
6
7
|
import { NoteDao } from './note_dao.js';
|
|
7
8
|
import { PxeDatabase } from './pxe_database.js';
|
|
8
9
|
/**
|
|
@@ -13,6 +14,7 @@ import { PxeDatabase } from './pxe_database.js';
|
|
|
13
14
|
*/
|
|
14
15
|
export declare class MemoryDB extends MemoryContractDatabase implements PxeDatabase {
|
|
15
16
|
private notesTable;
|
|
17
|
+
private deferredNotesTable;
|
|
16
18
|
private treeRoots;
|
|
17
19
|
private globalVariablesHash;
|
|
18
20
|
private blockNumber;
|
|
@@ -34,6 +36,9 @@ export declare class MemoryDB extends MemoryContractDatabase implements PxeDatab
|
|
|
34
36
|
*/
|
|
35
37
|
getAuthWitness(messageHash: Fr): Promise<Fr[] | undefined>;
|
|
36
38
|
addNote(note: NoteDao): Promise<void>;
|
|
39
|
+
addDeferredNotes(notes: DeferredNoteDao[]): Promise<void>;
|
|
40
|
+
getDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
|
|
41
|
+
removeDeferredNotesByContract(contractAddress: AztecAddress): Promise<DeferredNoteDao[]>;
|
|
37
42
|
addCapsule(capsule: Fr[]): Promise<void>;
|
|
38
43
|
popCapsule(): Promise<Fr[] | undefined>;
|
|
39
44
|
addNotes(notes: NoteDao[]): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_db.d.ts","sourceRoot":"","sources":["../../src/database/memory_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"memory_db.d.ts","sourceRoot":"","sources":["../../src/database/memory_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAGrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;;;;GAKG;AACH,qBAAa,QAAS,SAAQ,sBAAuB,YAAW,WAAW;IACzE,OAAO,CAAC,UAAU,CAAiB;IACnC,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,SAAS,CAAuC;IACxD,OAAO,CAAC,mBAAmB,CAAiB;IAC5C,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,uBAAuB,CAA6B;IAG5D,OAAO,CAAC,YAAY,CAAc;gBAEtB,SAAS,CAAC,EAAE,MAAM;IAI9B;;;;OAIG;IACI,cAAc,CAAC,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpE;;;;OAIG;IACI,cAAc,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC;IAI1D,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrC,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzD,0BAA0B,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAIrF,6BAA6B,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAYxF,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxC,UAAU,IAAI,OAAO,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC;IAIvC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE;IAKnB,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBtD,oBAAoB,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS;IAoBzD,YAAY,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC;IAQ/C,OAAO,CAAC,YAAY;IAIb,cAAc,IAAI,WAAW;IAiB7B,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1E,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBtE,kBAAkB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAK/E,oBAAoB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAIzD,iCAAiC,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS;IAIvE,iCAAiC,CAAC,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKnF,YAAY;CAOpB"}
|