fix build

AztecProtocol · Dec 10, 2024 · 7b39066 · 7b39066
1 parent 399147f
commit 7b39066
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/proof/mod.nr b/noir-projects/noir-protocol-circuits/crates/types/src/proof/mod.nr
@@ -1,5 +1,6 @@
 pub mod avm_proof;
 pub mod recursive_proof;
+pub mod rollup_recursive_proof;
 pub mod traits;
 pub mod tube_proof;
 pub mod verification_key;

diff --git a/yarn-project/bb-prover/src/bb/execute.ts b/yarn-project/bb-prover/src/bb/execute.ts
@@ -673,7 +673,7 @@ async function verifyProofInternal(
   pathToBB: string,
   proofFullPath: string,
   verificationKeyPath: string,
-  command: 'verify_ultra_honk' | 'verify_ultra_keccak_honk' | 'avm_verify',
+  command: 'verify_ultra_honk' | 'verify_ultra_rollup_honk' | 'verify_ultra_keccak_honk' | 'avm_verify',
   log: LogFn,
 ): Promise<BBFailure | BBSuccess> {
   const binaryPresent = await fs

diff --git a/yarn-project/bb-prover/src/honk.ts b/yarn-project/bb-prover/src/honk.ts
@@ -1,9 +1,9 @@
 import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types';
 
-export type UltraHonkFlavor = 'ultra_honk' | 'ultra_keccak_honk';
+export type UltraHonkFlavor = 'ultra_honk' | 'ultra_keccak_honk' | 'ultra_rollup_honk';
 
 const UltraKeccakHonkCircuits = ['RootRollupArtifact'] as const satisfies ProtocolArtifact[];
-const UltraHonkCircuits = ['BaseParityArtifact', 'RootParityArtifact'] as const satisfies ProtocolArtifact[];
+const UltraHonkCircuits = ['EmptyNestedArtifact', 'PrivateKernelEmptyArtifact', 'BaseParityArtifact', 'RootParityArtifact'] as const satisfies ProtocolArtifact[];
 
 export type UltraKeccakHonkProtocolArtifact = (typeof UltraKeccakHonkCircuits)[number];
 export type UltraHonkProtocolArtifact = (typeof UltraHonkCircuits)[number];
@@ -14,7 +14,9 @@ export function getUltraHonkFlavorForCircuit(artifact: UltraHonkProtocolArtifact
 export function getUltraHonkFlavorForCircuit(artifact: UltraRollupHonkProtocolArtifact): 'ultra_honk';
 export function getUltraHonkFlavorForCircuit(artifact: ProtocolArtifact): UltraHonkFlavor;
 export function getUltraHonkFlavorForCircuit(artifact: ProtocolArtifact): UltraHonkFlavor {
-  return isUltraKeccakHonkCircuit(artifact) ? 'ultra_keccak_honk' : 'ultra_honk';
+  if (isUltraKeccakHonkCircuit(artifact)) return 'ultra_keccak_honk';
+  else if (UltraHonkCircuits.includes(artifact as UltraHonkProtocolArtifact)) return 'ultra_honk';
+  return 'ultra_honk';
 }
 
 function isUltraKeccakHonkCircuit(artifact: ProtocolArtifact): artifact is UltraKeccakHonkProtocolArtifact {