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.

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

4.1 turbo pickles and recent unmerged branches #6803

Merged
merged 100 commits into from
Nov 24, 2020
Merged

4.1 turbo pickles and recent unmerged branches #6803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
f2bcaf1
Updating submodule coda-automation to branch master
lk86 Nov 12, 2020
ad5c17e
Merge remote-tracking branch 'origin/feature/log-proof-batch-sizes-an…
lk86 Nov 12, 2020
4dba556
Merge remote-tracking branch 'origin/feature/log-proof-batch-sizes-an…
lk86 Nov 12, 2020
90bd205
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 12, 2020
dcc30e9
Updating submodule coda-automation to branch master
lk86 Nov 13, 2020
ad2abe7
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 13, 2020
f1ccf53
Merge remote-tracking branch 'origin/feature/remove-rust-caml-vector'…
lk86 Nov 13, 2020
73238d3
Merge remote-tracking branch 'origin/feature/refusing-to-rebroadcast-…
lk86 Nov 13, 2020
7701183
Merge remote-tracking branch 'origin/fix/logrotate-increase-logs' int…
lk86 Nov 13, 2020
5da2161
Merge remote-tracking branch 'origin/fix/sync-status-hack' into 4.1-t…
lk86 Nov 13, 2020
9c7c0ac
4.1-turbo-pickles Restore the log message to fix build
lk86 Nov 13, 2020
0c20350
Merge remote-tracking branch 'origin/feature/genesis-ledger-helper-lo…
lk86 Nov 13, 2020
e9641b0
Merge remote-tracking branch 'origin/feature/remove-rust-caml-vector'…
lk86 Nov 13, 2020
550ea82
4.1-turbo-pickles Fix conflicts
lk86 Nov 13, 2020
f47aadb
Revert "fix typo"
lk86 Nov 13, 2020
4a5124a
4.1-turbo-pickles Fix conflicts
lk86 Nov 13, 2020
4c45cd0
Merge remote-tracking branch 'origin/feature/user-error-kind' into 4.…
lk86 Nov 13, 2020
df7d6f4
Merge remote-tracking branch 'origin/feature/user-error-kind' into 4.…
lk86 Nov 13, 2020
f4f95b9
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 13, 2020
c424abb
Merge remote-tracking branch 'origin/fix/sync-status-hack' into 4.1-t…
lk86 Nov 13, 2020
8fcda9c
Merge remote-tracking branch 'origin/fix/rpc-error-log' into 4.1-turb…
lk86 Nov 14, 2020
38dba2f
Merge remote-tracking branch 'origin/feature/user-error-kind' into 4.…
lk86 Nov 14, 2020
dff2a05
Merge remote-tracking branch 'origin/feature/peers-graphql' into 4.1-…
lk86 Nov 14, 2020
45a4d8d
Merge remote-tracking branch 'origin/feature/peers-graphql' into 4.1-…
lk86 Nov 14, 2020
7d9a451
fix/libp2p-disabe-decaying-tags Stop supporting the Decayer interface
lk86 Nov 14, 2020
b9d6a6c
Merge remote-tracking branch 'origin/fix/libp2p-disabe-decaying-tags'…
lk86 Nov 14, 2020
4f82444
temp
psteckler Nov 14, 2020
c881db9
temp
psteckler Nov 14, 2020
0a7b0c0
temp
psteckler Nov 16, 2020
e2a6d96
Add allocation_stress_test tool
mrmr1993 Nov 13, 2020
d2a6dab
Reformat
mrmr1993 Nov 14, 2020
5616bf7
Timed accounts, don't check balance
psteckler Nov 16, 2020
0d76e54
Merge remote-tracking branch 'origin/feature/cli-export-logs' into 4.…
lk86 Nov 16, 2020
3d5f827
Merge remote-tracking branch 'origin/feature/async-proving' into 4.1-…
lk86 Nov 16, 2020
55c181e
Merge remote-tracking branch 'origin/feature/refusing-to-rebroadcast-…
lk86 Nov 16, 2020
b009147
Merge remote-tracking branch 'origin/feature/standalone-verifier' int…
lk86 Nov 16, 2020
46af92a
Revert "Merge remote-tracking branch 'origin/feature/cli-export-logs'…
lk86 Nov 16, 2020
f8fcb5d
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 16, 2020
97e6a77
Merge remote-tracking branch 'origin/feature/remove-caml-vector' into…
lk86 Nov 16, 2020
3db7e20
Merge remote-tracking branch 'origin/feature/cli-export-logs' into 4.…
lk86 Nov 16, 2020
00a9776
4.1-turbo-pickles Merge in sync status fix and fix conflicts
lk86 Nov 16, 2020
00cba2f
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 16, 2020
3cf2198
Merge remote-tracking branch 'origin/feature/stop-double-escaping-log…
lk86 Nov 17, 2020
f89eeea
add local logs export
psteckler Nov 17, 2020
8edcc7e
rm unneeded lib logger
psteckler Nov 17, 2020
64a35eb
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 17, 2020
126c2bd
Merge remote-tracking branch 'origin/feature/graceful-oom-recovery' i…
lk86 Nov 17, 2020
7e40131
Merge remote-tracking branch 'origin/fix/libp2p-log' into 4.1-turbo-p…
lk86 Nov 17, 2020
e36cefd
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 17, 2020
c7afbfe
Merge remote-tracking branch 'origin/feature/pretty-daemon-bootup-fai…
lk86 Nov 18, 2020
9a1c4d7
Merge remote-tracking branch 'origin/feature/pretty-daemon-bootup-fai…
lk86 Nov 18, 2020
623e932
Merge remote-tracking branch 'origin/feature/systemd-user-service' in…
lk86 Nov 18, 2020
ad6e371
Merge remote-tracking branch 'origin/feature/systemd-user-service' in…
lk86 Nov 18, 2020
f4d4b6a
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 18, 2020
f6f2a8a
Merge remote-tracking branch 'origin/feature/pretty-daemon-bootup-fai…
lk86 Nov 18, 2020
5b5d2ff
Merge remote-tracking branch 'origin/feature/zero-knowledge-pickles' …
lk86 Nov 18, 2020
2f36b15
Merge remote-tracking branch 'origin/fix/absorb-combined-inner-produc…
lk86 Nov 18, 2020
75952de
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 18, 2020
d40d810
Updating submodule coda-automation to branch master
lk86 Nov 18, 2020
7c8f47c
Merge remote-tracking branch 'origin/removes-get-initial-peers' into …
lk86 Nov 18, 2020
c207773
4.1-turbo-pickles Remove dupl
lk86 Nov 18, 2020
360f9cf
4.1-turbo-pickles Add closing paren
lk86 Nov 18, 2020
0d301ba
fix build errors
deepthiskumar Nov 18, 2020
74aa169
Merge remote-tracking branch 'origin/feature/async-proving' into 4.1-…
lk86 Nov 18, 2020
56efbce
Updating submodule coda-automation to branch master
lk86 Nov 18, 2020
79f7316
4.1-turbo-pickles bundle config.json
lk86 Nov 18, 2020
757342b
Merge remote-tracking branch 'origin/fix/libp2p-logs-warn' into 4.1-t…
lk86 Nov 18, 2020
586581b
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 20, 2020
4b7028b
Updating submodule coda-automation to branch master
lk86 Nov 20, 2020
9c69810
Merge branch 'develop' into 4.1-turbo-pickles
lk86 Nov 20, 2020
b3b219c
Merge branch 'develop' into 4.1-turbo-pickles
lk86 Nov 21, 2020
9456ad0
kill the libp2p helper periodically
imeckler Nov 20, 2020
bd70b87
change to use env vars MINA_LIBP2P_HELPER_RESTART_INTERVAL_BASE and M…
imeckler Nov 20, 2020
56b8588
put a clamp on the interval delta
imeckler Nov 20, 2020
380820b
properly skip verification
imeckler Nov 21, 2020
05b7be8
check if snarks are referenced before verifying them
imeckler Nov 21, 2020
08f1123
catch error in allocation functor
imeckler Nov 22, 2020
a9fab8b
improve downloading of blocks
imeckler Nov 22, 2020
01af9ca
increase handshake timeout
imeckler Nov 22, 2020
3eeb774
ignore snark work when no frontier is available
imeckler Nov 22, 2020
5c8c932
little fix ups, logs
imeckler Nov 22, 2020
2149ec2
add a try_with to catch any potential exceptions
imeckler Nov 23, 2020
b59e4b6
preserve libp2p key across restarts
imeckler Nov 23, 2020
582dc10
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 23, 2020
b27faf9
Merge pull request #6823 from MinaProtocol/fixes-cherry-pick
lk86 Nov 23, 2020
8c6fe07
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 23, 2020
fb64919
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 23, 2020
620f714
get-initial-peers-again Re-add get initial peers rpc
lk86 Nov 23, 2020
808c257
Merge remote-tracking branch 'origin/get-initial-peers-again' into 4.…
lk86 Nov 23, 2020
0b1bc6d
Merge remote-tracking branch 'origin/feature/pid-in-lockfile' into 4.…
lk86 Nov 23, 2020
281cf4b
Merge remote-tracking branch 'origin/feature/fix-prover-segfault' int…
lk86 Nov 23, 2020
4bb98b3
Merge remote-tracking branch 'origin/feature/pid-in-lockfile' into 4.…
lk86 Nov 23, 2020
8245234
Merge pull request #6827 from MinaProtocol/4.1-turbo-pickles
lk86 Nov 23, 2020
d2c02ff
check last-checked-slot again when staking keys are reset
deepthiskumar Nov 24, 2020
3169e90
Merge branch 'develop' into fix/set-staking-fix
deepthiskumar Nov 24, 2020
cef78bc
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 24, 2020
6dec29c
Merge remote-tracking branch 'origin/fix/set-staking-fix' into 4.1-tu…
lk86 Nov 24, 2020
4995551
Merge remote-tracking branch 'origin/fix/libp2p-helper-fix' into 4.1-…
lk86 Nov 24, 2020
00c29f4
Merge branch 'master' into 4.1-turbo-pickles
lk86 Nov 24, 2020
34518bf
Merge remote-tracking branch 'origin/develop' into 4.1-turbo-pickles
lk86 Nov 24, 2020
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 coda-automation
Open in desktop
Submodule coda-automation updated from 592c8c to 64d683
226 changes: 0 additions & 226 deletions genesis_ledgers/phase_three/annotated_ledger.json
View file
Open in desktop

This file was deleted.

12,098 changes: 12,091 additions & 7 deletions genesis_ledgers/phase_three/config.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading