-
Notifications
You must be signed in to change notification settings - Fork 310
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.
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
chore: Merge back to master #7785
Merged
Merged
Changes from 171 commits
Commits
Show all changes
173 commits
Select commit
Hold shift + click to select a range
3b3954d
Initial metrics deployment
PhilWindle c0e609d
Fixes
PhilWindle 0e04caf
Always build
PhilWindle 6d552e9
Moved terraform
PhilWindle 4600367
Fixed spelling
PhilWindle 2f4411d
Attempted fix
PhilWindle 06f527a
Re-instate diff check
PhilWindle 229ebb2
Attempt grafana
PhilWindle 0bbf42a
feat: devnet release (#7593)
alexghr fd59b19
ci: fix env var
alexghr 3513334
Inject secrets through TF
PhilWindle 7756ab3
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 426313a
TF Fix
PhilWindle 7f05bc3
More fixes
PhilWindle e9356b8
Fixed grafana TF
PhilWindle 283c866
fix: recreate mount points
alexghr 2dc9763
Otel config
PhilWindle 17f50b6
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle aae287f
Grafana updates
PhilWindle b0fbb8e
Updated node config
PhilWindle e97b7ce
Removed USER directive
PhilWindle af35f36
Don't deploy mainet fork
PhilWindle 988882d
Comment
PhilWindle 0931bd7
DNS fix
PhilWindle b9345ea
Revert change
PhilWindle e776f03
Only 1 sequencer
PhilWindle 231a344
fix: correctly serialize contract addresses
alexghr 4b26848
fix: don't destroy mainnet-fork
alexghr b3ce684
ci: skip rebuilding aztec image
alexghr 0673ff1
ci: add logging
alexghr 7866135
fix: exclude emty lines from build check
alexghr c278e8a
ci: recreate mountpoints
alexghr 71ec387
ci: recreate efs
alexghr e5df449
fix: log json correctly
alexghr 1c288d6
Fixes
PhilWindle 15c789a
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 26276a3
fix: skip build if only tf files have changed
alexghr 06fab9d
Fixes
PhilWindle b1cdb76
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 347489b
chore: enable debug logging in otel
alexghr d1e8fd2
fix: specify endpoint
alexghr 3ae0b7e
Deploy latest metrics
PhilWindle 5e037eb
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 29f3edb
fix: remove http://
alexghr 163ae48
fix: add otel logging
alexghr bb99244
fix: only deploy metrics if changed
alexghr 389eb52
Merge remote-tracking branch 'origin/master' into devnet
alexghr 94b1c49
fix: add more logging
alexghr cc17cbe
Deploy latest images
PhilWindle 7e9a579
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 24d5dee
fix: exit early
alexghr 413049e
Force a rebuild
PhilWindle 0963404
chore: logging
alexghr 44e7c8e
Merge branch 'master' into devnet
PhilWindle 59a721e
Attempt to enable proving
PhilWindle 8041cf6
Fixes
PhilWindle ff5a1e4
Fixes
PhilWindle dec7c9a
Merge branch 'master' into devnet
PhilWindle 142e863
fix: faucet deploy
alexghr 4877a24
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 3238e91
TF Fix
PhilWindle 65c3bb8
Fix retagging
PhilWindle 5091deb
Default faucet private key
PhilWindle c4b4442
Try and fix faucet
PhilWindle 91d3ba8
Forgot previous file
PhilWindle 9f98b45
fix: fund fpc
alexghr 590a6a8
fix: number to string
alexghr b7e641f
Revert "fix: fund fpc"
alexghr c3256b9
fix: build aztec-faucet
alexghr 838bbf9
Reapply "fix: fund fpc"
alexghr 52028e1
Bot TF fix
PhilWindle c9bed7b
Merge branch 'master' into devnet
PhilWindle e304d64
Use EC2 instances as prover agents
PhilWindle 565a82d
Comment
PhilWindle 54fb8e7
Updated config
PhilWindle 9d80ef6
Updated devnet config
PhilWindle 5004bf1
TF changes
PhilWindle f5b2156
Merge branch 'master' into devnet
PhilWindle 25f5fda
Merge fix
PhilWindle 34bba71
Use spot instances
PhilWindle dea4526
Bot TF fix and wait for PXE
PhilWindle 7c2122b
Use efs to store data in node
PhilWindle a063d51
Alter machine specs
PhilWindle 54ed386
feat: devnet smoke test (#7629)
alexghr 61b1d67
Merge branch 'master' into devnet
PhilWindle 3de6138
Updated configuration
PhilWindle 90c9fb2
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle fb59d8e
Disable bot before deployment
PhilWindle 6371972
Merge branch 'master' into devnet
PhilWindle 979aa17
Add log level to node config
PhilWindle de4c808
Config updates
PhilWindle bb7af58
Config change
PhilWindle 07347f8
Another minor config change
PhilWindle e5d44fe
fix: disable devnet tests in normal ci
alexghr 0bd5a14
Updated bot config
PhilWindle 258cf5e
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 12082f5
chore: Fix the output of network bootstrapping (#7691)
PhilWindle a6c94ca
feat: devnet metrics (#7687)
alexghr 467693c
Merge branch 'master' into devnet
PhilWindle f328701
chore: update txe tsconfig
alexghr 9feb488
Build fix
PhilWindle 7bdd3fd
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 434a4fe
Trigger rebuild
PhilWindle 71e2736
fix: serialize empty tube proof
alexghr 26cec69
fix: try/catch
alexghr eabafa2
feat: Configure bot to run a local PXE (#7700)
PhilWindle 3a86a9d
feat: Don't wait for transaction if configured not to do so. (#7697)
PhilWindle 913b99b
Merge branch 'master' into devnet
spypsy b3e9a83
fix: serialize new class
alexghr 0a780e5
Upgrade grafana
PhilWindle 2d1432f
Updated deployment file
PhilWindle d01f22e
More env var work
PhilWindle 0f671b6
Debugging
PhilWindle 809ca7e
More debugging
PhilWindle 6ef8550
Debugging
PhilWindle 12ff3fa
Syntax
PhilWindle ac8c45b
Fix API_KEY
PhilWindle 0b1f303
Debugging
PhilWindle e82383b
feat: aztec start --pxe network=devnet (#7705)
spypsy 67eb953
Another attempt
PhilWindle abcdf42
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle 45fafc3
Try again
PhilWindle 907e167
Use Vars
PhilWindle 916ec4c
Try again
PhilWindle 710977e
Another attempt
PhilWindle 7b7d7c5
Debug
PhilWindle 8c3871d
Another attempt
PhilWindle b634c4f
Fix
PhilWindle bbf554b
Set TF_VAR_DEPLOY_TAG
PhilWindle 043e315
feat: Scale bots using spot instances (#7716)
PhilWindle 5409f49
chore: More fixes for the transaction bot (#7714)
PhilWindle a0cfc9b
Merge branch 'master' into devnet
PhilWindle b1cea64
Bot config updates
PhilWindle 6a800eb
Fixed bot config
PhilWindle b13c620
Minor bot fix
PhilWindle 2916f88
Deployment config updates
PhilWindle 0e96e09
Check branch name for deployment
PhilWindle f7f7c5e
feat: more metrics (#7739)
alexghr 0157a39
Re-instate on push
PhilWindle 398921e
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle e54cd55
Increase bot tx interval
PhilWindle 3a4a936
Trigger rebuild
PhilWindle 7a82bf1
Updated deployment config
PhilWindle 324ddf1
fix: set network id (#7746)
alexghr d5f2405
Changed bot config
PhilWindle 9d00b6c
fix: tf encode
alexghr 54a4954
fix: tf encode v2
alexghr ff0d12a
chore: Cleanup network api key configuration (#7766)
PhilWindle 758a7b0
Another attempt
PhilWindle d8db1e1
And another
PhilWindle 28eaf3f
Fixed
PhilWindle 7e40dc6
Merge branch 'master' into alphanet
PhilWindle 5385ca0
Merge fixes
PhilWindle 5dd3cb5
Multi-build
PhilWindle bb95967
Force build
PhilWindle 377503f
Build again
PhilWindle 2b8f496
Force build again
PhilWindle d6d83e5
Config updates
PhilWindle d9b10e0
Disable cli wallet
PhilWindle 09c8737
Fix
PhilWindle 48bec66
FIx fork
PhilWindle e338675
Fix
PhilWindle 711394c
More config
PhilWindle a8f38c3
More fixes
PhilWindle 2d0c127
More fixes
PhilWindle 8862553
Force first full build
PhilWindle 1bfb2cb
Config updates and build nargo
PhilWindle 8bb0689
Fixed aztec nargo
PhilWindle 82a6c71
Updated bot config
PhilWindle 131796a
Merge branch 'provernet' into pw/merge-to-master
PhilWindle 1c78da4
Merge branch 'master' into pw/merge-to-master
PhilWindle e2d73d3
Formatting
PhilWindle 7976928
Formatting
PhilWindle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
name: Run devnet smoke tests | ||
on: | ||
workflow_dispatch: | ||
workflow_run: | ||
workflows: | ||
- Deploy to network | ||
types: | ||
# triggered even if the workflow fails | ||
- completed | ||
|
||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.ref }} | ||
cancel-in-progress: true | ||
|
||
env: | ||
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} | ||
GIT_COMMIT: devnet | ||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
AZTEC_NODE_URL: https://api.aztec.network/devnet/aztec-node-1/{{ secrets.DEVNET_API_KEY }} | ||
FAUCET_URL: https://api.aztec.network/devnet/aztec-faucet/{{ secrets.DEVNET_API_KEY }} | ||
ETHEREUM_HOST: https://devnet-mainnet-fork.aztec.network:8545/${{ secrets.DEVNET_API_KEY }} | ||
|
||
jobs: | ||
setup: | ||
uses: ./.github/workflows/setup-runner.yml | ||
with: | ||
username: ${{ github.event.pull_request.user.login || github.actor }} | ||
runner_type: builder-x86 | ||
secrets: inherit | ||
if: ${{ github.event.workflow_run.conclusion == 'success' }} | ||
|
||
build: | ||
needs: setup | ||
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86 | ||
outputs: | ||
e2e_list: ${{ steps.e2e_list.outputs.list }} | ||
if: ${{ github.event.workflow_run.conclusion == 'success' }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
ref: "${{ env.GIT_COMMIT }}" | ||
|
||
- uses: ./.github/ci-setup-action | ||
with: | ||
concurrency_key: build-test-artifacts-${{ github.actor }} | ||
|
||
- name: "Build E2E Image" | ||
timeout-minutes: 40 | ||
run: | | ||
earthly-ci ./yarn-project+export-e2e-test-images | ||
|
||
- name: Create list of devnet end-to-end jobs | ||
id: e2e_list | ||
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep 'devnet' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT | ||
|
||
e2e: | ||
needs: build | ||
runs-on: ubuntu-20.04 | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
test: ${{ fromJson( needs.build.outputs.e2e_list )}} | ||
if: ${{ github.event.workflow_run.conclusion == 'success' }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: { ref: "${{ env.GIT_COMMIT }}" } | ||
- uses: ./.github/ci-setup-action | ||
- name: Setup and Test | ||
timeout-minutes: 40 | ||
uses: ./.github/ensure-tester-with-images | ||
with: | ||
# big machine since we're doing proving | ||
runner_type: "64core-tester-x86" | ||
builder_type: builder-x86 | ||
# these are copied to the tester and expected by the earthly command below | ||
# if they fail to copy, it will try to build them on the tester and fail | ||
builder_images_to_copy: aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} | ||
# command to produce the images in case they don't exist | ||
builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images | ||
run: | | ||
set -eux | ||
cd ./yarn-project/end-to-end/ | ||
export FORCE_COLOR=1 | ||
../../scripts/earthly-ci -P --no-output +${{ matrix.test }} |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -201,6 +201,7 @@ | |
"protobuf", | ||
"protogalaxy", | ||
"proverless", | ||
"PROVERNET", | ||
"proxied", | ||
"proxified", | ||
"proxify", | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -185,6 +185,7 @@ configs: | |
otlp: | ||
protocols: | ||
http: | ||
endpoint: 0.0.0.0:4318 | ||
|
||
processors: | ||
batch: | ||
|
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahh, does this mean we'll soon be able to push aztec-nargo from Github Actions instead of CircleCI?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be able to yes.