Commit Graph

46 Commits (04239ba53211e7cb025c72a16fb2a14b2995efbe)

Author SHA1 Message Date
vzotova 30a06fe37d StakingEscrow: method to remove unused sub-stakes 2020-10-20 20:33:38 +03:00
Bogdan Opanchuk 1557617afd Since web3=5.12.2 some of `eth` methods require positional arguments 2020-10-18 00:16:05 -07:00
vzotova e4aa44a10b Apply suggestions from code review #2204
Co-authored-by: David Núñez <david@nucypher.com>
2020-10-13 16:05:35 +03:00
vzotova c2f735ed73 StakingEscrow: allow to claim tokens from worklock before initialization 2020-10-13 00:23:37 +03:00
vzotova 76fbdce7f8 Combine two methods called from StakingEscrow -> PolicyManager into one 2020-10-12 14:31:26 +03:00
David Núñez cd47a3b566 Relocate test/utils/solidity.py to nucypher/utilities/ethereum.py 2020-10-05 12:12:17 +02:00
Kieran Prasch ea3584656c Implements --confirmations for deployer transactions, including defaults. 2020-09-29 20:25:21 -07:00
vzotova aca9c65b68 StakingEscrow: check for snapshots in batchDeposit, allow setWindDown before deposit 2020-09-28 14:05:19 +03:00
vzotova 7987115f75 StakingInterface: method to control snapshots 2020-09-28 12:45:52 +03:00
vzotova 4dcb414890 StakingEscrow: deposits from worklock allowed only after initialization 2020-09-28 12:12:35 +03:00
vzotova e9b506ff92 StakingEscrow: enable wind down for claim from worklock 2020-09-18 14:34:54 +03:00
vzotova d51ad8db93 Remove force re-stake lock 2020-09-17 13:54:57 +03:00
David Núñez a4efbcf06b Use Solidity 0.7.0 in the DAO contracts so far 2020-09-15 10:04:42 +02:00
David Núñez a7bc85c075 Get rid of the Translators idea and use Agents instead ...
... but this time the agent only defines the methods for getting function calls (with the name preceded by _ to mark this), since we'll only use this contract indirectly
2020-09-15 10:04:42 +02:00
David Núñez 6927a053bb
Merge pull request #1811 from vzotova/pooling-contract
First iteration of pooling contract
2020-09-08 11:58:03 +02:00
David Núñez 920ae58bc3 Setting a free gas strategy in tests that create a new blockchain interface 2020-08-28 18:00:19 +02:00
vzotova 6fe4bfe8b1 Fix after rebasing 2020-08-28 12:43:57 +03:00
vzotova 626fb70f9c PoolingContract: owner can disable deposit 2020-08-28 12:10:31 +03:00
vzotova ba17feb926 PoolingContract: split tokens into reward and deposit 2020-08-28 12:10:30 +03:00
vzotova a3495e0678 PoolingContract: rename coefficient to depositedTokens 2020-08-28 12:10:30 +03:00
vzotova 5c3b57cef5 PoolingContract: functions to calculate available amount of tokens and eth 2020-08-28 12:10:29 +03:00
vzotova 576ee4493d PoolingContract: reentrancy test 2020-08-28 12:10:29 +03:00
vzotova 91e068866b PoolingContract: method to withdraw ether 2020-08-28 12:10:28 +03:00
vzotova e2d7b93214 PoolingContract: simplify owner role 2020-08-28 12:10:28 +03:00
vzotova 7b92b4c9a2 PoolingContract: draft of contract 2020-08-28 12:10:27 +03:00
vzotova 4fd66b6311 Fix after rebasing 2020-08-25 22:58:22 +03:00
vzotova bb8610b744 StakingEscrow: force re-stake locking in `batchDeposit` 2020-08-25 18:50:42 +03:00
vzotova febc51b38e Dedicated method for deposit from WorkLock, auto-lock of `restake` parameter while claiming tokens 2020-08-25 18:50:23 +03:00
Kieran R. Prasch 93416e3bdd
Deprecates --runslow and supurflouous newlines. 2020-08-25 07:09:59 -07:00
David Núñez 52e21bbb65 Fix mock_ursula_reencrypts so it produces expected output types 2020-08-14 12:15:16 -07:00
vzotova 1819d5a552 Solidity -> 0.7.0 2020-08-06 13:39:17 +03:00
vzotova 091ca97e7d Fix bug in `StakingEscrow.mergeStake()` when using same index twice 2020-07-30 12:55:37 +03: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 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
Kieran R. Prasch 388ea2fc55 master -> main 2020-07-21 08:48:52 -07: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
vzotova 4335664aca SPDX license identifier in contracts 2020-06-08 15:52:54 +03:00
vzotova 790e22685c Adds `receive()` function to contracts instead of payable `fallback()` 2020-06-05 17:21:05 +03:00
Kieran Prasch 28cce2fccc Reorganize tests into multiple suites. 2020-05-27 14:11:25 -07:00