post merge fix

Author: ludamad

barretenberg/ts/src/barretenberg/backend.ts

@@ -45,15 +45,15 @@ export type UltraHonkBackendOptions = {
   starknetZK?: boolean;
 };
 
-
 function getProofSettingsFromOptions(
   options?: UltraHonkBackendOptions,
-): { ipaAccumulation: boolean; oracleHashType: string; disableZk: boolean } {
+): { ipaAccumulation: boolean; oracleHashType: string; disableZk: boolean, optimizedSolidityVerifier: boolean } {
   return {
     ipaAccumulation: false,
     oracleHashType: options?.keccak || options?.keccakZK ? 'keccak' : (options?.starknet || options?.starknetZK ? 'starknet' : 'poseidon2'),
     // TODO no current way to target non-zk poseidon2 hash
     disableZk: options?.keccak || options?.starknet ? true : false,
+    optimizedSolidityVerifier: false,
   };
 }
 
@@ -125,18 +125,6 @@ export class UltraHonkBackend {
     }
   }
 
-  private getProofSettingsFromOptions(
-    options?: UltraHonkBackendOptions,
-  ): { ipaAccumulation: boolean; oracleHashType: string; disableZk: boolean, optimizedSolidityVerifier: boolean } {
-    return {
-      ipaAccumulation: false,
-      oracleHashType: options?.keccak || options?.keccakZK ? 'keccak' : (options?.starknet || options?.starknetZK ? 'starknet' : 'poseidon2'),
-      // TODO no current way to target non-zk poseidon2 hash
-      disableZk: options?.keccak || options?.starknet ? true : false,
-      optimizedSolidityVerifier: false,
-    };
-  }
-
   async generateProof(compressedWitness: Uint8Array, options?: UltraHonkBackendOptions): Promise<ProofData> {
     await this.instantiate();