@aztec/world-state 0.32.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/synchronizer/server_world_state_synchronizer.d.ts +5 -5
- package/dest/synchronizer/server_world_state_synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/server_world_state_synchronizer.js +2 -2
- package/dest/synchronizer/world_state_synchronizer.d.ts +1 -1
- package/dest/synchronizer/world_state_synchronizer.d.ts.map +1 -1
- package/dest/world-state-db/merkle_tree_db.d.ts +4 -4
- package/dest/world-state-db/merkle_tree_db.d.ts.map +1 -1
- package/dest/world-state-db/merkle_tree_db.js +1 -2
- package/dest/world-state-db/merkle_tree_operations.d.ts +4 -4
- package/dest/world-state-db/merkle_tree_operations.d.ts.map +1 -1
- package/dest/world-state-db/merkle_tree_operations.js +1 -2
- package/dest/world-state-db/merkle_tree_operations_facade.d.ts +6 -6
- package/dest/world-state-db/merkle_tree_operations_facade.d.ts.map +1 -1
- package/dest/world-state-db/merkle_tree_snapshot_operations_facade.d.ts +6 -6
- package/dest/world-state-db/merkle_tree_snapshot_operations_facade.d.ts.map +1 -1
- package/dest/world-state-db/merkle_tree_snapshot_operations_facade.js +1 -1
- package/dest/world-state-db/merkle_trees.d.ts +7 -7
- package/dest/world-state-db/merkle_trees.d.ts.map +1 -1
- package/dest/world-state-db/merkle_trees.js +1 -1
- package/package.json +7 -7
- package/src/synchronizer/server_world_state_synchronizer.ts +14 -6
- package/src/synchronizer/world_state_synchronizer.ts +1 -1
- package/src/world-state-db/merkle_tree_db.ts +4 -4
- package/src/world-state-db/merkle_tree_operations.ts +4 -4
- package/src/world-state-db/merkle_tree_operations_facade.ts +10 -10
- package/src/world-state-db/merkle_tree_snapshot_operations_facade.ts +10 -10
- package/src/world-state-db/merkle_trees.ts +17 -17
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
|
|
2
|
-
import { AztecKVStore } from '@aztec/kv-store';
|
|
3
|
-
import { MerkleTreeOperations, MerkleTrees } from '../world-state-db/index.js';
|
|
4
|
-
import { WorldStateConfig } from './config.js';
|
|
5
|
-
import { WorldStateStatus, WorldStateSynchronizer } from './world_state_synchronizer.js';
|
|
1
|
+
import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-types';
|
|
2
|
+
import { type AztecKVStore } from '@aztec/kv-store';
|
|
3
|
+
import { type MerkleTreeOperations, type MerkleTrees } from '../world-state-db/index.js';
|
|
4
|
+
import { type WorldStateConfig } from './config.js';
|
|
5
|
+
import { type WorldStateStatus, type WorldStateSynchronizer } from './world_state_synchronizer.js';
|
|
6
6
|
/**
|
|
7
7
|
* Synchronizes the world state with the L2 blocks from a L2BlockSource.
|
|
8
8
|
* The synchronizer will download the L2 blocks from the L2BlockSource and insert the new note hashes into the merkle
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server_world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"server_world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAmC,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAOrH,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AAIzE,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAC;AAEvC;;;;GAIG;AACH,qBAAa,4BAA6B,YAAW,sBAAsB;;IAcvE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,aAAa;IAErB,OAAO,CAAC,GAAG;IAhBb,OAAO,CAAC,wBAAwB,CAAK;IAErC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,WAAW,CAAC,CAAyB;IAC7C,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,YAAY,CAAuD;IAC3E,OAAO,CAAC,WAAW,CAAyB;gBAG1C,KAAK,EAAE,YAAY,EACX,YAAY,EAAE,WAAW,EACzB,aAAa,EAAE,aAAa,GAAG,mBAAmB,EAC1D,MAAM,EAAE,gBAAgB,EAChB,GAAG,8CAAyC;IAU/C,SAAS,IAAI,oBAAoB;IAIjC,YAAY,IAAI,oBAAoB;IAIpC,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,oBAAoB;IAIhD,KAAK;IAwCL,IAAI;IAajB,OAAO,KAAK,iBAAiB,GAE5B;IAEM,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAQ1C;;;;OAIG;IACU,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoCpE;;OAEG;YACW,uBAAuB;IASrC;;;;;OAKG;YACW,yBAAyB;IAYvC;;;;;OAKG;YACW,wBAAwB;IAuBtC;;;OAGG;IACH,OAAO,CAAC,eAAe;CA0BxB"}
|
|
@@ -10,7 +10,7 @@ import { openTmpStore } from '@aztec/kv-store/utils';
|
|
|
10
10
|
import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
|
|
11
11
|
import { MerkleTreeOperationsFacade } from '../world-state-db/merkle_tree_operations_facade.js';
|
|
12
12
|
import { MerkleTreeSnapshotOperationsFacade } from '../world-state-db/merkle_tree_snapshot_operations_facade.js';
|
|
13
|
-
import { WorldStateRunningState } from './world_state_synchronizer.js';
|
|
13
|
+
import { WorldStateRunningState, } from './world_state_synchronizer.js';
|
|
14
14
|
/**
|
|
15
15
|
* Synchronizes the world state with the L2 blocks from a L2BlockSource.
|
|
16
16
|
* The synchronizer will download the L2 blocks from the L2BlockSource and insert the new note hashes into the merkle
|
|
@@ -210,4 +210,4 @@ async function _ServerWorldStateSynchronizer_verifyMessagesHashToInHash(l1ToL2Me
|
|
|
210
210
|
throw new Error('Obtained L1 to L2 messages failed to be hashed to the block inHash');
|
|
211
211
|
}
|
|
212
212
|
};
|
|
213
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server_world_state_synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/server_world_state_synchronizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/world_state_synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"world_state_synchronizer.d.ts","sourceRoot":"","sources":["../../src/synchronizer/world_state_synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE;;GAEG;AACH,oBAAY,sBAAsB;IAChC,IAAI,IAAA;IACJ,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,KAAK,EAAE,sBAAsB,CAAC;IAC9B;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,KAAK,IAAI,IAAI,CAAC;IAEd;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEpC;;OAEG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;;;OAIG;IACH,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAExD;;;OAGG;IACH,SAAS,IAAI,oBAAoB,CAAC;IAElC;;;OAGG;IACH,YAAY,IAAI,oBAAoB,CAAC;IAErC;;;;OAIG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAAC;CAClD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
-
import { Fr } from '@aztec/circuits.js';
|
|
3
|
-
import { IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree';
|
|
4
|
-
import { MerkleTreeOperations } from './merkle_tree_operations.js';
|
|
1
|
+
import { type MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
+
import { type Fr } from '@aztec/circuits.js';
|
|
3
|
+
import { type IndexedTreeSnapshot, type TreeSnapshot } from '@aztec/merkle-tree';
|
|
4
|
+
import { type MerkleTreeOperations } from './merkle_tree_operations.js';
|
|
5
5
|
/**
|
|
6
6
|
*
|
|
7
7
|
* @remarks Short explanation:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merkle_tree_db.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"merkle_tree_db.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,EAAqE,MAAM,oBAAoB,CAAC;AAChH,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEjF,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,2BAA2B,QAAgC,CAAC;AAEzE,eAAO,MAAM,6BAA6B,QAA6C,CAAC;AAExF;;GAEG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,MAAM,MAAM,GACjF,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,KAAK,MAAM,GACvC,CAAC,CAAC;AAEN;;GAEG;AACH,KAAK,iBAAiB,GAClB,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,UAAU,GACV,0BAA0B,GAC1B,aAAa,CAAC;AAElB,MAAM,MAAM,aAAa,GAAG;IAC1B,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACnD,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;IACrD,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;CAC1C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;KACxB,QAAQ,IAAI,MAAM,oBAAoB,IAAI,OAAO,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,sBAAsB,CACtG,oBAAoB,CAAC,QAAQ,CAAC,CAC/B;CACF,GAAG,IAAI,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,GAAG;IAChD;;;OAGG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACpD,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { MerkleTreeId } from '@aztec/circuit-types';
|
|
2
1
|
import { MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/circuits.js';
|
|
3
2
|
/**
|
|
4
3
|
*
|
|
@@ -17,4 +16,4 @@ import { MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } fro
|
|
|
17
16
|
*/
|
|
18
17
|
export const INITIAL_NULLIFIER_TREE_SIZE = 2 * MAX_NEW_NULLIFIERS_PER_TX;
|
|
19
18
|
export const INITIAL_PUBLIC_DATA_TREE_SIZE = 2 * MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX;
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd29ybGQtc3RhdGUtZGIvbWVya2xlX3RyZWVfZGIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFXLHlCQUF5QixFQUFFLHNDQUFzQyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFLaEg7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxNQUFNLENBQUMsTUFBTSwyQkFBMkIsR0FBRyxDQUFDLEdBQUcseUJBQXlCLENBQUM7QUFFekUsTUFBTSxDQUFDLE1BQU0sNkJBQTZCLEdBQUcsQ0FBQyxHQUFHLHNDQUFzQyxDQUFDIn0=
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
3
|
-
import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
|
|
4
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
5
|
-
import { AppendOnlyTree, BatchInsertionResult, IndexedTree } from '@aztec/merkle-tree';
|
|
2
|
+
import { type L2Block, type MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
3
|
+
import { type Fr, type Header, type NullifierLeafPreimage, type StateReference } from '@aztec/circuits.js';
|
|
4
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
5
|
+
import { type AppendOnlyTree, type BatchInsertionResult, type IndexedTree } from '@aztec/merkle-tree';
|
|
6
6
|
/**
|
|
7
7
|
* Type alias for the nullifier tree ID.
|
|
8
8
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merkle_tree_operations.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_operations.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"merkle_tree_operations.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { MerkleTreeId } from '@aztec/circuit-types';
|
|
2
1
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
2
|
/**
|
|
4
3
|
* Outputs a tree leaves using for debugging purposes.
|
|
@@ -11,4 +10,4 @@ export async function inspectTree(db, treeId, log = createDebugLogger('aztec:ins
|
|
|
11
10
|
}
|
|
12
11
|
log(output.join('\n'));
|
|
13
12
|
}
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfb3BlcmF0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93b3JsZC1zdGF0ZS1kYi9tZXJrbGVfdHJlZV9vcGVyYXRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBaU0xRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsV0FBVyxDQUMvQixFQUF3QixFQUN4QixNQUFvQixFQUNwQixHQUFHLEdBQUcsaUJBQWlCLENBQUMsb0JBQW9CLENBQUM7SUFFN0MsTUFBTSxJQUFJLEdBQUcsTUFBTSxFQUFFLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzFDLE1BQU0sTUFBTSxHQUFHLENBQUMsV0FBVyxNQUFNLFNBQVMsSUFBSSxDQUFDLElBQUksV0FBVyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDM0YsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNuQyxNQUFNLENBQUMsSUFBSSxDQUNULFNBQVMsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLFlBQVksQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxhQUFhLENBQUMsRUFBRSxDQUN6RyxDQUFDO0lBQ0osQ0FBQztJQUNELEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7QUFDekIsQ0FBQyJ9
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
3
|
-
import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
|
|
4
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
5
|
-
import { BatchInsertionResult } from '@aztec/merkle-tree';
|
|
6
|
-
import { MerkleTreeDb } from './merkle_tree_db.js';
|
|
7
|
-
import { HandleL2BlockAndMessagesResult, IndexedTreeId, MerkleTreeLeafType, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
|
|
2
|
+
import { type L2Block, type MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
3
|
+
import { type Fr, type Header, type NullifierLeafPreimage, type StateReference } from '@aztec/circuits.js';
|
|
4
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
5
|
+
import { type BatchInsertionResult } from '@aztec/merkle-tree';
|
|
6
|
+
import { type MerkleTreeDb } from './merkle_tree_db.js';
|
|
7
|
+
import { type HandleL2BlockAndMessagesResult, type IndexedTreeId, type MerkleTreeLeafType, type MerkleTreeOperations, type TreeInfo } from './merkle_tree_operations.js';
|
|
8
8
|
/**
|
|
9
9
|
* Wraps a MerkleTreeDbOperations to call all functions with a preset includeUncommitted flag.
|
|
10
10
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merkle_tree_operations_facade.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_operations_facade.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"merkle_tree_operations_facade.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_operations_facade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
2
|
-
import { Header, StateReference } from '@aztec/circuits.js';
|
|
3
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
4
|
-
import { BatchInsertionResult } from '@aztec/merkle-tree';
|
|
5
|
-
import { MerkleTreeDb } from './merkle_tree_db.js';
|
|
6
|
-
import { HandleL2BlockAndMessagesResult, IndexedTreeId, MerkleTreeLeafType, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
|
|
1
|
+
import { MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
2
|
+
import { type Header, StateReference } from '@aztec/circuits.js';
|
|
3
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
4
|
+
import { type BatchInsertionResult } from '@aztec/merkle-tree';
|
|
5
|
+
import { type MerkleTreeDb } from './merkle_tree_db.js';
|
|
6
|
+
import { type HandleL2BlockAndMessagesResult, type IndexedTreeId, type MerkleTreeLeafType, type MerkleTreeOperations, type TreeInfo } from './merkle_tree_operations.js';
|
|
7
7
|
/**
|
|
8
8
|
* Merkle tree operations on readonly tree snapshots.
|
|
9
9
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merkle_tree_snapshot_operations_facade.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_snapshot_operations_facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"merkle_tree_snapshot_operations_facade.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_tree_snapshot_operations_facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAA8B,KAAK,MAAM,EAAyB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpH,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,KAAK,oBAAoB,EAA4B,MAAM,oBAAoB,CAAC;AAEzF,OAAO,EAAE,KAAK,YAAY,EAAsB,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EACL,KAAK,8BAA8B,EACnC,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EACd,MAAM,6BAA6B,CAAC;AAErC;;GAEG;AACH,qBAAa,kCAAmC,YAAW,oBAAoB;;gBAKjE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM;IAc9C,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAM9G,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAC9C,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAC7B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAMxB,eAAe,CAAC,EAAE,SAAS,aAAa,EAC5C,MAAM,EAAE,EAAE,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAKzC,YAAY,CAAC,EAAE,SAAS,YAAY,EACxC,MAAM,EAAE,EAAE,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,CAAC,OAAO,MAAM,CAAC,GAAG,SAAS,CAAC;IAKnD,qBAAqB,CACzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,MAAM,GACZ,OAAO,CACN;QACE;;WAEG;QACH,KAAK,EAAE,MAAM,CAAC;QACd;;WAEG;QACH,cAAc,EAAE,OAAO,CAAC;KACzB,GACD,SAAS,CACZ;IAKK,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAK9F,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;IAUpD,iBAAiB,IAAI,OAAO,CAAC,cAAc,CAAC;IA+BlD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,WAAW,CAAC,UAAU,SAAS,MAAM,EAAE,wBAAwB,SAAS,MAAM,KAAK,OAAO,CACxF,oBAAoB,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAC3D;IAID,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvB,wBAAwB,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAInE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;CAGtC"}
|
|
@@ -94,4 +94,4 @@ _MerkleTreeSnapshotOperationsFacade_treesDb = new WeakMap(), _MerkleTreeSnapshot
|
|
|
94
94
|
__classPrivateFieldSet(this, _MerkleTreeSnapshotOperationsFacade_treeSnapshots, await __classPrivateFieldGet(this, _MerkleTreeSnapshotOperationsFacade_treesDb, "f").getSnapshot(__classPrivateFieldGet(this, _MerkleTreeSnapshotOperationsFacade_blockNumber, "f")), "f");
|
|
95
95
|
return __classPrivateFieldGet(this, _MerkleTreeSnapshotOperationsFacade_treeSnapshots, "f")[treeId];
|
|
96
96
|
};
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVya2xlX3RyZWVfc25hcHNob3Rfb3BlcmF0aW9uc19mYWNhZGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd29ybGQtc3RhdGUtZGIvbWVya2xlX3RyZWVfc25hcHNob3Rfb3BlcmF0aW9uc19mYWNhZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxFQUFFLEVBQWUscUJBQXFCLEVBQUUsY0FBYyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFhcEg7O0dBRUc7QUFDSCxNQUFNLE9BQU8sa0NBQWtDO0lBSzdDLFlBQVksS0FBbUIsRUFBRSxXQUFtQjs7UUFKcEQsOERBQXVCO1FBQ3ZCLGtFQUFxQjtRQUNyQiw0REFBZ0MsRUFBUyxFQUFDO1FBR3hDLHVCQUFBLElBQUksK0NBQVksS0FBSyxNQUFBLENBQUM7UUFDdEIsdUJBQUEsSUFBSSxtREFBZ0IsV0FBVyxNQUFBLENBQUM7SUFDbEMsQ0FBQztJQVdELEtBQUssQ0FBQyxhQUFhLENBQTBCLE1BQVUsRUFBRSxLQUE2QjtRQUNwRixNQUFNLElBQUksR0FBRyxNQUFNLHVCQUFBLElBQUksMEdBQWlCLE1BQXJCLElBQUksRUFBa0IsTUFBTSxDQUFDLENBQUM7UUFDakQsMEJBQTBCO1FBQzFCLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFZLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRUQsS0FBSyxDQUFDLGtCQUFrQixDQUN0QixNQUFvQixFQUNwQixLQUE2QixFQUM3QixVQUFrQjtRQUVsQixNQUFNLElBQUksR0FBRyxNQUFNLHVCQUFBLElBQUksMEdBQWlCLE1BQXJCLElBQUksRUFBa0IsTUFBTSxDQUFDLENBQUM7UUFDakQsMEJBQTBCO1FBQzFCLE9BQU8sSUFBSSxDQUFDLGtCQUFrQixDQUFDLEtBQVksRUFBRSxVQUFVLENBQUMsQ0FBQztJ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
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
2
|
+
import { type L2Block, MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
3
3
|
import { Fr, Header, StateReference } from '@aztec/circuits.js';
|
|
4
|
-
import { DebugLogger } from '@aztec/foundation/log';
|
|
5
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
6
|
-
import { AztecKVStore } from '@aztec/kv-store';
|
|
7
|
-
import { BatchInsertionResult } from '@aztec/merkle-tree';
|
|
8
|
-
import { MerkleTreeDb, TreeSnapshots } from './merkle_tree_db.js';
|
|
9
|
-
import { HandleL2BlockAndMessagesResult, IndexedTreeId, MerkleTreeLeafType, MerkleTreeOperations, TreeInfo } from './merkle_tree_operations.js';
|
|
4
|
+
import { type DebugLogger } from '@aztec/foundation/log';
|
|
5
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
6
|
+
import { type AztecKVStore } from '@aztec/kv-store';
|
|
7
|
+
import { type BatchInsertionResult } from '@aztec/merkle-tree';
|
|
8
|
+
import { type MerkleTreeDb, type TreeSnapshots } from './merkle_tree_db.js';
|
|
9
|
+
import { type HandleL2BlockAndMessagesResult, type IndexedTreeId, type MerkleTreeLeafType, type MerkleTreeOperations, type TreeInfo } from './merkle_tree_operations.js';
|
|
10
10
|
/**
|
|
11
11
|
* A convenience class for managing multiple merkle trees.
|
|
12
12
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
|
@@ -408,4 +408,4 @@ async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
|
408
408
|
return false;
|
|
409
409
|
}
|
|
410
410
|
};
|
|
411
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
|
411
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/world-state",
|
|
3
|
-
"version": "0.32.
|
|
3
|
+
"version": "0.32.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"typedocOptions": {
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"rootDir": "./src"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@aztec/circuit-types": "0.32.
|
|
34
|
-
"@aztec/circuits.js": "0.32.
|
|
35
|
-
"@aztec/foundation": "0.32.
|
|
36
|
-
"@aztec/kv-store": "0.32.
|
|
37
|
-
"@aztec/merkle-tree": "0.32.
|
|
38
|
-
"@aztec/types": "0.32.
|
|
33
|
+
"@aztec/circuit-types": "0.32.1",
|
|
34
|
+
"@aztec/circuits.js": "0.32.1",
|
|
35
|
+
"@aztec/foundation": "0.32.1",
|
|
36
|
+
"@aztec/kv-store": "0.32.1",
|
|
37
|
+
"@aztec/merkle-tree": "0.32.1",
|
|
38
|
+
"@aztec/types": "0.32.1",
|
|
39
39
|
"tslib": "^2.4.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
@@ -1,19 +1,27 @@
|
|
|
1
|
-
import { L1ToL2MessageSource, L2Block, L2BlockDownloader, L2BlockSource } from '@aztec/circuit-types';
|
|
2
|
-
import { L2BlockHandledStats } from '@aztec/circuit-types/stats';
|
|
1
|
+
import { type L1ToL2MessageSource, type L2Block, L2BlockDownloader, type L2BlockSource } from '@aztec/circuit-types';
|
|
2
|
+
import { type L2BlockHandledStats } from '@aztec/circuit-types/stats';
|
|
3
3
|
import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js/constants';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { SerialQueue } from '@aztec/foundation/fifo';
|
|
6
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
7
|
import { elapsed } from '@aztec/foundation/timer';
|
|
8
|
-
import { AztecKVStore, AztecSingleton } from '@aztec/kv-store';
|
|
8
|
+
import { type AztecKVStore, type AztecSingleton } from '@aztec/kv-store';
|
|
9
9
|
import { openTmpStore } from '@aztec/kv-store/utils';
|
|
10
10
|
import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree';
|
|
11
11
|
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
type HandleL2BlockAndMessagesResult,
|
|
14
|
+
type MerkleTreeOperations,
|
|
15
|
+
type MerkleTrees,
|
|
16
|
+
} from '../world-state-db/index.js';
|
|
13
17
|
import { MerkleTreeOperationsFacade } from '../world-state-db/merkle_tree_operations_facade.js';
|
|
14
18
|
import { MerkleTreeSnapshotOperationsFacade } from '../world-state-db/merkle_tree_snapshot_operations_facade.js';
|
|
15
|
-
import { WorldStateConfig } from './config.js';
|
|
16
|
-
import {
|
|
19
|
+
import { type WorldStateConfig } from './config.js';
|
|
20
|
+
import {
|
|
21
|
+
WorldStateRunningState,
|
|
22
|
+
type WorldStateStatus,
|
|
23
|
+
type WorldStateSynchronizer,
|
|
24
|
+
} from './world_state_synchronizer.js';
|
|
17
25
|
|
|
18
26
|
/**
|
|
19
27
|
* Synchronizes the world state with the L2 blocks from a L2BlockSource.
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
-
import { Fr, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/circuits.js';
|
|
3
|
-
import { IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree';
|
|
1
|
+
import { type MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
+
import { type Fr, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/circuits.js';
|
|
3
|
+
import { type IndexedTreeSnapshot, type TreeSnapshot } from '@aztec/merkle-tree';
|
|
4
4
|
|
|
5
|
-
import { MerkleTreeOperations } from './merkle_tree_operations.js';
|
|
5
|
+
import { type MerkleTreeOperations } from './merkle_tree_operations.js';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
*
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
2
|
-
import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
|
|
1
|
+
import { type L2Block, type MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
2
|
+
import { type Fr, type Header, type NullifierLeafPreimage, type StateReference } from '@aztec/circuits.js';
|
|
3
3
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
5
|
-
import { AppendOnlyTree, BatchInsertionResult, IndexedTree } from '@aztec/merkle-tree';
|
|
4
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
5
|
+
import { type AppendOnlyTree, type BatchInsertionResult, type IndexedTree } from '@aztec/merkle-tree';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Type alias for the nullifier tree ID.
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
2
|
-
import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js';
|
|
3
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
4
|
-
import { BatchInsertionResult } from '@aztec/merkle-tree';
|
|
1
|
+
import { type L2Block, type MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
2
|
+
import { type Fr, type Header, type NullifierLeafPreimage, type StateReference } from '@aztec/circuits.js';
|
|
3
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
4
|
+
import { type BatchInsertionResult } from '@aztec/merkle-tree';
|
|
5
5
|
|
|
6
|
-
import { MerkleTreeDb } from './merkle_tree_db.js';
|
|
6
|
+
import { type MerkleTreeDb } from './merkle_tree_db.js';
|
|
7
7
|
import {
|
|
8
|
-
HandleL2BlockAndMessagesResult,
|
|
9
|
-
IndexedTreeId,
|
|
10
|
-
MerkleTreeLeafType,
|
|
11
|
-
MerkleTreeOperations,
|
|
12
|
-
TreeInfo,
|
|
8
|
+
type HandleL2BlockAndMessagesResult,
|
|
9
|
+
type IndexedTreeId,
|
|
10
|
+
type MerkleTreeLeafType,
|
|
11
|
+
type MerkleTreeOperations,
|
|
12
|
+
type TreeInfo,
|
|
13
13
|
} from './merkle_tree_operations.js';
|
|
14
14
|
|
|
15
15
|
/**
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
2
|
-
import { AppendOnlyTreeSnapshot, Fr, Header, PartialStateReference, StateReference } from '@aztec/circuits.js';
|
|
3
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
4
|
-
import { BatchInsertionResult, IndexedTreeSnapshot } from '@aztec/merkle-tree';
|
|
1
|
+
import { MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
2
|
+
import { AppendOnlyTreeSnapshot, Fr, type Header, PartialStateReference, StateReference } from '@aztec/circuits.js';
|
|
3
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
4
|
+
import { type BatchInsertionResult, type IndexedTreeSnapshot } from '@aztec/merkle-tree';
|
|
5
5
|
|
|
6
|
-
import { MerkleTreeDb, TreeSnapshots } from './merkle_tree_db.js';
|
|
6
|
+
import { type MerkleTreeDb, type TreeSnapshots } from './merkle_tree_db.js';
|
|
7
7
|
import {
|
|
8
|
-
HandleL2BlockAndMessagesResult,
|
|
9
|
-
IndexedTreeId,
|
|
10
|
-
MerkleTreeLeafType,
|
|
11
|
-
MerkleTreeOperations,
|
|
12
|
-
TreeInfo,
|
|
8
|
+
type HandleL2BlockAndMessagesResult,
|
|
9
|
+
type IndexedTreeId,
|
|
10
|
+
type MerkleTreeLeafType,
|
|
11
|
+
type MerkleTreeOperations,
|
|
12
|
+
type TreeInfo,
|
|
13
13
|
} from './merkle_tree_operations.js';
|
|
14
14
|
|
|
15
15
|
/**
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types';
|
|
1
|
+
import { type L2Block, MerkleTreeId, type SiblingPath } from '@aztec/circuit-types';
|
|
2
2
|
import {
|
|
3
3
|
ARCHIVE_HEIGHT,
|
|
4
4
|
AppendOnlyTreeSnapshot,
|
|
@@ -23,36 +23,36 @@ import {
|
|
|
23
23
|
} from '@aztec/circuits.js';
|
|
24
24
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
25
25
|
import { SerialQueue } from '@aztec/foundation/fifo';
|
|
26
|
-
import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
|
|
27
|
-
import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
28
|
-
import { AztecKVStore } from '@aztec/kv-store';
|
|
26
|
+
import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
|
|
27
|
+
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
28
|
+
import { type AztecKVStore } from '@aztec/kv-store';
|
|
29
29
|
import {
|
|
30
|
-
AppendOnlyTree,
|
|
31
|
-
BatchInsertionResult,
|
|
32
|
-
IndexedTree,
|
|
30
|
+
type AppendOnlyTree,
|
|
31
|
+
type BatchInsertionResult,
|
|
32
|
+
type IndexedTree,
|
|
33
33
|
Pedersen,
|
|
34
34
|
StandardIndexedTree,
|
|
35
35
|
StandardTree,
|
|
36
|
-
UpdateOnlyTree,
|
|
36
|
+
type UpdateOnlyTree,
|
|
37
37
|
getTreeMeta,
|
|
38
38
|
loadTree,
|
|
39
39
|
newTree,
|
|
40
40
|
} from '@aztec/merkle-tree';
|
|
41
|
-
import { Hasher } from '@aztec/types/interfaces';
|
|
41
|
+
import { type Hasher } from '@aztec/types/interfaces';
|
|
42
42
|
|
|
43
43
|
import {
|
|
44
44
|
INITIAL_NULLIFIER_TREE_SIZE,
|
|
45
45
|
INITIAL_PUBLIC_DATA_TREE_SIZE,
|
|
46
|
-
MerkleTreeDb,
|
|
47
|
-
TreeSnapshots,
|
|
46
|
+
type MerkleTreeDb,
|
|
47
|
+
type TreeSnapshots,
|
|
48
48
|
} from './merkle_tree_db.js';
|
|
49
49
|
import {
|
|
50
|
-
HandleL2BlockAndMessagesResult,
|
|
51
|
-
IndexedTreeId,
|
|
52
|
-
MerkleTreeLeafType,
|
|
53
|
-
MerkleTreeMap,
|
|
54
|
-
MerkleTreeOperations,
|
|
55
|
-
TreeInfo,
|
|
50
|
+
type HandleL2BlockAndMessagesResult,
|
|
51
|
+
type IndexedTreeId,
|
|
52
|
+
type MerkleTreeLeafType,
|
|
53
|
+
type MerkleTreeMap,
|
|
54
|
+
type MerkleTreeOperations,
|
|
55
|
+
type TreeInfo,
|
|
56
56
|
} from './merkle_tree_operations.js';
|
|
57
57
|
import { MerkleTreeOperationsFacade } from './merkle_tree_operations_facade.js';
|
|
58
58
|
|