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

Merge berkeley into rampup #14278

Merged
merged 591 commits into from
Oct 10, 2023
Merged
Changes from 1 commit
Commits
Show all changes
591 commits
Select commit Hold shift + click to select a range
67808be
Merge pull request #13885 from MinaProtocol/fix/bootstrap-long-async-…
nholland94 Sep 14, 2023
7d4ec3b
Merge branch 'berkeley' into dkijania/hardfail_on_rosetta_int_tests
dkijania Sep 14, 2023
37058ac
Merge branch 'berkeley' into dkijania/move_it_to_nightly
dkijania Sep 14, 2023
ab85280
Merge branch 'berkeley' into dkijanai/waiting_for_deb_fix
dkijania Sep 14, 2023
f971e96
Merge branch 'berkeley' into dkijania/run_rosetta_on_archive_node_cha…
dkijania Sep 14, 2023
fc81823
Merge branch 'berkeley' into feature/rm-acct-precondition-ctors
psteckler Sep 14, 2023
194f3d0
fix txn hash test
psteckler Sep 14, 2023
a11adfb
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 14, 2023
cca95a4
Merge pull request #14108 from MinaProtocol/dkijania/hardfail_on_rose…
dkijania Sep 14, 2023
321af6d
Merge branch 'berkeley' into dkijania/move_it_to_nightly
dkijania Sep 14, 2023
35b9756
Add debug logs for Mina_lib_tests
psteckler Sep 14, 2023
6453b04
new unit tests for skipping invalid commands
Sep 14, 2023
c1e150d
Merge branch 'berkeley' into feature/rm-acct-precondition-ctors
psteckler Sep 14, 2023
4dfa9c7
mv verifier to test module
psteckler Sep 14, 2023
d53a94e
add finish coverage data upload file
dkijania Sep 15, 2023
52b854e
[mina_graphql] Add networkID query.
Sventimir Aug 30, 2023
baea0c7
[rosetta] Read the network identifier from GraphQL.
Sventimir Aug 30, 2023
bc85792
[rosetta] Read the blockchain name from GraphQL as well.
Sventimir Sep 8, 2023
b855c0a
[rosetta integration test] Adapt tests to handle dynamic network name.
Sventimir Sep 14, 2023
a9d87dc
Merge pull request #14127 from MinaProtocol/dkijania/nightly_tear_dow…
dkijania Sep 15, 2023
df7ea63
Merge branch 'berkeley' into dkijanai/waiting_for_deb_fix
dkijania Sep 15, 2023
5cc485b
Merge branch 'berkeley' into dkijania/run_rosetta_on_archive_node_cha…
dkijania Sep 15, 2023
8d6e28e
Merge pull request #14098 from MinaProtocol/dkijanai/waiting_for_deb_fix
dkijania Sep 16, 2023
e1ce638
Merge branch 'berkeley' into dkijania/run_rosetta_on_archive_node_cha…
dkijania Sep 16, 2023
588927f
Merge branch 'compatible' into fix/block-producer-long-async-cycle
nholland94 Sep 18, 2023
e9703e5
Merge branch 'berkeley' into dkijania/move_it_to_nightly
dkijania Sep 18, 2023
791bf22
Merge branch 'berkeley' into dkijania/add_nix_to_ci
dkijania Sep 18, 2023
4ffff85
Merge pull request #13775 from MinaProtocol/dkijania/run_rosetta_on_a…
dkijania Sep 18, 2023
fed7511
Merge branch 'berkeley' into dkijania/move_it_to_nightly
dkijania Sep 18, 2023
56dfd82
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 18, 2023
c00dc2c
Add Node.should_be_running
mrmr1993 Sep 18, 2023
2948a28
Monitor all tests for offline nodes
mrmr1993 Sep 18, 2023
9ecd6f2
Merge branch 'compatible' into feature/fast-fail-intg-tests-offline_c…
mrmr1993 Sep 18, 2023
16bede3
Merge branch 'berkeley' into feature/mina-lib-tests-logs
psteckler Sep 18, 2023
9a1b20d
Merge branch 'berkeley' into feature/rm-acct-precondition-ctors
psteckler Sep 18, 2023
d4e662f
Revert changes to tests
mrmr1993 Sep 18, 2023
6454430
Cleaner names for block production priority
bkase Sep 18, 2023
217be58
Double backslash
bkase Sep 18, 2023
0809005
Reformat
mrmr1993 Sep 18, 2023
084d731
Merge pull request #14135 from MinaProtocol/cleaner-names-for-int-test
mrmr1993 Sep 18, 2023
058a714
Remove delegation test
mrmr1993 Sep 18, 2023
56b16c7
Move delegation test into payments test
mrmr1993 Sep 18, 2023
e1db594
add unit tests for failed zkapp commands
Sep 18, 2023
052ec52
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 18, 2023
b8b947b
Merge pull request #14124 from MinaProtocol/feature/mina-lib-tests-logs
psteckler Sep 18, 2023
8196364
Merge branch 'berkeley' into feature/rm-acct-precondition-ctors
psteckler Sep 18, 2023
b62dcc7
Merge branch 'berkeley' into dkijania/move_it_to_nightly
dkijania Sep 18, 2023
b3bb2b5
Merge branch 'berkeley' into feature/proof-cache
mrmr1993 Sep 19, 2023
d20ea13
Merge pull request #13748 from MinaProtocol/feature/fast-fail-intg-te…
mrmr1993 Sep 19, 2023
a5ec175
Merge branch 'compatible' into merge-back-to-berkeley-2023-09-19
mrmr1993 Sep 19, 2023
ad5b95c
SnarkyJS annoyances
mrmr1993 Sep 19, 2023
3c8206a
Merge branch 'merge-back-to-berkeley-2023-09-19' into feature/delete-…
mrmr1993 Sep 19, 2023
457ba2d
Remove merge error
mrmr1993 Sep 19, 2023
a49e443
Merge pull request #13937 from MinaProtocol/feature/log-inline-test-r…
mrmr1993 Sep 19, 2023
a1bac08
Merge branch 'berkeley' into feature/proof-cache
mrmr1993 Sep 19, 2023
142acd6
Merge pull request #14145 from MinaProtocol/merge-back-to-berkeley-20…
mrmr1993 Sep 19, 2023
3efda21
Merge pull request #14146 from MinaProtocol/feature/delete-delegation…
mrmr1993 Sep 19, 2023
5467a2c
Merge pull request #14030 from MinaProtocol/feature/proof-cache
mrmr1993 Sep 19, 2023
810322a
Merge branch 'berkeley' into dkijania/move_it_to_nightly
dkijania Sep 19, 2023
f775f4f
Merge branch 'berkeley' into dkijania/add_nix_to_ci
dkijania Sep 19, 2023
661dc1f
Merge branch 'berkeley' into feature/rm-acct-precondition-ctors
psteckler Sep 19, 2023
d322317
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 19, 2023
b7082d2
Merge pull request #12522 from openmina/optimization/check-completed-…
mrmr1993 Sep 19, 2023
43b3dab
Merge branch 'compatible' into fix/block-producer-long-async-cycle
ghost-not-in-the-shell Sep 19, 2023
5460ec2
Merge branch 'berkeley' of github.com:MinaProtocol/mina into readme/u…
Sep 19, 2023
9050a23
Merge branch 'readme/update-linux-part' of github.com:MinaProtocol/mi…
Sep 19, 2023
e01fa7b
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 19, 2023
c217856
Merge branch 'berkeley' into dkijania/move_it_to_nightly
dkijania Sep 19, 2023
121dc2e
tidy things up
Sep 19, 2023
ca58b8c
renaming `keypairs` to `newkeypairs` for readability
Sep 19, 2023
9b708a7
Merge branch 'fix/staged-ledger-test-zkapp-gen' of github.com:MinaPro…
Sep 19, 2023
7d9f0b3
Merge branch 'berkeley' of github.com:MinaProtocol/mina into fix/stag…
Sep 19, 2023
0de226a
add one more txn to the staged_ledger_diff
Sep 19, 2023
166b6ba
clean up a little bit
Sep 19, 2023
fc54b27
fix compilation error
Sep 19, 2023
43a5a48
Merge branch 'berkeley' into test/staged-ledger-nonce-test
ghost-not-in-the-shell Sep 19, 2023
680b265
Merge branch 'berkeley' into dkijania/add_nix_to_ci
dkijania Sep 19, 2023
fd36ec1
Merge pull request #13654 from MinaProtocol/fix/block-producer-long-a…
nholland94 Sep 19, 2023
9a4de48
Let `git merge` determine whether we can merge
mrmr1993 Sep 19, 2023
76502fa
Merge pull request #14156 from MinaProtocol/feature/fix-mergability-c…
mrmr1993 Sep 20, 2023
a5f3540
Fix buildkite diff generation (so that dirtyWhen rules work)
nholland94 Sep 20, 2023
f4420c3
Propagate BUILDKITE_PULL_REQUEST_BASE_BRANCH
nholland94 Sep 20, 2023
d8b0a31
Print out the tag when we treat everything as dirty
nholland94 Sep 20, 2023
961e3a8
Merge remote-tracking branch 'origin/compatible' into fix/ci-generate…
nholland94 Sep 20, 2023
6eb63f1
Revert "Propagate BUILDKITE_PULL_REQUEST_BASE_BRANCH"
nholland94 Sep 20, 2023
a79f1a2
(Oops) Invert incorrect condition
mrmr1993 Sep 20, 2023
dd8fb6c
Hi, it's me, CI
mrmr1993 Sep 20, 2023
eb2e91a
Merge branch 'berkeley' into merging-up
mrmr1993 Sep 20, 2023
6bab9c3
Merge pull request #14161 from MinaProtocol/merging-up
mrmr1993 Sep 20, 2023
cec5eb4
Merge pull request #14160 from MinaProtocol/oops
mrmr1993 Sep 20, 2023
560fa41
Merge pull request #14162 from MinaProtocol/compatible
mrmr1993 Sep 20, 2023
8054179
Merge branch 'compatible' into fix/ci-generate-diff
mrmr1993 Sep 20, 2023
22ac469
Merge pull request #14159 from MinaProtocol/fix/ci-generate-diff
mrmr1993 Sep 20, 2023
21d429e
Merge branch 'berkeley' into merge-back-to-berkeley-2023-09-20
mrmr1993 Sep 20, 2023
f88f044
Only run the fuzzy zkapp test once
nholland94 Sep 20, 2023
d8ccedb
Merge pull request #14164 from MinaProtocol/merge-back-to-berkeley-20…
mrmr1993 Sep 20, 2023
ca88d15
Merge pull request #14165 from MinaProtocol/fix/run-fuzzy-zkapp-test-…
nholland94 Sep 20, 2023
0ce6d1f
Merge branch 'berkeley' into dkijania/move_it_to_nightly
deepthiskumar Sep 20, 2023
e7b31de
Merge branch 'berkeley' into dkijania/add_nix_to_ci
dkijania Sep 20, 2023
f73bd82
Merge pull request #14095 from MinaProtocol/dkijania/move_it_to_nightly
dkijania Sep 20, 2023
6b66fc1
Merge branch 'berkeley' into dkijania/add_nix_to_ci
dkijania Sep 20, 2023
848a83a
removing if statement for running tests on develop and compatible
dkijania Sep 20, 2023
65515e8
fix compilation issues
dkijania Sep 20, 2023
17d7f9d
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 20, 2023
f4be0c3
Merge branch 'berkeley' into readme/update-linux-part
ghost-not-in-the-shell Sep 20, 2023
9624f29
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 20, 2023
4f018a0
reformat
Sep 20, 2023
591c826
Merge branch 'fix/staged-ledger-test-zkapp-gen' of github.com:MinaPro…
Sep 20, 2023
f399c96
Merge branch 'berkeley' into test/staged-ledger-nonce-test
ghost-not-in-the-shell Sep 20, 2023
b7a81cf
Merge pull request #14167 from MinaProtocol/dkijania/port_compatible_…
deepthiskumar Sep 20, 2023
c7d65e0
Merge pull request #13884 from MinaProtocol/dkijania/add_nix_to_ci
deepthiskumar Sep 20, 2023
870a7a1
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 20, 2023
36a383b
Merge branch 'berkeley' into readme/update-linux-part
ghost-not-in-the-shell Sep 20, 2023
370b4b6
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 20, 2023
ace37e2
Batch transactions on persistent frontier writing
georgeee Jul 9, 2023
f6445e6
Address review requests
georgeee Jul 12, 2023
a643fbe
Refactor persistent frontier worker diff optimizations
nholland94 Sep 13, 2023
2ef6534
Fix a bug with snarked ledgers not updated
georgeee Sep 19, 2023
354ab60
Fix a bug with state hashes being unnecessary queried in DB
georgeee Sep 20, 2023
17115b8
CLI command to dump libp2p keys
psteckler Sep 20, 2023
aaa9d6f
Merge pull request #13557 from MinaProtocol/georgeee/batch-persistent…
deepthiskumar Sep 21, 2023
a692741
Merge branch 'berkeley' into feature/dump-libp2p-keypair
psteckler Sep 21, 2023
b423d99
Merge pull request #14169 from MinaProtocol/feature/dump-libp2p-keypair
deepthiskumar Sep 21, 2023
1c3b779
Disable rate limitting for snark works
georgeee Sep 21, 2023
34c5d29
Merge branch 'berkeley' into feature/rm-acct-precondition-ctors
georgeee Sep 21, 2023
2c9528a
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 21, 2023
62ebdc8
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 21, 2023
7856e0c
Merge branch 'berkeley' into readme/update-linux-part
ghost-not-in-the-shell Sep 21, 2023
de03589
Merge pull request #14174 from MinaProtocol/georgeee/disable-snark-wo…
georgeee Sep 21, 2023
66c5f44
Merge branch 'berkeley' into feature/rm-acct-precondition-ctors
georgeee Sep 21, 2023
f107ac0
add comment
psteckler Sep 21, 2023
30036cb
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 21, 2023
a914649
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 21, 2023
32a6423
add cases for invalid blocks
Sep 21, 2023
4666a8b
Merge branch 'test/staged-ledger-nonce-test' of github.com:MinaProtoc…
Sep 21, 2023
b2cec14
Merge branch 'berkeley' of github.com:MinaProtocol/mina into test/sta…
Sep 21, 2023
b787a32
Merge branch 'berkeley' into readme/update-linux-part
ghost-not-in-the-shell Sep 21, 2023
9a93042
fix compilation error
Sep 21, 2023
e13331e
Merge pull request #14117 from MinaProtocol/feature/rm-acct-precondit…
deepthiskumar Sep 21, 2023
eb241e2
Merge branch 'berkeley' into fix/staged-ledger-test-zkapp-gen
ghost-not-in-the-shell Sep 21, 2023
ce27309
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 21, 2023
f876a63
Remove some oversized logs
georgeee Sep 6, 2023
e185fd0
Do not print block in uptime_service.ml logs
georgeee Sep 8, 2023
c9d0cdd
Nit: rename variables after refactor
georgeee Sep 11, 2023
7d1c2e1
log transaction hash in intg tests
deepthiskumar Sep 12, 2023
9324696
show transaction
deepthiskumar Sep 12, 2023
430068d
Address review comments
georgeee Sep 22, 2023
f611438
Merge pull request #14054 from MinaProtocol/georgeee/remove-oversized…
georgeee Sep 22, 2023
806d407
New version linter
psteckler Feb 28, 2023
dacfa0c
feature/new-version-linter Use new mina-type-shapes bucket to handle …
lk86 Jun 8, 2023
bc54bec
added CI part for pushing shapes to gcloud
dkijania Sep 12, 2023
3dc8805
Revert "Auxiliary commit to revert individual files from 4ce1c53c0701…
dkijania Sep 13, 2023
e1e9925
trigger build
dkijania Sep 13, 2023
de1a02b
Revert "Auxiliary commit to revert individual files from 4a62376fd09e…
dkijania Sep 15, 2023
1825063
Revert "Auxiliary commit to revert individual files from 73bb4c8a34fc…
dkijania Sep 15, 2023
08abf72
Merge branch 'berkeley' into sventimir/graphql-network-id
Sventimir Sep 25, 2023
cb8d87c
use Keypair.gen instead Keypair.create
Sep 25, 2023
a52b845
Merge branch 'fix/staged-ledger-test-zkapp-gen' of github.com:MinaPro…
Sep 25, 2023
5588a22
Merge branch 'berkeley' of github.com:MinaProtocol/mina into fix/stag…
Sep 25, 2023
8b3eb4c
Merge branch 'berkeley' into test/staged-ledger-nonce-test
ghost-not-in-the-shell Sep 25, 2023
e94ef0b
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 25, 2023
4c24e6a
Merge pull request #14180 from MinaProtocol/dkijania/port_version_linter
dkijania Sep 25, 2023
05d1188
Remove old version linter
psteckler Sep 25, 2023
b97b0bd
move the fetch
psteckler Sep 25, 2023
f5aabd0
Merge pull request #14058 from MinaProtocol/fix/staged-ledger-test-zk…
ghost-not-in-the-shell Sep 25, 2023
8a9808b
Merge branch 'berkeley' into renaming-previous-slot-to-genesis-slot
ghost-not-in-the-shell Sep 25, 2023
be93a75
Merge pull request #14042 from MinaProtocol/sventimir/graphql-network-id
Sventimir Sep 26, 2023
059cc15
[integration tests] Generalise balance computation in hard fork test.
Sventimir Sep 14, 2023
33d9e51
Just Balance module from Currency
psteckler Sep 25, 2023
399d99b
[integration_tests] Rename the Balance module to Balances.
Sventimir Sep 26, 2023
2e7ba61
Merge pull request #14014 from MinaProtocol/renaming-previous-slot-to…
ghost-not-in-the-shell Sep 26, 2023
98f57d3
Merge branch 'berkeley' into test/staged-ledger-nonce-test
ghost-not-in-the-shell Sep 26, 2023
15a9110
Merge branch 'berkeley' into sventimir/refactor-hf-int-test
psteckler Sep 26, 2023
d4b5574
Merge branch 'berkeley' into feature/rm-old-version-linter
psteckler Sep 26, 2023
26e0cb2
Merge pull request #14203 from MinaProtocol/feature/rm-old-version-li…
deepthiskumar Sep 27, 2023
9656f87
Merge branch 'berkeley' into readme/update-linux-part
ghost-not-in-the-shell Sep 27, 2023
e03fe03
Merge branch 'berkeley' into sventimir/refactor-hf-int-test
deepthiskumar Sep 27, 2023
8bc2eac
New protocol version
psteckler Sep 27, 2023
4354ae8
reformat
psteckler Sep 27, 2023
f911173
call correct function
psteckler Sep 27, 2023
53fbdac
fix wire type equality test
psteckler Sep 27, 2023
0fd6daa
rm obsolete code from test
psteckler Sep 27, 2023
590c694
fix extract_blocks
psteckler Sep 27, 2023
22ed157
renaming changes
QuiteStochastic Sep 27, 2023
cdc59ed
fix bootstrapper
psteckler Sep 28, 2023
78731dd
fix schema
psteckler Sep 28, 2023
ad0cf92
add testworld-2-0
Sep 28, 2023
be9e6b1
respond to pr comments
QuiteStochastic Sep 28, 2023
76e7647
Merge branch 'berkeley' into test/staged-ledger-nonce-test
ghost-not-in-the-shell Sep 28, 2023
321008d
fix protocol version
psteckler Sep 28, 2023
14362f7
printouts use infra_id
QuiteStochastic Sep 28, 2023
c9c975b
infra_id for printouts only, id for map keys
QuiteStochastic Sep 28, 2023
a1ca3df
fix sample blocks; detail in comment
psteckler Sep 28, 2023
2eacdaf
nit
QuiteStochastic Sep 28, 2023
9fe4ad9
Merge pull request #14118 from MinaProtocol/sventimir/refactor-hf-int…
Sventimir Sep 30, 2023
cdcd656
undo changes to snarkyjs
Oct 2, 2023
f132d36
Merge branch 'readme/update-linux-part' of github.com:MinaProtocol/mi…
Oct 2, 2023
426d26c
Merge branch 'berkeley' into readme/update-linux-part
ghost-not-in-the-shell Oct 2, 2023
6da00e4
Merge branch 'berkeley' into feature/new-protocol-version
psteckler Oct 2, 2023
89d67e2
Address PR comments
psteckler Oct 2, 2023
f81c289
Merge pull request #14025 from MinaProtocol/readme/update-linux-part
ghost-not-in-the-shell Oct 2, 2023
4b4fccd
Merge branch 'berkeley' into test/staged-ledger-nonce-test
ghost-not-in-the-shell Oct 2, 2023
cf8b4d9
Merge branch 'berkeley' into feature/new-protocol-version
psteckler Oct 2, 2023
b9f3b47
fix extract_blocks again
psteckler Oct 2, 2023
b646d91
200k ledger for ITN
psteckler Oct 2, 2023
5d48d72
Merge pull request #14227 from MinaProtocol/feature/new-protocol-version
deepthiskumar Oct 2, 2023
4397dad
Documentation for register_event
psteckler Oct 3, 2023
da92b06
Merge branch 'naming_changes' into naming_changes_BERK
QuiteStochastic Oct 3, 2023
b669892
fix conflict
QuiteStochastic Oct 3, 2023
6915b22
Merge pull request #14245 from MinaProtocol/feature/register-event-doc
psteckler Oct 3, 2023
1287e7c
Merge pull request #14243 from MinaProtocol/naming_changes_BERK
mrmr1993 Oct 3, 2023
52c564b
Merge branch 'berkeley' into test/staged-ledger-nonce-test
ghost-not-in-the-shell Oct 3, 2023
eb8f634
Merge pull request #14154 from MinaProtocol/test/staged-ledger-nonce-…
ghost-not-in-the-shell Oct 4, 2023
3161db6
Merge branch 'berkeley' into alert/add-testworld-2-0
ghost-not-in-the-shell Oct 4, 2023
87ba719
Merge pull request #14230 from MinaProtocol/alert/add-testworld-2-0
deepthiskumar Oct 4, 2023
bca873b
Remove unnecessary build of test executive since deb package of it is…
dkijania Oct 4, 2023
95f20b8
remove unnecessary dependency
dkijania Oct 5, 2023
6eed453
added the missing ~
Oct 5, 2023
ddc0188
Merge branch 'berkeley' into feature/berkeley-into-rampup-2023-10-05
psteckler Oct 5, 2023
3aba303
finish up renaming
QuiteStochastic Oct 5, 2023
6466e22
dont use infra_id for keys
QuiteStochastic Oct 5, 2023
0d04119
reformat
QuiteStochastic Oct 5, 2023
e04064c
Merge pull request #14281 from MinaProtocol/more_renaming
QuiteStochastic Oct 5, 2023
685662c
Merge pull request #14275 from MinaProtocol/fix/alerts-filter
deepthiskumar Oct 6, 2023
16104c1
Merge branch 'berkeley' into feature/200k-berkeley-ledger
deepthiskumar Oct 6, 2023
0dc9e3a
rename ledger
psteckler Oct 6, 2023
8a3c9cd
Merge pull request #14242 from MinaProtocol/feature/200k-berkeley-ledger
psteckler Oct 6, 2023
1794451
Merge branch 'berkeley' into dkijania/do_not_build_te_again
dkijania Oct 6, 2023
8c5a144
hardcode number of oversized logs
Oct 6, 2023
d731e7a
Merge pull request #14267 from MinaProtocol/dkijania/do_not_build_te_…
dkijania Oct 6, 2023
995389b
Merge branch 'berkeley' into feature/berkeley-into-rampup-2023-10-05
Oct 6, 2023
5e3581e
Improvements to zkapp generator
georgeee Sep 25, 2023
46f3fd3
Change balance allocated per key
georgeee Sep 18, 2023
dec72b4
Refactor generator
georgeee Sep 20, 2023
f01cc1e
Add unit test for generator
georgeee Sep 21, 2023
319b6a2
Use maxAccountUpdates in generator/orchestrator
georgeee Sep 25, 2023
4fda9f2
Support separate payment/zkapp fee parameters in generator
georgeee Sep 26, 2023
2e870c1
Nits
georgeee Oct 4, 2023
9752e23
Merge pull request #14201 from MinaProtocol/georgeee/zkapp-gen-improv…
deepthiskumar Oct 8, 2023
761176b
Merge branch 'berkeley' into hardcode-num-of-oversized-logs
ghost-not-in-the-shell Oct 9, 2023
0f1918f
Merge pull request #14286 from MinaProtocol/hardcode-num-of-oversized…
georgeee Oct 9, 2023
b19d41f
Update account_subtree_height to 6
georgeee Oct 4, 2023
5217a1d
Merge pull request #14310 from MinaProtocol/georgeee/account-subtree-…
deepthiskumar Oct 10, 2023
6ce889c
Merge remote-tracking branch 'origin/berkeley' into georgeee/add-snar…
deepthiskumar Oct 10, 2023
84d74b5
Merge remote-tracking branch 'origin/berkeley' into georgeee/add-snar…
deepthiskumar Oct 10, 2023
19de438
Merge pull request #13572 from MinaProtocol/georgeee/add-snark-pool-s…
deepthiskumar Oct 10, 2023
a9f4645
Merge branch 'berkeley' into feature/berkeley-into-rampup-2023-10-05
Oct 10, 2023
5ad614e
Raise balances 10x in berkeley ledger
georgeee Oct 10, 2023
57f3e00
Merge pull request #14325 from MinaProtocol/georgeee/berkeley-ledger-10x
deepthiskumar Oct 10, 2023
d2f8012
Merge remote-tracking branch 'origin/berkeley' into feature/berkeley-…
deepthiskumar Oct 10, 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
Prev Previous commit
Next Next commit
Improvements to zkapp generator
1. Use memo and fee range
2. Make max_account_updates configurable
3. Change type string of zkapp in internal logging to
   `zkapp:<num acc upds>:<num proofs>`
4. Reduce checking interval in `wait_until_zkapps_deployed`
georgeee committed Oct 7, 2023
commit 5e3581e708be3b34bea3cf94004c49e3aefa4bbb
33 changes: 19 additions & 14 deletions src/lib/mina_generators/zkapp_command_generators.ml
Original file line number Diff line number Diff line change
@@ -1665,21 +1665,23 @@ let mk_account_update ~pk ~vk : Account_update.Simple.t =
; authorization = Control.(dummy_of_tag Proof)
}

let mk_fee_payer ~pk ~nonce : Account_update.Fee_payer.t =
{ body =
{ public_key = pk
; fee = Currency.Fee.of_mina_string_exn "1.0"
; valid_until = None
; nonce
}
let mk_fee_payer ~fee ~pk ~nonce : Account_update.Fee_payer.t =
{ body = { public_key = pk; fee; valid_until = None; nonce }
; authorization = Signature.dummy
}

let gen_max_cost_zkapp_command_from
let gen_max_cost_zkapp_command_from ?memo ?fee_range
~(fee_payer_keypair : Signature_lib.Keypair.t)
~(account_state_tbl : (Account.t * role) Account_id.Table.t) ~vk
~(genesis_constants : Genesis_constants.t) =
~(genesis_constants : Genesis_constants.t) () =
let open Quickcheck.Generator.Let_syntax in
let%bind memo =
match memo with
| Some memo ->
return @@ Signed_command_memo.create_from_string_exn memo
| None ->
Signed_command_memo.gen
in
let zkapp_accounts =
Account_id.Table.data account_state_tbl
|> List.filter_map ~f:(fun ((a, role) : Account.t * role) ->
@@ -1702,13 +1704,12 @@ let gen_max_cost_zkapp_command_from
|> Quickcheck.Generator.list_with_length
genesis_constants.max_event_elements
in
let%map actions =
let%bind actions =
Snark_params.Tick.Field.gen
|> Quickcheck.Generator.map ~f:(fun x -> [| x |])
|> Quickcheck.Generator.list_with_length
genesis_constants.max_action_elements
in

let account_updates =
{ head with body = { head.body with events; actions } } :: tail
in
@@ -1719,16 +1720,20 @@ let gen_max_cost_zkapp_command_from
let fee_payer_account, _ =
Account_id.Table.find_exn account_state_tbl fee_payer_id
in
let%map fee =
Option.value_map fee_range
~default:(return @@ Currency.Fee.of_mina_string_exn "1.0")
~f:Currency.Fee.(fun (lo, hi) -> gen_incl lo hi)
in
let fee_payer =
mk_fee_payer ~pk:fee_payer_pk ~nonce:fee_payer_account.nonce
mk_fee_payer ~fee ~pk:fee_payer_pk ~nonce:fee_payer_account.nonce
in
Account_id.Table.change account_state_tbl fee_payer_id ~f:(function
| None ->
None
| Some (a, role) ->
Some ({ a with nonce = Account.Nonce.succ a.nonce }, role) ) ;
Zkapp_command.of_simple
{ fee_payer; account_updates; memo = Signed_command_memo.empty }
Zkapp_command.of_simple { fee_payer; account_updates; memo }

let%test_module _ =
( module struct
5 changes: 4 additions & 1 deletion src/lib/mina_generators/zkapp_command_generators.mli
Original file line number Diff line number Diff line change
@@ -97,8 +97,11 @@ val gen_list_of_zkapp_command_from :

(** Generate a zkapp command with max cost *)
val gen_max_cost_zkapp_command_from :
fee_payer_keypair:Signature_lib.Keypair.t
?memo:string
-> ?fee_range:Currency.Fee.t * Currency.Fee.t
-> fee_payer_keypair:Signature_lib.Keypair.t
-> account_state_tbl:(Account.t * role) Account_id.Table.t
-> vk:(Side_loaded_verification_key.t, State_hash.t) With_hash.Stable.V1.t
-> genesis_constants:Genesis_constants.t
-> unit
-> Zkapp_command.t Quickcheck.Generator.t
13 changes: 10 additions & 3 deletions src/lib/mina_graphql/itn_zkapps.ml
Original file line number Diff line number Diff line change
@@ -125,9 +125,10 @@ let rec wait_until_zkapps_deployed ?(deployed = false) ~scheduler_tbl ~mina
"Some deployed zkApp accounts weren't found in the best tip ledger, \
trying again" ;
let%bind () =
(* Checking three times per block window to avoid unnecessary waiting after the block is created *)
Async.after
(Time.Span.of_ms
(Float.of_int constraint_constants.block_window_duration_ms) )
(Float.of_int constraint_constants.block_window_duration_ms /. 3.0) )
in
let ledger =
Utils.get_ledger_and_breadcrumb mina
@@ -223,13 +224,19 @@ let send_zkapps ~fee_payer_array ~constraint_constants ~tm_end ~scheduler_tbl
@@ Quickcheck.Generator.generate
( if zkapp_command_details.max_cost then
Mina_generators.Zkapp_command_generators
.gen_max_cost_zkapp_command_from ~fee_payer_keypair:fee_payer
~account_state_tbl ~vk
.gen_max_cost_zkapp_command_from ~memo
~fee_range:
( zkapp_command_details.min_fee
, zkapp_command_details.max_fee )
~fee_payer_keypair:fee_payer ~account_state_tbl ~vk
~genesis_constants:
(Mina_lib.config mina).precomputed_values.genesis_constants
()
else
Mina_generators.Zkapp_command_generators.gen_zkapp_command_from
~memo
?max_account_updates:
zkapp_command_details.max_account_updates
~no_account_precondition:
zkapp_command_details.no_precondition
~fee_range:
57 changes: 28 additions & 29 deletions src/lib/mina_graphql/mina_graphql.ml
Original file line number Diff line number Diff line change
@@ -1290,36 +1290,35 @@ module Mutations = struct
Public_key.compress public_key )
|> Public_key.Compressed.Hash_set.of_list
in
upon
(Itn_zkapps.wait_until_zkapps_deployed ~scheduler_tbl ~mina
~ledger ~deployment_fee:zkapp_command_details.deployment_fee
~max_cost:zkapp_command_details.max_cost
~init_balance:zkapp_command_details.init_balance
~fee_payer_array ~constraint_constants zkapp_account_keypairs
~logger ~uuid ~stop_signal ~stop_time:tm_end
~memo_prefix:zkapp_command_details.memo_prefix ~wait_span )
(fun result ->
match result with
| None ->
()
| Some ledger ->
let account_state_tbl =
let get_account ids role =
List.map ids ~f:(fun id ->
(id, (Utils.account_of_id id ledger, role)) )
in
Account_id.Table.of_alist_exn
( get_account fee_payer_ids `Fee_payer
@ get_account zkapp_account_ids `Ordinary_participant )
let deploy_zkapps_do () =
Itn_zkapps.wait_until_zkapps_deployed ~scheduler_tbl ~mina ~ledger
~deployment_fee:zkapp_command_details.deployment_fee
~max_cost:zkapp_command_details.max_cost
~init_balance:zkapp_command_details.init_balance
~fee_payer_array ~constraint_constants zkapp_account_keypairs
~logger ~uuid ~stop_signal ~stop_time:tm_end
~memo_prefix:zkapp_command_details.memo_prefix ~wait_span
in
upon (deploy_zkapps_do ()) (function
| None ->
()
| Some ledger ->
let account_state_tbl =
let get_account ids role =
List.map ids ~f:(fun id ->
(id, (Utils.account_of_id id ledger, role)) )
in
let tm_next = Time.add (Time.now ()) wait_span in
don't_wait_for
@@ Itn_zkapps.send_zkapps ~fee_payer_array
~constraint_constants ~scheduler_tbl ~uuid ~keymap
~unused_pks ~stop_signal ~mina ~zkapp_command_details
~wait_span ~logger ~tm_end ~account_state_tbl tm_next
(List.length zkapp_account_keypairs) ) ;

Account_id.Table.of_alist_exn
( get_account fee_payer_ids `Fee_payer
@ get_account zkapp_account_ids `Ordinary_participant )
in
let tm_next = Time.add (Time.now ()) wait_span in
don't_wait_for
@@ Itn_zkapps.send_zkapps ~fee_payer_array
~constraint_constants ~scheduler_tbl ~uuid ~keymap
~unused_pks ~stop_signal ~mina ~zkapp_command_details
~wait_span ~logger ~tm_end ~account_state_tbl tm_next
(List.length zkapp_account_keypairs) ) ;
Ok (Uuid.to_string uuid) )

let stop_scheduled_transactions =
12 changes: 10 additions & 2 deletions src/lib/mina_graphql/types.ml
Original file line number Diff line number Diff line change
@@ -2933,6 +2933,7 @@ module Input = struct
; max_cost : bool
; balance_change_range :
Mina_generators.Zkapp_command_generators.balance_change_range_t
; max_account_updates : int option
}

let arg_typ : ((input, string) result option, input option) arg_typ =
@@ -2943,7 +2944,7 @@ module Input = struct
min_balance_change max_balance_change
min_new_zkapp_balance max_new_zkapp_balance init_balance
min_fee max_fee deployment_fee account_queue_size
max_cost ->
max_cost max_account_updates ->
Result.return
{ fee_payers
; num_zkapps_to_deploy
@@ -2958,6 +2959,7 @@ module Input = struct
; deployment_fee
; account_queue_size
; max_cost
; max_account_updates
; balance_change_range =
{ min_balance_change
; max_balance_change
@@ -2973,7 +2975,7 @@ module Input = struct
t.balance_change_range.min_new_zkapp_balance
t.balance_change_range.max_new_zkapp_balance t.init_balance
t.min_fee t.max_fee t.deployment_fee t.account_queue_size
t.max_cost )
t.max_cost t.max_account_updates )
~fields:
Arg.
[ arg "feePayers"
@@ -3020,6 +3022,12 @@ module Input = struct
~typ:(non_null int)
; arg "maxCost" ~doc:"Generate max cost zkApp command"
~typ:(non_null bool)
; arg "maxAccountUpdates"
~doc:
"Parameter of zkapp generation, each generated zkapp tx \
will have (2*maxAccountUpdates+2) account updates \
(including balancing and fee payer)"
~typ:int
]
end

10 changes: 9 additions & 1 deletion src/lib/transaction/transaction.ml
Original file line number Diff line number Diff line change
@@ -152,6 +152,14 @@ let check_well_formedness ~genesis_constants (t : t) =
Ok ()

let yojson_summary_of_command =
let is_proof upd =
match Account_update.authorization upd with Proof _ -> true | _ -> false
in
let zkapp_type cmd =
let updates = Zkapp_command.account_updates_list cmd in
Printf.sprintf "zkapp:%d:%d" (List.length updates)
(List.count updates ~f:is_proof)
in
let mk_record type_ memo signature =
`List
[ `String type_
@@ -161,7 +169,7 @@ let yojson_summary_of_command =
in
function
| User_command.Zkapp_command cmd ->
mk_record "zkapp" (Zkapp_command.memo cmd)
mk_record (zkapp_type cmd) (Zkapp_command.memo cmd)
( Zkapp_command.fee_payer_account_update cmd
|> Account_update.Fee_payer.authorization )
| Signed_command cmd ->