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

Fix support for validator key rotation, add end-to-end test #1643

Merged
merged 219 commits into from
Nov 16, 2019
Merged
Show file tree
Hide file tree
Changes from 205 commits
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
02f39db
Most things that don't touch incentives
Sep 19, 2019
0f226c8
Trying to get things to compile
Sep 19, 2019
721b9da
More work
Sep 19, 2019
17a624e
More changes
Sep 19, 2019
6ce7f7e
Compiling
Sep 20, 2019
c19b8b6
Updated validators test
Sep 21, 2019
a6921d3
LockedGold tests passing
Sep 24, 2019
871d06d
Validators tests passing
Sep 24, 2019
e0e8cf7
Fix governance tests
Sep 24, 2019
223536d
Add election test file
Sep 24, 2019
651009d
Election tests passing
Sep 26, 2019
a795125
Fix governance test
Sep 30, 2019
9b4d431
Most e2e governance tests passing
Oct 1, 2019
e866ca7
end to end tests passing
Oct 2, 2019
3a31670
Point to celo-blockchain branch
Oct 2, 2019
3f35c70
Merge master
Oct 2, 2019
c466d78
Add some natspecs
Oct 2, 2019
f02b05a
Linting
Oct 2, 2019
70d7478
Small fix
Oct 2, 2019
69f6ab2
ContractKit building
Oct 3, 2019
15d2e8c
cli builds
Oct 3, 2019
d6ef3ec
Update oclif
Oct 3, 2019
615ec4f
Checkpoint
Oct 3, 2019
1bbf1e0
Merge master
Oct 3, 2019
3ff2fe4
CLI seems to be working
Oct 3, 2019
d3b83c8
cleanup
Oct 3, 2019
2887651
Fix
Oct 3, 2019
2d61f63
Fix
Oct 3, 2019
a427d46
Begin work on validator/group payments
Oct 4, 2019
47a247c
Added test for epoch payment distribution
Oct 4, 2019
767c651
Validator set changing again
Oct 5, 2019
7f82317
Epoch payments and rewards appear to be working
Oct 6, 2019
50d6029
Update membership history upon validator registration
Oct 6, 2019
999bca2
End to end tests passing
Oct 7, 2019
03dc663
Add epoch size precompile, among other things
Oct 8, 2019
055d50f
Merge master
Oct 8, 2019
b491453
Revert "Feature #909 proxy delegatecall (#1152)"
asaj Oct 8, 2019
9cccd70
Merge branch 'revert-1152-feature/909-proxy-delegatecall' into asaj/p…
Oct 8, 2019
96f7a7a
Governance end-to-end tests working again
Oct 8, 2019
e40eaf0
Address comments
Oct 8, 2019
2fd2f9d
Merge master
Oct 9, 2019
adcad0b
Fix linting issues
Oct 9, 2019
53e4977
Make things build, tests pass
Oct 9, 2019
c2ea8e1
Merge branch 'master' into asaj/pos
Oct 9, 2019
ed62a4d
Merge asaj/pos
Oct 9, 2019
a5aa266
Fix unit tests
Oct 9, 2019
115a457
Fix migration
Oct 9, 2019
884773b
Add addFirstMember function
Oct 9, 2019
b2858d0
Rework balance requirements
Oct 10, 2019
0492b15
Fix build issues in contractkit
Oct 10, 2019
c0c1f27
Merge master
Oct 10, 2019
3c8739c
Merge asaj/pos
Oct 10, 2019
264a7f5
Fix
Oct 10, 2019
99d3fcc
Remove registry from governance test
Oct 10, 2019
7d9c5cc
Fix linting issues
Oct 10, 2019
f15e844
Add missing cli doc
Oct 10, 2019
993339c
Governance end-to-end test passing
Oct 10, 2019
44f9a43
Fix migration
Oct 10, 2019
3f5c804
Merge branch 'master' into asaj/pos
Oct 10, 2019
1ca67ac
Merge asaj/pos
Oct 10, 2019
2abdd08
Merge branch 'master' into asaj/pos
Oct 10, 2019
f59ca01
Fix CLI build
Oct 10, 2019
00f8061
Add electabilityThreshold enforcement
Oct 10, 2019
aba8552
Don't pay out epoch payments unless validator and group meet balance …
Oct 10, 2019
16f476c
Don't pay out epoch rewards unless the group meets balance requirements
Oct 10, 2019
3616cc6
Fix migrations
Oct 10, 2019
64016a7
Beef up documentation
Oct 11, 2019
6ffdd36
Merge branch 'master' into asaj/pos
Oct 11, 2019
b494b87
Merge branch 'master' into asaj/pos-2
Oct 11, 2019
67966e0
Merge asaj/pos
Oct 11, 2019
fb5e8b4
Fix linting issues
Oct 11, 2019
449e1ed
Add documentation
Oct 11, 2019
143a69c
Fix interface
Oct 11, 2019
1f18108
Expire previously upvoted proposals
Oct 11, 2019
506a77b
Address comments
Oct 11, 2019
23054fc
Merge branch 'master' into asaj/pos
Oct 11, 2019
0e207d0
Point to asaj/pos-2
Oct 11, 2019
90e8b58
Address comments
Oct 14, 2019
32557cf
Merge master
Oct 14, 2019
610cfe3
Base group locked gold requirement on number of members
Oct 16, 2019
b8e1797
Address comments
Oct 16, 2019
631894a
Merge master
Oct 16, 2019
4a4d6e2
Address comments
Oct 16, 2019
1d36857
Merge branch 'master' into asaj/pos
Oct 16, 2019
f3515ac
Fix tests, linting
Oct 16, 2019
c697213
Merge branch 'master' into asaj/pos
Oct 16, 2019
9aa6ec3
Remove bondeddeposits test
Oct 16, 2019
ed8e5a0
Merge branch 'master' into asaj/pos
Oct 16, 2019
89364ab
Fix test
Oct 16, 2019
98d8feb
Merge branch 'master' into asaj/pos
Oct 16, 2019
d85fc78
Merge asaj/pos
Oct 16, 2019
4faaf75
Merge master
Oct 16, 2019
931ceba
Address comments; remove url and authorizedBy.active, allow for varia…
Oct 18, 2019
92e254e
Fix build
Oct 18, 2019
a288e2b
Merge master
Oct 18, 2019
d9c2cc0
Fix migrations, end-to-end tests
Oct 18, 2019
0b894ac
Fix tests
Oct 18, 2019
44aa9f9
Update CLI docs
Oct 18, 2019
262c002
Fix end-to-end transfer tests
Oct 18, 2019
7346fa8
Merge branch 'master' into asaj/pos-2
Oct 18, 2019
97372e7
Fix contractkit tests
Oct 18, 2019
15ace64
Merge master
Oct 22, 2019
c6b2656
merge master
Oct 22, 2019
ef71139
Fix contractkit tests
Oct 22, 2019
c152286
Merge branch 'asaj/pos-2' into asaj/pos-3
Oct 22, 2019
b8eafd7
Fix
Oct 22, 2019
3847bef
Cleanup
Oct 22, 2019
ae1be93
Fix circle config
Oct 22, 2019
2b1da94
Contract unit tests passing
Oct 22, 2019
19488c7
Re-add isVoting tests
Oct 22, 2019
e3e3809
Small cleanup
Oct 22, 2019
fb7c235
Merge branch 'master' into asaj/pos-2
Oct 22, 2019
e39ff0a
Clean up election setters
Oct 23, 2019
1eb0e40
Merge branch 'master' into asaj/pos-2
Oct 23, 2019
5a43d3f
Add first pass at epoch rewards
Oct 23, 2019
035e7e2
Merge master
Oct 24, 2019
44d6f51
Fix contractkit test
Oct 24, 2019
aaf02cd
Remove outdated comment
Oct 24, 2019
ec88d47
More work
Oct 24, 2019
5e2ec52
Merge branch 'asaj/pos-2' into asaj/pos-3
Oct 24, 2019
7e60132
Merge master
Oct 24, 2019
a6c9bb6
Merge branch 'master' into asaj/pos-3
Oct 25, 2019
59dedea
Fix Validators contract wrapper
Oct 25, 2019
7c25aed
Merge branch 'master' into asaj/pos-3
Oct 30, 2019
172c7ec
Merge branch 'asaj/pos-3' into asaj/pos-4
Oct 30, 2019
367429d
Unit tests for EpochRewards passing
Oct 31, 2019
6fa6ee1
Merge master
Oct 31, 2019
9281b4c
Make precompile public
Oct 31, 2019
15c928e
Merge branch 'master' into asaj/pos-3
Oct 31, 2019
95c77d9
Fix migrations
Oct 31, 2019
4c609ec
Merge branch 'asaj/pos-3' into asaj/pos-4
Oct 31, 2019
e2eec9b
end-to-end tests passing, not accounting for voting yield and multiplier
Nov 1, 2019
c561862
Merge master
Nov 1, 2019
2bc75cc
Fix typo
Nov 1, 2019
72ff0ba
end-to-end tests adjusted for rewards multiplier
Nov 1, 2019
568659c
end-to-end tests working
Nov 1, 2019
6316dde
merge master
Nov 1, 2019
a871d67
Fix merge conflicts
Nov 1, 2019
fc95abc
Merge branch 'master' into asaj/pos-3
Nov 2, 2019
9163be1
Merge asaj/pos-3
Nov 2, 2019
b4638d5
Fix linting
Nov 2, 2019
9fe10d7
Add natspecs
Nov 2, 2019
990fc14
reduce gold requirement for contractkit tests
Nov 2, 2019
5d910c9
Be sure to migrate random contract in validator order end-to-end tests
Nov 2, 2019
9d28444
Merge branch 'asaj/pos-3' into asaj/pos-4
Nov 2, 2019
6bc0a1d
Merge master
Nov 2, 2019
e4a9c0b
Small cleanup
Nov 4, 2019
896b08c
Merge branch 'master' into asaj/pos-4
Nov 7, 2019
e51e20d
Update packages/protocol/contracts/governance/EpochRewards.sol
Nov 7, 2019
8d831ec
Update packages/protocol/contracts/governance/EpochRewards.sol
Nov 7, 2019
9ee4f02
Address comments
Nov 7, 2019
464ec62
Address comments
Nov 7, 2019
c2e9f00
WIP
Nov 8, 2019
106a27f
Tests passing other than round robin proposing
Nov 8, 2019
231eed1
Merge master
Nov 9, 2019
531e319
Address comments
Nov 9, 2019
5af2e3b
Fix tests
Nov 9, 2019
bec525b
Fix tests
Nov 9, 2019
e3f7c88
Merge branch 'master' into asaj/pos-4
Nov 9, 2019
10f3149
Delte comment
Nov 9, 2019
8afe7e5
Merge branch 'master' into asaj/pos-4
Nov 9, 2019
767afe3
Key rotation e2e test working
Nov 10, 2019
75610af
Merge master
Nov 10, 2019
1f0079b
remove \.only
Nov 10, 2019
47d2c65
Authorize and pop cli commands seem to work
Nov 10, 2019
649f7a1
Merge branch 'master' into asaj/pos-4
Nov 10, 2019
cca1e4d
Merge branch 'asaj/pos-4' of https://github.com/celo-org/celo-monorep…
Nov 10, 2019
a4090d2
Merge asaj/pos-4
Nov 10, 2019
1e3b012
Cleanup
Nov 10, 2019
e8bc744
Update exchange tests
Nov 10, 2019
fe90660
Merge branch 'asaj/pos-4' into asaj/e2e-key-swap
Nov 10, 2019
d5f0bca
Fix docstring
Nov 10, 2019
3f7cb22
Do not connect validator signers directly to any validators
Nov 10, 2019
6364667
Fix tests
Nov 10, 2019
a33012b
Fix authorize test
Nov 10, 2019
90796c1
Fix linting
Nov 10, 2019
d8265aa
Fix reserve tests
Nov 10, 2019
11d120d
Fix end-to-end tests
Nov 10, 2019
5552c2e
Merge asaj/pos-4
Nov 10, 2019
117d581
Remove unsupported test
Nov 10, 2019
0cc9273
Merge master
Nov 10, 2019
cf50693
Fix tests
Nov 10, 2019
cc2684f
Merge branch 'asaj/pos-4' into asaj/e2e-key-swap
Nov 10, 2019
4f7d450
Remove unused import
Nov 10, 2019
93571b2
Merge branch 'master' into asaj/pos-4
Nov 11, 2019
6fb7a33
Address comments
Nov 11, 2019
2e17037
Whoops
Nov 11, 2019
23776ee
Fix epoch rewards tests
Nov 11, 2019
d7520fb
Merge asa/pos-4
Nov 11, 2019
d80ab32
WIP
Nov 12, 2019
73730fb
Most unit tests passing
Nov 12, 2019
036d934
WIP
Nov 12, 2019
5f35fa9
Merge master
Nov 12, 2019
41f0dcf
end-to-end governance test passing
Nov 12, 2019
c29f513
Remove ecrecoverpublickey precompile
Nov 12, 2019
4248584
Merge branch 'master' into asaj/e2e-key-swap
Nov 12, 2019
8799b0a
Add updateEcdsaKey test
Nov 12, 2019
3039042
remove .only
Nov 12, 2019
ac0c53c
Merge branch 'master' into asaj/e2e-key-swap
Nov 12, 2019
10171dc
Update docs
Nov 12, 2019
05fb26c
Update dependencies
Nov 12, 2019
a15ffaa
Fix governance test
Nov 12, 2019
0fdbc23
Merge master
Nov 14, 2019
1d6ad57
Address comments
Nov 14, 2019
627b9f6
Make things compile
Nov 14, 2019
d550f1e
Finish removal of end-to-end-geth-integration-sync-test
Nov 14, 2019
998ead7
Fix unit tests
Nov 14, 2019
4b2c9ca
Merge branch 'master' into asaj/e2e-key-swap
Nov 14, 2019
4b498b9
Merge branch 'master' into asaj/e2e-key-swap
Nov 14, 2019
54f0bd2
Merge master
Nov 14, 2019
bb16d98
Fix tests
Nov 14, 2019
a0d7503
Remove unnecessary awaits
Nov 14, 2019
beab2c2
Merge master
Nov 15, 2019
2c4b3c1
Fix build
Nov 15, 2019
05f8903
Merge master, address comments
Nov 15, 2019
c9c01d9
WIP
Nov 15, 2019
360b473
Fix attestations test
Nov 15, 2019
4e97b48
Fix lint
Nov 15, 2019
bca30f7
Merge master
Nov 16, 2019
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_transfers.sh checkout master
./ci_test_transfers.sh checkout asaj/key-rotation-plus-enode
asaj marked this conversation as resolved.
Show resolved Hide resolved

end-to-end-geth-blockchain-parameters-test:
<<: *e2e-defaults
Expand All @@ -542,7 +542,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_blockchain_parameters.sh checkout master
./ci_test_blockchain_parameters.sh checkout asaj/key-rotation-plus-enode

end-to-end-geth-governance-test:
<<: *e2e-defaults
Expand All @@ -562,7 +562,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_governance.sh checkout master
./ci_test_governance.sh checkout asaj/key-rotation-plus-enode

end-to-end-geth-sync-test:
<<: *e2e-defaults
Expand All @@ -581,7 +581,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_sync.sh checkout master
./ci_test_sync.sh checkout asaj/key-rotation-plus-enode

end-to-end-geth-attestations-test:
<<: *e2e-defaults
Expand All @@ -599,7 +599,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_attestations.sh checkout master
./ci_test_attestations.sh checkout asaj/key-rotation-plus-enode

end-to-end-geth-validator-order-test:
<<: *e2e-defaults
Expand All @@ -617,7 +617,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_validator_order.sh checkout master
./ci_test_validator_order.sh checkout asaj/key-rotation-plus-enode

web:
working_directory: ~/app
Expand Down
Loading