Commit Graph

23688 Commits

Author SHA1 Message Date
jl777
6d7133ae0c Test 2018-07-26 06:13:28 -11:00
jl777
352d59af12 Test 2018-07-26 06:12:19 -11:00
jl777
c0198c14d7 tokenswapask 2018-07-26 06:04:46 -11:00
Homu
52e2f2cec9 Auto merge of #3416 - charlieok:3415_fix_double_slash_error, r=bitcartel
Remove extra slash from lockfile path

Issue: https://github.com/zcash/zcash/issues/3415

After this change I can successfully run `fetch-params` in an msys2 environment.
2018-07-26 08:42:57 -07:00
jl777
3ed54ff10c +print 2018-07-26 04:19:15 -11:00
jl777
87ccafbd6f Test 2018-07-26 03:55:59 -11:00
jl777
1d801ae689 Create funding, addfunding, lock 2018-07-26 03:52:22 -11:00
jl777
db6bfcc4f6 Params to rewardscalc 2018-07-26 03:49:26 -11:00
jl777
d18420d255 Test 2018-07-26 03:34:27 -11:00
jl777
4610bb9188 Fix 2018-07-26 03:33:10 -11:00
jl777
fac8776497 Rewards functions 2018-07-26 03:31:05 -11:00
jl777
2e20239906 Test 2018-07-26 02:15:55 -11:00
jl777
ddf40bb69e Fix ask fill dest 2018-07-26 02:06:43 -11:00
jl777
a7b6ef9acc Test 2018-07-26 01:36:42 -11:00
jl777
20eb6d3013 Test 2018-07-26 01:33:23 -11:00
jl777
546f76cad3 Test 2018-07-26 01:31:14 -11:00
jl777
87a6afd303 Test 2018-07-26 01:21:24 -11:00
jl777
f2f62e9ed9 Properly handle multiple vins funding fills 2018-07-26 01:17:50 -11:00
jl777
6a2641f71c Test 2018-07-26 01:02:23 -11:00
jl777
6b12f35df8 Test 2018-07-26 00:58:14 -11:00
jl777
84ffe75ecf Test 2018-07-26 00:44:49 -11:00
jl777
7ca7aaf719 Test 2018-07-26 00:39:54 -11:00
jl777
855ff4a174 Test 2018-07-26 00:36:53 -11:00
jl777
c272ff8636 Test 2018-07-26 00:26:11 -11:00
jl777
5901a2d530 Test 2018-07-26 00:22:50 -11:00
jl777
c2c2a808cb SMALLVAL 2018-07-26 00:22:08 -11:00
jl777
3e1ed867aa Test 2018-07-26 00:21:10 -11:00
jl777
80ec17cb25 Test 2018-07-26 00:20:27 -11:00
jl777
ba8a98f2e7 Test 2018-07-26 00:17:47 -11:00
jl777
6fa0da91a0 Test 2018-07-25 23:59:13 -11:00
jl777
1e25835880 Test 2018-07-25 23:44:56 -11:00
jl777
ca4da23d56 Test 2018-07-25 23:41:47 -11:00
jl777
d4dc91931c +print 2018-07-25 23:40:41 -11:00
jl777
91af10c12d Test 2018-07-25 23:34:10 -11:00
jl777
1ef7caa451 Test 2018-07-25 23:33:01 -11:00
jl777
37d7927487 Test 2018-07-25 23:30:17 -11:00
jl777
c76fe5e087 Test 2018-07-25 23:29:31 -11:00
jl777
6cc6dc2a9a Fixes 2018-07-25 23:26:01 -11:00
jl777
dda4711a58 Split amounts/validation: bid, ask, swap 2018-07-25 23:08:08 -11:00
jl777
2da209fbe6 Merge branch 'dev' into jl777 2018-07-25 21:54:16 -11:00
jl777
203eccbd02 Merge pull request #705 from lukechilds/assetchain-conf
[WIP] Assetchain conf
2018-07-25 21:53:59 -11:00
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