Skip to content

fix: mainnet fork redeploys #5573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spypsy merged 3 commits into from
Apr 5, 2024
Merged

fix: mainnet fork redeploys #5573

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f33f52a
fix: mainnet fork redeploys
spypsy Apr 4, 2024
9096472
undo unecessary change
spypsy Apr 4, 2024
9bf3803
custom retry loop
spypsy Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,11 @@ jobs:
deploy_dockerhub cli
deploy_dockerhub aztec-faucet
deploy_dockerhub mainnet-fork
- run:
name: "Deploy mainnet fork"
command: |
should_deploy || exit 0
deploy_terraform_services iac/mainnet-fork
- run:
name: "Release canary to NPM: bb.js"
command: |
Expand Down Expand Up @@ -1212,11 +1217,6 @@ jobs:
command: |
should_release || exit 0
deploy_npm l1-contracts latest
- run:
name: "Deploy mainnet fork"
command: |
should_deploy || exit 0
deploy_terraform_services iac/mainnet-fork mainnet-fork mainnet-fork aws_efs_file_system.aztec_mainnet_fork_data_store
- run:
name: "Deploy L1 contracts to mainnet fork"
working_directory: l1-contracts
Expand Down
7 changes: 6 additions & 1 deletion iac/mainnet-fork/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,17 @@ resource "aws_efs_file_system" "aztec_mainnet_fork_data_store" {
creation_token = "${var.DEPLOY_TAG}-mainnet-fork-data"

tags = {
Name = "${var.DEPLOY_TAG}-mainnet-fork-data"
Name = "${var.DEPLOY_TAG}-mainnet-fork-data"
TaskDefinitionArn = "${aws_ecs_task_definition.aztec_mainnet_fork.arn}" # This line forces recreation on task definition change
}

lifecycle_policy {
transition_to_ia = "AFTER_30_DAYS"
}

lifecycle {
create_before_destroy = true
}
}

resource "aws_efs_mount_target" "aztec_fork_private_az1" {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/scripts/ci_deploy_contracts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ retry docker pull $CLI_IMAGE

# remove 0x prefix from private key
PRIVATE_KEY=${CONTRACT_PUBLISHER_PRIVATE_KEY#0x}
docker run \
retry docker run \

@ludamad ludamad Apr 4, 2024 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This retry probably would not go perfectly well because we're hoping to tee all the input. You'd need either a custom loop or this whole thing to be a script (as the pipe needs to be retried too)

@ludamad ludamad Apr 4, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd probably go custom loop - retry will wait max 30 seconds, this could take more?

@spypsy spypsy Apr 4, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it up a few steps as well, I think it should be fined. updated now!

$CLI_IMAGE \
deploy-l1-contracts -u $ETHEREUM_HOST -p $PRIVATE_KEY | tee ./serve/contract_addresses.json

Expand Down