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

Add incentives to proof-of-stake #1292

Merged
merged 109 commits into from
Oct 24, 2019
Merged

Add incentives to proof-of-stake #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 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
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
c6b2656
merge master
Oct 22, 2019
ef71139
Fix contractkit tests
Oct 22, 2019
b8eafd7
Fix
Oct 22, 2019
ae1be93
Fix circle config
Oct 22, 2019
e3e3809
Small cleanup
Oct 22, 2019
fb7c235
Merge branch 'master' into asaj/pos-2
Oct 22, 2019
1eb0e40
Merge branch 'master' into asaj/pos-2
Oct 23, 2019
035e7e2
Merge master
Oct 24, 2019
44d6f51
Fix contractkit test
Oct 24, 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
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_transfers.sh checkout master
./ci_test_transfers.sh checkout asaj/pos-2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reminder to change these back before merging

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After merging?


end-to-end-geth-exit-test:
<<: *e2e-defaults
Expand All @@ -522,7 +522,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_exit.sh checkout master
./ci_test_exit.sh checkout asaj/pos-2

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

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

end-to-end-geth-integration-sync-test:
<<: *e2e-defaults
Expand Down Expand Up @@ -596,7 +596,7 @@ jobs:
command: |
set -e
cd packages/celotool
./ci_test_attestations.sh checkout master
./ci_test_attestations.sh checkout asaj/pos-2

web:
working_directory: ~/app
Expand Down
7 changes: 6 additions & 1 deletion packages/celotool/src/cmds/deploy/initial/contracts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@ export const handler = async (argv: InitialArgv) => {
validatorKeys,
},
stableToken: {
initialAccounts: getAddressesFor(AccountType.FAUCET, mnemonic, 2),
initialBalances: {
addresses: getAddressesFor(AccountType.FAUCET, mnemonic, 2),
values: getAddressesFor(AccountType.FAUCET, mnemonic, 2).map(
() => '60000000000000000000000'
), // 60k Celo Dollars
},
},
})

Expand Down
Loading