@aztec/prover-client 0.44.0 → 0.45.0

package/dest/mocks/test_context.d.ts

@@ -3,7 +3,7 @@ import { type BlockProver, type ProcessedTx, type ServerCircuitProver, type Tx,
 import { type Gas, GlobalVariables, type Nullifier, type TxContext } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
 import { type DebugLogger } from '@aztec/foundation/log';
-import { type ContractsDataSourcePublicDB, type PublicExecution, type PublicExecutionResult, type PublicExecutor, PublicProcessor, type SimulationProvider, type WorldStatePublicDB } from '@aztec/simulator';
+import { type ContractsDataSourcePublicDB, type PublicExecutionRequest, type PublicExecutionResult, type PublicExecutor, PublicProcessor, type SimulationProvider, type WorldStatePublicDB } from '@aztec/simulator';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 import { type MockProxy } from 'jest-mock-extended';
 import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
@@ -27,6 +27,6 @@ export declare class TestContext {
     static new(logger: DebugLogger, proverCount?: number, createProver?: (bbConfig: BBProverConfig) => Promise<ServerCircuitProver>, blockNumber?: number): Promise<TestContext>;
     cleanup(): Promise<void>;
     processPublicFunctions(txs: Tx[], maxTransactions: number, blockProver?: BlockProver, txValidator?: TxValidator<ProcessedTx>): Promise<[ProcessedTx[], import("@aztec/circuit-types").FailedTx[], import("@aztec/circuit-types").NestedProcessReturnValues[]]>;
-    processPublicFunctionsWithMockExecutorImplementation(txs: Tx[], maxTransactions: number, blockProver?: BlockProver, txValidator?: TxValidator<ProcessedTx>, executorMock?: (execution: PublicExecution, globalVariables: GlobalVariables, availableGas: Gas, txContext: TxContext, pendingNullifiers: Nullifier[], transactionFee?: Fr, sideEffectCounter?: number) => Promise<PublicExecutionResult>): Promise<[ProcessedTx[], import("@aztec/circuit-types").FailedTx[], import("@aztec/circuit-types").NestedProcessReturnValues[]]>;
+    processPublicFunctionsWithMockExecutorImplementation(txs: Tx[], maxTransactions: number, blockProver?: BlockProver, txValidator?: TxValidator<ProcessedTx>, executorMock?: (execution: PublicExecutionRequest, globalVariables: GlobalVariables, availableGas: Gas, txContext: TxContext, pendingNullifiers: Nullifier[], transactionFee?: Fr, sideEffectCounter?: number) => Promise<PublicExecutionResult>): Promise<[ProcessedTx[], import("@aztec/circuit-types").FailedTx[], import("@aztec/circuit-types").NestedProcessReturnValues[]]>;
 }
 //# sourceMappingURL=test_context.d.ts.map

package/dest/mocks/test_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test_context.d.ts","sourceRoot":"","sources":["../../src/mocks/test_context.ts"],"names":[],"mappings":"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"}

package/dest/mocks/test_context.js

@@ -116,4 +116,4 @@ export class TestContext {
         return await this.publicProcessor.process(txs, maxTransactions, blockProver, txValidator);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vY2tzL3Rlc3RfY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBRUwsZUFBZSxFQUNmLE1BQU0sRUFHTix1QkFBdUIsR0FDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUc1QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUlMLDRCQUE0QixFQUU1QixlQUFlLEVBQ2YsZ0NBQWdDLEVBRWhDLGFBQWEsR0FFZCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBNkIsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFNUUsT0FBTyxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEMsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUN2RixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6RixNQUFNLGlCQUFpQjtJQUNyQixZQUFvQixZQUFpQyxFQUFVLG1CQUFtQix1QkFBdUIsRUFBRTtRQUF2RixpQkFBWSxHQUFaLFlBQVksQ0FBcUI7UUFBVSxxQkFBZ0IsR0FBaEIsZ0JBQWdCLENBQTRCO0lBQUcsQ0FBQztJQUMvRyxhQUFhLENBQUMsTUFBYyxFQUFFLGVBQWdDLEVBQUUsY0FBb0I7UUFDbEYs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9jb250ZXh0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vY2tzL3Rlc3RfY29udGV4dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFVQSxPQUFPLEVBRUwsZUFBZSxFQUNmLE1BQU0sRUFHTix1QkFBdUIsR0FDeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUc1QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUlMLDRCQUE0QixFQUU1QixlQUFlLEVBQ2YsZ0NBQWdDLEVBRWhDLGFBQWEsR0FFZCxNQUFNLGtCQUFrQixDQUFDO0FBQzFCLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ25FLE9BQU8sRUFBNkIsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFNUUsT0FBTyxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEMsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUUxRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvREFBb0QsQ0FBQztBQUN2RixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDOUQsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHFCQUFxQixFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6RixNQUFNLGlCQUFpQjtJQUNyQixZQUFvQixZQUFpQyxFQUFVLG1CQUFtQix1QkFBdUIsRUFBRTtRQUF2RixpQkFBWSxHQUFaLFlBQVksQ0FBcUI7UUFBVSxxQkFBZ0IsR0FBaEIsZ0JBQWdCLENBQTRCO0lBQUcsQ0FBQztJQUMvRyxhQUFhLENBQUMsTUFBYyxFQUFFLGVBQWdDLEVBQUUsY0FBb0I7UUFDbEYs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

package/dest/orchestrator/orchestrator.d.ts

@@ -44,7 +44,7 @@ export declare class ProvingOrchestrator {
      */
     addNewTx(tx: ProcessedTx): Promise<void>;
     /**
-     * Marks the block as full and pads it to the full power of 2 block size, no more transactions will be accepted.
+     * Marks the block as full and pads it if required, no more transactions will be accepted.
      */
     setBlockCompleted(): Promise<void>;
     private enqueuePaddingTxs;

package/dest/orchestrator/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EAQjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,WAAW,EAGhB,KAAK,aAAa,EAElB,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAML,EAAE,EACF,KAAK,eAAe,EACpB,KAAK,MAAM,EAeX,KAAK,gBAAgB,EAEtB,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AACvH,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAmB/D;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAmB;IAQ5B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,aAAa,CAAC;IAVxB,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,SAAS,CAA6C;IAE9D,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGrB,EAAE,EAAE,oBAAoB,EACxB,MAAM,EAAE,mBAAmB,EACnC,eAAe,EAAE,eAAe,EACxB,aAAa,CAAC,oBAAQ;IAKhC;;OAEG;IACI,KAAK;IAIZ;;;;;;;OAOG;IAKU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,aAAa,CAAC;IA4EzB;;;OAGG;IAIU,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBrD;;OAEG;IAYU,iBAAiB;IAqC9B,OAAO,CAAC,iBAAiB;IA0CzB;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IAchC;;OAEG;IACI,WAAW;IAQlB;;;OAGG;IAQU,aAAa;IAoE1B;;;;OAIG;YACW,kBAAkB;IAahC,OAAO,CAAC,iBAAiB;IA4BzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YA4DT,uBAAuB;IAyBrC,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,iBAAiB;IA4EzB,OAAO,CAAC,kBAAkB;YAiCZ,iBAAiB;IAmD/B,OAAO,CAAC,wBAAwB;IA6BhC,OAAO,CAAC,wBAAwB;YAmBlB,yBAAyB;IAQvC;;;;;;OAMG;IACH,OAAO,CAAC,6BAA6B;IA0BrC;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IAkDjB,OAAO,CAAC,2BAA2B;IAkBnC;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;CA6D5B"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,WAAW,EAQjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,WAAW,EAGhB,KAAK,aAAa,EAElB,KAAK,mBAAmB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAML,EAAE,EACF,KAAK,eAAe,EACpB,KAAK,MAAM,EAeX,KAAK,gBAAgB,EAEtB,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,MAAM,EAAiC,MAAM,yBAAyB,CAAC;AACvH,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAmB/D;;;;;;;;;GASG;AAEH;;GAEG;AACH,qBAAa,mBAAmB;IAQ5B,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,aAAa,CAAC;IAVxB,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,SAAS,CAA6C;IAE9D,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGrB,EAAE,EAAE,oBAAoB,EACxB,MAAM,EAAE,mBAAmB,EACnC,eAAe,EAAE,eAAe,EACxB,aAAa,CAAC,oBAAQ;IAKhC;;OAEG;IACI,KAAK;IAIZ;;;;;;;OAOG;IAKU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,EAAE,EAAE,EACpB,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,aAAa,CAAC;IA0EzB;;;OAGG;IAIU,QAAQ,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD;;OAEG;IAYU,iBAAiB;IA0C9B,OAAO,CAAC,iBAAiB;IA0CzB;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IAchC;;OAEG;IACI,WAAW;IAQlB;;;OAGG;IAQU,aAAa;IAoE1B;;;;OAIG;YACW,kBAAkB;IAahC,OAAO,CAAC,iBAAiB;IA4BzB;;;;;OAKG;IACH,OAAO,CAAC,eAAe;YA4DT,uBAAuB;IAyBrC,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,iBAAiB;IA4EzB,OAAO,CAAC,kBAAkB;YAiCZ,iBAAiB;IAmD/B,OAAO,CAAC,wBAAwB;IA6BhC,OAAO,CAAC,wBAAwB;YAmBlB,yBAAyB;IAQvC;;;;;;OAMG;IACH,OAAO,CAAC,6BAA6B;IA0BrC;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IAkDjB,OAAO,CAAC,2BAA2B;IAkBnC;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;CA6D5B"}

package/dest/orchestrator/orchestrator.js

@@ -65,10 +65,8 @@ let ProvingOrchestrator = (() => {
                 if (!this.initialHeader) {
                     this.initialHeader = await this.db.buildInitialHeader();
                 }
-                // Check that the length of the array of txs is a power of two
-                // See https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
-                if (!Number.isInteger(numTxs) || numTxs < 2 || (numTxs & (numTxs - 1)) !== 0) {
-                    throw new Error(`Length of txs for the block should be a power of two and at least two (got ${numTxs})`);
+                if (!Number.isInteger(numTxs) || numTxs < 2) {
+                    throw new Error(`Length of txs for the block should be at least two (got ${numTxs})`);
                 }
                 // Cancel any currently proving block before starting a new one
                 this.cancelBlock();
@@ -116,11 +114,15 @@ let ProvingOrchestrator = (() => {
                 }
                 validateTx(tx);
                 logger.info(`Received transaction: ${tx.hash}`);
+                if (tx.isEmpty) {
+                    logger.warn(`Ignoring empty transaction ${tx.hash} - it will not be added to this block`);
+                    return;
+                }
                 const [inputs, treeSnapshots] = await this.prepareTransaction(tx, this.provingState);
                 this.enqueueFirstProof(inputs, treeSnapshots, tx, this.provingState);
             }
             /**
-             * Marks the block as full and pads it to the full power of 2 block size, no more transactions will be accepted.
+             * Marks the block as full and pads it if required, no more transactions will be accepted.
              */
             async setBlockCompleted() {
                 if (!this.provingState) {
@@ -131,8 +133,14 @@ let ProvingOrchestrator = (() => {
                 if (paddingTxCount === 0) {
                     return;
                 }
+                else if (this.provingState.totalNumTxs > 2) {
+                    throw new Error(`Block not ready for completion: expecting ${paddingTxCount} more transactions.`);
+                }
                 logger.debug(`Padding rollup with ${paddingTxCount} empty transactions`);
                 // Make an empty padding transaction
+                // Required for:
+                // 0 (when we want an empty block, largely for testing), or
+                // 1 (we need to pad with one tx as all rollup circuits require a pair of inputs) txs
                 // Insert it into the tree the required number of times to get all of the
                 // base rollup inputs
                 // Then enqueue the proving of all the transactions
@@ -355,13 +363,15 @@ let ProvingOrchestrator = (() => {
             }
             // Stores the intermediate inputs prepared for a merge proof
             storeMergeInputs(provingState, currentLevel, currentIndex, mergeInputs) {
-                const mergeLevel = currentLevel - 1n;
-                const indexWithinMergeLevel = currentIndex >> 1n;
+                const [mergeLevel, indexWithinMergeLevel, indexWithinMerge] = provingState.findMergeLevel(currentLevel, currentIndex);
                 const mergeIndex = 2n ** mergeLevel - 1n + indexWithinMergeLevel;
-                const subscript = Number(mergeIndex);
-                const indexWithinMerge = Number(currentIndex & 1n);
-                const ready = provingState.storeMergeInputs(mergeInputs, indexWithinMerge, subscript);
-                return { ready, indexWithinMergeLevel, mergeLevel, mergeInputData: provingState.getMergeInputs(subscript) };
+                const ready = provingState.storeMergeInputs(mergeInputs, Number(indexWithinMerge), Number(mergeIndex));
+                return {
+                    ready,
+                    indexWithinMergeLevel,
+                    mergeLevel,
+                    mergeInputData: provingState.getMergeInputs(Number(mergeIndex)),
+                };
             }
             // Executes the base rollup circuit and stored the output as intermediate state for the parent merge/root circuit
             // Executes the next level of merge if all inputs are available
@@ -652,4 +662,4 @@ function extractAggregationObject(proof, numPublicInputs) {
     }
     return BufferReader.asReader(buffer).readArray(AGGREGATION_OBJECT_LENGTH, Fr);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../../src/orchestrator/orchestrator.ts"],"names":[],"mappings":"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"}

package/dest/orchestrator/proving-state.d.ts

@@ -36,6 +36,7 @@ export declare class ProvingState {
     private txs;
     constructor(totalNumTxs: number, completionCallback: (result: ProvingResult) => void, rejectionCallback: (reason: string) => void, globalVariables: GlobalVariables, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>, numRootParityInputs: number, messageTreeSnapshot: AppendOnlyTreeSnapshot, messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>, privateKernelVerificationKeys: VerificationKeys);
     get numMergeLevels(): bigint;
+    findMergeLevel(currentLevel: bigint, currentIndex: bigint): bigint[];
     addNewTx(tx: TxProvingState): number;
     get transactionsReceived(): number;
     get finalRootParityInput(): RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH> | undefined;

package/dest/orchestrator/proving-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/proving-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,EAClC,KAAK,EAAE,EACP,KAAK,eAAe,EACpB,KAAK,wCAAwC,EAC7C,KAAK,6BAA6B,EAClC,KAAK,mCAAmC,EACxC,KAAK,KAAK,EACV,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,CAAC,6BAA6B,GAAG,SAAS,EAAE,6BAA6B,GAAG,SAAS,CAAC,CAAC;IAC/F,MAAM,EAAE;QACN,cAAc,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS;QAChE,cAAc,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS;KACjE,CAAC;IACF,gBAAgB,EAAE,CAAC,uBAAuB,GAAG,SAAS,EAAE,uBAAuB,GAAG,SAAS,CAAC,CAAC;CAC9F,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;AAStE;;;;GAIG;AACH,qBAAa,YAAY;aAWL,WAAW,EAAE,MAAM;IACnC,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,iBAAiB;aACT,eAAe,EAAE,eAAe;aAChC,iBAAiB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC;aAExE,mBAAmB,EAAE,sBAAsB;aAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC;aACtF,6BAA6B,EAAE,gBAAgB;IAlBjE,OAAO,CAAC,qBAAqB,CAAiD;IAC9E,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,gBAAgB,CAAyE;IACjG,OAAO,CAAC,qBAAqB,CAAoE;IAC1F,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAC3D,sBAAsB,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;IACzC,UAAU,EAAE,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,OAAO,CAAC,GAAG,CAAwB;gBAEjB,WAAW,EAAE,MAAM,EAC3B,kBAAkB,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,EACnD,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,EACnC,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,mCAAmC,CAAC,EACxF,mBAAmB,EAAE,MAAM,EACX,mBAAmB,EAAE,sBAAsB,EAC3C,0BAA0B,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,wCAAwC,CAAC,EACtF,6BAA6B,EAAE,gBAAgB;IAMjE,IAAW,cAAc,WAExB;IAIM,QAAQ,CAAC,EAAE,EAAE,cAAc;IASlC,IAAW,oBAAoB,WAE9B;IAGD,IAAW,oBAAoB,IAKQ,eAAe,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,CAHvG;IAGD,IAAW,oBAAoB,CAAC,KAAK,EAAE,eAAe,CAAC,OAAO,6BAA6B,CAAC,GAAG,SAAS,EAEvG;IAGD,IAAW,eAAe,wCAEzB;IAGM,WAAW;IAQX,uBAAuB;IAK9B,IAAW,MAAM,qBAEhB;IAED;;;;;;OAMG;IACI,gBAAgB,CACrB,WAAW,EAAE;QACX,6BAA6B;QAC7B,cAAc,CAAC,OAAO,6BAA6B,CAAC;QACpD,uBAAuB;KACxB,EACD,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM;IAsBf,iBAAiB,CAAC,OAAO,EAAE,MAAM;IAKjC,cAAc,CAAC,YAAY,EAAE,MAAM;IAKnC,oBAAoB;IASpB,mBAAmB,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,sBAAsB,CAAC,EAAE,KAAK,EAAE,MAAM;IAKzF,wBAAwB;IAKxB,MAAM;IAMN,MAAM,CAAC,MAAM,EAAE,MAAM;IAUrB,OAAO,CAAC,MAAM,EAAE,aAAa;CAOrC"}
+{"version":3,"file":"proving-state.d.ts","sourceRoot":"","sources":["../../src/orchestrator/proving-state.ts"],"names":[],"mappings":"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"}

package/dest/orchestrator/proving-state.js

@@ -30,6 +30,31 @@ export class ProvingState {
     get numMergeLevels() {
         return BigInt(Math.ceil(Math.log2(this.totalNumTxs)) - 1);
     }
+    // Calculates the index and level of the parent rollup circuit
+    // Based on tree implementation in unbalanced_tree.ts -> batchInsert()
+    findMergeLevel(currentLevel, currentIndex) {
+        const moveUpMergeLevel = (levelSize, index, nodeToShift) => {
+            levelSize /= 2;
+            if (levelSize & 1) {
+                [levelSize, nodeToShift] = nodeToShift ? [levelSize + 1, false] : [levelSize - 1, true];
+            }
+            index >>= 1n;
+            return { thisLevelSize: levelSize, thisIndex: index, shiftUp: nodeToShift };
+        };
+        let [thisLevelSize, shiftUp] = this.totalNumTxs & 1 ? [this.totalNumTxs - 1, true] : [this.totalNumTxs, false];
+        const maxLevel = this.numMergeLevels + 1n;
+        let placeholder = currentIndex;
+        for (let i = 0; i < maxLevel - currentLevel; i++) {
+            ({ thisLevelSize, thisIndex: placeholder, shiftUp } = moveUpMergeLevel(thisLevelSize, placeholder, shiftUp));
+        }
+        let thisIndex = currentIndex;
+        let mergeLevel = currentLevel;
+        while (thisIndex >= thisLevelSize && mergeLevel != 0n) {
+            mergeLevel -= 1n;
+            ({ thisLevelSize, thisIndex, shiftUp } = moveUpMergeLevel(thisLevelSize, thisIndex, shiftUp));
+        }
+        return [mergeLevel - 1n, thisIndex >> 1n, thisIndex & 1n];
+    }
     // Adds a transaction to the proving state, returns it's index
     // Will update the proving life cycle if this is the last transaction
     addNewTx(tx) {
@@ -139,4 +164,4 @@ export class ProvingState {
         this.completionCallback(result);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFnQ0EsSUFBSyx1QkFLSjtBQUxELFdBQUssdUJBQXVCO0lBQzFCLHVHQUFxQixDQUFBO0lBQ3JCLGlHQUFrQixDQUFBO0lBQ2xCLHlHQUFzQixDQUFBO0lBQ3RCLHlHQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFMSSx1QkFBdUIsS0FBdkIsdUJBQXVCLFFBSzNCO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBVXZCLFlBQ2tCLFdBQW1CLEVBQzNCLGtCQUFtRCxFQUNuRCxpQkFBMkMsRUFDbkMsZUFBZ0MsRUFDaEMsaUJBQXdFLEVBQ3hGLG1CQUEyQixFQUNYLG1CQUEyQyxFQUMzQywwQkFBc0YsRUFDdEYsNkJBQStDO1FBUi9DLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQzNCLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBaUM7UUFDbkQsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUEwQjtRQUNuQyxvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUF1RDtRQUV4RSx3QkFBbUIsR0FBbkIsbUJBQW1CLENBQXdCO1FBQzNDLCtCQUEwQixHQUExQiwwQkFBMEIsQ0FBNEQ7UUFDdEYsa0NBQTZCLEdBQTdCLDZCQUE2QixDQUFrQjtRQWxCekQsMEJBQXFCLEdBQUcsdUJBQXVCLENBQUMscUJBQXFCLENBQUM7UUFDdEUsc0JBQWlCLEdBQTJCLEVBQUUsQ0FBQztRQUMvQyxxQkFBZ0IsR0FBc0UsRUFBRSxDQUFDO1FBTXpGLFFBQUcsR0FBcUIsRUFBRSxDQUFDO1FBWWpDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLENBQUMsQ0FBQyxHQUFHLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmluZy1zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vcmNoZXN0cmF0b3IvcHJvdmluZy1zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFnQ0EsSUFBSyx1QkFLSjtBQUxELFdBQUssdUJBQXVCO0lBQzFCLHVHQUFxQixDQUFBO0lBQ3JCLGlHQUFrQixDQUFBO0lBQ2xCLHlHQUFzQixDQUFBO0lBQ3RCLHlHQUFzQixDQUFBO0FBQ3hCLENBQUMsRUFMSSx1QkFBdUIsS0FBdkIsdUJBQXVCLFFBSzNCO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxZQUFZO0lBVXZCLFlBQ2tCLFdBQW1CLEVBQzNCLGtCQUFtRCxFQUNuRCxpQkFBMkMsRUFDbkMsZUFBZ0MsRUFDaEMsaUJBQXdFLEVBQ3hGLG1CQUEyQixFQUNYLG1CQUEyQyxFQUMzQywwQkFBc0YsRUFDdEYsNkJBQStDO1FBUi9DLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQzNCLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBaUM7UUFDbkQsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUEwQjtRQUNuQyxvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7UUFDaEMsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUF1RDtRQUV4RSx3QkFBbUIsR0FBbkIsbUJBQW1CLENBQXdCO1FBQzNDLCtCQUEwQixHQUExQiwwQkFBMEIsQ0FBNEQ7UUFDdEYsa0NBQTZCLEdBQTdCLDZCQUE2QixDQUFrQjtRQWxCekQsMEJBQXFCLEdBQUcsdUJBQXVCLENBQUMscUJBQXFCLENBQUM7UUFDdEUsc0JBQWlCLEdBQTJCLEVBQUUsQ0FBQztRQUMvQyxxQkFBZ0IsR0FBc0UsRUFBRSxDQUFDO1FBTXpGLFFBQUcsR0FBcUIsRUFBRSxDQUFDO1FBWWpDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLENBQUMsQ0FBQyxHQUFHLENB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/prover-client",
-  "version": "0.44.0",
+  "version": "0.45.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -58,15 +58,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.44.0",
-    "@aztec/circuit-types": "0.44.0",
-    "@aztec/circuits.js": "0.44.0",
-    "@aztec/foundation": "0.44.0",
-    "@aztec/kv-store": "0.44.0",
-    "@aztec/noir-protocol-circuits-types": "0.44.0",
-    "@aztec/simulator": "0.44.0",
-    "@aztec/telemetry-client": "0.44.0",
-    "@aztec/world-state": "0.44.0",
+    "@aztec/bb-prover": "0.45.0",
+    "@aztec/circuit-types": "0.45.0",
+    "@aztec/circuits.js": "0.45.0",
+    "@aztec/foundation": "0.45.0",
+    "@aztec/kv-store": "0.45.0",
+    "@aztec/noir-protocol-circuits-types": "0.45.0",
+    "@aztec/simulator": "0.45.0",
+    "@aztec/telemetry-client": "0.45.0",
+    "@aztec/world-state": "0.45.0",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "commander": "^9.0.0",
     "lodash.chunk": "^4.2.0",

package/src/mocks/test_context.ts

@@ -21,7 +21,7 @@ import { type DebugLogger } from '@aztec/foundation/log';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import {
   type ContractsDataSourcePublicDB,
-  type PublicExecution,
+  type PublicExecutionRequest,
   type PublicExecutionResult,
   PublicExecutionResultBuilder,
   type PublicExecutor,
@@ -164,7 +164,7 @@ export class TestContext {
     txValidator?: TxValidator<ProcessedTx>,
   ) {
     const defaultExecutorImplementation = (
-      execution: PublicExecution,
+      execution: PublicExecutionRequest,
       _globalVariables: GlobalVariables,
       availableGas: Gas,
       _txContext: TxContext,
@@ -204,7 +204,7 @@ export class TestContext {
     blockProver?: BlockProver,
     txValidator?: TxValidator<ProcessedTx>,
     executorMock?: (
-      execution: PublicExecution,
+      execution: PublicExecutionRequest,
       globalVariables: GlobalVariables,
       availableGas: Gas,
       txContext: TxContext,

package/src/orchestrator/orchestrator.ts

@@ -135,10 +135,8 @@ export class ProvingOrchestrator {
       this.initialHeader = await this.db.buildInitialHeader();
     }
 
-    // Check that the length of the array of txs is a power of two
-    // See https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
-    if (!Number.isInteger(numTxs) || numTxs < 2 || (numTxs & (numTxs - 1)) !== 0) {
-      throw new Error(`Length of txs for the block should be a power of two and at least two (got ${numTxs})`);
+    if (!Number.isInteger(numTxs) || numTxs < 2) {
+      throw new Error(`Length of txs for the block should be at least two (got ${numTxs})`);
     }
     // Cancel any currently proving block before starting a new one
     this.cancelBlock();
@@ -225,12 +223,17 @@ export class ProvingOrchestrator {
 
     logger.info(`Received transaction: ${tx.hash}`);
 
+    if (tx.isEmpty) {
+      logger.warn(`Ignoring empty transaction ${tx.hash} - it will not be added to this block`);
+      return;
+    }
+
     const [inputs, treeSnapshots] = await this.prepareTransaction(tx, this.provingState);
     this.enqueueFirstProof(inputs, treeSnapshots, tx, this.provingState);
   }
 
   /**
-   * Marks the block as full and pads it to the full power of 2 block size, no more transactions will be accepted.
+   * Marks the block as full and pads it if required, no more transactions will be accepted.
    */
   @trackSpan('ProvingOrchestrator.setBlockCompleted', function () {
     if (!this.provingState) {
@@ -252,10 +255,15 @@ export class ProvingOrchestrator {
     const paddingTxCount = this.provingState.totalNumTxs - this.provingState.transactionsReceived;
     if (paddingTxCount === 0) {
       return;
+    } else if (this.provingState.totalNumTxs > 2) {
+      throw new Error(`Block not ready for completion: expecting ${paddingTxCount} more transactions.`);
     }
 
     logger.debug(`Padding rollup with ${paddingTxCount} empty transactions`);
     // Make an empty padding transaction
+    // Required for:
+    // 0 (when we want an empty block, largely for testing), or
+    // 1 (we need to pad with one tx as all rollup circuits require a pair of inputs) txs
     // Insert it into the tree the required number of times to get all of the
     // base rollup inputs
     // Then enqueue the proving of all the transactions
@@ -579,13 +587,18 @@ export class ProvingOrchestrator {
       VerificationKeyAsFields,
     ],
   ) {
-    const mergeLevel = currentLevel - 1n;
-    const indexWithinMergeLevel = currentIndex >> 1n;
+    const [mergeLevel, indexWithinMergeLevel, indexWithinMerge] = provingState.findMergeLevel(
+      currentLevel,
+      currentIndex,
+    );
     const mergeIndex = 2n ** mergeLevel - 1n + indexWithinMergeLevel;
-    const subscript = Number(mergeIndex);
-    const indexWithinMerge = Number(currentIndex & 1n);
-    const ready = provingState.storeMergeInputs(mergeInputs, indexWithinMerge, subscript);
-    return { ready, indexWithinMergeLevel, mergeLevel, mergeInputData: provingState.getMergeInputs(subscript) };
+    const ready = provingState.storeMergeInputs(mergeInputs, Number(indexWithinMerge), Number(mergeIndex));
+    return {
+      ready,
+      indexWithinMergeLevel,
+      mergeLevel,
+      mergeInputData: provingState.getMergeInputs(Number(mergeIndex)),
+    };
   }
 
   // Executes the base rollup circuit and stored the output as intermediate state for the parent merge/root circuit

package/src/orchestrator/proving-state.ts

@@ -71,6 +71,32 @@ export class ProvingState {
     return BigInt(Math.ceil(Math.log2(this.totalNumTxs)) - 1);
   }
 
+  // Calculates the index and level of the parent rollup circuit
+  // Based on tree implementation in unbalanced_tree.ts -> batchInsert()
+  public findMergeLevel(currentLevel: bigint, currentIndex: bigint) {
+    const moveUpMergeLevel = (levelSize: number, index: bigint, nodeToShift: boolean) => {
+      levelSize /= 2;
+      if (levelSize & 1) {
+        [levelSize, nodeToShift] = nodeToShift ? [levelSize + 1, false] : [levelSize - 1, true];
+      }
+      index >>= 1n;
+      return { thisLevelSize: levelSize, thisIndex: index, shiftUp: nodeToShift };
+    };
+    let [thisLevelSize, shiftUp] = this.totalNumTxs & 1 ? [this.totalNumTxs - 1, true] : [this.totalNumTxs, false];
+    const maxLevel = this.numMergeLevels + 1n;
+    let placeholder = currentIndex;
+    for (let i = 0; i < maxLevel - currentLevel; i++) {
+      ({ thisLevelSize, thisIndex: placeholder, shiftUp } = moveUpMergeLevel(thisLevelSize, placeholder, shiftUp));
+    }
+    let thisIndex = currentIndex;
+    let mergeLevel = currentLevel;
+    while (thisIndex >= thisLevelSize && mergeLevel != 0n) {
+      mergeLevel -= 1n;
+      ({ thisLevelSize, thisIndex, shiftUp } = moveUpMergeLevel(thisLevelSize, thisIndex, shiftUp));
+    }
+    return [mergeLevel - 1n, thisIndex >> 1n, thisIndex & 1n];
+  }
+
   // Adds a transaction to the proving state, returns it's index
   // Will update the proving life cycle if this is the last transaction
   public addNewTx(tx: TxProvingState) {