Commit Graph

1623 Commits (45bf82b0339172fdbffc5939444f461b741f05e2)

Author SHA1 Message Date
Tux a972f0e801
Merge pull request #219 from tuxxy/crypto-config
Spice up config
2018-04-11 20:15:25 -06:00
tuxxy 17b22ad1a4 Use Blake2b as the HKDF hash 2018-04-11 17:23:46 -06:00
tuxxy 0b55e6d3e1 Write public keyfiles in generate 2018-04-11 17:00:34 -06:00
tuxxy a3f03b8338 Use term 'key_material' instead of 'master_key' 2018-04-11 16:59:46 -06:00
tuxxy 82536055b6 Change private key dir perms from 744 to 700 2018-04-11 16:29:29 -06:00
tuxxy 6636e11ee4 Add _save_public_keyfile function 2018-04-11 16:23:39 -06:00
tuxxy 1dcafa1edb Merge remote-tracking branch 'nucypher/master' into crypto-config 2018-04-11 16:09:28 -06:00
K Prasch df60841fd9
Merge pull request #215 from KPrasch/master
Merge nucypher-kms-ethereum constituents
2018-04-11 14:56:12 -07:00
K Prasch 534406006f
Merge branch 'master' into master 2018-04-11 14:55:57 -07:00
K Prasch 1c484c41a0
Merge pull request #216 from jMyles/absorb-eth-codebase
Keeping a passing test suite.
2018-04-11 14:54:41 -07:00
tuxxy 6cdeddab40 encrypt() -> decrypt() 2018-04-10 21:46:32 -06:00
jMyles 5e04f1a215 Skipping blockchain tests for now. 2018-04-10 20:21:23 -07:00
Justin Holmes a028ef001c Merge commit to smooth conflicts after the unification merge. 2018-04-10 19:31:06 -07:00
Justin Holmes e27f174ad3
Merge branch 'master' into master 2018-04-10 19:30:06 -07:00
Justin Holmes 55b11dcc3c
Merge pull request #196 from jMyles/unification-aftermath
Unification aftermath Part 1
2018-04-10 18:40:54 -07:00
tuxxy 99f1b1b6d3 Make parse_keyfile and save_private_keyfile 'private' 2018-04-10 19:40:20 -06:00
Kieran Prasch adfa29609e Manually merges inter-codebase tests, setup, pipfile, config classes, and sol source, respectively updates imports. 2018-04-10 17:03:21 -07:00
Kieran Prasch 38bb5095af Merge remote-tracking branch 'tuxxy/crypto-config' into config: Includes blockchain inter-codebase integration. 2018-04-10 15:16:06 -07:00
Kieran Prasch 50c1aacb1f Implements protected key caching methods for keyring. 2018-04-10 16:02:35 -06:00
Kieran Prasch bb52cab664 Successfuly create keyring paths and keys, setting permissions with file descriptors. Better naming/comments, Reintroduces config.utils 2018-04-10 16:01:16 -06:00
Kieran Prasch 0315fbaa56 Extract key configuration module; Fixes key caching scope, Deprecates Wallet in favor of umbral-style key handling; Add keyring generation functionality. 2018-04-10 15:56:22 -06:00
Kieran Prasch f952723597 Updates pipfile with web3 and eth_accounts 2018-04-10 15:53:58 -06:00
tuxxy 32503c59f7 Add get_signing_key and get_decrypting_key functions; Add comment for time on master key derivation; Cleanup stale functions 2018-04-10 15:53:09 -06:00
tuxxy e3ba60e729 Use JSON and dicts for keyfiles via _parse_keyfile and _save_keyfile 2018-04-10 15:53:02 -06:00
tuxxy 6e24f05556 Add key derivation functions for master and wrapping keys, and add
functiosn to encrypt/decrypt key material
2018-04-10 15:51:34 -06:00
Kieran Prasch ec88557dfa Implements protected key caching methods for keyring. 2018-04-10 14:41:44 -07:00
Tux 9899355ba6
Merge pull request #195 from jMyles/absorb-eth-codebase
Absorb KMS-ETH codebase.
2018-04-10 14:22:43 -06:00
jMyles 5b46b9d17a Moves and fixes to support KMS logic with unified ETH codebase. 2018-04-10 00:34:18 -07:00
jMyles d0f1821d82 Final merge commit to complete unification of projects. Prior to this commit, the KMS and the Ethereum integration lived in different repositories. 2018-04-10 00:33:06 -07:00
jMyles d10cae3c5f [KMS-ETH]- Moving to separate dir in preparation to absorb. LAST COMMIT ON nucypher-kms-ethereum project before unification. 2018-04-09 21:41:36 -07:00
K Prasch 3ef3fd5a36 [KMS-ETH]- Merge pull request #21 from KPrasch/web3
Prepare for testnet & merge with nucypher-kms
2018-04-09 13:14:32 -07:00
Kieran Prasch 30835b8221 [KMS-ETH]- Begin to deprecate populus with web3 TestProvider; Deprecate IssuerDeployer. Begin reflow of deployer subclasses to depend on other deployers, instead of agents. Updates Enum references. 2018-04-09 12:58:13 -07:00
Kieran Prasch c419f5cbd5 [KMS-ETH]- Additional code review changes: Moves enum, better comments, string formatting, and type hints 2018-04-09 12:45:02 -07:00
Kieran Prasch a7325eed75 [KMS-ETH]- Responds to code review requests for changes: tx tracking with tuple, string formatting. 2018-04-09 12:41:30 -07:00
Justin Holmes 99b821c3b5 [KMS-ETH]- Merge pull request #20 from nucypher/nopulus
[WIP] Yank Populus
2018-04-08 22:16:02 -07:00
Kieran Prasch a81c729c83 [KMS-ETH]- PopulusConfig -> EthereumConfig: Prep for inter-codebase merge. 2018-04-08 22:07:36 -07:00
Kieran Prasch 82cafb3252 [KMS-ETH]- UserEscrow and Issuer (to be removed) ContractDeployer subclasses. Begin to simplify deployment interface. 2018-04-08 21:11:29 -07:00
Kieran Prasch 667d22b2f2 [KMS-ETH]- Embelish actor tests 2018-04-08 21:11:29 -07:00
Kieran Prasch 48e3d75b84 [KMS-ETH]- Reorganize test for PolicyManager usage; Reorg test utilities 2018-04-08 21:11:29 -07:00
Kieran Prasch 9f4c960963 [KMS-ETH]- Publish arrangement method 2018-04-08 21:11:29 -07:00
Kieran Prasch c75392598c [KMS-ETH]- DispatcherDeployer class and Government contract-wrapping deploy logic for NuCypher smart contracts: MinerEscrow and PolicyManager. 2018-04-08 21:11:29 -07:00
Kieran Prasch 154cf79615 [KMS-ETH]- Dehydration method for verifying the rediness of a contract for deployment. 2018-04-08 21:11:29 -07:00
Kieran Prasch 0afe92b9a4 [KMS-ETH]- Renames .call to .read, go concrete: Removes ABC for contract wrapper types. 2018-04-08 21:11:29 -07:00
Kieran Prasch 2ea28b4c69 [KMS-ETH]- Higher and Lower level extrapolation of miner methods. 2018-04-08 21:11:29 -07:00
szotov aa5566cbce [KMS-ETH]- Fixed bug with calculating refund, combined mint and confirmActivity methods, added integration test 2018-04-08 21:11:29 -07:00
jMyles 0e5c192f01 [KMS-ETH]- PopulusContract -=> Contract 2018-04-08 20:50:20 -07:00
Kieran Prasch 5e3f1d94f9 Successfuly create keyring paths and keys, setting permissions with file descriptors. Better naming/comments, Reintroduces config.utils 2018-04-08 18:44:40 -07:00
Kieran Prasch 03a57bb7f2 Merge remote-tracking branch 'upstream/master' into config; Update imports to newer config composition. 2018-04-08 02:13:36 -07:00
Kieran Prasch 9e6c201993 Extract key configuration module; Fixes key caching scope, Deprecates Wallet in favor of umbral-style key handling; Addd keyring generation functionality. 2018-04-08 02:03:40 -07:00
Kieran Prasch d00d1cd72e Further compose subconfigurations. 2018-04-08 02:02:46 -07:00