Commit Graph

2252 Commits

Author SHA1 Message Date
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
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
d74d791ae0 Test 2018-08-02 04:07:15 -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
4e525e48e9 Test 2018-08-02 03:19:48 -11:00
jl777
7e9887593d Dice status 2018-08-02 03:05:37 -11:00
Homu
871e1726c6 Auto merge of #3340 - Eirik0:rename-merkle-typedefs, r=str4d
Rename merkle tree typedefs to include Sprout

This is to be consistent with the naming convention we have been using to distinguish Sprout/Sapling.
2018-08-01 20:48:17 -07:00
Homu
16117c0d5a Auto merge of #3439 - ebfull:fix-ecc, r=ebfull
Don't call ECC_Start/ECC_Stop outside the test harness.
2018-08-01 17:23:14 -07:00
Sean Bowe
262d21bcbb Don't call ECC_Start/ECC_Stop outside the test harness. 2018-08-01 16:45:12 -06:00
Homu
066cc9c6c7 Auto merge of #3429 - str4d:3217-sapling-address-creation, r=str4d
Add Sapling support to z_getnewaddress and z_listaddresses

Closes #3217.
2018-08-01 12:01:39 -07:00
Eirik Ogilvie-Wigley
8ea8ef9850 Rename Witnesses to include sprout or sapling 2018-08-01 10:41:36 -06:00
Eirik Ogilvie-Wigley
4fc309f0f5 Rename Merkle Trees to include sprout or sapling 2018-08-01 10:31:09 -06:00
Jack Grigg
4fab49e173 test: Another assert in wallet_zkeys_tests.store_and_load_sapling_zkeys 2018-08-01 09:46:32 +01:00
Homu
d84f14ec4a Auto merge of #3417 - str4d:sapling-tx-builder, r=ebfull
TransactionBuilder for Sapling and transparent transactions

This PR includes zcash/librustzcash#24, and will create a testnet chain split once merged into master (and once a Sapling transaction is mined).
2018-07-31 23:44:29 -07:00
jl777
d9cf43a556 Test 2018-07-31 19:31:58 -11:00
jl777
7137a0223e FSM skeleton 2018-07-31 19:19:33 -11:00
Jack Grigg
fbd029d99d Formatting 2018-07-31 23:28:42 +01:00
jl777
ec48f0c361 Test 2018-07-31 05:37:35 -11:00
jl777
cfdc377065 Test 2018-07-31 05:36:16 -11:00
jl777
b47b17439b Add locks 2018-07-31 03:19:36 -11:00
jl777
4608d17092 Faucet info 2018-07-30 23:24:21 -11:00
jl777
25044c0e93 Prevent skip Relaying wtx on non-KMD 2018-07-30 09:38:41 -11:00
jl777
0240997499 Dice refund -> timeout 2018-07-30 08:13:29 -11:00
jl777
a03bb7faac winloserefund 2018-07-30 06:45:21 -11:00
jl777
9025093e5a Relax vout constraint 2018-07-30 05:18:11 -11:00
Jack Grigg
eec85c4388 Add Sapling support to z_getnewaddress and z_listaddresses 2018-07-30 16:24:20 +01:00
Jack Grigg
4715b31c76 Implement CKeyStore::GetSaplingPaymentAddresses() 2018-07-30 16:01:22 +01:00
jl777
544593c6ab Dice refund 2018-07-30 02:14:52 -11:00
jl777
05177cfb4e Diceinit fund 2018-07-30 02:08:32 -11:00
jl777
2c42e02c62 Test 2018-07-30 01:54:24 -11:00
jl777
5d3d3a8712 test 2018-07-30 01:51:32 -11:00
jl777
1702dceff3 CCaddress fixes 2018-07-30 01:13:05 -11:00
Jay Graber
501de644ab Refactor into visitors and throw errors for invalid key or address. 2018-07-29 18:42:41 -07:00
Jay Graber
dd4c8a3c70 Add Sapling support to z_importkey 2018-07-29 16:15:06 -07:00
Jay Graber
2afc8eb0ec Add Sapling support to z_exportkey 2018-07-29 16:15:06 -07:00
jl777
135ead85b2 Test 2018-07-29 05:46:28 -11:00
jl777
4d5488bbab Test 2018-07-29 05:45:12 -11:00
jl777
7d82111255 Dice bet 2018-07-29 05:42:18 -11:00
jl777
c857567a62 Dice list and dice info 2018-07-29 05:31:42 -11:00
jl777
587e715dc9 Diceaddfunds 2018-07-29 05:20:48 -11:00
jl777
14182ebaf1 Test 2018-07-29 05:14:35 -11:00
jl777
5bd03ad7b6 Fix 2018-07-29 05:13:38 -11:00
jl777
d0d96ab044 Initial dice morph from rewards.cpp 2018-07-29 05:06:39 -11:00
jl777
f4e21be41c Fix c script 2018-07-29 04:16:26 -11:00
jl777
42106faf18 Test 2018-07-29 04:05:14 -11:00