@aztec/prover-client 0.0.0-test.0 → 0.0.1-fake-c83136db25
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/block-factory/index.d.ts +2 -0
- package/dest/block-factory/index.d.ts.map +1 -0
- package/dest/block-factory/light.d.ts +38 -0
- package/dest/block-factory/light.d.ts.map +1 -0
- package/dest/block-factory/light.js +94 -0
- package/dest/config.d.ts +6 -6
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +11 -1
- package/dest/mocks/fixtures.d.ts +7 -4
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +32 -4
- package/dest/mocks/test_context.d.ts +43 -15
- package/dest/mocks/test_context.d.ts.map +1 -1
- package/dest/mocks/test_context.js +110 -48
- package/dest/orchestrator/block-building-helpers.d.ts +37 -28
- package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
- package/dest/orchestrator/block-building-helpers.js +156 -150
- package/dest/orchestrator/block-proving-state.d.ts +62 -46
- package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/block-proving-state.js +223 -179
- package/dest/orchestrator/checkpoint-proving-state.d.ts +63 -0
- package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -0
- package/dest/orchestrator/checkpoint-proving-state.js +211 -0
- package/dest/orchestrator/epoch-proving-state.d.ts +37 -24
- package/dest/orchestrator/epoch-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/epoch-proving-state.js +143 -73
- package/dest/orchestrator/orchestrator.d.ts +34 -31
- package/dest/orchestrator/orchestrator.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator.js +392 -234
- package/dest/orchestrator/orchestrator_metrics.d.ts +2 -0
- package/dest/orchestrator/orchestrator_metrics.d.ts.map +1 -1
- package/dest/orchestrator/orchestrator_metrics.js +9 -0
- package/dest/orchestrator/tx-proving-state.d.ts +12 -10
- package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
- package/dest/orchestrator/tx-proving-state.js +30 -38
- package/dest/prover-client/prover-client.d.ts +3 -3
- package/dest/prover-client/prover-client.d.ts.map +1 -1
- package/dest/prover-client/prover-client.js +5 -4
- package/dest/prover-client/server-epoch-prover.d.ts +13 -10
- package/dest/prover-client/server-epoch-prover.d.ts.map +1 -1
- package/dest/prover-client/server-epoch-prover.js +11 -11
- package/dest/proving_broker/broker_prover_facade.d.ts +22 -15
- package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
- package/dest/proving_broker/broker_prover_facade.js +64 -39
- package/dest/proving_broker/config.d.ts +9 -4
- package/dest/proving_broker/config.d.ts.map +1 -1
- package/dest/proving_broker/config.js +15 -4
- package/dest/proving_broker/factory.d.ts +1 -1
- package/dest/proving_broker/factory.d.ts.map +1 -1
- package/dest/proving_broker/factory.js +5 -1
- package/dest/proving_broker/fixtures.js +1 -1
- package/dest/proving_broker/proof_store/factory.js +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.js +1 -0
- package/dest/proving_broker/proof_store/index.d.ts +1 -0
- package/dest/proving_broker/proof_store/index.d.ts.map +1 -1
- package/dest/proving_broker/proof_store/index.js +1 -0
- package/dest/proving_broker/proving_agent.d.ts +3 -3
- package/dest/proving_broker/proving_agent.d.ts.map +1 -1
- package/dest/proving_broker/proving_agent.js +83 -47
- package/dest/proving_broker/proving_broker.d.ts +11 -2
- package/dest/proving_broker/proving_broker.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker.js +34 -22
- package/dest/proving_broker/proving_broker_database/memory.js +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
- package/dest/proving_broker/proving_broker_database/persisted.js +9 -8
- package/dest/proving_broker/proving_job_controller.d.ts +7 -8
- package/dest/proving_broker/proving_job_controller.d.ts.map +1 -1
- package/dest/proving_broker/proving_job_controller.js +89 -61
- package/dest/proving_broker/rpc.d.ts +3 -5
- package/dest/proving_broker/rpc.d.ts.map +1 -1
- package/dest/proving_broker/rpc.js +1 -4
- package/dest/test/mock_proof_store.d.ts +9 -0
- package/dest/test/mock_proof_store.d.ts.map +1 -0
- package/dest/test/mock_proof_store.js +10 -0
- package/dest/test/mock_prover.d.ts +23 -16
- package/dest/test/mock_prover.d.ts.map +1 -1
- package/dest/test/mock_prover.js +38 -20
- package/package.json +29 -29
- package/src/block-factory/index.ts +1 -0
- package/src/block-factory/light.ts +140 -0
- package/src/config.ts +24 -8
- package/src/mocks/fixtures.ts +43 -15
- package/src/mocks/test_context.ts +201 -75
- package/src/orchestrator/block-building-helpers.ts +247 -243
- package/src/orchestrator/block-proving-state.ts +247 -231
- package/src/orchestrator/checkpoint-proving-state.ts +299 -0
- package/src/orchestrator/epoch-proving-state.ts +187 -111
- package/src/orchestrator/orchestrator.ts +590 -289
- package/src/orchestrator/orchestrator_metrics.ts +20 -1
- package/src/orchestrator/tx-proving-state.ts +60 -61
- package/src/prover-client/prover-client.ts +16 -14
- package/src/prover-client/server-epoch-prover.ts +40 -21
- package/src/proving_broker/broker_prover_facade.ts +200 -113
- package/src/proving_broker/config.ts +17 -6
- package/src/proving_broker/factory.ts +2 -1
- package/src/proving_broker/fixtures.ts +1 -1
- package/src/proving_broker/proof_store/factory.ts +1 -1
- package/src/proving_broker/proof_store/gcs_proof_store.ts +5 -1
- package/src/proving_broker/proof_store/index.ts +1 -0
- package/src/proving_broker/proof_store/inline_proof_store.ts +1 -1
- package/src/proving_broker/proving_agent.ts +89 -47
- package/src/proving_broker/proving_broker.ts +51 -32
- package/src/proving_broker/proving_broker_database/memory.ts +1 -1
- package/src/proving_broker/proving_broker_database/persisted.ts +9 -8
- package/src/proving_broker/proving_job_controller.ts +92 -81
- package/src/proving_broker/rpc.ts +1 -6
- package/src/test/mock_proof_store.ts +14 -0
- package/src/test/mock_prover.ts +164 -60
- package/dest/bin/get-proof-inputs.d.ts +0 -2
- package/dest/bin/get-proof-inputs.d.ts.map +0 -1
- package/dest/bin/get-proof-inputs.js +0 -51
- package/dest/block_builder/index.d.ts +0 -6
- package/dest/block_builder/index.d.ts.map +0 -1
- package/dest/block_builder/light.d.ts +0 -33
- package/dest/block_builder/light.d.ts.map +0 -1
- package/dest/block_builder/light.js +0 -82
- package/src/bin/get-proof-inputs.ts +0 -59
- package/src/block_builder/index.ts +0 -6
- package/src/block_builder/light.ts +0 -101
- /package/dest/{block_builder → block-factory}/index.js +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block-factory/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { SpongeBlob } from '@aztec/blob-lib';
|
|
2
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
3
|
+
import { L2Block } from '@aztec/stdlib/block';
|
|
4
|
+
import type { IBlockFactory, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
5
|
+
import type { GlobalVariables, ProcessedTx } from '@aztec/stdlib/tx';
|
|
6
|
+
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
7
|
+
/**
|
|
8
|
+
* Builds a block and its header from a set of processed tx without running any circuits.
|
|
9
|
+
*
|
|
10
|
+
* NOTE: the onus is ON THE CALLER to update the db that is passed in with the notes hashes, nullifiers, etc
|
|
11
|
+
* PRIOR to calling `buildBlock`.
|
|
12
|
+
*
|
|
13
|
+
* Why? Because if you are, e.g. building a block in practice from TxObjects, you are using the
|
|
14
|
+
* PublicProcessor which will do this for you as it processes transactions.
|
|
15
|
+
*
|
|
16
|
+
* If you haven't already inserted the side effects, e.g. because you are in a testing context, you can use the helper
|
|
17
|
+
* function `buildBlockWithCleanDB`, which calls `insertSideEffectsAndBuildBaseRollupHints` for you.
|
|
18
|
+
*/
|
|
19
|
+
export declare class LightweightBlockFactory implements IBlockFactory {
|
|
20
|
+
private db;
|
|
21
|
+
private telemetry;
|
|
22
|
+
private globalVariables?;
|
|
23
|
+
private l1ToL2Messages?;
|
|
24
|
+
private startSpongeBlob?;
|
|
25
|
+
private txs;
|
|
26
|
+
private readonly logger;
|
|
27
|
+
constructor(db: MerkleTreeWriteOperations, telemetry?: TelemetryClient);
|
|
28
|
+
startNewBlock(globalVariables: GlobalVariables, l1ToL2Messages: Fr[], startSpongeBlob?: SpongeBlob, isFirstBlock?: boolean): Promise<void>;
|
|
29
|
+
addTxs(txs: ProcessedTx[]): Promise<void>;
|
|
30
|
+
setBlockCompleted(): Promise<L2Block>;
|
|
31
|
+
private buildBlock;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Inserts the processed transactions into the DB, then creates a block.
|
|
35
|
+
* @param db - A db fork to use for block building which WILL BE MODIFIED.
|
|
36
|
+
*/
|
|
37
|
+
export declare function buildBlockWithCleanDB(txs: ProcessedTx[], globalVariables: GlobalVariables, l1ToL2Messages: Fr[], db: MerkleTreeWriteOperations, startSpongeBlob?: SpongeBlob, isFirstBlock?: boolean, telemetry?: TelemetryClient): Promise<L2Block>;
|
|
38
|
+
//# sourceMappingURL=light.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"light.d.ts","sourceRoot":"","sources":["../../src/block-factory/light.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEhG,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAQnF;;;;;;;;;;;GAWG;AACH,qBAAa,uBAAwB,YAAW,aAAa;IASzD,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IATnB,OAAO,CAAC,eAAe,CAAC,CAAkB;IAC1C,OAAO,CAAC,cAAc,CAAC,CAAO;IAC9B,OAAO,CAAC,eAAe,CAAC,CAAa;IACrC,OAAO,CAAC,GAAG,CAA4B;IAEvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6C;gBAG1D,EAAE,EAAE,yBAAyB,EAC7B,SAAS,GAAE,eAAsC;IAGrD,aAAa,CACjB,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EAEpB,eAAe,CAAC,EAAE,UAAU,EAE5B,YAAY,UAAO,GAClB,OAAO,CAAC,IAAI,CAAC;IAYhB,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;YAIvB,UAAU;CA2BzB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,WAAW,EAAE,EAClB,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,EAAE,EAAE,yBAAyB,EAC7B,eAAe,CAAC,EAAE,UAAU,EAC5B,YAAY,UAAO,EACnB,SAAS,GAAE,eAAsC,oBAuBlD"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { SpongeBlob } from '@aztec/blob-lib';
|
|
2
|
+
import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
|
|
3
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
4
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
5
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
6
|
+
import { L2Block } from '@aztec/stdlib/block';
|
|
7
|
+
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
8
|
+
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
9
|
+
import { buildHeaderAndBodyFromTxs, getTreeSnapshot, insertSideEffectsAndBuildBaseRollupHints } from '../orchestrator/block-building-helpers.js';
|
|
10
|
+
/**
|
|
11
|
+
* Builds a block and its header from a set of processed tx without running any circuits.
|
|
12
|
+
*
|
|
13
|
+
* NOTE: the onus is ON THE CALLER to update the db that is passed in with the notes hashes, nullifiers, etc
|
|
14
|
+
* PRIOR to calling `buildBlock`.
|
|
15
|
+
*
|
|
16
|
+
* Why? Because if you are, e.g. building a block in practice from TxObjects, you are using the
|
|
17
|
+
* PublicProcessor which will do this for you as it processes transactions.
|
|
18
|
+
*
|
|
19
|
+
* If you haven't already inserted the side effects, e.g. because you are in a testing context, you can use the helper
|
|
20
|
+
* function `buildBlockWithCleanDB`, which calls `insertSideEffectsAndBuildBaseRollupHints` for you.
|
|
21
|
+
*/ export class LightweightBlockFactory {
|
|
22
|
+
db;
|
|
23
|
+
telemetry;
|
|
24
|
+
globalVariables;
|
|
25
|
+
l1ToL2Messages;
|
|
26
|
+
startSpongeBlob;
|
|
27
|
+
txs;
|
|
28
|
+
logger;
|
|
29
|
+
constructor(db, telemetry = getTelemetryClient()){
|
|
30
|
+
this.db = db;
|
|
31
|
+
this.telemetry = telemetry;
|
|
32
|
+
this.logger = createLogger('lightweight-block-factory');
|
|
33
|
+
}
|
|
34
|
+
async startNewBlock(globalVariables, l1ToL2Messages, // Must be provided to generate the correct spongeBlobHash for the block header if there's more than one block in the checkpoint.
|
|
35
|
+
startSpongeBlob, // Only insert l1 to l2 messages for the first block in a checkpoint.
|
|
36
|
+
isFirstBlock = true) {
|
|
37
|
+
this.logger.debug('Starting new block', {
|
|
38
|
+
globalVariables: globalVariables.toInspect(),
|
|
39
|
+
l1ToL2Messages
|
|
40
|
+
});
|
|
41
|
+
this.globalVariables = globalVariables;
|
|
42
|
+
this.l1ToL2Messages = isFirstBlock ? padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP) : [];
|
|
43
|
+
this.startSpongeBlob = startSpongeBlob;
|
|
44
|
+
this.txs = undefined;
|
|
45
|
+
// Update L1 to L2 tree
|
|
46
|
+
await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, this.l1ToL2Messages);
|
|
47
|
+
}
|
|
48
|
+
addTxs(txs) {
|
|
49
|
+
// Most times, `addTxs` is only called once per block.
|
|
50
|
+
// So avoid copies.
|
|
51
|
+
if (this.txs === undefined) {
|
|
52
|
+
this.txs = txs;
|
|
53
|
+
} else {
|
|
54
|
+
this.txs.push(...txs);
|
|
55
|
+
}
|
|
56
|
+
return Promise.resolve();
|
|
57
|
+
}
|
|
58
|
+
setBlockCompleted() {
|
|
59
|
+
return this.buildBlock();
|
|
60
|
+
}
|
|
61
|
+
async buildBlock() {
|
|
62
|
+
const { header, body } = await buildHeaderAndBodyFromTxs(this.txs ?? [], this.globalVariables, this.l1ToL2Messages, this.db, this.startSpongeBlob);
|
|
63
|
+
header.state.validate();
|
|
64
|
+
const blockHeader = header.toBlockHeader();
|
|
65
|
+
await this.db.updateArchive(blockHeader);
|
|
66
|
+
const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
|
|
67
|
+
const block = new L2Block(newArchive, header, body);
|
|
68
|
+
this.logger.debug(`Built block ${block.number}`, {
|
|
69
|
+
globalVariables: this.globalVariables?.toInspect(),
|
|
70
|
+
archiveRoot: newArchive.root.toString(),
|
|
71
|
+
stateReference: header.state.toInspect(),
|
|
72
|
+
blockHash: (await block.hash()).toString(),
|
|
73
|
+
txs: block.body.txEffects.map((tx)=>tx.txHash.toString())
|
|
74
|
+
});
|
|
75
|
+
return block;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Inserts the processed transactions into the DB, then creates a block.
|
|
80
|
+
* @param db - A db fork to use for block building which WILL BE MODIFIED.
|
|
81
|
+
*/ export async function buildBlockWithCleanDB(txs, globalVariables, l1ToL2Messages, db, startSpongeBlob, isFirstBlock = true, telemetry = getTelemetryClient()) {
|
|
82
|
+
const lastArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
|
|
83
|
+
const builder = new LightweightBlockFactory(db, telemetry);
|
|
84
|
+
await builder.startNewBlock(globalVariables, l1ToL2Messages, startSpongeBlob, isFirstBlock);
|
|
85
|
+
const l1ToL2MessageTree = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db);
|
|
86
|
+
for (const tx of txs){
|
|
87
|
+
// startSpongeBlob and proverId are only used for constructing private inputs of the base rollup.
|
|
88
|
+
// Their values don't matter here because we are not using the return private inputs to build the block.
|
|
89
|
+
const proverId = Fr.ZERO;
|
|
90
|
+
await insertSideEffectsAndBuildBaseRollupHints(tx, lastArchive, l1ToL2MessageTree, startSpongeBlob?.clone() ?? SpongeBlob.empty(), proverId, db);
|
|
91
|
+
}
|
|
92
|
+
await builder.addTxs(txs);
|
|
93
|
+
return await builder.setBlockCompleted();
|
|
94
|
+
}
|
package/dest/config.d.ts
CHANGED
|
@@ -2,16 +2,16 @@ import type { ACVMConfig, BBConfig } from '@aztec/bb-prover';
|
|
|
2
2
|
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
3
3
|
import { type ProverConfig } from '@aztec/stdlib/interfaces/server';
|
|
4
4
|
import { type ProverAgentConfig, type ProverBrokerConfig } from './proving_broker/config.js';
|
|
5
|
-
/**
|
|
6
|
-
|
|
7
|
-
*/
|
|
8
|
-
export type ProverClientConfig =
|
|
5
|
+
/** The prover configuration as defined by the user. */
|
|
6
|
+
export type ProverClientUserConfig = ProverConfig & ProverAgentConfig & ProverBrokerConfig & BBConfig & ACVMConfig;
|
|
7
|
+
/** The prover configuration with all missing fields resolved. */
|
|
8
|
+
export type ProverClientConfig = ProverClientUserConfig & Required<Pick<ProverClientUserConfig, 'proverId'>>;
|
|
9
9
|
export declare const bbConfigMappings: ConfigMappingsType<BBConfig & ACVMConfig>;
|
|
10
|
-
export declare const proverClientConfigMappings: ConfigMappingsType<
|
|
10
|
+
export declare const proverClientConfigMappings: ConfigMappingsType<ProverClientUserConfig>;
|
|
11
11
|
/**
|
|
12
12
|
* Returns the prover configuration from the environment variables.
|
|
13
13
|
* Note: If an environment variable is not set, the default value is used.
|
|
14
14
|
* @returns The prover configuration.
|
|
15
15
|
*/
|
|
16
|
-
export declare function getProverEnvVars():
|
|
16
|
+
export declare function getProverEnvVars(): ProverClientUserConfig;
|
|
17
17
|
//# sourceMappingURL=config.d.ts.map
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,YAAY,EAAwB,MAAM,iCAAiC,CAAC;AAE1F,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EAGxB,MAAM,4BAA4B,CAAC;AAEpC,uDAAuD;AACvD,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG,iBAAiB,GAAG,kBAAkB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnH,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC,CAAC;AAE7G,eAAO,MAAM,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,GAAG,UAAU,CAgCtE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,sBAAsB,CAKjF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,sBAAsB,CAEzD"}
|
package/dest/config.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
|
|
1
|
+
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
|
|
2
2
|
import { proverConfigMappings } from '@aztec/stdlib/interfaces/server';
|
|
3
3
|
import { proverAgentConfigMappings, proverBrokerConfigMappings } from './proving_broker/config.js';
|
|
4
4
|
export const bbConfigMappings = {
|
|
@@ -22,6 +22,16 @@ export const bbConfigMappings = {
|
|
|
22
22
|
env: 'BB_SKIP_CLEANUP',
|
|
23
23
|
description: 'Whether to skip cleanup of bb temporary files',
|
|
24
24
|
...booleanConfigHelper(false)
|
|
25
|
+
},
|
|
26
|
+
numConcurrentIVCVerifiers: {
|
|
27
|
+
env: 'BB_NUM_IVC_VERIFIERS',
|
|
28
|
+
description: 'Max number of chonk verifiers to run concurrently',
|
|
29
|
+
...numberConfigHelper(8)
|
|
30
|
+
},
|
|
31
|
+
bbIVCConcurrency: {
|
|
32
|
+
env: 'BB_IVC_CONCURRENCY',
|
|
33
|
+
description: 'Number of threads to use for IVC verification',
|
|
34
|
+
...numberConfigHelper(1)
|
|
25
35
|
}
|
|
26
36
|
};
|
|
27
37
|
export const proverClientConfigMappings = {
|
package/dest/mocks/fixtures.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { Logger } from '@aztec/foundation/log';
|
|
2
|
-
import {
|
|
2
|
+
import type { FieldsOf } from '@aztec/foundation/types';
|
|
3
|
+
import { type CircuitSimulator } from '@aztec/simulator/server';
|
|
3
4
|
import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
|
|
5
|
+
import { CheckpointConstantData } from '@aztec/stdlib/rollup';
|
|
4
6
|
import type { ProcessedTx } from '@aztec/stdlib/tx';
|
|
5
7
|
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
6
8
|
export declare const getEnvironmentConfig: (logger: Logger) => Promise<{
|
|
@@ -11,10 +13,11 @@ export declare const getEnvironmentConfig: (logger: Logger) => Promise<{
|
|
|
11
13
|
directoryToCleanup: string | undefined;
|
|
12
14
|
bbSkipCleanup: boolean;
|
|
13
15
|
} | undefined>;
|
|
14
|
-
export declare function
|
|
16
|
+
export declare function getSimulator(config: {
|
|
15
17
|
acvmWorkingDirectory: string | undefined;
|
|
16
18
|
acvmBinaryPath: string | undefined;
|
|
17
|
-
}, logger?: Logger): Promise<
|
|
19
|
+
}, logger?: Logger): Promise<CircuitSimulator>;
|
|
18
20
|
export declare const updateExpectedTreesFromTxs: (db: MerkleTreeWriteOperations, txs: ProcessedTx[]) => Promise<void>;
|
|
19
|
-
export declare const makeGlobals: (blockNumber: number) => GlobalVariables;
|
|
21
|
+
export declare const makeGlobals: (blockNumber: number, slotNumber?: number, overrides?: Partial<FieldsOf<GlobalVariables> & FieldsOf<CheckpointConstantData>>) => GlobalVariables;
|
|
22
|
+
export declare const makeCheckpointConstants: (slotNumber: number, overrides?: Partial<FieldsOf<CheckpointConstantData>>) => CheckpointConstantData;
|
|
20
23
|
//# sourceMappingURL=fixtures.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/mocks/fixtures.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,KAAK,gBAAgB,EAA+C,MAAM,yBAAyB,CAAC;AAG7G,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAiBnD,eAAO,MAAM,oBAAoB,GAAU,QAAQ,MAAM;;;;;;;cAkCxD,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE;IAAE,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACxF,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAGD,eAAO,MAAM,0BAA0B,GAAU,IAAI,yBAAyB,EAAE,KAAK,WAAW,EAAE,kBAgBjG,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,aAAa,MAAM,EACnB,mBAAwB,EACxB,YAAW,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAM,oBActF,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,EAClB,YAAW,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAM,2BAc1D,CAAC"}
|
package/dest/mocks/fixtures.js
CHANGED
|
@@ -4,9 +4,12 @@ import { randomBytes } from '@aztec/foundation/crypto';
|
|
|
4
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
6
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
7
|
+
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
|
|
8
|
+
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
7
9
|
import { NativeACVMSimulator, WASMSimulatorWithBlobs } from '@aztec/simulator/server';
|
|
8
10
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
9
11
|
import { GasFees } from '@aztec/stdlib/gas';
|
|
12
|
+
import { CheckpointConstantData } from '@aztec/stdlib/rollup';
|
|
10
13
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
11
14
|
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
12
15
|
import { promises as fs } from 'fs';
|
|
@@ -15,7 +18,7 @@ const { BB_RELEASE_DIR = 'cpp/build/bin', TEMP_DIR = '/tmp', BB_BINARY_PATH = ''
|
|
|
15
18
|
// Determines if we have access to the bb binary and a tmp folder for temp files
|
|
16
19
|
export const getEnvironmentConfig = async (logger)=>{
|
|
17
20
|
try {
|
|
18
|
-
const expectedBBPath = BB_BINARY_PATH ? BB_BINARY_PATH : `${path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/', BB_RELEASE_DIR)}/bb`;
|
|
21
|
+
const expectedBBPath = BB_BINARY_PATH ? BB_BINARY_PATH : `${path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../barretenberg/', BB_RELEASE_DIR)}/bb-avm`;
|
|
19
22
|
await fs.access(expectedBBPath, fs.constants.R_OK);
|
|
20
23
|
const tempWorkingDirectory = `${TEMP_DIR}/${randomBytes(4).toString('hex')}`;
|
|
21
24
|
const bbWorkingDirectory = BB_WORKING_DIRECTORY ? BB_WORKING_DIRECTORY : `${tempWorkingDirectory}/bb`;
|
|
@@ -48,7 +51,7 @@ export const getEnvironmentConfig = async (logger)=>{
|
|
|
48
51
|
return undefined;
|
|
49
52
|
}
|
|
50
53
|
};
|
|
51
|
-
export async function
|
|
54
|
+
export async function getSimulator(config, logger) {
|
|
52
55
|
if (config.acvmBinaryPath && config.acvmWorkingDirectory) {
|
|
53
56
|
try {
|
|
54
57
|
await fs.access(config.acvmBinaryPath, fs.constants.R_OK);
|
|
@@ -72,6 +75,31 @@ export const updateExpectedTreesFromTxs = async (db, txs)=>{
|
|
|
72
75
|
await db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, tx.txEffect.publicDataWrites.map((write)=>write.toBuffer()));
|
|
73
76
|
}
|
|
74
77
|
};
|
|
75
|
-
export const makeGlobals = (blockNumber)=>{
|
|
76
|
-
|
|
78
|
+
export const makeGlobals = (blockNumber, slotNumber = blockNumber, overrides = {})=>{
|
|
79
|
+
const checkpointConstants = makeCheckpointConstants(slotNumber, overrides);
|
|
80
|
+
return GlobalVariables.from({
|
|
81
|
+
chainId: checkpointConstants.chainId,
|
|
82
|
+
version: checkpointConstants.version,
|
|
83
|
+
blockNumber,
|
|
84
|
+
slotNumber: new Fr(slotNumber),
|
|
85
|
+
timestamp: BigInt(blockNumber),
|
|
86
|
+
coinbase: checkpointConstants.coinbase,
|
|
87
|
+
feeRecipient: checkpointConstants.feeRecipient,
|
|
88
|
+
gasFees: checkpointConstants.gasFees,
|
|
89
|
+
...overrides
|
|
90
|
+
});
|
|
91
|
+
};
|
|
92
|
+
export const makeCheckpointConstants = (slotNumber, overrides = {})=>{
|
|
93
|
+
return CheckpointConstantData.from({
|
|
94
|
+
chainId: Fr.ZERO,
|
|
95
|
+
version: Fr.ZERO,
|
|
96
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
97
|
+
protocolContractsHash,
|
|
98
|
+
proverId: Fr.ZERO,
|
|
99
|
+
slotNumber: new Fr(slotNumber),
|
|
100
|
+
coinbase: EthAddress.ZERO,
|
|
101
|
+
feeRecipient: AztecAddress.ZERO,
|
|
102
|
+
gasFees: GasFees.empty(),
|
|
103
|
+
...overrides
|
|
104
|
+
});
|
|
77
105
|
};
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import type { BBProverConfig } from '@aztec/bb-prover';
|
|
2
2
|
import { Fr } from '@aztec/foundation/fields';
|
|
3
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
4
|
-
import {
|
|
4
|
+
import type { FieldsOf } from '@aztec/foundation/types';
|
|
5
|
+
import { SimpleContractDataSource } from '@aztec/simulator/public/fixtures';
|
|
5
6
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
6
|
-
import type { L2Block } from '@aztec/stdlib/block';
|
|
7
7
|
import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
|
|
8
|
+
import type { CheckpointConstantData } from '@aztec/stdlib/rollup';
|
|
8
9
|
import { makeBloatedProcessedTx } from '@aztec/stdlib/testing';
|
|
9
|
-
import { type AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
|
|
10
10
|
import { type BlockHeader, type GlobalVariables, type ProcessedTx, type Tx } from '@aztec/stdlib/tx';
|
|
11
11
|
import type { MerkleTreeAdminDatabase } from '@aztec/world-state';
|
|
12
|
+
import type { BlockProvingState } from '../orchestrator/block-proving-state.js';
|
|
12
13
|
import { ProvingOrchestrator } from '../orchestrator/index.js';
|
|
13
14
|
import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
|
|
14
15
|
import { TestBroker } from '../test/mock_prover.js';
|
|
15
16
|
export declare class TestContext {
|
|
16
|
-
publicTxSimulator: PublicTxSimulator;
|
|
17
17
|
worldState: MerkleTreeAdminDatabase;
|
|
18
|
-
|
|
18
|
+
firstCheckpointNumber: Fr;
|
|
19
19
|
globalVariables: GlobalVariables;
|
|
20
20
|
prover: ServerCircuitProver;
|
|
21
21
|
broker: TestBroker;
|
|
@@ -24,32 +24,60 @@ export declare class TestContext {
|
|
|
24
24
|
blockNumber: number;
|
|
25
25
|
feePayer: AztecAddress;
|
|
26
26
|
directoriesToCleanup: string[];
|
|
27
|
-
tester: PublicTxSimulationTester;
|
|
28
27
|
logger: Logger;
|
|
29
28
|
private headers;
|
|
30
29
|
private feePayerBalance;
|
|
31
|
-
constructor(
|
|
30
|
+
constructor(worldState: MerkleTreeAdminDatabase, firstCheckpointNumber: Fr, globalVariables: GlobalVariables, prover: ServerCircuitProver, broker: TestBroker, brokerProverFacade: BrokerCircuitProverFacade, orchestrator: TestProvingOrchestrator, blockNumber: number, feePayer: AztecAddress, initialFeePayerBalance: Fr, directoriesToCleanup: string[], logger: Logger);
|
|
32
31
|
get epochProver(): TestProvingOrchestrator;
|
|
33
|
-
|
|
32
|
+
getCheckpointConstants(checkpointIndex?: number): CheckpointConstantData;
|
|
33
|
+
static new(logger: Logger, { proverCount, createProver, slotNumber, blockNumber, }?: {
|
|
34
|
+
proverCount?: number;
|
|
35
|
+
createProver?: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver>;
|
|
36
|
+
slotNumber?: number;
|
|
37
|
+
blockNumber?: number;
|
|
38
|
+
}): Promise<TestContext>;
|
|
34
39
|
getFork(): Promise<import("@aztec/stdlib/trees").MerkleTreeWriteOperations>;
|
|
35
40
|
getBlockHeader(blockNumber: 0): BlockHeader;
|
|
36
41
|
getBlockHeader(blockNumber: number): BlockHeader | undefined;
|
|
37
42
|
getPreviousBlockHeader(currentBlockNumber?: number): BlockHeader;
|
|
38
43
|
cleanup(): Promise<void>;
|
|
39
44
|
makeProcessedTx(opts?: Parameters<typeof makeBloatedProcessedTx>[0]): Promise<ProcessedTx>;
|
|
40
|
-
makeProcessedTx(seed?: number): Promise<ProcessedTx>;
|
|
41
45
|
/** Creates a block with the given number of txs and adds it to world-state */
|
|
42
|
-
makePendingBlock(numTxs: number,
|
|
43
|
-
|
|
46
|
+
makePendingBlock(numTxs: number, { checkpointIndex, numL1ToL2Messages, blockNumber, makeProcessedTxOpts, }?: {
|
|
47
|
+
checkpointIndex?: number;
|
|
48
|
+
numL1ToL2Messages?: number;
|
|
49
|
+
blockNumber?: number;
|
|
50
|
+
makeProcessedTxOpts?: (index: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>;
|
|
51
|
+
}): Promise<{
|
|
52
|
+
block: import("@aztec/stdlib/block").L2Block;
|
|
44
53
|
txs: ProcessedTx[];
|
|
45
|
-
|
|
54
|
+
l1ToL2Messages: Fr[];
|
|
46
55
|
}>;
|
|
47
|
-
|
|
48
|
-
|
|
56
|
+
makePendingBlocksInCheckpoint(numBlocks: number, { checkpointIndex, numTxsPerBlock, numL1ToL2Messages, firstBlockNumber, makeGlobalVariablesOpts, makeProcessedTxOpts, }?: {
|
|
57
|
+
checkpointIndex?: number;
|
|
58
|
+
numTxsPerBlock?: number | number[];
|
|
59
|
+
numL1ToL2Messages?: number;
|
|
60
|
+
firstBlockNumber?: number;
|
|
61
|
+
makeGlobalVariablesOpts?: (blockNumber: number, checkpointIndex: number) => Partial<FieldsOf<GlobalVariables> & FieldsOf<CheckpointConstantData>>;
|
|
62
|
+
makeProcessedTxOpts?: (blockGlobalVariables: GlobalVariables, txIndex: number) => Partial<Parameters<typeof makeBloatedProcessedTx>[0]>;
|
|
63
|
+
}): Promise<{
|
|
64
|
+
blocks: {
|
|
65
|
+
header: BlockHeader;
|
|
66
|
+
txs: ProcessedTx[];
|
|
67
|
+
}[];
|
|
68
|
+
l1ToL2Messages: Fr[];
|
|
69
|
+
blobFields: Fr[];
|
|
70
|
+
}>;
|
|
71
|
+
processPublicFunctions(txs: Tx[], { maxTransactions, numL1ToL2Messages, contractDataSource, }?: {
|
|
72
|
+
maxTransactions?: number;
|
|
73
|
+
numL1ToL2Messages?: number;
|
|
74
|
+
contractDataSource?: SimpleContractDataSource;
|
|
75
|
+
}): Promise<[ProcessedTx[], import("@aztec/stdlib/tx").FailedTx[], Tx[], import("@aztec/stdlib/tx").NestedProcessReturnValues[]]>;
|
|
76
|
+
private setTreeRoots;
|
|
49
77
|
}
|
|
50
78
|
declare class TestProvingOrchestrator extends ProvingOrchestrator {
|
|
51
79
|
isVerifyBuiltBlockAgainstSyncedStateEnabled: boolean;
|
|
52
|
-
protected verifyBuiltBlockAgainstSyncedState(
|
|
80
|
+
protected verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState): Promise<void>;
|
|
53
81
|
}
|
|
54
82
|
export {};
|
|
55
83
|
//# sourceMappingURL=test_context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
|