Commit Graph

1582 Commits (d103ba0795f6b75cd5dc15f60f31769ba7cd7428)

Author SHA1 Message Date
jMyles d103ba0795 The recent merges to pyUmbral have us all caught up - changing the refspec back to nucypher-depend. 2018-05-29 15:39:05 -07:00
Justin Holmes 19b0f71555
Merge pull request #278 from jMyles/umbral-compat
Uses Alice's Stamp as a signer for KFrags; Bob and Ursula validate them as such.
2018-05-29 18:35:54 -04:00
jMyles fa6a4f6f57 Using pyUmbral Signer as SignatureStamp's signing function. 2018-05-28 12:10:05 -07:00
jMyles e2d1a019cc Specifying version of pyUmbral for now until we get everything merged. 2018-05-28 11:26:59 -07:00
jMyles 562ec6b95f Using expected_bytes_length for frags. 2018-05-28 10:46:48 -07:00
jMyles 4eddf5a283 Accepting verifying_key where it's needed in decrypt functions. 2018-05-28 10:44:37 -07:00
jMyles f29179bd79 Reflecting that Signature has been moved to pyUmbral. 2018-05-28 10:41:01 -07:00
jMyles 65ade05855 We need a signer in a few places now - using Alice's stamp for that. 2018-05-28 10:34:29 -07:00
jMyles 4ae1c5a546 Passing delegator_signing_key where it's needed in Character. 2018-05-28 00:06:39 -07:00
Sergey 53becc5f95
Merge pull request #277 from szotov/solidity-dev
Fixes #272
2018-05-24 11:17:12 +03:00
szotov 4079522140 Fixes #272 2018-05-22 14:12:04 +03:00
szotov b0aab2acbd Fixed warnings by Solidity version 0.4.24 2018-05-22 14:12:04 +03:00
Sergey e41a3f3b05
Merge pull request #271 from szotov/solidity-dev
Contracts improvements and bugs fixing
2018-05-20 13:38:50 +03:00
szotov 55e1a254ec Fixed test in test_actors.py 2018-05-19 11:56:38 +03:00
szotov 48ce0a6428 Changed unlocking in the UserEscrow 2018-05-19 11:56:38 +03:00
szotov 41d24f9ad9 Fixed finishUpgrade methods in the MinerEscrow and Issuer, added vote method to the UserEscrow 2018-05-19 11:56:37 +03:00
Michael Egorov fce814f8d9 Wait for receipt in global_airdrop 2018-05-19 11:56:37 +03:00
szotov be514a4848 Fixed unlocking with confirmActivity 2018-05-19 11:56:36 +03:00
szotov 0b068d26e0 Added draft of the docs for contracts, fixed user escrow 2018-05-19 11:56:36 +03:00
szotov 01a1a6d7d7 Fixed the approveAndCall method in the token contract, added implementation of the receiveApproval method in the escrow contract 2018-05-19 11:56:36 +03:00
szotov 33ff3d0955 Added minimum reward rate for nodes in the PolicyManager 2018-05-19 11:56:35 +03:00
K Prasch b685d93c31
Merge pull request #273 from KPrasch/master
Keep blockchain dependencies up-to-date
2018-05-18 12:21:31 -07:00
Kieran Prasch 53ef5c0679 Bumps etherereum dependency versions; Fixes side effects. 2018-05-18 12:14:02 -07:00
K Prasch 31503e50e6
Merge pull request #270 from KPrasch/sol-client
Blockchain client updates and bugfixes
2018-05-16 22:50:14 -07:00
Kieran R Prasch 6397fba5f1 Rename NuCypher -> nucypher where appropriate. 2018-05-16 18:31:49 -04:00
Kieran R Prasch 9b592a0c74 Update method argument validation 2018-05-15 21:48:48 -07:00
Kieran R Prasch bcc81682c6 Rename periods -> lock_periods 2018-05-15 21:42:58 -07:00
Kieran Prasch a5bf95734d Pipfile locked 2018-05-15 21:42:58 -07:00
Kieran Prasch b546c7159b Time Travel Fixes, Remove skips, fixes post-rebase 2018-05-15 21:42:31 -07:00
Kieran Prasch e176ba82b7 Make config class attrs public, use real values for testing via time travel and simulated mining. 2018-05-15 21:27:12 -07:00
Kieran Prasch ceda960832 Relocate miner spawning test utility 2018-05-15 21:25:46 -07:00
Kieran Prasch 8cde41da70 Fixes sampling and miner datastore logic from contract API updates 2018-05-15 21:20:21 -07:00
Kieran Prasch e6f212a1cc Fixes staking and locking client methods, concise test narrative for miners. 2018-05-15 21:20:21 -07:00
Kieran Prasch 9972063ef1 Decouple minting from confirm activity. 2018-05-15 21:20:21 -07:00
Kieran Prasch b575b65166 locktime -> periods 2018-05-15 21:20:21 -07:00
Kieran Prasch 3f862e8747 Adds period style time travel 2018-05-15 21:20:18 -07:00
Kieran Prasch 320d84da63 Small fixes to rulebooks and airdropping. 2018-05-15 21:19:38 -07:00
Kieran Prasch 441fb1346f Additional mocked testing utils; Faked token distribution for testing only 2018-05-15 21:19:35 -07:00
Kieran Prasch 3b27ef265c Gives contract deployers agency classes, bypassing the registrar to produce contract agents. 2018-05-15 20:47:06 -07:00
Kieran Prasch c5d5cd0f3a stake and locktime validators 2018-05-15 20:18:40 -07:00
Kieran Prasch 4ec9df051f deprecates agent.call() and .transact(); Upgrade to newer web3 API, with direct contract access 2018-05-15 20:18:40 -07:00
szotov f9eb10de60 Added cancellation of the upgrading if there are errors 2018-05-15 20:18:40 -07:00
Justin Holmes 060b0b5084
Merge pull request #269 from jMyles/code-organization
Deprecates size constants for cfrags and kfrags - uses .get_size() instead.
2018-05-11 21:22:15 -04:00
Justin Holmes 5c898e4175
Merge pull request #268 from jMyles/master
Renaming NuCypher KMS to NuCypher
2018-05-10 09:59:53 -07:00
jMyles 3e76563c10 Using.get_size() for fragments. 2018-05-08 21:45:00 -07:00
jMyles 41805d5d06 Removing references to 'KMS' 2018-05-08 13:02:18 -07:00
Justin Holmes 2d68b9bf70
Merge pull request #267 from jMyles/blockchain-merge-concepts5
A reasonably straightfoward, merge-ready composite of 237, 262, 264, and some more recent work.
2018-05-08 10:36:38 -07:00
jMyles e5d17b527c Marking last few pesky tests skip for now. 2018-05-07 14:56:44 -07:00
jMyles ac6843a9fa Installing wheel from pyUmbral github. 2018-05-07 14:32:37 -07:00
jMyles f1b28a1c8e Variable length CFrag and CFrag validity checks in place. 2018-05-07 13:41:55 -07:00