Skip to content
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 173 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from 171 commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
3b3954d
Initial metrics deployment
PhilWindle Jul 24, 2024
c0e609d
Fixes
PhilWindle Jul 24, 2024
0e04caf
Always build
PhilWindle Jul 24, 2024
6d552e9
Moved terraform
PhilWindle Jul 24, 2024
4600367
Fixed spelling
PhilWindle Jul 24, 2024
2f4411d
Attempted fix
PhilWindle Jul 24, 2024
06f527a
Re-instate diff check
PhilWindle Jul 24, 2024
229ebb2
Attempt grafana
PhilWindle Jul 24, 2024
0bbf42a
feat: devnet release (#7593)
alexghr Jul 24, 2024
fd59b19
ci: fix env var
alexghr Jul 24, 2024
3513334
Inject secrets through TF
PhilWindle Jul 24, 2024
7756ab3
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 24, 2024
426313a
TF Fix
PhilWindle Jul 24, 2024
7f05bc3
More fixes
PhilWindle Jul 24, 2024
e9356b8
Fixed grafana TF
PhilWindle Jul 24, 2024
283c866
fix: recreate mount points
alexghr Jul 24, 2024
2dc9763
Otel config
PhilWindle Jul 24, 2024
17f50b6
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 24, 2024
aae287f
Grafana updates
PhilWindle Jul 24, 2024
b0fbb8e
Updated node config
PhilWindle Jul 24, 2024
e97b7ce
Removed USER directive
PhilWindle Jul 24, 2024
af35f36
Don't deploy mainet fork
PhilWindle Jul 24, 2024
988882d
Comment
PhilWindle Jul 24, 2024
0931bd7
DNS fix
PhilWindle Jul 24, 2024
b9345ea
Revert change
PhilWindle Jul 24, 2024
e776f03
Only 1 sequencer
PhilWindle Jul 24, 2024
231a344
fix: correctly serialize contract addresses
alexghr Jul 25, 2024
4b26848
fix: don't destroy mainnet-fork
alexghr Jul 25, 2024
b3ce684
ci: skip rebuilding aztec image
alexghr Jul 25, 2024
0673ff1
ci: add logging
alexghr Jul 25, 2024
7866135
fix: exclude emty lines from build check
alexghr Jul 25, 2024
c278e8a
ci: recreate mountpoints
alexghr Jul 25, 2024
71ec387
ci: recreate efs
alexghr Jul 25, 2024
e5df449
fix: log json correctly
alexghr Jul 25, 2024
1c288d6
Fixes
PhilWindle Jul 25, 2024
15c789a
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 25, 2024
26276a3
fix: skip build if only tf files have changed
alexghr Jul 25, 2024
06fab9d
Fixes
PhilWindle Jul 25, 2024
b1cdb76
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 25, 2024
347489b
chore: enable debug logging in otel
alexghr Jul 25, 2024
d1e8fd2
fix: specify endpoint
alexghr Jul 25, 2024
3ae0b7e
Deploy latest metrics
PhilWindle Jul 25, 2024
5e037eb
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 25, 2024
29f3edb
fix: remove http://
alexghr Jul 25, 2024
163ae48
fix: add otel logging
alexghr Jul 25, 2024
bb99244
fix: only deploy metrics if changed
alexghr Jul 25, 2024
389eb52
Merge remote-tracking branch 'origin/master' into devnet
alexghr Jul 25, 2024
94b1c49
fix: add more logging
alexghr Jul 25, 2024
cc17cbe
Deploy latest images
PhilWindle Jul 25, 2024
7e9a579
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 25, 2024
24d5dee
fix: exit early
alexghr Jul 25, 2024
413049e
Force a rebuild
PhilWindle Jul 25, 2024
0963404
chore: logging
alexghr Jul 25, 2024
44e7c8e
Merge branch 'master' into devnet
PhilWindle Jul 25, 2024
59a721e
Attempt to enable proving
PhilWindle Jul 25, 2024
8041cf6
Fixes
PhilWindle Jul 25, 2024
ff5a1e4
Fixes
PhilWindle Jul 25, 2024
dec7c9a
Merge branch 'master' into devnet
PhilWindle Jul 25, 2024
142e863
fix: faucet deploy
alexghr Jul 26, 2024
4877a24
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 26, 2024
3238e91
TF Fix
PhilWindle Jul 26, 2024
65c3bb8
Fix retagging
PhilWindle Jul 26, 2024
5091deb
Default faucet private key
PhilWindle Jul 26, 2024
c4b4442
Try and fix faucet
PhilWindle Jul 26, 2024
91d3ba8
Forgot previous file
PhilWindle Jul 26, 2024
9f98b45
fix: fund fpc
alexghr Jul 26, 2024
590a6a8
fix: number to string
alexghr Jul 26, 2024
b7e641f
Revert "fix: fund fpc"
alexghr Jul 26, 2024
c3256b9
fix: build aztec-faucet
alexghr Jul 26, 2024
838bbf9
Reapply "fix: fund fpc"
alexghr Jul 26, 2024
52028e1
Bot TF fix
PhilWindle Jul 26, 2024
c9bed7b
Merge branch 'master' into devnet
PhilWindle Jul 26, 2024
e304d64
Use EC2 instances as prover agents
PhilWindle Jul 29, 2024
565a82d
Comment
PhilWindle Jul 29, 2024
54fb8e7
Updated config
PhilWindle Jul 29, 2024
9d80ef6
Updated devnet config
PhilWindle Jul 29, 2024
5004bf1
TF changes
PhilWindle Jul 29, 2024
f5b2156
Merge branch 'master' into devnet
PhilWindle Jul 29, 2024
25f5fda
Merge fix
PhilWindle Jul 29, 2024
34bba71
Use spot instances
PhilWindle Jul 29, 2024
dea4526
Bot TF fix and wait for PXE
PhilWindle Jul 29, 2024
7c2122b
Use efs to store data in node
PhilWindle Jul 29, 2024
a063d51
Alter machine specs
PhilWindle Jul 30, 2024
54ed386
feat: devnet smoke test (#7629)
alexghr Jul 30, 2024
61b1d67
Merge branch 'master' into devnet
PhilWindle Jul 30, 2024
3de6138
Updated configuration
PhilWindle Jul 30, 2024
90c9fb2
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 30, 2024
fb59d8e
Disable bot before deployment
PhilWindle Jul 30, 2024
6371972
Merge branch 'master' into devnet
PhilWindle Jul 30, 2024
979aa17
Add log level to node config
PhilWindle Jul 30, 2024
de4c808
Config updates
PhilWindle Jul 30, 2024
bb7af58
Config change
PhilWindle Jul 31, 2024
07347f8
Another minor config change
PhilWindle Jul 31, 2024
e5d44fe
fix: disable devnet tests in normal ci
alexghr Jul 31, 2024
0bd5a14
Updated bot config
PhilWindle Jul 31, 2024
258cf5e
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 31, 2024
12082f5
chore: Fix the output of network bootstrapping (#7691)
PhilWindle Jul 31, 2024
a6c94ca
feat: devnet metrics (#7687)
alexghr Jul 31, 2024
467693c
Merge branch 'master' into devnet
PhilWindle Jul 31, 2024
f328701
chore: update txe tsconfig
alexghr Jul 31, 2024
9feb488
Build fix
PhilWindle Jul 31, 2024
7bdd3fd
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Jul 31, 2024
434a4fe
Trigger rebuild
PhilWindle Jul 31, 2024
71e2736
fix: serialize empty tube proof
alexghr Jul 31, 2024
26cec69
fix: try/catch
alexghr Jul 31, 2024
eabafa2
feat: Configure bot to run a local PXE (#7700)
PhilWindle Jul 31, 2024
3a86a9d
feat: Don't wait for transaction if configured not to do so. (#7697)
PhilWindle Jul 31, 2024
913b99b
Merge branch 'master' into devnet
spypsy Jul 31, 2024
b3e9a83
fix: serialize new class
alexghr Jul 31, 2024
0a780e5
Upgrade grafana
PhilWindle Jul 31, 2024
2d1432f
Updated deployment file
PhilWindle Aug 1, 2024
d01f22e
More env var work
PhilWindle Aug 1, 2024
0f671b6
Debugging
PhilWindle Aug 1, 2024
809ca7e
More debugging
PhilWindle Aug 1, 2024
6ef8550
Debugging
PhilWindle Aug 1, 2024
12ff3fa
Syntax
PhilWindle Aug 1, 2024
ac8c45b
Fix API_KEY
PhilWindle Aug 1, 2024
0b1f303
Debugging
PhilWindle Aug 1, 2024
e82383b
feat: aztec start --pxe network=devnet (#7705)
spypsy Aug 1, 2024
67eb953
Another attempt
PhilWindle Aug 1, 2024
abcdf42
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Aug 1, 2024
45fafc3
Try again
PhilWindle Aug 1, 2024
907e167
Use Vars
PhilWindle Aug 1, 2024
916ec4c
Try again
PhilWindle Aug 1, 2024
710977e
Another attempt
PhilWindle Aug 1, 2024
7b7d7c5
Debug
PhilWindle Aug 1, 2024
8c3871d
Another attempt
PhilWindle Aug 1, 2024
b634c4f
Fix
PhilWindle Aug 1, 2024
bbf554b
Set TF_VAR_DEPLOY_TAG
PhilWindle Aug 1, 2024
043e315
feat: Scale bots using spot instances (#7716)
PhilWindle Aug 1, 2024
5409f49
chore: More fixes for the transaction bot (#7714)
PhilWindle Aug 1, 2024
a0cfc9b
Merge branch 'master' into devnet
PhilWindle Aug 1, 2024
b1cea64
Bot config updates
PhilWindle Aug 2, 2024
6a800eb
Fixed bot config
PhilWindle Aug 2, 2024
b13c620
Minor bot fix
PhilWindle Aug 2, 2024
2916f88
Deployment config updates
PhilWindle Aug 2, 2024
0e96e09
Check branch name for deployment
PhilWindle Aug 2, 2024
f7f7c5e
feat: more metrics (#7739)
alexghr Aug 2, 2024
0157a39
Re-instate on push
PhilWindle Aug 2, 2024
398921e
Merge branch 'devnet' of github.com:AztecProtocol/aztec-packages into…
PhilWindle Aug 2, 2024
e54cd55
Increase bot tx interval
PhilWindle Aug 2, 2024
3a4a936
Trigger rebuild
PhilWindle Aug 2, 2024
7a82bf1
Updated deployment config
PhilWindle Aug 2, 2024
324ddf1
fix: set network id (#7746)
alexghr Aug 2, 2024
d5f2405
Changed bot config
PhilWindle Aug 2, 2024
9d00b6c
fix: tf encode
alexghr Aug 2, 2024
54a4954
fix: tf encode v2
alexghr Aug 2, 2024
ff0d12a
chore: Cleanup network api key configuration (#7766)
PhilWindle Aug 5, 2024
758a7b0
Another attempt
PhilWindle Aug 5, 2024
d8db1e1
And another
PhilWindle Aug 5, 2024
28eaf3f
Fixed
PhilWindle Aug 5, 2024
7e40dc6
Merge branch 'master' into alphanet
PhilWindle Aug 5, 2024
5385ca0
Merge fixes
PhilWindle Aug 5, 2024
5dd3cb5
Multi-build
PhilWindle Aug 5, 2024
bb95967
Force build
PhilWindle Aug 5, 2024
377503f
Build again
PhilWindle Aug 5, 2024
2b8f496
Force build again
PhilWindle Aug 5, 2024
d6d83e5
Config updates
PhilWindle Aug 5, 2024
d9b10e0
Disable cli wallet
PhilWindle Aug 5, 2024
09c8737
Fix
PhilWindle Aug 5, 2024
48bec66
FIx fork
PhilWindle Aug 5, 2024
e338675
Fix
PhilWindle Aug 5, 2024
711394c
More config
PhilWindle Aug 5, 2024
a8f38c3
More fixes
PhilWindle Aug 5, 2024
2d0c127
More fixes
PhilWindle Aug 5, 2024
8862553
Force first full build
PhilWindle Aug 5, 2024
1bfb2cb
Config updates and build nargo
PhilWindle Aug 6, 2024
8bb0689
Fixed aztec nargo
PhilWindle Aug 6, 2024
82a6c71
Updated bot config
PhilWindle Aug 6, 2024
131796a
Merge branch 'provernet' into pw/merge-to-master
PhilWindle Aug 6, 2024
1c78da4
Merge branch 'master' into pw/merge-to-master
PhilWindle Aug 6, 2024
e2d73d3
Formatting
PhilWindle Aug 6, 2024
7976928
Formatting
PhilWindle Aug 6, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
# (Note ARM uses just 2 tests as a smoketest)
- name: Create list of non-bench end-to-end jobs
id: e2e_list
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep -v '+base' | grep -v '+bench' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep -v '+base' | grep -v '+bench' | grep -v 'devnet' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
- name: Create list of bench end-to-end jobs
id: bench_list
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep '+bench' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
Expand Down
481 changes: 423 additions & 58 deletions .github/workflows/devnet-deploys.yml

Large diffs are not rendered by default.

85 changes: 85 additions & 0 deletions .github/workflows/devnet-smoke.yml
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 }}
6 changes: 6 additions & 0 deletions aztec-nargo/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ run:
ENV PATH "/usr/bin:${PATH}"
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/compile_then_transpile.sh"]
SAVE IMAGE aztecprotocol/aztec-nargo

export-aztec-nargo:
Copy link
Contributor

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?

Copy link
Collaborator Author

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.

FROM +run
ARG DIST_TAG="latest"
ARG ARCH
SAVE IMAGE --push aztecprotocol/aztec-nargo:${DIST_TAG}${ARCH:+-$ARCH}
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
"protobuf",
"protogalaxy",
"proverless",
"PROVERNET",
"proxied",
"proxified",
"proxify",
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ configs:
otlp:
protocols:
http:
endpoint: 0.0.0.0:4318

processors:
batch:
Expand Down
Loading
Loading