Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,850 Commits
7 Branches
138 Tags
74 MiB
Commit Graph

6850 Commits (a293eca6226a6f9b825b95c0995f4b2ba3b2bae0)

Author SHA1 Message Date
David Núñez a293eca622
Merge pull request #2160 from cygnusv/fix-token-agent-test 
[Hotfix] Fix missing kwarg rename for NuCypherTokenAgent.approve_transfer()
 2020-07-30 01:28:19 +02:00
David Núñez dadf3c81f6 Fix missing kwarg rename for NuCypherTokenAgent.approve_transfer() 2020-07-30 01:13:51 +02:00
David Núñez c88e5c5699
Merge pull request #2149 from cygnusv/se-init 
[The Royal We] Allow StakingEscrow initialization from a separate funding source
 2020-07-22 16:52:21 +02:00
David Núñez 001df65b3f Use the YES_ENTER constant in test_deploy 2020-07-21 22:26:00 +02:00
David Núñez b667a808b0 Test Issuer initialization with an owner different than the creator 2020-07-21 22:15:43 +02:00
David Núñez 76f0147602 Change approve token allowance flag from --approve to --allowance 
Co-authored-by: Derek Pierre <derek.pierre@gmail.com>
 2020-07-21 22:15:43 +02:00
David Núñez bd8692d6a4 Approve token allowances with `nucypher-deploy transfer-tokens --approve` 2020-07-21 22:15:43 +02:00
David Núñez e83a815e47 Improve TokenAgent's API and usage of approve_transfer and increase_allowance 2020-07-21 22:15:43 +02:00
David Núñez d1acf35002 Allow StakingEscrow initialization from a separate funding source 
This is necessary to allow the DAO agent to activate the contract without necessarily giving tokens to the agent
 2020-07-21 22:15:43 +02:00
David Núñez 56fd7394db Test that stakers can have positive balance before StakingEscrow initialization 2020-07-21 22:15:43 +02:00
David Núñez 38d4b4416a
Merge pull request #2143 from KPrasch/docs 
"Tone down" node operator agreement language - Closes #2047.
 2020-07-21 22:14:46 +02:00
Kieran Prasch fed0f362b1
Adjusts node operator agreement language. Closes #2047 
Co-authored-by: David Núñez <david@nucypher.com>
Co-authored-by: MacLane S Wilkison <maclane@nucypher.com>
 2020-07-21 12:16:32 -07:00
David Núñez e1db2c6206
Merge pull request #2151 from KPrasch/main 
Update default branch to main
 2020-07-21 21:14:28 +02:00
K Prasch f3da57b778
Update docs/source/guides/contribution_guide.rst 
Co-authored-by: David Núñez <david@nucypher.com>
 2020-07-21 08:59:16 -07:00
Kieran R. Prasch 388ea2fc55 master -> main 2020-07-21 08:48:52 -07:00
damon c 8d0ecb1ea7
Merge pull request #2135 from derekpierre/commitment-made 
Ensure Prometheus metric for CommitmentMade is correctly updated on startup
 2020-07-17 13:54:49 -07:00
derekpierre 63f2618a15 Remove comment since possible for multiple CommitmentMade events in one period 
Co-authored-by vzotova <vikki.zta@gmail.com>
 2020-07-16 09:03:25 -04:00
David Núñez f5bee795d8
Merge pull request #2121 from mswilkison/worklock-terminology 
Update WorkLock terminology
 2020-07-15 17:46:44 +02:00
derekpierre f5bc03e235 Ensure all event entries are checked during initialization 2020-07-14 16:11:05 -04:00
derekpierre 832d7f6fdc Ensure that CommitmentMade is checked for during initialization since the event could have already occurred for the period 2020-07-14 15:53:18 -04:00
K Prasch 32386e4b6f
Merge pull request #2117 from vzotova/stakeholder-fixes 
Some fixes for `stake` commands
 2020-07-14 10:45:00 -07:00
Victoria e717b6d030 Apply suggestions from code review #2117 
Co-authored-by: Derek Pierre <derek.pierre@gmail.com>
Co-authored-by: K Prasch <kieran@nucypher.com>
Co-authored-by: David Núñez <david@nucypher.com>
 2020-07-14 12:04:35 +03:00
MacLane S Wilkison 36fd3ce884
Apply suggestions from code review 
Co-authored-by: Derek Pierre <derek.pierre@gmail.com>
Co-authored-by: David Núñez <david@nucypher.com>
 2020-07-09 15:29:03 +00:00
vzotova 073cbf345e Refactor sub-stake status and selecting sub-stake 2020-07-09 16:33:25 +03:00
MacLane S Wilkison 248d5ca4c1
Apply suggestions from code review 
Co-authored-by: David Núñez <david@nucypher.com>
 2020-07-08 15:30:09 +00:00
David Núñez 10ef0a1d62 Rename WorkLock commands and options 2020-07-08 17:13:05 +02:00
David Núñez df93a93b75 Update WorkLock command output 2020-07-08 16:18:08 +02:00
vzotova 8f598f0df6 More integration tests for stake selection 2020-07-07 17:21:06 +03:00
vzotova 796f297e93 Refactor `StakeHolder.assimilate()`, now `StakeHolder` instances from configuration and from interactive mode are the same 2020-07-07 17:19:02 +03:00
mswilkison b5cfbf5a34 Update WorkLock guide terminology 2020-07-02 11:27:01 -04:00
mswilkison 62c767bc38 Update WorkLock architecture terminology 2020-07-02 11:10:28 -04:00
K Prasch b3a9e6bb7b
Merge pull request #2097 from vzotova/mint-cli 
`mint` command + minor updates for `collect-reward` in CLI
 2020-06-27 09:59:58 -07:00
vzotova 2d0be22dec Apply suggestions from code review #2097 
Co-authored-by: MacLane S Wilkison <maclane@nucypher.com>
Co-authored-by: David Núñez <david@nucypher.com>
Co-authored-by: K Prasch <kieran@nucypher.com>
 2020-06-27 19:36:51 +03:00
vzotova 6c68fba65c Small docs update for collecting reward 
Co-authored-by: Derek Pierre <derek.pierre@gmail.com>
 2020-06-25 20:57:21 +03:00
vzotova 0e46140e8f Added `mint` command to CLI, added some warnings in `collecting-reward` command 2020-06-25 20:13:42 +03:00
vzotova 9897c0f93c Fix agent mocking: use instance to hold mocked method instead of class 2020-06-25 20:08:27 +03:00
K Prasch 394859c5b7
Merge pull request #2104 from derekpierre/setup-cleanup 
Variety of cleanup work related to docs/cli output for setting up staker and worker
 2020-06-25 10:01:36 -07:00
derekpierre 4d3cbe2799 Update the output in docs of `nucypher stake collect-reward` 2020-06-25 09:13:15 -04:00
derekpierre 99b21cecfa Maintain "policy fee" wording (vs "policy reward") 2020-06-25 09:13:15 -04:00
derekpierre 2d939e8f2d Update `nucypher stake divide` output to latest. 
Fix bug in parameter passed to string template `PROMPT_STAKE_DIVIDE_VALUE`.
 2020-06-25 09:13:15 -04:00
derekpierre 8f76236c69 Variety of cleanup work related to setting up a staker and worker on the network. 2020-06-25 09:13:15 -04:00
David Núñez 02e734fc89
Merge pull request #2025 from vzotova/staker-updates 
Updates for staker in StakingEscrow
 2020-06-23 17:38:32 +02:00
vzotova 0eecc1296e Apply suggestions from code review #2025 
Co-authored-by: Derek Pierre <derek.pierre@gmail.com>
Co-authored-by: David Núñez <david@nucypher.com>
 2020-06-23 11:15:02 +03:00
vzotova e90a27c8c3 StakingEscrow: new method to merge two sub-stakes into one 2020-06-23 11:15:02 +03:00
vzotova a55f462902 StakingEscrow: add way to stake tokens to already existing sub-stake, including < minimum allowed 2020-06-23 11:15:02 +03:00
vzotova 3caa46f367 StakingEscrow: removed messages from require and removed one deposit function to decrease contract size 2020-06-23 11:15:01 +03:00
vzotova 54297be311 StakingEscrow: extract getLockedTokensInPast method to test set 2020-06-23 11:15:01 +03:00
vzotova 0c9d4bc9e3 StakingEscrow: unbond worker when withdrawing last portion of NU 2020-06-23 11:15:01 +03:00
vzotova 8f19161920 StakingEscrow: now staker is not only who has tokens but also who has not-rewarded periods 2020-06-23 11:15:00 +03:00
K Prasch 523ea089f4
Merge pull request #2098 from KPrasch/enrico 
Simple Enrico file encryption
 2020-06-21 07:42:38 -07:00