@aztec-labs/aztec 6.1.0-nightly.20261113 → 6.1.0-rc.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/deploy/bridging.d.ts +1 -1
- package/dest/deploy/bridging.d.ts.map +1 -1
- package/dest/deploy/bridging.js +4 -3
- package/dest/deploy/graph.d.ts +1 -1
- package/dest/deploy/graph.d.ts.map +1 -1
- package/dest/deploy/graph.js +2 -3
- package/dest/deploy/runner.d.ts +1 -1
- package/dest/deploy/runner.d.ts.map +1 -1
- package/dest/deploy/runner.js +5 -5
- package/dest/examples/util.d.ts +1 -1
- package/dest/examples/util.d.ts.map +1 -1
- package/dest/examples/util.js +2 -1
- package/dest/local-network/local-network.d.ts +1 -1
- package/dest/local-network/local-network.d.ts.map +1 -1
- package/dest/local-network/local-network.js +3 -2
- package/package.json +30 -30
- package/src/deploy/bridging.ts +4 -3
- package/src/deploy/graph.ts +3 -1
- package/src/deploy/runner.ts +5 -5
- package/src/examples/util.ts +2 -1
- package/src/local-network/local-network.ts +3 -4
|
@@ -81,4 +81,4 @@ export declare function warpToL1ToL2Message(node: AztecNode, messageHash: Fr, op
|
|
|
81
81
|
nodeUrl?: string;
|
|
82
82
|
timeoutMs?: number;
|
|
83
83
|
}): Promise<void>;
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJpZGdpbmcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZXBsb3kvYnJpZGdpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7OztHQVNHO0FBQ0gsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDbkUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBS3pELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQVloQywrRkFBNkY7QUFDN0YsTUFBTSxNQUFNLGdCQUFnQixHQUFHLE1BQU0sR0FBRyxNQUFNLENBQUM7QUFFL0Msa0dBQWtHO0FBQ2xHLE1BQU0sTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyx1QkFBdUIsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUUvRjs7Ozs7Ozs7O0dBU0c7QUFDSCx3QkFBZ0IsZUFBZSxDQUFDLElBQUksRUFBRTtJQUFFLFNBQVMsRUFBRSxPQUFPLENBQUM7SUFBQyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FBRztJQUNqRyxTQUFTLEVBQUUsT0FBTyxDQUFDO0lBQ25CLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNqQixDQWtCQTtBQUVELE1BQU0sV0FBVyxvQkFBb0I7SUFDbkMsSUFBSSxFQUFFLFNBQVMsQ0FBQztJQUNoQixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsU0FBUyxFQUFFLFlBQVksQ0FBQztJQUN4QixrR0FBa0c7SUFDbEcsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLDhGQUE4RjtJQUM5RixZQUFZLENBQUMsRUFBRSxHQUFHLENBQUM7Q0FDcEI7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLGNBQWMsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQWV6RjtBQUVELE1BQU0sV0FBVyxrQkFBa0I7SUFDakMsSUFBSSxFQUFFLFNBQVMsQ0FBQztJQUNoQixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCOzs7T0FHRztJQUNILElBQUksRUFBRSxnQkFBZ0IsQ0FBQztJQUN2QiwwRUFBMEU7SUFDMUUsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ25CLDREQUE0RDtJQUM1RCxRQUFRLENBQUMsRUFBRTtRQUFFLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBQUM7Q0FDakM7QUFFRCxxR0FBbUc7QUFDbkcsd0JBQXNCLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUNwRjtBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLG1CQUFtQixDQUN2QyxJQUFJLEVBQUUsU0FBUyxFQUNmLFdBQVcsRUFBRSxFQUFFLEVBQ2YsSUFBSSxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQUMsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQU8sR0FDbEQsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXNCZiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridging.d.ts","sourceRoot":"","sources":["../../src/deploy/bridging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"bridging.d.ts","sourceRoot":"","sources":["../../src/deploy/bridging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAKzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAYhC,+FAA6F;AAC7F,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/C,kGAAkG;AAClG,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAE/F;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACjG,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAkBA;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,YAAY,CAAC;IACxB,kGAAkG;IAClG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8FAA8F;IAC9F,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAezF;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,SAAS,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB;;;OAGG;IACH,IAAI,EAAE,gBAAgB,CAAC;IACvB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACjC;AAED,qGAAmG;AACnG,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCpF;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,EAAE,EACf,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAClD,OAAO,CAAC,IAAI,CAAC,CAsBf"}
|
package/dest/deploy/bridging.js
CHANGED
|
@@ -13,6 +13,7 @@ import { createEthereumChain } from '@aztec-labs/ethereum/chain';
|
|
|
13
13
|
import { createExtendedL1Client } from '@aztec-labs/ethereum/client';
|
|
14
14
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
15
15
|
import { retryUntil } from '@aztec-labs/foundation/retry';
|
|
16
|
+
import { Timer } from '@aztec-labs/foundation/timer';
|
|
16
17
|
import { createAztecNodeDebugClient } from '@aztec-labs/stdlib/interfaces/client';
|
|
17
18
|
import { generatePrivateKey } from 'viem/accounts';
|
|
18
19
|
const logger = createLogger('deploy:bridging');
|
|
@@ -81,8 +82,8 @@ const logger = createLogger('deploy:bridging');
|
|
|
81
82
|
return;
|
|
82
83
|
}
|
|
83
84
|
const timeoutMs = params.timeoutMs ?? 30 * 60_000;
|
|
84
|
-
const
|
|
85
|
-
let lastLog =
|
|
85
|
+
const timer = new Timer();
|
|
86
|
+
let lastLog = Date.now();
|
|
86
87
|
await retryUntil(async ()=>{
|
|
87
88
|
if (await isL1ToL2MessageReady(node, messageHash)) {
|
|
88
89
|
return true;
|
|
@@ -91,7 +92,7 @@ const logger = createLogger('deploy:bridging');
|
|
|
91
92
|
lastLog = Date.now();
|
|
92
93
|
logger.info('Still waiting for L1→L2 message to become available', {
|
|
93
94
|
messageHash: messageHash.toString(),
|
|
94
|
-
elapsedMs:
|
|
95
|
+
elapsedMs: timer.ms(),
|
|
95
96
|
timeoutMs
|
|
96
97
|
});
|
|
97
98
|
}
|
package/dest/deploy/graph.d.ts
CHANGED
|
@@ -37,4 +37,4 @@ export declare function formatList(title: string, rows: PlanRow[]): string;
|
|
|
37
37
|
* submitted in parallel.
|
|
38
38
|
*/
|
|
39
39
|
export declare function formatLayers(title: string, layers: PlanRow[][]): string;
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JhcGguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZXBsb3kvZ3JhcGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUE7OztHQUdHO0FBRUg7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsaUJBQWlCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxFQUFFLFlBQVksRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLEdBQUcsTUFBTSxFQUFFLEVBQUUsQ0FpQmxHO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFnQixjQUFjLENBQzVCLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFDZixZQUFZLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUNuQyxTQUFTLEVBQUUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxLQUFLLE9BQU8sR0FDbkMsTUFBTSxFQUFFLEVBQUUsQ0ErQ1o7QUFFRCxvQ0FBb0M7QUFDcEMsTUFBTSxXQUFXLE9BQU87SUFDdEIsb0JBQW9CO0lBQ3BCLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixpREFBZ0Q7SUFDaEQsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2IsNkNBQTJDO0lBQzNDLFlBQVksQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0NBQ3pCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLFVBQVUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsR0FBRyxNQUFNLENBV2pFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLFlBQVksQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsRUFBRSxHQUFHLE1BQU0sQ0FjdkUifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/deploy/graph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/deploy/graph.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAiBlG;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACnC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GACnC,MAAM,EAAE,EAAE,CA+CZ;AAED,oCAAoC;AACpC,MAAM,WAAW,OAAO;IACtB,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,iDAAgD;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAWjE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,CAcvE"}
|
package/dest/deploy/graph.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { times } from '@aztec-labs/foundation/collection';
|
|
1
2
|
/**
|
|
2
3
|
* Dependency-graph utilities for the deploy framework: topological layering (which steps
|
|
3
4
|
* can run together) and a pretty-printer for the resulting plan.
|
|
@@ -73,9 +74,7 @@
|
|
|
73
74
|
const latest = deps.length === 0 ? lastLayer : Math.min(...deps.map((d)=>layerOf.get(d))) - 1;
|
|
74
75
|
layerOf.set(node, Math.max(layerOf.get(node), latest));
|
|
75
76
|
}
|
|
76
|
-
const layers =
|
|
77
|
-
length: asap.length
|
|
78
|
-
}, ()=>[]);
|
|
77
|
+
const layers = times(asap.length, ()=>[]);
|
|
79
78
|
for (const node of nodes){
|
|
80
79
|
layers[layerOf.get(node)].push(node);
|
|
81
80
|
}
|
package/dest/deploy/runner.d.ts
CHANGED
|
@@ -5,4 +5,4 @@ import type { DeploymentSpec, Steps } from './types.js';
|
|
|
5
5
|
* dependency layers. Idempotent — a re-run sends nothing when everything is already in place.
|
|
6
6
|
*/
|
|
7
7
|
export declare function runDeployment<C extends Steps>(spec: DeploymentSpec<C>): Promise<void>;
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVubmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGVwbG95L3J1bm5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUF5REEsT0FBTyxLQUFLLEVBSVYsY0FBYyxFQUtkLEtBQUssRUFDTixNQUFNLFlBQVksQ0FBQztBQXFEcEI7Ozs7R0FJRztBQUNILHdCQUFzQixhQUFhLENBQUMsQ0FBQyxTQUFTLEtBQUssRUFBRSxJQUFJLEVBQUUsY0FBYyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FjM0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/deploy/runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/deploy/runner.ts"],"names":[],"mappings":"AAyDA,OAAO,KAAK,EAIV,cAAc,EAKd,KAAK,EACN,MAAM,YAAY,CAAC;AAqDpB;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,CAAC,SAAS,KAAK,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAc3F"}
|
package/dest/deploy/runner.js
CHANGED
|
@@ -26,7 +26,8 @@ import { Fr } from '@aztec-labs/aztec.js/fields';
|
|
|
26
26
|
import { createAztecNodeClient } from '@aztec-labs/aztec.js/node';
|
|
27
27
|
import { FeeJuiceContract } from '@aztec-labs/aztec.js/protocol';
|
|
28
28
|
import { APP_MAX_CALLS } from '@aztec-labs/entrypoints/encoding';
|
|
29
|
-
import { chunk, compactArray } from '@aztec-labs/foundation/collection';
|
|
29
|
+
import { chunk, compactArray, partition } from '@aztec-labs/foundation/collection';
|
|
30
|
+
import { Timer } from '@aztec-labs/foundation/timer';
|
|
30
31
|
import { getPXEConfig } from '@aztec-labs/pxe/server';
|
|
31
32
|
import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec-labs/stdlib/contract';
|
|
32
33
|
import { deriveKeys, deriveMasterMessageSigningSecretKey } from '@aztec-labs/stdlib/keys';
|
|
@@ -941,8 +942,7 @@ function isDeferred(step) {
|
|
|
941
942
|
}
|
|
942
943
|
// Fund units run sequentially relative to each other: their send closures submit L1 bridge
|
|
943
944
|
// txs, and two bridges signed by the same funder key would race on nonces.
|
|
944
|
-
const fundRest = rest
|
|
945
|
-
const parallelRest = rest.filter((unit)=>unit.kind !== 'fund');
|
|
945
|
+
const [fundRest, parallelRest] = partition(rest, (unit)=>unit.kind === 'fund');
|
|
946
946
|
const runParallel = ()=>Promise.all(parallelRest.map((unit)=>this.runUnit(unit, feeSession)));
|
|
947
947
|
const runFunds = async ()=>{
|
|
948
948
|
for (const unit of fundRest){
|
|
@@ -969,7 +969,7 @@ function isDeferred(step) {
|
|
|
969
969
|
};
|
|
970
970
|
this.reporter.onUnitStart?.(info);
|
|
971
971
|
const { fee, onConsumed } = feeSession.next(unit.account);
|
|
972
|
-
const
|
|
972
|
+
const timer = new Timer();
|
|
973
973
|
let result;
|
|
974
974
|
try {
|
|
975
975
|
result = await unit.send(fee);
|
|
@@ -983,7 +983,7 @@ function isDeferred(step) {
|
|
|
983
983
|
blockNumber: receipt?.blockNumber != null ? Number(receipt.blockNumber) : undefined,
|
|
984
984
|
feePaid: receipt?.transactionFee,
|
|
985
985
|
status: receipt?.status != null ? String(receipt.status) : undefined,
|
|
986
|
-
durationMs:
|
|
986
|
+
durationMs: timer.ms()
|
|
987
987
|
});
|
|
988
988
|
onConsumed();
|
|
989
989
|
}
|
package/dest/examples/util.d.ts
CHANGED
|
@@ -16,4 +16,4 @@ export declare function deployL1Contract(l1Client: ExtendedViemWalletClient, abi
|
|
|
16
16
|
* @param ms - the number of milliseconds to sleep for
|
|
17
17
|
*/
|
|
18
18
|
export declare function delay(ms: number): Promise<void>;
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4YW1wbGVzL3V0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHM0UsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUMzQyxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEM7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FDcEMsUUFBUSxFQUFFLHdCQUF3QixFQUNsQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxDQUFDLEVBQ3JDLFFBQVEsRUFBRSxHQUFHLEVBQ2IsSUFBSSxHQUFFLFNBQVMsT0FBTyxFQUFPLEdBQzVCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FjckI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsS0FBSyxDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUvQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAG3E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}
|
package/dest/examples/util.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { EthAddress } from '@aztec-labs/aztec.js/addresses';
|
|
2
2
|
import { jsonStringify } from '@aztec-labs/foundation/json-rpc';
|
|
3
|
+
import { sleep } from '@aztec-labs/foundation/sleep';
|
|
3
4
|
/**
|
|
4
5
|
* Helper function to deploy ETH contracts.
|
|
5
6
|
* @param l1Client - A viem WalletClient extended with public actions.
|
|
@@ -26,5 +27,5 @@ import { jsonStringify } from '@aztec-labs/foundation/json-rpc';
|
|
|
26
27
|
* Sleep for a given number of milliseconds.
|
|
27
28
|
* @param ms - the number of milliseconds to sleep for
|
|
28
29
|
*/ export function delay(ms) {
|
|
29
|
-
return
|
|
30
|
+
return sleep(ms);
|
|
30
31
|
}
|
|
@@ -48,4 +48,4 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
|
|
|
48
48
|
}, options?: {
|
|
49
49
|
genesis?: GenesisData;
|
|
50
50
|
}): Promise<import("@aztec-labs/aztec-node").AztecNodeService>;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBR0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLCtCQUErQixDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVqRCxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSxnQ0FBZ0MsQ0FBQztBQU01RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBR3RGLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRXhELE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0sOEJBQThCLENBQUM7QUFJOUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUU3RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0sOEJBQThCLENBQUM7QUFLdEMsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBbUJoQzs7OztHQUlHO0FBQ0gsd0JBQXNCLG1CQUFtQixDQUN2QyxlQUFlLEVBQUUsZUFBZSxFQUNoQyxVQUFVLEVBQUUsR0FBRyxFQUNmLElBQUksR0FBRTtJQUNKLGtCQUFrQixDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3hCLDRCQUE0QixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2xDLEdBQ0wsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBbUI5QjtBQUVELDhCQUE4QjtBQUM5QixNQUFNLE1BQU0sa0JBQWtCLEdBQUcsZUFBZSxHQUFHO0lBQ2pELDBEQUEwRDtJQUMxRCxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLDZEQUE2RDtJQUM3RCxZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLHlGQUF5RjtJQUN6RixzQkFBc0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztDQUM3QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxNQUFNLHlDQUFrQyxFQUFFLE9BQU8sRUFBRSxLQUFLOzs7R0FnSWhHO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxlQUFlLENBQU0sRUFDckMsSUFBSSxHQUFFO0lBQ0osU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQzVCLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQ2pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixZQUFZLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztDQUM1QixFQUNOLE9BQU8sR0FBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLFdBQVcsQ0FBQTtDQUFPLDhEQWN4QyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEjD,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,gCAAgC,CAAC;AAM5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAGtF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEjD,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,gCAAgC,CAAC;AAM5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAGtF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAoB,MAAM,8BAA8B,CAAC;AAI9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,8BAA8B,CAAC;AAKtC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAmBhC;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC,GACL,OAAO,CAAC,mBAAmB,CAAC,CAmB9B;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,sBAAsB,CAAC,EAAE,EAAE,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAgIhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,WAAW,CAAA;CAAO,8DAcxC"}
|
|
@@ -12,6 +12,7 @@ import { NULL_KEY } from '@aztec-labs/ethereum/constants';
|
|
|
12
12
|
import { deployAztecL1Contracts } from '@aztec-labs/ethereum/deploy-aztec-l1-contracts';
|
|
13
13
|
import { SecretValue } from '@aztec-labs/foundation/config';
|
|
14
14
|
import { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
15
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
15
16
|
import { TestDateProvider } from '@aztec-labs/foundation/timer';
|
|
16
17
|
import { getVKTreeRoot } from '@aztec-labs/noir-protocol-circuits-types/vk-tree';
|
|
17
18
|
import { protocolContractsHash } from '@aztec-labs/protocol-contracts';
|
|
@@ -113,13 +114,13 @@ const setupWaitOpts = {
|
|
|
113
114
|
if (aztecNodeConfig.sequencerPublisherPrivateKeys == undefined || !aztecNodeConfig.sequencerPublisherPrivateKeys.length || aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY) {
|
|
114
115
|
const privKey = hdAccount.getHdKey().privateKey;
|
|
115
116
|
aztecNodeConfig.sequencerPublisherPrivateKeys = [
|
|
116
|
-
new SecretValue(
|
|
117
|
+
new SecretValue(bufferToHex(Buffer.from(privKey)))
|
|
117
118
|
];
|
|
118
119
|
}
|
|
119
120
|
if (!aztecNodeConfig.validatorPrivateKeys?.getValue().length) {
|
|
120
121
|
const privKey = hdAccount.getHdKey().privateKey;
|
|
121
122
|
aztecNodeConfig.validatorPrivateKeys = new SecretValue([
|
|
122
|
-
|
|
123
|
+
bufferToHex(Buffer.from(privKey))
|
|
123
124
|
]);
|
|
124
125
|
}
|
|
125
126
|
aztecNodeConfig.coinbase = EthAddress.fromString(privateKeyToAddress(aztecNodeConfig.validatorPrivateKeys.getValue()[0]));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/aztec",
|
|
3
|
-
"version": "6.1.0-
|
|
3
|
+
"version": "6.1.0-rc.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -30,35 +30,35 @@
|
|
|
30
30
|
],
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@aztec-foundation/bb.js": "6.1.0-nightly.20261111",
|
|
33
|
-
"@aztec-labs/accounts": "6.1.0-
|
|
34
|
-
"@aztec-labs/archiver": "6.1.0-
|
|
35
|
-
"@aztec-labs/aztec-node": "6.1.0-
|
|
36
|
-
"@aztec-labs/aztec.js": "6.1.0-
|
|
37
|
-
"@aztec-labs/blob-client": "6.1.0-
|
|
38
|
-
"@aztec-labs/bot": "6.1.0-
|
|
39
|
-
"@aztec-labs/builder": "6.1.0-
|
|
40
|
-
"@aztec-labs/cli": "6.1.0-
|
|
41
|
-
"@aztec-labs/constants": "6.1.0-
|
|
42
|
-
"@aztec-labs/entrypoints": "6.1.0-
|
|
43
|
-
"@aztec-labs/ethereum": "6.1.0-
|
|
44
|
-
"@aztec-labs/foundation": "6.1.0-
|
|
45
|
-
"@aztec-labs/kv-store": "6.1.0-
|
|
46
|
-
"@aztec-labs/node-lib": "6.1.0-
|
|
47
|
-
"@aztec-labs/noir-contracts.js": "6.1.0-
|
|
48
|
-
"@aztec-labs/noir-protocol-circuits-types": "6.1.0-
|
|
49
|
-
"@aztec-labs/p2p": "6.1.0-
|
|
50
|
-
"@aztec-labs/protocol-contracts": "6.1.0-
|
|
51
|
-
"@aztec-labs/prover-client": "6.1.0-
|
|
52
|
-
"@aztec-labs/prover-node": "6.1.0-
|
|
53
|
-
"@aztec-labs/pxe": "6.1.0-
|
|
54
|
-
"@aztec-labs/sequencer-client": "6.1.0-
|
|
55
|
-
"@aztec-labs/standard-contracts": "6.1.0-
|
|
56
|
-
"@aztec-labs/stdlib": "6.1.0-
|
|
57
|
-
"@aztec-labs/telemetry-client": "6.1.0-
|
|
58
|
-
"@aztec-labs/txe": "6.1.0-
|
|
59
|
-
"@aztec-labs/validator-ha-signer": "6.1.0-
|
|
60
|
-
"@aztec-labs/wallets": "6.1.0-
|
|
61
|
-
"@aztec-labs/world-state": "6.1.0-
|
|
33
|
+
"@aztec-labs/accounts": "6.1.0-rc.1",
|
|
34
|
+
"@aztec-labs/archiver": "6.1.0-rc.1",
|
|
35
|
+
"@aztec-labs/aztec-node": "6.1.0-rc.1",
|
|
36
|
+
"@aztec-labs/aztec.js": "6.1.0-rc.1",
|
|
37
|
+
"@aztec-labs/blob-client": "6.1.0-rc.1",
|
|
38
|
+
"@aztec-labs/bot": "6.1.0-rc.1",
|
|
39
|
+
"@aztec-labs/builder": "6.1.0-rc.1",
|
|
40
|
+
"@aztec-labs/cli": "6.1.0-rc.1",
|
|
41
|
+
"@aztec-labs/constants": "6.1.0-rc.1",
|
|
42
|
+
"@aztec-labs/entrypoints": "6.1.0-rc.1",
|
|
43
|
+
"@aztec-labs/ethereum": "6.1.0-rc.1",
|
|
44
|
+
"@aztec-labs/foundation": "6.1.0-rc.1",
|
|
45
|
+
"@aztec-labs/kv-store": "6.1.0-rc.1",
|
|
46
|
+
"@aztec-labs/node-lib": "6.1.0-rc.1",
|
|
47
|
+
"@aztec-labs/noir-contracts.js": "6.1.0-rc.1",
|
|
48
|
+
"@aztec-labs/noir-protocol-circuits-types": "6.1.0-rc.1",
|
|
49
|
+
"@aztec-labs/p2p": "6.1.0-rc.1",
|
|
50
|
+
"@aztec-labs/protocol-contracts": "6.1.0-rc.1",
|
|
51
|
+
"@aztec-labs/prover-client": "6.1.0-rc.1",
|
|
52
|
+
"@aztec-labs/prover-node": "6.1.0-rc.1",
|
|
53
|
+
"@aztec-labs/pxe": "6.1.0-rc.1",
|
|
54
|
+
"@aztec-labs/sequencer-client": "6.1.0-rc.1",
|
|
55
|
+
"@aztec-labs/standard-contracts": "6.1.0-rc.1",
|
|
56
|
+
"@aztec-labs/stdlib": "6.1.0-rc.1",
|
|
57
|
+
"@aztec-labs/telemetry-client": "6.1.0-rc.1",
|
|
58
|
+
"@aztec-labs/txe": "6.1.0-rc.1",
|
|
59
|
+
"@aztec-labs/validator-ha-signer": "6.1.0-rc.1",
|
|
60
|
+
"@aztec-labs/wallets": "6.1.0-rc.1",
|
|
61
|
+
"@aztec-labs/world-state": "6.1.0-rc.1",
|
|
62
62
|
"@iarna/toml": "^2.2.5",
|
|
63
63
|
"@types/chalk": "^2.2.0",
|
|
64
64
|
"abitype": "^0.8.11",
|
package/src/deploy/bridging.ts
CHANGED
|
@@ -17,6 +17,7 @@ import { createExtendedL1Client } from '@aztec-labs/ethereum/client';
|
|
|
17
17
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
18
18
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
19
19
|
import { retryUntil } from '@aztec-labs/foundation/retry';
|
|
20
|
+
import { Timer } from '@aztec-labs/foundation/timer';
|
|
20
21
|
import { type AztecNodeDebug, createAztecNodeDebugClient } from '@aztec-labs/stdlib/interfaces/client';
|
|
21
22
|
import type { Hex } from 'viem';
|
|
22
23
|
import { generatePrivateKey } from 'viem/accounts';
|
|
@@ -129,8 +130,8 @@ export async function waitForL1ToL2Message(params: WaitForClaimParams): Promise<
|
|
|
129
130
|
}
|
|
130
131
|
|
|
131
132
|
const timeoutMs = params.timeoutMs ?? 30 * 60_000;
|
|
132
|
-
const
|
|
133
|
-
let lastLog =
|
|
133
|
+
const timer = new Timer();
|
|
134
|
+
let lastLog = Date.now();
|
|
134
135
|
await retryUntil(
|
|
135
136
|
async () => {
|
|
136
137
|
if (await isL1ToL2MessageReady(node, messageHash)) {
|
|
@@ -140,7 +141,7 @@ export async function waitForL1ToL2Message(params: WaitForClaimParams): Promise<
|
|
|
140
141
|
lastLog = Date.now();
|
|
141
142
|
logger.info('Still waiting for L1→L2 message to become available', {
|
|
142
143
|
messageHash: messageHash.toString(),
|
|
143
|
-
elapsedMs:
|
|
144
|
+
elapsedMs: timer.ms(),
|
|
144
145
|
timeoutMs,
|
|
145
146
|
});
|
|
146
147
|
}
|
package/src/deploy/graph.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { times } from '@aztec-labs/foundation/collection';
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* Dependency-graph utilities for the deploy framework: topological layering (which steps
|
|
3
5
|
* can run together) and a pretty-printer for the resulting plan.
|
|
@@ -82,7 +84,7 @@ export function scheduleLayers(
|
|
|
82
84
|
layerOf.set(node, Math.max(layerOf.get(node)!, latest));
|
|
83
85
|
}
|
|
84
86
|
|
|
85
|
-
const layers: string[][] =
|
|
87
|
+
const layers: string[][] = times(asap.length, () => []);
|
|
86
88
|
for (const node of nodes) {
|
|
87
89
|
layers[layerOf.get(node)!].push(node);
|
|
88
90
|
}
|
package/src/deploy/runner.ts
CHANGED
|
@@ -28,7 +28,8 @@ import { Fr } from '@aztec-labs/aztec.js/fields';
|
|
|
28
28
|
import { type AztecNode, createAztecNodeClient } from '@aztec-labs/aztec.js/node';
|
|
29
29
|
import { FeeJuiceContract } from '@aztec-labs/aztec.js/protocol';
|
|
30
30
|
import { APP_MAX_CALLS } from '@aztec-labs/entrypoints/encoding';
|
|
31
|
-
import { chunk, compactArray } from '@aztec-labs/foundation/collection';
|
|
31
|
+
import { chunk, compactArray, partition } from '@aztec-labs/foundation/collection';
|
|
32
|
+
import { Timer } from '@aztec-labs/foundation/timer';
|
|
32
33
|
import { getPXEConfig } from '@aztec-labs/pxe/server';
|
|
33
34
|
import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec-labs/stdlib/contract';
|
|
34
35
|
import { deriveKeys, deriveMasterMessageSigningSecretKey } from '@aztec-labs/stdlib/keys';
|
|
@@ -1010,8 +1011,7 @@ class DeploymentRun<C extends Steps> {
|
|
|
1010
1011
|
}
|
|
1011
1012
|
// Fund units run sequentially relative to each other: their send closures submit L1 bridge
|
|
1012
1013
|
// txs, and two bridges signed by the same funder key would race on nonces.
|
|
1013
|
-
const fundRest = rest
|
|
1014
|
-
const parallelRest = rest.filter(unit => unit.kind !== 'fund');
|
|
1014
|
+
const [fundRest, parallelRest] = partition(rest, unit => unit.kind === 'fund');
|
|
1015
1015
|
const runParallel = () => Promise.all(parallelRest.map(unit => this.runUnit(unit, feeSession)));
|
|
1016
1016
|
const runFunds = async () => {
|
|
1017
1017
|
for (const unit of fundRest) {
|
|
@@ -1032,7 +1032,7 @@ class DeploymentRun<C extends Steps> {
|
|
|
1032
1032
|
const info = { label: unit.label, kind: unit.kind, account: unit.account };
|
|
1033
1033
|
this.reporter.onUnitStart?.(info);
|
|
1034
1034
|
const { fee, onConsumed } = feeSession.next(unit.account);
|
|
1035
|
-
const
|
|
1035
|
+
const timer = new Timer();
|
|
1036
1036
|
let result: unknown;
|
|
1037
1037
|
try {
|
|
1038
1038
|
result = await unit.send(fee);
|
|
@@ -1046,7 +1046,7 @@ class DeploymentRun<C extends Steps> {
|
|
|
1046
1046
|
blockNumber: receipt?.blockNumber != null ? Number(receipt.blockNumber) : undefined,
|
|
1047
1047
|
feePaid: receipt?.transactionFee,
|
|
1048
1048
|
status: receipt?.status != null ? String(receipt.status) : undefined,
|
|
1049
|
-
durationMs:
|
|
1049
|
+
durationMs: timer.ms(),
|
|
1050
1050
|
});
|
|
1051
1051
|
onConsumed();
|
|
1052
1052
|
}
|
package/src/examples/util.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EthAddress } from '@aztec-labs/aztec.js/addresses';
|
|
2
2
|
import type { ExtendedViemWalletClient } from '@aztec-labs/ethereum/types';
|
|
3
3
|
import { jsonStringify } from '@aztec-labs/foundation/json-rpc';
|
|
4
|
+
import { sleep } from '@aztec-labs/foundation/sleep';
|
|
4
5
|
import type { Abi, Narrow } from 'abitype';
|
|
5
6
|
import type { Hex } from 'viem';
|
|
6
7
|
|
|
@@ -38,5 +39,5 @@ export async function deployL1Contract(
|
|
|
38
39
|
* @param ms - the number of milliseconds to sleep for
|
|
39
40
|
*/
|
|
40
41
|
export function delay(ms: number): Promise<void> {
|
|
41
|
-
return
|
|
42
|
+
return sleep(ms);
|
|
42
43
|
}
|
|
@@ -14,6 +14,7 @@ import type { L1ContractAddresses } from '@aztec-labs/ethereum/l1-contract-addre
|
|
|
14
14
|
import { SecretValue } from '@aztec-labs/foundation/config';
|
|
15
15
|
import { EthAddress } from '@aztec-labs/foundation/eth-address';
|
|
16
16
|
import type { LogFn } from '@aztec-labs/foundation/log';
|
|
17
|
+
import { bufferToHex } from '@aztec-labs/foundation/string';
|
|
17
18
|
import { DateProvider, TestDateProvider } from '@aztec-labs/foundation/timer';
|
|
18
19
|
import { getVKTreeRoot } from '@aztec-labs/noir-protocol-circuits-types/vk-tree';
|
|
19
20
|
import { protocolContractsHash } from '@aztec-labs/protocol-contracts';
|
|
@@ -149,13 +150,11 @@ export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {
|
|
|
149
150
|
aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY
|
|
150
151
|
) {
|
|
151
152
|
const privKey = hdAccount.getHdKey().privateKey;
|
|
152
|
-
aztecNodeConfig.sequencerPublisherPrivateKeys = [
|
|
153
|
-
new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const),
|
|
154
|
-
];
|
|
153
|
+
aztecNodeConfig.sequencerPublisherPrivateKeys = [new SecretValue(bufferToHex(Buffer.from(privKey!)))];
|
|
155
154
|
}
|
|
156
155
|
if (!aztecNodeConfig.validatorPrivateKeys?.getValue().length) {
|
|
157
156
|
const privKey = hdAccount.getHdKey().privateKey;
|
|
158
|
-
aztecNodeConfig.validatorPrivateKeys = new SecretValue([
|
|
157
|
+
aztecNodeConfig.validatorPrivateKeys = new SecretValue([bufferToHex(Buffer.from(privKey!))]);
|
|
159
158
|
}
|
|
160
159
|
aztecNodeConfig.coinbase = EthAddress.fromString(
|
|
161
160
|
privateKeyToAddress(aztecNodeConfig.validatorPrivateKeys.getValue()[0]),
|