Merge pull request #1592 from AztecProtocol/defi-bridge-project

* Initial attempt to have Kebab perform deployments (#1558)

* Initial attempt to have Kebab perform deployments

* Fix e2e tests, don't redeploy if given rollup contract

* Use correct verification key

* Bug fix

* VK fix

* Added curl to Falafel docker image

* WIP

* WIP

* Updated Faucet

* WIP

* Deploy mainnet fork alongside kebab (#1556)

* Deploy mainnet fork alongside kebab

* Added backend block

* Updated kebab TF

Co-authored-by: PhilWindle <[email protected]>

* WIP

* Fixed env var name

* WIP

* Yarn lock files

* Revert explorer and zk-money changes

* Use devnet specific private key

* Additional logging

* Attempt to fix block explorer

* Reverted unnecessary change

* Fix bigint literals and remove hosted sdk e2e test

* Fixes

Co-authored-by: spypsy <[email protected]>

* Fixed command ordering (#1566)

* Fixed scripting (#1567)

* More TF fixes (#1571)

* Force contract redeploy (dev) (#1568)

* force contract redeploy + add port to kebab health check

* undo port specification for healthcheck

* Log the number of drips provided by the faucet (#1518)

* Pw/devnet deployment fixes (#1574)

* Terraform changes to restart Falafel and Faucet on redeployment

* New Devnet chain id

* Fix pkey srs size to (n + 1) while loading a pkey. (#1550)

* Pw/devnet deployment fixes (#1577)

* Terraform changes to restart Falafel and Faucet on redeployment

* New Devnet chain id

* Fixed Falafel Dev Terraform

* Fixed Faucet Dev Terraform (#1578)

* Updated Wasabi Terraform for Dev and Test nets (#1579)

* Fix for Wasabi Uniswap Terraform (#1580)

* update JSON provider request method (#1588)

* update JSON provider request method

* comment clarification

* allow additional methods to go through kebab auth (#1589)

* Allow for setting of Rollup Provider in deployments (#1590)

* Allow for setting of Rollup Provider in deployments

* Force contract redeployment

* Terraform fix

* Pw/testnet deployment (#1591)

* WIP

* WIP

* WIP

* TF updates

* Dev TF fix

Co-authored-by: spypsy <[email protected]>
Co-authored-by: Suyash Bagad <[email protected]>

src/aztec/rollup/proofs/compute_circuit_data.hpp

@@ -86,14 +86,8 @@ circuit_data get_circuit_data(std::string const& name,
             auto pk_stream = std::ifstream(pk_path);
             waffle::proving_key_data pk_data;
             read_mmap(pk_stream, pk_dir, pk_data);
-            if (pk_data.composer_type == 0) {
-                data.proving_key =
-                    std::make_shared<waffle::proving_key>(std::move(pk_data), srs->get_prover_crs(pk_data.n + 1));
-
-            } else {
-                data.proving_key =
-                    std::make_shared<waffle::proving_key>(std::move(pk_data), srs->get_prover_crs(pk_data.n));
-            }
+            data.proving_key =
+                std::make_shared<waffle::proving_key>(std::move(pk_data), srs->get_prover_crs(pk_data.n + 1));
             data.num_gates = pk_data.n;
             info(name, ": Circuit size 2^n: ", data.num_gates);
         } else if (compute) {