Commit Graph

51 Commits (c5550d064b110b9cdf6402804c6b8b7b34191b16)

Author SHA1 Message Date
szotov c5550d064b [KMS-ETH]- Changed mining formula, added activity confirmation 2017-12-11 19:46:37 +03:00
Michael Egorov 221e90c9c5 [KMS-ETH]- Mining works 2017-12-02 18:44:48 -08:00
szotov 98d01b3e19 [KMS-ETH]- Added rollback method to Dispatcher 2017-11-28 15:24:47 +03:00
Michael Egorov eadd57eb95 [KMS-ETH]- List of n ursulas to give kfrags to 2017-11-26 16:59:25 -08:00
Michael Egorov 13da7d3c65 [KMS-ETH]- Re-arrange functions related to the escrow 2017-11-25 23:38:07 -08:00
Michael Egorov 3f7444faa8 [KMS-ETH]- lock money in mining escrow 2017-11-25 15:03:20 -08:00
Michael Egorov 67003ef51b [KMS-ETH]- Create mining escrow 2017-11-25 14:11:16 -08:00
Michael Egorov 51440f6eca [KMS-ETH]- Changed ursula_flow to use project() function 2017-11-25 13:49:14 -08:00
szotov 5ca1a5bea9 [KMS-ETH]- Added Upgradeable base contract 2017-11-24 20:28:42 +03:00
szotov fff9c77d11 [KMS-ETH]- Reorganized test contracts 2017-11-24 13:11:40 +03:00
Michael Egorov c9dd460d5a [KMS-ETH]- Version bump for solc 2017-11-23 20:34:11 -08:00
szotov 6ce978a774 [KMS-ETH]- Added README.MD for dispatcher 2017-11-23 20:05:15 +03:00
szotov dc9e23e7fe [KMS-ETH]- Added dispatcher contract for using in upgrading contracts 2017-11-22 20:23:01 +03:00
Michael Egorov 0fba71e215 [KMS-ETH]- Save registrat.json in .local/... config directory 2017-11-19 18:41:14 -08:00
Michael Egorov d54fad14bc [KMS-ETH]- Modules to work with a token 2017-11-18 20:40:09 -08:00
Michael Egorov 8563d9b9e7 [KMS-ETH]- Move tests for contracts 2017-11-18 14:59:56 -08:00
Michael Egorov 4a418cbed2 [KMS-ETH]- Change constant in the conftest 2017-11-18 14:53:46 -08:00
szotov ff07719599 [KMS-ETH]- Merge branch 'multi-personal' into lib
Conflicts:
	contracts/EscrowV2.sol
	tests/test_escrow_v2.py
2017-11-17 12:06:39 +03:00
Michael Egorov 666a00b871 [KMS-ETH]- Boilerplate: which functions to implement 2017-11-16 23:55:14 -08:00
Michael Egorov 74dd1d67c3 [KMS-ETH]- Common functions to connect to local ethereum node or testrpc-py 2017-11-16 23:44:11 -08:00
Michael Egorov 7b998f9bbc [KMS-ETH]- All the tests pass 2017-11-15 18:21:45 -08:00
Michael Egorov f84193c9fb [KMS-ETH]- Changing references 2017-11-15 17:51:16 -08:00
szotov 54abf35c96 [KMS-ETH]- Added tests for miner, enhanced locking and deposit methods 2017-11-15 14:21:29 +03:00
Michael Egorov 3722f477c0 [KMS-ETH]- Empty modules 2017-11-14 19:29:12 -08:00
Michael Egorov 204e13bcba [KMS-ETH]- Cleanup 2017-11-14 18:55:43 -08:00
Michael Egorov 75f277a842 [KMS-ETH]- Wrapping Solidity contracts into python package_data 2017-11-14 15:27:20 -08:00
Michael Egorov c089fb9701 [KMS-ETH]- Experiment with selecting N random ursulas 2017-11-13 15:17:42 -08:00
Michael Egorov 839f59bb3a [KMS-ETH]- py.test cumsum 2017-11-12 19:04:45 -08:00
Michael Egorov 0343c091bf [KMS-ETH]- Adding missed step() 2017-11-12 14:39:49 -08:00
Michael Egorov cdcb43cef3 [KMS-ETH]- Checking findCumSum 2017-11-12 13:36:50 -08:00
Michael Egorov 0b650b4721 [KMS-ETH]- Step in cumsum 2017-11-12 11:46:06 -08:00
Michael Egorov 8958c7747d [KMS-ETH]- Ursula actions flow 2017-11-11 17:32:46 -08:00
szotov f48418fcf0 [KMS-ETH]- Merge branch 'multi-personal' of https://github.com/nucypher/nucypher-kms-ethereum into multi-personal 2017-11-11 20:37:30 +03:00
szotov c76013ce32 [KMS-ETH]- Added initiation of mining by user, added exponential mining function 2017-11-11 20:36:04 +03:00
Michael Egorov 7bd10be84d [KMS-ETH]- mainnetrpc in config - connecting to an external geth or parity instance 2017-11-08 23:59:43 -08:00
szotov 67c94866c6 [KMS-ETH]- Added penalty function 2017-11-03 20:28:23 +03:00
szotov 61c5bc5b74 [KMS-ETH]- Added mining for token 2017-11-02 18:31:01 +03:00
szotov cd290957d8 [KMS-ETH]- Added gas estimating on tester 2017-10-31 18:03:42 +03:00
szotov 57259de4bd [KMS-ETH]- Added simple mining and tests 2017-10-31 12:01:52 +03:00
szotov 223deac0b0 [KMS-ETH]- Removed human jury, changed locking to use block numbers, added second example of escrow contract 2017-10-27 19:13:50 +03:00
szotov d28e183280 [KMS-ETH]- Added zeppelin library, added some functions to Escrow 2017-10-26 19:53:04 +03:00
szotov 7204d16faf [KMS-ETH]- Added linked list library for addresses, added destruct method for escrow 2017-10-25 17:36:23 +03:00
szotov 14549213d7 [KMS-ETH]- Upgraded populus configuration 2017-10-23 13:28:20 +03:00
szotov 3404f01cb1 [KMS-ETH]- Added multi-personal Escrow contract and some checks 2017-10-22 19:53:09 +03:00
Michael Egorov 9631b92a9b [KMS-ETH]- Jury only locks, and Ursula can withdraw from escrow 2017-09-18 15:40:05 -04:00
Michael Egorov 06e625f000 [KMS-ETH]- Simple escrow to be controlled by smart contract (Jury) 2017-09-18 12:03:21 -07:00
Michael Egorov 62d79566d6 [KMS-ETH]- Where the contract comes from 2017-09-13 11:31:55 -07:00
Michael Egorov 5bd6f7b220 [KMS-ETH]- Remove the greeter 2017-09-12 23:54:50 -07:00
Michael Egorov 40345c340c [KMS-ETH]- Token transfers work 2017-09-12 23:54:15 -07:00
Michael Egorov 8d178b2dd8 [KMS-ETH]- ERC20 contract and some basic tests 2017-09-12 22:31:33 -07:00