@aztec/pxe 0.31.0 → 0.32.1
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 +6 -6
- package/dest/contract_data_oracle/index.d.ts.map +1 -1
- package/dest/contract_data_oracle/index.js +1 -1
- package/dest/contract_data_oracle/private_functions_tree.d.ts +3 -3
- package/dest/contract_data_oracle/private_functions_tree.d.ts.map +1 -1
- package/dest/database/contracts/contract_artifact_db.d.ts +2 -2
- package/dest/database/contracts/contract_artifact_db.d.ts.map +1 -1
- package/dest/database/contracts/contract_instance_db.d.ts +2 -2
- package/dest/database/contracts/contract_instance_db.d.ts.map +1 -1
- package/dest/database/deferred_note_dao.d.ts +1 -1
- package/dest/database/deferred_note_dao.d.ts.map +1 -1
- package/dest/database/deferred_note_dao.js +2 -2
- package/dest/database/kv_pxe_database.d.ts +6 -6
- package/dest/database/kv_pxe_database.d.ts.map +1 -1
- package/dest/database/kv_pxe_database.js +1 -1
- package/dest/database/note_dao.d.ts +2 -2
- package/dest/database/note_dao.d.ts.map +1 -1
- package/dest/database/note_dao.js +13 -13
- package/dest/database/pxe_database.d.ts +10 -10
- package/dest/database/pxe_database.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.d.ts +1 -1
- package/dest/database/pxe_database_test_suite.d.ts.map +1 -1
- package/dest/database/pxe_database_test_suite.js +1 -1
- package/dest/kernel_oracle/index.d.ts +4 -4
- package/dest/kernel_oracle/index.d.ts.map +1 -1
- package/dest/kernel_prover/hints_builder.d.ts +3 -3
- package/dest/kernel_prover/hints_builder.d.ts.map +1 -1
- package/dest/kernel_prover/kernel_prover.d.ts +4 -4
- package/dest/kernel_prover/kernel_prover.d.ts.map +1 -1
- package/dest/kernel_prover/kernel_prover.js +1 -1
- package/dest/kernel_prover/proof_creator.d.ts +2 -2
- package/dest/kernel_prover/proof_creator.d.ts.map +1 -1
- package/dest/kernel_prover/proving_data_oracle.d.ts +3 -3
- package/dest/kernel_prover/proving_data_oracle.d.ts.map +1 -1
- package/dest/note_processor/note_processor.d.ts +6 -6
- package/dest/note_processor/note_processor.d.ts.map +1 -1
- package/dest/note_processor/note_processor.js +3 -3
- package/dest/note_processor/produce_note_dao.d.ts +3 -3
- package/dest/note_processor/produce_note_dao.d.ts.map +1 -1
- package/dest/note_processor/produce_note_dao.js +1 -1
- 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 +3 -3
- package/dest/pxe_service/create_pxe_service.d.ts +2 -2
- package/dest/pxe_service/create_pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.d.ts +7 -7
- package/dest/pxe_service/pxe_service.d.ts.map +1 -1
- package/dest/pxe_service/pxe_service.js +4 -4
- 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/simulator/index.d.ts +2 -2
- package/dest/simulator/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.d.ts +7 -7
- package/dest/simulator_oracle/index.d.ts.map +1 -1
- package/dest/simulator_oracle/index.js +1 -1
- package/dest/synchronizer/synchronizer.d.ts +4 -4
- package/dest/synchronizer/synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/synchronizer.js +2 -2
- package/package.json +12 -12
- package/src/contract_data_oracle/index.ts +9 -9
- package/src/contract_data_oracle/private_functions_tree.ts +3 -3
- package/src/database/contracts/contract_artifact_db.ts +2 -2
- package/src/database/contracts/contract_instance_db.ts +2 -2
- package/src/database/deferred_note_dao.ts +7 -7
- package/src/database/kv_pxe_database.ts +12 -6
- package/src/database/note_dao.ts +14 -14
- package/src/database/pxe_database.ts +11 -11
- package/src/database/pxe_database_test_suite.ts +3 -3
- package/src/kernel_oracle/index.ts +9 -9
- package/src/kernel_prover/hints_builder.ts +9 -9
- package/src/kernel_prover/kernel_prover.ts +9 -9
- package/src/kernel_prover/proof_creator.ts +9 -9
- package/src/kernel_prover/proving_data_oracle.ts +11 -11
- package/src/note_processor/note_processor.ts +18 -8
- package/src/note_processor/produce_note_dao.ts +3 -3
- package/src/pxe_http/pxe_http_server.ts +4 -3
- package/src/pxe_service/create_pxe_service.ts +2 -2
- package/src/pxe_service/pxe_service.ts +30 -29
- package/src/pxe_service/test/pxe_test_suite.ts +1 -1
- package/src/simulator/index.ts +2 -2
- package/src/simulator_oracle/index.ts +19 -19
- package/src/synchronizer/synchronizer.ts +15 -8
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { AztecNode, KeyStore } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecAddress, PublicKey } from '@aztec/circuits.js';
|
|
3
|
-
import { SerialQueue } from '@aztec/foundation/fifo';
|
|
4
|
-
import { PxeDatabase } from '../database/index.js';
|
|
1
|
+
import { type AztecNode, type KeyStore } from '@aztec/circuit-types';
|
|
2
|
+
import { type AztecAddress, type PublicKey } from '@aztec/circuits.js';
|
|
3
|
+
import { type SerialQueue } from '@aztec/foundation/fifo';
|
|
4
|
+
import { type PxeDatabase } from '../database/index.js';
|
|
5
5
|
/**
|
|
6
6
|
* The Synchronizer class manages the synchronization of note processors and interacts with the Aztec node
|
|
7
7
|
* to obtain encrypted logs, blocks, and other necessary information for the accounts.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,QAAQ,EAKd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,YAAY,EAAiC,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtG,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;;;GAMG;AACH,qBAAa,YAAY;;IAQX,OAAO,CAAC,IAAI;IAAa,OAAO,CAAC,EAAE;IAAe,OAAO,CAAC,QAAQ;IAP9E,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,uBAAuB,CAAuB;gBAElC,IAAI,EAAE,SAAS,EAAU,EAAE,EAAE,WAAW,EAAU,QAAQ,EAAE,WAAW,EAAE,SAAS,SAAK;IAI3G;;;;;;;OAOG;IACU,KAAK,CAAC,KAAK,SAAI,EAAE,aAAa,SAAO;cAalC,WAAW;IAO3B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM;IAgB5B;;;;;OAKG;cACa,IAAI,CAAC,KAAK,SAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IA6BjD;;;;;;OAMG;cACa,wBAAwB,CAAC,KAAK,SAAI,GAAG,OAAO,CAAC,OAAO,CAAC;YAkGvD,kBAAkB;IAShC;;;;;;OAMG;IACU,IAAI;IAMjB;;;;;;;;;OASG;IACI,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM;IAUjF;;;;;;;OAOG;IACU,0BAA0B,CAAC,OAAO,EAAE,YAAY;IAe7D,OAAO,CAAC,qBAAqB;IAI7B;;;;;OAKG;IACU,yBAAyB;IAKtC;;;OAGG;IACI,aAAa;;;;;;IAQpB;;;OAGG;IACI,iCAAiC,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CA8DvF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var _Synchronizer_instances, _Synchronizer_reprocessDeferredNotesForContract;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import { L2BlockContext, L2BlockL2Logs, MerkleTreeId } from '@aztec/circuit-types';
|
|
3
|
+
import { L2BlockContext, L2BlockL2Logs, MerkleTreeId, } from '@aztec/circuit-types';
|
|
4
4
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
|
|
5
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
6
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
@@ -326,4 +326,4 @@ _Synchronizer_instances = new WeakSet(), _Synchronizer_reprocessDeferredNotesFor
|
|
|
326
326
|
await this.db.removeNullifiedNotes(relevantNullifiers, publicKey);
|
|
327
327
|
}
|
|
328
328
|
};
|
|
329
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}
|
|
329
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/pxe",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.32.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"bin": "./dest/bin/index.js",
|
|
@@ -33,17 +33,17 @@
|
|
|
33
33
|
"workerThreads": true
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@aztec/circuit-types": "0.
|
|
37
|
-
"@aztec/circuits.js": "0.
|
|
38
|
-
"@aztec/ethereum": "0.
|
|
39
|
-
"@aztec/foundation": "0.
|
|
40
|
-
"@aztec/key-store": "0.
|
|
41
|
-
"@aztec/kv-store": "0.
|
|
42
|
-
"@aztec/noir-compiler": "0.
|
|
43
|
-
"@aztec/noir-protocol-circuits-types": "0.
|
|
44
|
-
"@aztec/protocol-contracts": "0.
|
|
45
|
-
"@aztec/simulator": "0.
|
|
46
|
-
"@aztec/types": "0.
|
|
36
|
+
"@aztec/circuit-types": "0.32.1",
|
|
37
|
+
"@aztec/circuits.js": "0.32.1",
|
|
38
|
+
"@aztec/ethereum": "0.32.1",
|
|
39
|
+
"@aztec/foundation": "0.32.1",
|
|
40
|
+
"@aztec/key-store": "0.32.1",
|
|
41
|
+
"@aztec/kv-store": "0.32.1",
|
|
42
|
+
"@aztec/noir-compiler": "0.32.1",
|
|
43
|
+
"@aztec/noir-protocol-circuits-types": "0.32.1",
|
|
44
|
+
"@aztec/protocol-contracts": "0.32.1",
|
|
45
|
+
"@aztec/simulator": "0.32.1",
|
|
46
|
+
"@aztec/types": "0.32.1",
|
|
47
47
|
"koa": "^2.14.2",
|
|
48
48
|
"koa-router": "^12.0.0",
|
|
49
49
|
"lodash.omit": "^4.5.0",
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { AztecAddress, MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
1
|
+
import { type AztecAddress, MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
2
2
|
import {
|
|
3
|
-
ContractArtifact,
|
|
4
|
-
FunctionArtifact,
|
|
5
|
-
FunctionDebugMetadata,
|
|
6
|
-
FunctionSelector,
|
|
3
|
+
type ContractArtifact,
|
|
4
|
+
type FunctionArtifact,
|
|
5
|
+
type FunctionDebugMetadata,
|
|
6
|
+
type FunctionSelector,
|
|
7
7
|
getFunctionDebugMetadata,
|
|
8
8
|
} from '@aztec/foundation/abi';
|
|
9
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
9
|
+
import { type Fr } from '@aztec/foundation/fields';
|
|
10
10
|
import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator';
|
|
11
|
-
import { ContractClass, ContractInstance } from '@aztec/types/contracts';
|
|
11
|
+
import { type ContractClass, type ContractInstance } from '@aztec/types/contracts';
|
|
12
12
|
|
|
13
|
-
import { ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';
|
|
14
|
-
import { ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js';
|
|
13
|
+
import { type ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js';
|
|
14
|
+
import { type ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js';
|
|
15
15
|
import { PrivateFunctionsTree } from './private_functions_tree.js';
|
|
16
16
|
|
|
17
17
|
/**
|
|
@@ -5,11 +5,11 @@ import {
|
|
|
5
5
|
computePrivateFunctionsTree,
|
|
6
6
|
getContractClassFromArtifact,
|
|
7
7
|
} from '@aztec/circuits.js';
|
|
8
|
-
import { MerkleTree } from '@aztec/circuits.js/merkle';
|
|
9
|
-
import { ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
|
|
8
|
+
import { type MerkleTree } from '@aztec/circuits.js/merkle';
|
|
9
|
+
import { type ContractArtifact, type FunctionSelector } from '@aztec/foundation/abi';
|
|
10
10
|
import { Fr } from '@aztec/foundation/fields';
|
|
11
11
|
import { assertLength } from '@aztec/foundation/serialize';
|
|
12
|
-
import { ContractClassWithId } from '@aztec/types/contracts';
|
|
12
|
+
import { type ContractClassWithId } from '@aztec/types/contracts';
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* Represents a Merkle tree of functions for a particular Contract Class.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
2
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
1
|
+
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
2
|
+
import { type Fr } from '@aztec/foundation/fields';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* PXE database for managing contract artifacts.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AztecAddress } from '@aztec/circuits.js';
|
|
2
|
-
import { ContractInstanceWithAddress } from '@aztec/types/contracts';
|
|
1
|
+
import { type AztecAddress } from '@aztec/circuits.js';
|
|
2
|
+
import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* PXE database for managing contract instances.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Note, TxHash } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecAddress, Fr, Point, PublicKey, Vector } from '@aztec/circuits.js';
|
|
2
|
+
import { AztecAddress, Fr, Point, type PublicKey, Vector } from '@aztec/circuits.js';
|
|
3
3
|
import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
4
4
|
|
|
5
5
|
/**
|
|
@@ -29,12 +29,12 @@ export class DeferredNoteDao {
|
|
|
29
29
|
|
|
30
30
|
toBuffer(): Buffer {
|
|
31
31
|
return serializeToBuffer(
|
|
32
|
-
this.publicKey
|
|
33
|
-
this.note
|
|
34
|
-
this.contractAddress
|
|
35
|
-
this.storageSlot
|
|
36
|
-
this.noteTypeId
|
|
37
|
-
this.txHash
|
|
32
|
+
this.publicKey,
|
|
33
|
+
this.note,
|
|
34
|
+
this.contractAddress,
|
|
35
|
+
this.storageSlot,
|
|
36
|
+
this.noteTypeId,
|
|
37
|
+
this.txHash,
|
|
38
38
|
new Vector(this.newNoteHashes),
|
|
39
39
|
this.dataStartIndexForTx,
|
|
40
40
|
);
|
|
@@ -1,15 +1,21 @@
|
|
|
1
|
-
import { MerkleTreeId, NoteFilter, NoteStatus, PublicKey } from '@aztec/circuit-types';
|
|
1
|
+
import { MerkleTreeId, type NoteFilter, NoteStatus, type PublicKey } from '@aztec/circuit-types';
|
|
2
2
|
import { AztecAddress, CompleteAddress, Header } from '@aztec/circuits.js';
|
|
3
|
-
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
3
|
+
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
4
|
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
5
|
-
import { Fr, Point } from '@aztec/foundation/fields';
|
|
6
|
-
import {
|
|
5
|
+
import { Fr, type Point } from '@aztec/foundation/fields';
|
|
6
|
+
import {
|
|
7
|
+
type AztecArray,
|
|
8
|
+
type AztecKVStore,
|
|
9
|
+
type AztecMap,
|
|
10
|
+
type AztecMultiMap,
|
|
11
|
+
type AztecSingleton,
|
|
12
|
+
} from '@aztec/kv-store';
|
|
7
13
|
import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi';
|
|
8
|
-
import { ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
|
|
14
|
+
import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
|
|
9
15
|
|
|
10
16
|
import { DeferredNoteDao } from './deferred_note_dao.js';
|
|
11
17
|
import { NoteDao } from './note_dao.js';
|
|
12
|
-
import { PxeDatabase } from './pxe_database.js';
|
|
18
|
+
import { type PxeDatabase } from './pxe_database.js';
|
|
13
19
|
|
|
14
20
|
/**
|
|
15
21
|
* A PXE database backed by LMDB.
|
package/src/database/note_dao.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Note, TxHash } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecAddress, Fr, Point, PublicKey } from '@aztec/circuits.js';
|
|
3
|
-
import { toBigIntBE
|
|
4
|
-
import { BufferReader } from '@aztec/foundation/serialize';
|
|
5
|
-
import { NoteData } from '@aztec/simulator';
|
|
2
|
+
import { AztecAddress, Fr, Point, type PublicKey } from '@aztec/circuits.js';
|
|
3
|
+
import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
|
|
4
|
+
import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
|
|
5
|
+
import { type NoteData } from '@aztec/simulator';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* A note with contextual data.
|
|
@@ -35,17 +35,17 @@ export class NoteDao implements NoteData {
|
|
|
35
35
|
) {}
|
|
36
36
|
|
|
37
37
|
toBuffer(): Buffer {
|
|
38
|
-
return
|
|
39
|
-
this.note
|
|
40
|
-
this.contractAddress
|
|
41
|
-
this.storageSlot
|
|
42
|
-
this.noteTypeId
|
|
38
|
+
return serializeToBuffer([
|
|
39
|
+
this.note,
|
|
40
|
+
this.contractAddress,
|
|
41
|
+
this.storageSlot,
|
|
42
|
+
this.noteTypeId,
|
|
43
43
|
this.txHash.buffer,
|
|
44
|
-
this.nonce
|
|
45
|
-
this.innerNoteHash
|
|
46
|
-
this.siloedNullifier
|
|
47
|
-
|
|
48
|
-
this.publicKey
|
|
44
|
+
this.nonce,
|
|
45
|
+
this.innerNoteHash,
|
|
46
|
+
this.siloedNullifier,
|
|
47
|
+
this.index,
|
|
48
|
+
this.publicKey,
|
|
49
49
|
]);
|
|
50
50
|
}
|
|
51
51
|
static fromBuffer(buffer: Buffer | BufferReader) {
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { NoteFilter } from '@aztec/circuit-types';
|
|
2
|
-
import { CompleteAddress, Header, PublicKey } from '@aztec/circuits.js';
|
|
3
|
-
import { ContractArtifact } from '@aztec/foundation/abi';
|
|
4
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
6
|
-
import { ContractInstanceWithAddress } from '@aztec/types/contracts';
|
|
7
|
-
|
|
8
|
-
import { ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
|
|
9
|
-
import { ContractInstanceDatabase } from './contracts/contract_instance_db.js';
|
|
10
|
-
import { DeferredNoteDao } from './deferred_note_dao.js';
|
|
11
|
-
import { NoteDao } from './note_dao.js';
|
|
1
|
+
import { type NoteFilter } from '@aztec/circuit-types';
|
|
2
|
+
import { type CompleteAddress, type Header, type PublicKey } from '@aztec/circuits.js';
|
|
3
|
+
import { type ContractArtifact } from '@aztec/foundation/abi';
|
|
4
|
+
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
|
+
import { type Fr } from '@aztec/foundation/fields';
|
|
6
|
+
import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
|
|
7
|
+
|
|
8
|
+
import { type ContractArtifactDatabase } from './contracts/contract_artifact_db.js';
|
|
9
|
+
import { type ContractInstanceDatabase } from './contracts/contract_instance_db.js';
|
|
10
|
+
import { type DeferredNoteDao } from './deferred_note_dao.js';
|
|
11
|
+
import { type NoteDao } from './note_dao.js';
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* A database interface that provides methods for retrieving, adding, and removing transactional data related to Aztec
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { NoteFilter, NoteStatus, randomTxHash } from '@aztec/circuit-types';
|
|
1
|
+
import { type NoteFilter, NoteStatus, randomTxHash } from '@aztec/circuit-types';
|
|
2
2
|
import { AztecAddress, CompleteAddress, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
|
|
3
3
|
import { makeHeader } from '@aztec/circuits.js/testing';
|
|
4
4
|
import { randomInt } from '@aztec/foundation/crypto';
|
|
@@ -6,9 +6,9 @@ import { Fr, Point } from '@aztec/foundation/fields';
|
|
|
6
6
|
import { BenchmarkingContractArtifact } from '@aztec/noir-contracts.js/Benchmarking';
|
|
7
7
|
import { SerializableContractInstance } from '@aztec/types/contracts';
|
|
8
8
|
|
|
9
|
-
import { NoteDao } from './note_dao.js';
|
|
9
|
+
import { type NoteDao } from './note_dao.js';
|
|
10
10
|
import { randomNoteDao } from './note_dao.test.js';
|
|
11
|
-
import { PxeDatabase } from './pxe_database.js';
|
|
11
|
+
import { type PxeDatabase } from './pxe_database.js';
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* A common test suite for a PXE database.
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import { AztecNode, KeyStore } from '@aztec/circuit-types';
|
|
1
|
+
import { type AztecNode, type KeyStore } from '@aztec/circuit-types';
|
|
2
2
|
import {
|
|
3
|
-
AztecAddress,
|
|
4
|
-
Fr,
|
|
5
|
-
FunctionSelector,
|
|
3
|
+
type AztecAddress,
|
|
4
|
+
type Fr,
|
|
5
|
+
type FunctionSelector,
|
|
6
6
|
MembershipWitness,
|
|
7
|
-
NOTE_HASH_TREE_HEIGHT,
|
|
8
|
-
Point,
|
|
7
|
+
type NOTE_HASH_TREE_HEIGHT,
|
|
8
|
+
type Point,
|
|
9
9
|
computeContractClassIdPreimage,
|
|
10
10
|
computeSaltedInitializationHash,
|
|
11
11
|
} from '@aztec/circuits.js';
|
|
12
|
-
import { Tuple } from '@aztec/foundation/serialize';
|
|
12
|
+
import { type Tuple } from '@aztec/foundation/serialize';
|
|
13
13
|
|
|
14
|
-
import { ContractDataOracle } from '../contract_data_oracle/index.js';
|
|
15
|
-
import { ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';
|
|
14
|
+
import { type ContractDataOracle } from '../contract_data_oracle/index.js';
|
|
15
|
+
import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';
|
|
16
16
|
|
|
17
17
|
// TODO: Block number should not be "latest".
|
|
18
18
|
// It should be fixed at the time the proof is being simulated. I.e., it should be the same as the value defined in the constant data.
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Fr,
|
|
3
3
|
GrumpkinScalar,
|
|
4
|
-
MAX_NEW_NOTE_HASHES_PER_TX,
|
|
4
|
+
type MAX_NEW_NOTE_HASHES_PER_TX,
|
|
5
5
|
MAX_NEW_NULLIFIERS_PER_TX,
|
|
6
6
|
MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
|
|
7
7
|
MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX,
|
|
8
|
-
MAX_NULLIFIER_READ_REQUESTS_PER_TX,
|
|
8
|
+
type MAX_NULLIFIER_READ_REQUESTS_PER_TX,
|
|
9
9
|
MembershipWitness,
|
|
10
10
|
NULLIFIER_TREE_HEIGHT,
|
|
11
|
-
NullifierKeyValidationRequestContext,
|
|
12
|
-
ReadRequestContext,
|
|
13
|
-
SideEffect,
|
|
14
|
-
SideEffectLinkedToNoteHash,
|
|
15
|
-
SideEffectType,
|
|
11
|
+
type NullifierKeyValidationRequestContext,
|
|
12
|
+
type ReadRequestContext,
|
|
13
|
+
type SideEffect,
|
|
14
|
+
type SideEffectLinkedToNoteHash,
|
|
15
|
+
type SideEffectType,
|
|
16
16
|
buildNullifierReadRequestHints,
|
|
17
17
|
} from '@aztec/circuits.js';
|
|
18
18
|
import { makeTuple } from '@aztec/foundation/array';
|
|
19
|
-
import { Tuple } from '@aztec/foundation/serialize';
|
|
19
|
+
import { type Tuple } from '@aztec/foundation/serialize';
|
|
20
20
|
|
|
21
|
-
import { ProvingDataOracle } from './proving_data_oracle.js';
|
|
21
|
+
import { type ProvingDataOracle } from './proving_data_oracle.js';
|
|
22
22
|
|
|
23
23
|
export class HintsBuilder {
|
|
24
24
|
constructor(private oracle: ProvingDataOracle) {}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
|
-
AztecAddress,
|
|
2
|
+
type AztecAddress,
|
|
3
3
|
CallRequest,
|
|
4
4
|
Fr,
|
|
5
|
-
MAX_NEW_NOTE_HASHES_PER_TX,
|
|
6
|
-
MAX_NEW_NULLIFIERS_PER_TX,
|
|
5
|
+
type MAX_NEW_NOTE_HASHES_PER_TX,
|
|
6
|
+
type MAX_NEW_NULLIFIERS_PER_TX,
|
|
7
7
|
MAX_NOTE_HASH_READ_REQUESTS_PER_CALL,
|
|
8
8
|
MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
|
|
9
9
|
MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
|
|
@@ -14,9 +14,9 @@ import {
|
|
|
14
14
|
PrivateKernelInnerCircuitPublicInputs,
|
|
15
15
|
PrivateKernelInnerData,
|
|
16
16
|
PrivateKernelTailCircuitPrivateInputs,
|
|
17
|
-
SideEffect,
|
|
18
|
-
SideEffectLinkedToNoteHash,
|
|
19
|
-
TxRequest,
|
|
17
|
+
type SideEffect,
|
|
18
|
+
type SideEffectLinkedToNoteHash,
|
|
19
|
+
type TxRequest,
|
|
20
20
|
VK_TREE_HEIGHT,
|
|
21
21
|
VerificationKey,
|
|
22
22
|
makeEmptyProof,
|
|
@@ -26,11 +26,11 @@ import { padArrayEnd } from '@aztec/foundation/collection';
|
|
|
26
26
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
27
27
|
import { assertLength, mapTuple } from '@aztec/foundation/serialize';
|
|
28
28
|
import { pushTestData } from '@aztec/foundation/testing';
|
|
29
|
-
import { ExecutionResult, NoteAndSlot } from '@aztec/simulator';
|
|
29
|
+
import { type ExecutionResult, type NoteAndSlot } from '@aztec/simulator';
|
|
30
30
|
|
|
31
31
|
import { HintsBuilder } from './hints_builder.js';
|
|
32
|
-
import { KernelProofCreator, ProofCreator, ProofOutput, ProofOutputFinal } from './proof_creator.js';
|
|
33
|
-
import { ProvingDataOracle } from './proving_data_oracle.js';
|
|
32
|
+
import { KernelProofCreator, type ProofCreator, type ProofOutput, type ProofOutputFinal } from './proof_creator.js';
|
|
33
|
+
import { type ProvingDataOracle } from './proving_data_oracle.js';
|
|
34
34
|
|
|
35
35
|
/**
|
|
36
36
|
* Represents an output note data object.
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { CircuitSimulationStats } from '@aztec/circuit-types/stats';
|
|
1
|
+
import { type CircuitSimulationStats } from '@aztec/circuit-types/stats';
|
|
2
2
|
import {
|
|
3
|
-
PrivateCircuitPublicInputs,
|
|
4
|
-
PrivateKernelInitCircuitPrivateInputs,
|
|
5
|
-
PrivateKernelInnerCircuitPrivateInputs,
|
|
6
|
-
PrivateKernelInnerCircuitPublicInputs,
|
|
7
|
-
PrivateKernelTailCircuitPrivateInputs,
|
|
8
|
-
PrivateKernelTailCircuitPublicInputs,
|
|
9
|
-
Proof,
|
|
3
|
+
type PrivateCircuitPublicInputs,
|
|
4
|
+
type PrivateKernelInitCircuitPrivateInputs,
|
|
5
|
+
type PrivateKernelInnerCircuitPrivateInputs,
|
|
6
|
+
type PrivateKernelInnerCircuitPublicInputs,
|
|
7
|
+
type PrivateKernelTailCircuitPrivateInputs,
|
|
8
|
+
type PrivateKernelTailCircuitPublicInputs,
|
|
9
|
+
type Proof,
|
|
10
10
|
makeEmptyProof,
|
|
11
11
|
} from '@aztec/circuits.js';
|
|
12
12
|
import { siloNoteHash } from '@aztec/circuits.js/hash';
|
|
13
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
13
|
+
import { type Fr } from '@aztec/foundation/fields';
|
|
14
14
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
15
15
|
import { elapsed } from '@aztec/foundation/timer';
|
|
16
16
|
import { executeInit, executeInner, executeTail } from '@aztec/noir-protocol-circuits-types';
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { NullifierMembershipWitness } from '@aztec/circuit-types';
|
|
1
|
+
import { type NullifierMembershipWitness } from '@aztec/circuit-types';
|
|
2
2
|
import {
|
|
3
|
-
FUNCTION_TREE_HEIGHT,
|
|
4
|
-
Fr,
|
|
5
|
-
FunctionSelector,
|
|
6
|
-
GrumpkinPrivateKey,
|
|
7
|
-
MembershipWitness,
|
|
8
|
-
NOTE_HASH_TREE_HEIGHT,
|
|
9
|
-
Point,
|
|
10
|
-
VK_TREE_HEIGHT,
|
|
11
|
-
VerificationKey,
|
|
3
|
+
type FUNCTION_TREE_HEIGHT,
|
|
4
|
+
type Fr,
|
|
5
|
+
type FunctionSelector,
|
|
6
|
+
type GrumpkinPrivateKey,
|
|
7
|
+
type MembershipWitness,
|
|
8
|
+
type NOTE_HASH_TREE_HEIGHT,
|
|
9
|
+
type Point,
|
|
10
|
+
type VK_TREE_HEIGHT,
|
|
11
|
+
type VerificationKey,
|
|
12
12
|
} from '@aztec/circuits.js';
|
|
13
|
-
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
13
|
+
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
14
14
|
|
|
15
15
|
/**
|
|
16
16
|
* Provides functionality to fetch membership witnesses for verification keys,
|
|
@@ -1,15 +1,22 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import {
|
|
2
|
+
type AztecNode,
|
|
3
|
+
type EncryptedL2BlockL2Logs,
|
|
4
|
+
type KeyStore,
|
|
5
|
+
L1NotePayload,
|
|
6
|
+
type L2BlockContext,
|
|
7
|
+
TaggedNote,
|
|
8
|
+
} from '@aztec/circuit-types';
|
|
9
|
+
import { type NoteProcessorStats } from '@aztec/circuit-types/stats';
|
|
10
|
+
import { INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX, type PublicKey } from '@aztec/circuits.js';
|
|
4
11
|
import { Grumpkin } from '@aztec/circuits.js/barretenberg';
|
|
5
|
-
import { Fr } from '@aztec/foundation/fields';
|
|
12
|
+
import { type Fr } from '@aztec/foundation/fields';
|
|
6
13
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
14
|
import { Timer } from '@aztec/foundation/timer';
|
|
8
15
|
import { ContractNotFoundError } from '@aztec/simulator';
|
|
9
16
|
|
|
10
17
|
import { DeferredNoteDao } from '../database/deferred_note_dao.js';
|
|
11
|
-
import { PxeDatabase } from '../database/index.js';
|
|
12
|
-
import { NoteDao } from '../database/note_dao.js';
|
|
18
|
+
import { type PxeDatabase } from '../database/index.js';
|
|
19
|
+
import { type NoteDao } from '../database/note_dao.js';
|
|
13
20
|
import { getAcirSimulator } from '../simulator/index.js';
|
|
14
21
|
import { produceNoteDao } from './produce_note_dao.js';
|
|
15
22
|
|
|
@@ -84,7 +91,10 @@ export class NoteProcessor {
|
|
|
84
91
|
* @param encryptedL2BlockLogs - An array of encrypted logs associated with the L2 block contexts.
|
|
85
92
|
* @returns A promise that resolves once the processing is completed.
|
|
86
93
|
*/
|
|
87
|
-
public async process(
|
|
94
|
+
public async process(
|
|
95
|
+
l2BlockContexts: L2BlockContext[],
|
|
96
|
+
encryptedL2BlockLogs: EncryptedL2BlockL2Logs[],
|
|
97
|
+
): Promise<void> {
|
|
88
98
|
if (l2BlockContexts.length !== encryptedL2BlockLogs.length) {
|
|
89
99
|
throw new Error(
|
|
90
100
|
`Number of blocks and EncryptedLogs is not equal. Received ${l2BlockContexts.length} blocks, ${encryptedL2BlockLogs.length} encrypted logs.`,
|
|
@@ -125,7 +135,7 @@ export class NoteProcessor {
|
|
|
125
135
|
for (const functionLogs of txFunctionLogs) {
|
|
126
136
|
for (const log of functionLogs.logs) {
|
|
127
137
|
this.stats.seen++;
|
|
128
|
-
const taggedNote = TaggedNote.fromEncryptedBuffer(log, privateKey, curve);
|
|
138
|
+
const taggedNote = TaggedNote.fromEncryptedBuffer(log.data, privateKey, curve);
|
|
129
139
|
if (taggedNote?.notePayload) {
|
|
130
140
|
const { notePayload: payload } = taggedNote;
|
|
131
141
|
// We have successfully decrypted the data.
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { L1NotePayload, TxHash } from '@aztec/circuit-types';
|
|
2
|
-
import { Fr, PublicKey } from '@aztec/circuits.js';
|
|
1
|
+
import { type L1NotePayload, type TxHash } from '@aztec/circuit-types';
|
|
2
|
+
import { Fr, type PublicKey } from '@aztec/circuits.js';
|
|
3
3
|
import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/hash';
|
|
4
|
-
import { AcirSimulator } from '@aztec/simulator';
|
|
4
|
+
import { type AcirSimulator } from '@aztec/simulator';
|
|
5
5
|
|
|
6
6
|
import { NoteDao } from '../database/note_dao.js';
|
|
7
7
|
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
import {
|
|
2
2
|
AuthWitness,
|
|
3
3
|
CompleteAddress,
|
|
4
|
+
EncryptedL2BlockL2Logs,
|
|
4
5
|
ExtendedNote,
|
|
5
6
|
ExtendedUnencryptedL2Log,
|
|
6
7
|
L2Block,
|
|
7
|
-
L2BlockL2Logs,
|
|
8
8
|
LogId,
|
|
9
9
|
Note,
|
|
10
10
|
NullifierMembershipWitness,
|
|
11
|
-
PXE,
|
|
11
|
+
type PXE,
|
|
12
12
|
Tx,
|
|
13
13
|
TxEffect,
|
|
14
14
|
TxExecutionRequest,
|
|
15
15
|
TxHash,
|
|
16
16
|
TxReceipt,
|
|
17
|
+
UnencryptedL2BlockL2Logs,
|
|
17
18
|
} from '@aztec/circuit-types';
|
|
18
19
|
import { FunctionSelector } from '@aztec/circuits.js';
|
|
19
20
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -48,7 +49,7 @@ export function createPXERpcServer(pxeService: PXE): JsonRpcServer {
|
|
|
48
49
|
TxEffect,
|
|
49
50
|
LogId,
|
|
50
51
|
},
|
|
51
|
-
{ Tx, TxReceipt,
|
|
52
|
+
{ Tx, TxReceipt, EncryptedL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
|
|
52
53
|
['start', 'stop'],
|
|
53
54
|
);
|
|
54
55
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AztecNode } from '@aztec/circuit-types';
|
|
1
|
+
import { type AztecNode } from '@aztec/circuit-types';
|
|
2
2
|
import { Grumpkin } from '@aztec/circuits.js/barretenberg';
|
|
3
3
|
import { randomBytes } from '@aztec/foundation/crypto';
|
|
4
4
|
import { TestKeyStore } from '@aztec/key-store';
|
|
@@ -11,7 +11,7 @@ import { getCanonicalMultiCallEntrypointContract } from '@aztec/protocol-contrac
|
|
|
11
11
|
|
|
12
12
|
import { join } from 'path';
|
|
13
13
|
|
|
14
|
-
import { PXEServiceConfig } from '../config/index.js';
|
|
14
|
+
import { type PXEServiceConfig } from '../config/index.js';
|
|
15
15
|
import { KVPxeDatabase } from '../database/kv_pxe_database.js';
|
|
16
16
|
import { PXEService } from './pxe_service.js';
|
|
17
17
|
|