Commit Graph
32095 Commits
Author SHA1 Message Date
Homu 4b27d2efcd Auto merge of #3441 - ebfull:check-param-hash, r=str4d
Check the hash of the zk-SNARK parameters during initialization

**Please also review https://github.com/zcash/librustzcash/pull/28.**
2018-08-03 07:52:09 -07:00
jl777 99c090d95e Fix edge case for maxodds 2018-08-03 03:07:01 -11:00
jl777 ebe7e27ada Fix timeout claim 2018-08-03 01:51:05 -11:00
jl777 2911cd8048 Merge pull request #791 from jl777/dev
Get current CC to a stable release:

disable asset swap
implement dice timeout claims
Tokens, faucet, rewards and dice now have no reproducible bugs
2018-08-03 00:15:29 -11:00
jl777 035095bc5a Merge pull request #799 from jl777/jl777
Get current CC to a stable release:

disable asset swap
implement dice timeout claims

Tokens, faucet, rewards and dice now have no reproducible bugs
2018-08-03 00:12:12 -11:00
jl777 ac8b2c68d2 Disable assets swap 2018-08-03 00:09:53 -11:00
jl777 b0becd6e7c Test 2018-08-02 23:32:03 -11:00
jl777 8e3c66caf9 Test 2018-08-02 23:09:42 -11:00
jl777 da07d84b84 Implement dice timeout 2018-08-02 23:02:51 -11:00
Jack Grigg 25d5e80cbe Rename *SpendingKey -> *SproutSpendingKey
Also GetPaymentAddresses -> GetSproutPaymentAddresses
2018-08-03 10:10:26 +01:00
jl777 d84c86336e Merge pull request #798 from jl777/jl777
initial stable dice CC
2018-08-02 22:07:16 -11:00
jl777 8132e08781 Add back join split in decoderawtransaction 2018-08-02 21:33:06 -11:00
Larry Ruane c0aa34a4b2 generalize mininode.py protocol versioning 2018-08-02 20:30:20 -06:00
Jack Grigg f84cf5f817 Formatting nits 2018-08-03 02:25:51 +01:00
Jack Grigg 4c77517772 Rename *ViewingKey* -> *SproutViewingKey* 2018-08-03 02:23:38 +01:00
Jack Grigg 74f5b010df Rename Serialized*Size -> SerializedSprout*Size 2018-08-03 01:57:40 +01:00
Jack Grigg 93fcf892d4 Rename SpendingKeyMap -> SproutSpendingKeyMap 2018-08-03 01:47:30 +01:00
Jack Grigg 5175a7f07b Pass SaplingPaymentAddress to store through the CKeyStore 2018-08-03 01:01:45 +01:00
Jack Grigg bc6344b350 Add CWallet::AddCryptedSaplingSpendingKey() hook
To be filled in when we implement Sapling persistence to disk.
2018-08-03 00:23:08 +01:00
Jack Grigg 9c9258c4f8 Remove outdated comment 2018-08-03 00:23:08 +01:00
Jack Grigg 4a89221ffc Check for unencrypted Sapling keys in CCryptoKeyStore::SetCrypted() 2018-08-03 00:23:08 +01:00
Jack Grigg 0adba6789b Add Sapling decryption check to CCryptoKeyStore::Unlock() 2018-08-03 00:23:08 +01:00
Jack Grigg e8a949c153 Rename CryptedSpendingKeyMap -> CryptedSproutSpendingKeyMap 2018-08-03 00:23:08 +01:00
Jack Grigg adf2eadba2 Rename DecryptSpendingKey -> DecryptSproutSpendingKey 2018-08-03 00:23:08 +01:00
Jay Graber 85beb9c9ca Add Sapling keys to CCryptoKeyStore::EncryptKeys 2018-08-03 00:23:08 +01:00
Jay Graber 55f2889396 Add Sapling have/get sk crypter overrides 2018-08-03 00:23:08 +01:00
Daira Hopwood 66856b2b3c Support testnet rollback.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2018-08-02 23:10:30 +01:00
Sean Bowe d9ef8f622e Check the hash of the (Sapling+) zk-SNARK parameters during initialization. 2018-08-02 12:18:13 -06:00
jl777 fba740ea43 Test 2018-08-02 05:30:37 -11:00
jl777 d4c70c4f7a Funding plan creator to auto create entropy tx on dice status 2018-08-02 05:24:47 -11:00
jl777 221972777d Test 2018-08-02 05:13:18 -11:00
jl777 3bb6e2335e Test 2018-08-02 04:40:20 -11:00
jl777 096cfeb8a3 Test 2018-08-02 04:33:18 -11:00
jl777 7b44d4c123 Test 2018-08-02 04:27:46 -11:00
jl777 75dbd47819 Status zero 2018-08-02 04:26:06 -11:00
jl777 50854c787b Test 2018-08-02 04:23:36 -11:00
jl777 510d6d5c5e Status 2018-08-02 04:21:32 -11:00
jl777 d74d791ae0 Test 2018-08-02 04:07:15 -11:00
jl777 1fadc7992c Test 2018-08-02 03:57:55 -11:00
jl777 9cd014a973 Test 2018-08-02 03:55:02 -11:00
jl777 6555bf3aa4 Test 2018-08-02 03:51:42 -11:00
jl777 846c9eb9bf Test 2018-08-02 03:50:46 -11:00
jl777 507520445b Test 2018-08-02 03:47:06 -11:00
jl777 dbf213821f Test 2018-08-02 03:44:34 -11:00
jl777 598e88cec5 Test 2018-08-02 03:39:53 -11:00
jl777 cd2a5d0af0 Test 2018-08-02 03:33:03 -11:00
jl777 92b48feece Test 2018-08-02 03:28:45 -11:00
jl777 4e525e48e9 Test 2018-08-02 03:19:48 -11:00
jl777 cdd6d559d7 Test 2018-08-02 03:16:47 -11:00
jl777 9726ead472 Test 2018-08-02 03:15:36 -11:00