@aztec/foundation 0.69.1 → 0.71.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/abi/note_selector.d.ts +5 -2
- package/dest/abi/note_selector.d.ts.map +1 -1
- package/dest/abi/note_selector.js +12 -4
- package/dest/collection/array.d.ts +8 -0
- package/dest/collection/array.d.ts.map +1 -1
- package/dest/collection/array.js +28 -1
- package/dest/config/env_var.d.ts +1 -1
- package/dest/config/env_var.d.ts.map +1 -1
- package/dest/config/index.d.ts +3 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +6 -2
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts +7 -2
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts.map +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.js +18 -16
- package/dest/log/gcloud-logger-config.d.ts +14 -0
- package/dest/log/gcloud-logger-config.d.ts.map +1 -0
- package/dest/log/gcloud-logger-config.js +64 -0
- package/dest/log/pino-logger.d.ts +3 -0
- package/dest/log/pino-logger.d.ts.map +1 -1
- package/dest/log/pino-logger.js +25 -39
- package/dest/noir/noir_package_config.d.ts +2 -2
- package/dest/promise/running-promise.d.ts.map +1 -1
- package/dest/promise/running-promise.js +9 -1
- package/dest/queue/serial_queue.d.ts +1 -0
- package/dest/queue/serial_queue.d.ts.map +1 -1
- package/dest/queue/serial_queue.js +6 -1
- package/dest/testing/files/index.d.ts +2 -1
- package/dest/testing/files/index.d.ts.map +1 -1
- package/dest/testing/files/index.js +6 -2
- package/dest/trees/index.d.ts +2 -1
- package/dest/trees/index.d.ts.map +1 -1
- package/dest/trees/index.js +3 -2
- package/dest/trees/{unbalanced_merkle_root.d.ts → unbalanced_merkle_tree.d.ts} +6 -2
- package/dest/trees/unbalanced_merkle_tree.d.ts.map +1 -0
- package/dest/trees/{unbalanced_merkle_root.js → unbalanced_merkle_tree.js} +40 -2
- package/dest/trees/unbalanced_tree_store.d.ts +19 -0
- package/dest/trees/unbalanced_tree_store.d.ts.map +1 -0
- package/dest/trees/unbalanced_tree_store.js +80 -0
- package/package.json +2 -2
- package/src/abi/note_selector.ts +11 -4
- package/src/collection/array.ts +31 -0
- package/src/config/env_var.ts +7 -3
- package/src/config/index.ts +7 -2
- package/src/json-rpc/server/safe_json_rpc_server.ts +22 -15
- package/src/log/gcloud-logger-config.ts +71 -0
- package/src/log/pino-logger.ts +30 -42
- package/src/promise/running-promise.ts +8 -0
- package/src/queue/serial_queue.ts +5 -0
- package/src/testing/files/index.ts +6 -1
- package/src/trees/index.ts +2 -1
- package/src/trees/unbalanced_merkle_tree.ts +103 -0
- package/src/trees/unbalanced_tree_store.ts +102 -0
- package/dest/trees/unbalanced_merkle_root.d.ts.map +0 -1
- package/src/trees/unbalanced_merkle_root.ts +0 -52
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"unbalanced_merkle_root.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_merkle_root.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,qBAAc,GAAG,MAAM,CAwC9G"}
|
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
2
|
-
import { sha256Trunc } from '@aztec/foundation/crypto';
|
|
3
|
-
|
|
4
|
-
/**
|
|
5
|
-
* Computes the merkle root for an unbalanced tree.
|
|
6
|
-
*
|
|
7
|
-
* @dev Adapted from proving-state.ts -> findMergeLevel and unbalanced_tree.ts.
|
|
8
|
-
* Calculates the tree upwards layer by layer until we reach the root.
|
|
9
|
-
* The L1 calculation instead computes the tree from right to left (slightly cheaper gas).
|
|
10
|
-
* TODO: A more thorough investigation of which method is cheaper, then use that method everywhere.
|
|
11
|
-
*/
|
|
12
|
-
export function computeUnbalancedMerkleRoot(leaves: Buffer[], emptyLeaf?: Buffer, hasher = sha256Trunc): Buffer {
|
|
13
|
-
// Pad leaves to 2
|
|
14
|
-
if (leaves.length < 2) {
|
|
15
|
-
if (emptyLeaf === undefined) {
|
|
16
|
-
throw new Error('Cannot compute a Merkle root with less than 2 leaves');
|
|
17
|
-
} else {
|
|
18
|
-
leaves = padArrayEnd(leaves, emptyLeaf, 2);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
const depth = Math.ceil(Math.log2(leaves.length));
|
|
23
|
-
let [layerWidth, nodeToShift] =
|
|
24
|
-
leaves.length & 1 ? [leaves.length - 1, leaves[leaves.length - 1]] : [leaves.length, Buffer.alloc(0)];
|
|
25
|
-
// Allocate this layer's leaves and init the next layer up
|
|
26
|
-
let thisLayer = leaves.slice(0, layerWidth);
|
|
27
|
-
let nextLayer = [];
|
|
28
|
-
for (let i = 0; i < depth; i++) {
|
|
29
|
-
for (let j = 0; j < layerWidth; j += 2) {
|
|
30
|
-
// Store the hash of each pair one layer up
|
|
31
|
-
nextLayer[j / 2] = hasher(Buffer.concat([thisLayer[j], thisLayer[j + 1]]));
|
|
32
|
-
}
|
|
33
|
-
layerWidth /= 2;
|
|
34
|
-
if (layerWidth & 1) {
|
|
35
|
-
if (nodeToShift.length) {
|
|
36
|
-
// If the next layer has odd length, and we have a node that needs to be shifted up, add it here
|
|
37
|
-
nextLayer.push(nodeToShift);
|
|
38
|
-
layerWidth += 1;
|
|
39
|
-
nodeToShift = Buffer.alloc(0);
|
|
40
|
-
} else {
|
|
41
|
-
// If we don't have a node waiting to be shifted, store the next layer's final node to be shifted
|
|
42
|
-
layerWidth -= 1;
|
|
43
|
-
nodeToShift = nextLayer[layerWidth];
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
// reset the layers
|
|
47
|
-
thisLayer = nextLayer;
|
|
48
|
-
nextLayer = [];
|
|
49
|
-
}
|
|
50
|
-
// return the root
|
|
51
|
-
return thisLayer[0];
|
|
52
|
-
}
|