chore: fix dirty merge #1574
Merged
chore: fix dirty merge #1574
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rahul-kothari
approved these changes
Aug 15, 2023
codygunton
pushed a commit
that referenced
this pull request
Jan 23, 2024
* 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 <philip.windle@gmail.com> * 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 <spypsy@users.noreply.github.com> * 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 <spypsy@users.noreply.github.com> Co-authored-by: Suyash Bagad <suyash@aztecprotocol.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes dirty merge between #1570 and #1515