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

[o1js] Reset feature flags before assertion + tests #14503

Closed
wants to merge 155 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
4d38b5b
Use Proof_cache for Test_zkapp_update tests
mrmr1993 Sep 1, 2023
9f524b3
Merge branch 'feature/proof-cache' into feature/use-proof-cache
mrmr1993 Sep 19, 2023
9feca63
Port app_state test proof-cache to a JSON file
mrmr1993 Sep 19, 2023
4d2cc75
Port delegate test proof-cache to a JSON file
mrmr1993 Sep 19, 2023
f582c3e
Port permissions test proof-cache to a JSON file
mrmr1993 Sep 19, 2023
6a706af
Port token_symbol proof-cache to a JSON file
mrmr1993 Sep 19, 2023
5b70f47
Port verification_key test proof-cache to a JSON file
mrmr1993 Sep 19, 2023
698987c
Port voting_for test proof-cache to a JSON file
mrmr1993 Sep 19, 2023
504ab6f
Port zkapp_uri test proof-cache to a JSON file
mrmr1993 Sep 19, 2023
c7e6ab7
Merge branch 'feature/proof-cache' into feature/use-proof-cache
mrmr1993 Sep 19, 2023
284cced
add alerts for stuck at catchup and bootstrap
Sep 25, 2023
877400a
Introduce PipelineTag and PipelineFilter modules which can help more …
dkijania Sep 26, 2023
e24ebc6
hardcode
dkijania Sep 26, 2023
ff8359b
pipeline
dkijania Sep 26, 2023
21e7ab7
Properly tag jobs
dkijania Sep 26, 2023
2b1f0dd
comp
dkijania Sep 26, 2023
141d6a6
move tag
dkijania Sep 26, 2023
38712a8
Revert "Auxiliary commit to revert individual files from 877400a0a0ed…
dkijania Sep 27, 2023
7c71a0c
format
dkijania Sep 28, 2023
26b4528
add timeout to invalid test
Sep 28, 2023
da74bb2
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Sep 28, 2023
00e4064
add timeout to fuzzy zkapp tests
Sep 28, 2023
d6ba770
Merge branch 'berkeley' into fix/fuzzy-zkapp-tests-timeout
ghost-not-in-the-shell Sep 28, 2023
1477c03
Merge branch 'berkeley' into fix/fuzzy-zkapp-tests-timeout
ghost-not-in-the-shell Oct 2, 2023
a542334
Merge branch 'berkeley' into fix/fuzzy-zkapp-tests-timeout
ghost-not-in-the-shell Oct 2, 2023
051d117
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 2, 2023
c86cbc0
add logs for compute transaction-snark
Oct 2, 2023
bb15088
change log level to info
Oct 3, 2023
005cf5c
Merge branch 'berkeley' into fix/fuzzy-zkapp-tests-timeout
ghost-not-in-the-shell Oct 3, 2023
f87075f
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 3, 2023
9e9e1eb
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 4, 2023
1f452ad
Merge branch 'berkeley' into dkijania/move_te_to_stage_2
dkijania Oct 5, 2023
bb7f744
Merge branch 'berkeley' into fix/fuzzy-zkapp-tests-timeout
ghost-not-in-the-shell Oct 5, 2023
31dd230
Merge branch 'berkeley' into dkijania/move_te_to_stage_2
dkijania Oct 6, 2023
c425cb1
add alltests filter for backward compatibility
dkijania Oct 6, 2023
5d9f27c
Pickles: add runtime table test
dannywillems Oct 9, 2023
c069189
Bump up proof-systems to feature/blinding-for-table_id
dannywillems Oct 9, 2023
f508315
Merge branch 'berkeley' into dkijania/move_te_to_stage_2
dkijania Oct 9, 2023
1f25702
Chunking for public input
mrmr1993 Oct 10, 2023
e4837c8
Merge branch 'feature/more-chunks' into feature/even-more-chunks
mrmr1993 Oct 10, 2023
1e87339
Set the max_poly_size for the constraint system
mrmr1993 Oct 10, 2023
e95103a
Propagate the useful error message from rust
mrmr1993 Oct 10, 2023
9a0d0dc
Remove unnecessary max_poly_size from fq_plonk_index
mrmr1993 Oct 10, 2023
619adbc
Propagate step public input evals to the wrap proof
mrmr1993 Oct 10, 2023
bf2022e
Bump proof-systems for chunking bugfix
mrmr1993 Oct 10, 2023
8f54c63
Add num_chunks argument to Pickles.compile and friends
mrmr1993 Oct 10, 2023
9efd655
Fix merges conflict
dkijania Oct 10, 2023
9a8a8ec
Merge branch 'berkeley' into dkijania/move_te_to_stage_2
dkijania Oct 10, 2023
162a788
Add zk_rows
mrmr1993 Oct 10, 2023
f309ad2
Merge branch 'develop' into feature/even-more-chunks
mrmr1993 Oct 10, 2023
45fc3d8
Merge branch 'feature/even-more-chunks' into feature/and-yet-more-chunks
mrmr1993 Oct 10, 2023
1e77eea
Use an array for public input evals
mrmr1993 Oct 10, 2023
7c7fa9d
Merge branch 'berkeley' into fix/fuzzy-zkapp-tests-timeout
ghost-not-in-the-shell Oct 10, 2023
d15044d
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 10, 2023
d4910ae
Route zk_rows through to constant_term evaluation
mrmr1993 Oct 10, 2023
3d6d2bb
Update proof-systems for a zk_rows variable
mrmr1993 Oct 10, 2023
88118ec
Rename variable to reflect zk_rows
mrmr1993 Oct 10, 2023
da7aab8
Bump proof-systems to appease clippy
mrmr1993 Oct 10, 2023
8343ec0
Rename variables
mrmr1993 Oct 10, 2023
743d077
Merge branch 'berkeley' into dkijania/move_te_to_stage_2
dkijania Oct 10, 2023
aead6fa
Merge pull request #14314 from MinaProtocol/feature/even-more-chunks
dannywillems Oct 11, 2023
0d307f6
Merge branch 'berkeley' into fix/fuzzy-zkapp-tests-timeout
ghost-not-in-the-shell Oct 11, 2023
fd43d8c
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 11, 2023
bac960c
Merge branch 'feat/o1js-add-mina-submodule-support' into feat/o1js-ad…
MartinMinkov Oct 11, 2023
f9c8dcc
Don't timeout if offline or bootstrapping before genesis
Oct 11, 2023
fc856f4
factor common code
Oct 11, 2023
22ddc3f
Fix naming error
mrmr1993 Oct 12, 2023
8ef3c2b
Compute zk_polynomial and vanishes_on_zero_knowledge_and_previous_rows
mrmr1993 Oct 12, 2023
3d7f8f8
Verify chunked step proofs in the wrap circuit
mrmr1993 Oct 12, 2023
9fd18e2
Merge branch 'feature/and-yet-more-chunks' into feature/surely-not-mo…
mrmr1993 Oct 12, 2023
8fb6e3d
Bump proof-systems for clippy annoyances
mrmr1993 Oct 12, 2023
9e50a5f
Merge branch 'develop' into feature/and-yet-more-chunks
mrmr1993 Oct 12, 2023
411687e
Merge branch 'feature/and-yet-more-chunks' into feature/and-yet-more-…
mrmr1993 Oct 12, 2023
085ba5b
Merge branch 'feature/and-yet-more-chunks' into feature/surely-not-mo…
mrmr1993 Oct 12, 2023
3ee519d
Bump proof-systems more; insert grumbling about clippy here
mrmr1993 Oct 12, 2023
b1e6a7f
Add docs for Processor, Load_data
Oct 12, 2023
948358b
Add comment for version linter script
Oct 12, 2023
d905bd9
Merge pull request #14238 from MinaProtocol/feat/o1js-add-mina-submod…
psteckler Oct 12, 2023
38665a4
Fixup Pickles.verify for chunked proofs
mrmr1993 Oct 13, 2023
6e884aa
Fix recursion over chunked proofs
mrmr1993 Oct 14, 2023
66893df
Bump proof-systems
mrmr1993 Oct 14, 2023
3106deb
Add a test for chunking
mrmr1993 Oct 14, 2023
4b2e023
Merge pull request #14317 from MinaProtocol/feature/and-yet-more-chunks
mrmr1993 Oct 16, 2023
732814c
Merge branch 'berkeley' into dkijania/move_te_to_stage_2
dkijania Oct 16, 2023
560dc8e
Update src/app/archive/lib/processor.ml
barriebyron Oct 16, 2023
4703298
Merge pull request #13861 from MinaProtocol/dkijania/move_te_to_stage_2
dkijania Oct 16, 2023
1e10156
Merge branch 'berkeley' into feature/ci-linter-doc
deepthiskumar Oct 16, 2023
a7e3673
Merge pull request #14336 from MinaProtocol/feature/ci-linter-doc
psteckler Oct 16, 2023
5b9dbb3
Merge pull request #14335 from MinaProtocol/feature/archive-processor…
psteckler Oct 16, 2023
93d01ae
Merge branch 'berkeley' into feature/no-offline-bootstrap-timeouts-be…
deepthiskumar Oct 16, 2023
b193f27
Merge pull request #14231 from MinaProtocol/fix/fuzzy-zkapp-tests-tim…
ghost-not-in-the-shell Oct 16, 2023
7f11feb
Merge branch 'berkeley' into feature/no-offline-bootstrap-timeouts-be…
psteckler Oct 16, 2023
520715b
Regenerate o1js bindings for zk_rows
mrmr1993 Oct 17, 2023
6d93f0e
Update test for zk_rows
mrmr1993 Oct 17, 2023
416925d
Update cached vk for new zk_rows
mrmr1993 Oct 17, 2023
86f2b93
Merge branch 'feature/surely-not-more-chunks' into feature/recursive-…
mrmr1993 Oct 17, 2023
780342e
Reformat
mrmr1993 Oct 17, 2023
b4be2ac
Re-update generated vk
mrmr1993 Oct 17, 2023
3887340
Merge branch 'feature/surely-not-more-chunks' into feature/recursive-…
mrmr1993 Oct 17, 2023
ecf32fa
Merge branch 'berkeley' into feature/use-proof-cache
mrmr1993 Oct 17, 2023
14c7581
Add PROOF_CACHE_OUT env var, and reset proof_cache.json files
mrmr1993 Oct 17, 2023
11d5ada
Add an ERROR_ON_PROOF env var to fail when the cache is skipped
mrmr1993 Oct 17, 2023
fa85395
Add README.md with caching info
mrmr1993 Oct 17, 2023
edd120b
Update proof_caches for latest berkeley
mrmr1993 Oct 17, 2023
a1db6b3
Merge branch 'berkeley' into feature/use-proof-cache
mrmr1993 Oct 17, 2023
61afcae
Add proof-cache for fee_payer and zkapp_deploy test
mrmr1993 Oct 17, 2023
837c5bb
Make zkapp_preconditions test deterministic, add proof-cache
mrmr1993 Oct 17, 2023
9986785
Make payments test deterministic, using a quickcheck generator
mrmr1993 Oct 17, 2023
57f53ca
Add proof-cache for zkapp_payments test
mrmr1993 Oct 17, 2023
1c38d90
Complicate code for review nitpick
mrmr1993 Oct 17, 2023
4678fec
Commit link in readme
mrmr1993 Oct 17, 2023
17c65d0
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 17, 2023
fbafea9
Fix CI on non-default base branches
mrmr1993 Oct 17, 2023
93c6ae7
Fix DirtyWhen attribute for snark profiler related changes
dkijania Oct 17, 2023
6540733
fix comma
dkijania Oct 17, 2023
08d678a
Merge pull request #14031 from MinaProtocol/feature/use-proof-cache
mrmr1993 Oct 17, 2023
807e8f5
Merge branch 'berkeley' into feature/no-offline-bootstrap-timeouts-be…
psteckler Oct 17, 2023
a64807a
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 17, 2023
27b35b8
Fix UNIQUE constraint for protocol versions
Oct 17, 2023
2825f09
Merge pull request #14358 from MinaProtocol/feature/use-proof-cache-more
mrmr1993 Oct 17, 2023
94ddfbf
Merge branch 'berkeley' into feature/no-offline-bootstrap-timeouts-be…
psteckler Oct 17, 2023
a7ec519
Merge branch 'berkeley' into fix/protocol-version-unique-constraint
psteckler Oct 17, 2023
2bbce00
Merge pull request #14328 from MinaProtocol/feature/no-offline-bootst…
psteckler Oct 17, 2023
e7c4166
Merge branch 'berkeley' into fix/protocol-version-unique-constraint
psteckler Oct 17, 2023
ebecbcb
Merge branch 'berkeley' into alert/catchup-and-bootstrap-got-stuck
ghost-not-in-the-shell Oct 17, 2023
1b997df
Merge pull request #14363 from MinaProtocol/fix/protocol-version-uniq…
psteckler Oct 18, 2023
5794dc2
Merge pull request #14331 from MinaProtocol/feature/surely-not-more-c…
mrmr1993 Oct 18, 2023
d22db61
Merge branch 'develop' into feature/recursive-chunks-too
mrmr1993 Oct 18, 2023
7d2d394
Merge pull request #14360 from MinaProtocol/fix/unbreak-ci-for-arbitr…
mrmr1993 Oct 18, 2023
149864c
Merge pull request #14204 from MinaProtocol/alert/catchup-and-bootstr…
ghost-not-in-the-shell Oct 18, 2023
30d5d94
Merge branch 'develop' into dannywillems/runtime-table-tests
mrmr1993 Oct 18, 2023
14d4cad
Send txns more frequently in rosetta
mrmr1993 Oct 18, 2023
af1347c
Dirty src/app/rosetta
mrmr1993 Oct 18, 2023
a9ad61d
Increase relative bp stake
mrmr1993 Oct 18, 2023
7df71fd
Add crypto debugging helpers
mrmr1993 Oct 18, 2023
a277153
Absorb the runtime table commitment, when available
mrmr1993 Oct 18, 2023
962234d
Merge pull request #14344 from MinaProtocol/feature/recursive-chunks-too
mrmr1993 Oct 18, 2023
2be922f
Revert "Dirty src/app/rosetta"
mrmr1993 Oct 18, 2023
c16a844
Merge pull request #14376 from MinaProtocol/experiment/rosetta-more-txns
mrmr1993 Oct 18, 2023
6ad0b78
Merge branch 'develop' into merge-back-to-develop-2023-10-18
mrmr1993 Oct 18, 2023
32b0f1c
Add the runtime commitment to the IPA input
mrmr1993 Oct 18, 2023
f6c72b3
Merge pull request #14381 from MinaProtocol/merge-back-to-develop-202…
mrmr1993 Oct 18, 2023
43f1816
Merge pull request #14308 from MinaProtocol/dannywillems/runtime-tabl…
mrmr1993 Oct 18, 2023
878274f
Fix the proof-cache for the latest develop changes
mrmr1993 Oct 19, 2023
f16e20a
Merge pull request #14392 from MinaProtocol/feature/use-proof-cache-d…
mrmr1993 Oct 19, 2023
eef491b
Propagate thread errors from o1trace even if they were raised during …
nholland94 Oct 19, 2023
61b8817
Reraise mina_net2 errors
nholland94 Oct 19, 2023
4c629a1
Merge pull request #14397 from MinaProtocol/fix/itn-mangled-errors
deepthiskumar Oct 20, 2023
4061884
Empty commit to signpost Berkeley 2.0.0rampup6
dkijania Oct 20, 2023
3b186d6
Reset feature flags before assertion
mrmr1993 Oct 19, 2023
a764e51
Merge branch 'fix/wrap-circuit-features' into feature/custom-gate-zka…
mrmr1993 Oct 20, 2023
6b160b1
Move Pickles custom gate circuits to their own library
mrmr1993 Oct 20, 2023
c2d9b3b
Hack around edge-case in proof-systems temporarily
mrmr1993 Oct 20, 2023
8e153c2
Add unit test for zkApps using optional custom gates
mrmr1993 Oct 20, 2023
cc262a7
Move test to zkapps_examples
mrmr1993 Oct 20, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,24 @@ groups:
description: "{{ $value }} blocks have been validated on network {{ $labels.testnet }} in the last hour (according to some node)."
runbook: "https://www.notion.so/minaprotocol/FewBlocksPerHour-47a6356f093242d988b0d9527ce23478"

- alert: StuckInBootstrap
expr: count by (testnet) (increase(Coda_Runtime_process_uptime_ms_total{syncStatus = "BOOTSTRAP"}[2h]) >= 7200000) > 0
for: ${alert_evaluation_duration}
labels:
testnet: "{{ $labels.testnet }}"
severity: critical
annotations:
summary: "One or more {{ $labels.testnet }} nodes are stuck at bootstrap for more than 2 hours"

- alert: StuckInCatchup
expr: count by (testnet) (increase(Coda_Runtime_process_uptime_ms_total{syncStatus = "CATCHUP"}[2h]) >= 7200000) > 0
for: ${alert_evaluation_duration}
labels:
testnet: "{{ $labels.testnet }}"
severity: critical
annotations:
summary: "One or more {{ $labels.testnet }} nodes are stuck at catchup for more than 2 hours"


- name: Warnings
rules:
Expand Down
2 changes: 1 addition & 1 deletion automation/terraform/monitoring/o1-testnet-alerts.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module "o1testnet_alerts" {
alert_timeframe = "1h"
alert_duration = "10m"
pagerduty_alert_filter = "devnet2|mainnet"
berkeley_testnet = "testnet=\"(berkeley|testworld-2-0)\""
berkeley_testnet = "testnet=~\"(berkeley|testworld-2-0)\""
synced_status_filter = "syncStatus=\"SYNCED\""
}

Expand Down
6 changes: 3 additions & 3 deletions buildkite/scripts/rosetta-integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ ROSETTA_CLI_CONFIG_FILES=${ROSETTA_CLI_CONFIG_FILES:="config.json mina.ros"}
ROSETTA_CLI_MAIN_CONFIG_FILE=${ROSETTA_CLI_MAIN_CONFIG_FILE:="config.json"}

# Frequency (in seconds) at which payment operations will be sent
TRANSACTION_FREQUENCY=60
TRANSACTION_FREQUENCY=10

# Fetch zkApps
curl -Ls https://github.com/MinaProtocol/rosetta-integration-test-zkapps/tarball/$ROSETTA_INT_TEST_ZKAPPS_VERSION | tar xz -C /tmp
Expand Down Expand Up @@ -122,8 +122,8 @@ cat <<EOF >"$MINA_CONFIG_FILE"
"ledger": {
"name": "${MINA_NETWORK}",
"accounts": [
{ "pk": "${BLOCK_PRODUCER_PK}", "balance": "1000", "delegate": null, "sk": null },
{ "pk": "${SNARK_PRODUCER_PK}", "balance": "2000", "delegate": "${BLOCK_PRODUCER_PK}", "sk": null }
{ "pk": "${BLOCK_PRODUCER_PK}", "balance": "1000000", "delegate": null, "sk": null },
{ "pk": "${SNARK_PRODUCER_PK}", "balance": "2000000", "delegate": "${BLOCK_PRODUCER_PK}", "sk": null }
]
}
}
Expand Down
10 changes: 2 additions & 8 deletions buildkite/scripts/run-snark-transaction-profiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -y git apt-transport-https ca-certificates tzdata curl python3

case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in
rampup|berkeley|release/2.0.0|develop)
TESTNET_NAME="berkeley"
;;
*)
TESTNET_NAME="mainnet"
esac
TESTNET_NAME="berkeley"

git config --global --add safe.directory /workdir

Expand All @@ -30,4 +24,4 @@ MAX_NUM_UPDATES=4
MIN_NUM_UPDATES=2

echo "--- Run Snark Transaction Profiler with parameters: --zkapps --k ${K} --max-num-updates ${MAX_NUM_UPDATES} --min-num-updates ${MIN_NUM_UPDATES}"
python3 ./scripts/snark_transaction_profiler.py ${K} ${MAX_NUM_UPDATES} ${MIN_NUM_UPDATES}
python3 ./scripts/snark_transaction_profiler.py ${K} ${MAX_NUM_UPDATES} ${MIN_NUM_UPDATES}
6 changes: 5 additions & 1 deletion buildkite/src/Constants/DebianVersions.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ let minimalDirtyWhen = [
S.strictlyStart (S.contains "dockerfiles/stages"),
S.exactly "scripts/rebuild-deb" "sh",
S.exactly "scripts/release-docker" "sh",
S.exactly "buildkite/scripts/build-artifact" "sh"
S.exactly "buildkite/scripts/build-artifact" "sh",
-- Snark profiler dirtyWhen
S.exactly "buildkite/src/Jobs/Test/RunSnarkProfiler" "dhall",
S.exactly "buildkite/scripts/run-snark-transaction-profiler" "sh",
S.exactly "scripts/snark_transaction_profiler" "py"
]

-- The default debian version (Bullseye) is used in all downstream CI jobs
Expand Down
2 changes: 1 addition & 1 deletion buildkite/src/Jobs/Test/FuzzyZkappTest.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ Pipeline.build
mode = PipelineMode.Type.Stable
},
steps = [
buildTestCmd "dev" "src/lib/transaction_snark/test/zkapp_fuzzy/zkapp_fuzzy.exe" 3600 150 Size.Small
buildTestCmd "dev" "src/lib/transaction_snark/test/zkapp_fuzzy/zkapp_fuzzy.exe" 4200 150 Size.Small
]
}
Loading
Loading