Commit Graph

22197 Commits

Author SHA1 Message Date
Luke Childs
9fb17c97de Merge branch 'dev' into assetchain-conf 2018-07-26 09:28:12 +01:00
Luke Childs
6eb2ba9993 Add SEC to assetchains.json 2018-07-26 09:24:39 +01:00
jl777
81781a36fd Merge branch 'dev' into jl777 2018-07-25 21:07:21 -11:00
jl777
99ddfea13d Merge pull request #788 from letolabs/dev_fixes
Fix compiler error: call of overloaded 'Pair(const char [9], time_t)'…
2018-07-25 21:05:14 -11:00
jl777
19da5c6446 Fix token orders crash 2018-07-25 20:18:33 -11:00
jl777
334687197b Merge pull request #789 from letolabs/snapshot
getsnapshot of top N addresses
2018-07-25 19:43:17 -11:00
Homu
3eefe12c79 Auto merge of #3353 - Eirik0:3062-cache-sapling-witnesses, r=bitcartel
Cache Sapling witnesses in the wallet

Closes #3062

I have not update the tests in test_wallet.cpp. Also, there are several other methods in the wallet that have to do with witnesses and note data which will need to be updated, but this PR focuses on IncrementNoteWitnesses and DecrementNoteWitnesses.
2018-07-25 23:40:11 -07:00
Jonathan "Duke" Leto
e9ca010084 Correctly parse optional top parameter to getsnapshot 2018-07-25 22:36:51 -07:00
Jonathan "Duke" Leto
66d08a3640 Fix compiler error: call of overloaded 'Pair(const char [9], time_t)' is ambiguous 2018-07-25 21:40:31 -07:00
Jonathan "Duke" Leto
b456e6262b Fix compiler error: call of overloaded 'Pair(const char [9], time_t)' is ambiguous 2018-07-25 21:33:01 -07:00
Simon
2f0b2a256d Clean up for rebase: rename mapNoteData to mapSproutNoteData. 2018-07-25 20:47:41 -07:00
Simon
d9fe33b86f Only check for a valid Sapling anchor after Sapling activation.
Before Sapling activates, hashFinalSaplingRoot is 0x0, which is
not a valid anchor.  After Sapling activates, the empty root value
of 0x3e49... is a valid anchor.
2018-07-25 20:47:41 -07:00
Eirik Ogilvie-Wigley
3a5f66c880 Add parameter for version in GetValidReceive 2018-07-25 20:47:41 -07:00
Eirik Ogilvie-Wigley
e6b0a8b9ee Add getter and setter for sapling note data and update tests 2018-07-25 20:47:41 -07:00
Eirik Ogilvie-Wigley
29523dc778 Remove extra indentation 2018-07-25 20:47:41 -07:00
Eirik Ogilvie-Wigley
8e8279e728 Rename sprout specific methods 2018-07-25 20:47:41 -07:00
Eirik Ogilvie-Wigley
45de2eda07 Increment sapling note witnesses 2018-07-25 20:47:41 -07:00
Eirik Ogilvie-Wigley
f86ee1c252 Pass sapling merkle tree when incrementing witnesses 2018-07-25 20:47:41 -07:00
Eirik Ogilvie-Wigley
4a0bc6047e Extract method for incrementing witness heights 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
f6d0d5ec43 Extract methods for incrementing witnesses 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
b538024806 Extract method for copying previous witnesses 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
403b9b4e4d Clear sapling witness cache 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
9d804cc619 Decrement sapling note witnesses 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
be43b7469d Add sapling note data and map 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
00ed92343d Add out point for sapling note data 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
3c868d2b03 Consolidate for loops 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
49695a97b5 Remove redundant curly braces 2018-07-25 20:47:40 -07:00
Eirik Ogilvie-Wigley
005f3ad1dd Rename note data to include sprout 2018-07-25 20:47:40 -07:00
jl777
f8bcad38ed Test 2018-07-25 10:22:45 -11:00
jl777
312424d66d Test 2018-07-25 10:20:47 -11:00
jl777
ae7a0a5728 Test 2018-07-25 10:18:33 -11:00
jl777
08d1ae2554 Test 2018-07-25 10:12:46 -11:00
jl777
fd165fce38 Test 2018-07-25 10:11:49 -11:00
jl777
6e466feb35 Test 2018-07-25 10:05:49 -11:00
jl777
b5269aa620 Test 2018-07-25 10:02:49 -11:00
jl777
7b676bd92a Fix 2018-07-25 09:56:47 -11:00
jl777
1c7b71487c Test 2018-07-25 09:55:48 -11:00
jl777
c2fb22315d Test 2018-07-25 09:48:01 -11:00
jl777
aaff16ceb9 Fix silly bug 2018-07-25 09:39:34 -11:00
jl777
8d44e2c321 Remove dust check 2018-07-25 09:36:23 -11:00
jl777
c6c490af1d Fix duplicate vin 2018-07-25 09:33:23 -11:00
jl777
1fcdefbbb1 Fix oops 2018-07-25 09:25:31 -11:00
jl777
76a601923d Fix order display 2018-07-25 09:04:01 -11:00
jl777
ef6cece390 Test 2018-07-25 09:00:54 -11:00
jl777
289636be6d Test 2018-07-25 08:57:24 -11:00
jl777
4c0f3c8745 ) 2018-07-25 08:53:18 -11:00
jl777
05e35a3364 Fix order book prints 2018-07-25 08:52:44 -11:00
jl777
9f5388d750 Fix sell 2018-07-25 08:31:12 -11:00
jl777
f7a6568660 Test 2018-07-25 08:29:20 -11:00
jl777
6ea3b878be Test 2018-07-25 08:26:21 -11:00