Commit Graph

18830 Commits

Author SHA1 Message Date
jl777
eb9e13acee Merge pull request #842 from jl777/dev
Dev
2018-08-25 09:04:35 -11:00
jl777
e6701338dc Merge pull request #841 from jl777/jl777
Jl777
2018-08-25 09:03:23 -11:00
jl777
3e30e9e4dc Prevent unlocking fundingtxid 2018-08-25 09:01:05 -11:00
jl777
7f21f76985 -print 2018-08-25 07:29:08 -11:00
jl777
19107e362e -print 2018-08-25 05:56:54 -11:00
jl777
62d82abc4c -print 2018-08-25 05:54:33 -11:00
jl777
282473f1fc -print 2018-08-25 05:51:19 -11:00
jl777
5a7b90e880 Merge branch 'dev' into jl777 2018-08-25 05:50:53 -11:00
jl777
f4e9f4670c -print 2018-08-25 05:50:29 -11:00
jl777
8010774526 Merge pull request #840 from jl777/dev
Dev
2018-08-25 03:34:24 -11:00
jl777
8a3c440ea4 Merge pull request #839 from jl777/kolo
CCL
2018-08-24 14:20:15 -11:00
Mihail Fedorov
5016068231 CCL 2018-08-25 04:17:37 +03:00
Mihail Fedorov
4d61e5cd99 CCL 2018-08-25 04:15:55 +03:00
jl777
6009e3ef8d Merge branch 'dev' into jl777 2018-08-24 14:01:30 -11:00
jl777
6375be3326 Merge pull request #838 from tonymorony/dev
Errors printout define moved to wallet.h
2018-08-24 14:01:05 -11:00
Mihail Fedorov
26bb361375 CCL chain, one shot 2018-08-25 02:59:44 +03:00
jl777
603845b5db Merge pull request #836 from jl777/dev
Dev
2018-08-24 11:23:39 -11:00
jl777
da11a577b6 Merge pull request #835 from jl777/jl777
-print
2018-08-24 11:23:14 -11:00
jl777
968ab09e71 -print 2018-08-24 11:22:23 -11:00
Anton Lysakov
fd2fd9a7e5 Errors printout define moved to wallet.h 2018-08-25 03:59:03 +07:00
jl777
d0102c55fa Merge branch 'master' into beta 2018-08-24 09:00:53 -11:00
jl777
ca55a65ed6 Merge pull request #832 from jl777/dev
Dev
2018-08-24 08:59:01 -11:00
jl777
bac7b7174a Merge pull request #831 from jl777/jl777
Jl777
2018-08-24 08:58:19 -11:00
jl777
4b89518be0 Prevent script spam 2018-08-24 08:55:53 -11:00
jl777
681d0c6604 Fix compiler error in dice.cpp 2018-08-24 07:49:58 -11:00
jl777
0098b57993 Merge branch 'dev' into jl777 2018-08-24 06:39:39 -11:00
jl777
4ec7d5def6 Merge pull request #830 from letolabs/cctests
cctests sync
2018-08-24 05:40:40 -11:00
Jonathan "Duke" Leto
d6635db93a Test for new behavior for faucets 2018-08-24 18:34:19 +02:00
Jonathan "Duke" Leto
ade19d82a5 Grab changes from TonyL 2018-08-24 17:50:49 +02:00
Jonathan "Duke" Leto
c56b391b54 Merge remote-tracking branch 'origin/jl777' into cctests 2018-08-24 17:46:51 +02:00
Jonathan "Duke" Leto
d90c7309e6 Better errors from diceinfo 2018-08-24 17:46:36 +02:00
jl777
58e39188c8 Merge pull request #829 from tonymorony/dev
Added more Token CC tests
2018-08-24 01:59:17 -11:00
jl777
84e970ad43 Merge branch 'dev' into dev 2018-08-24 01:59:07 -11:00
Anton Lysakov
ebe5a796b9 more TokenCC tests 2 2018-08-24 19:49:55 +07:00
Anton Lysakov
a46e14f643 more Token CC test #2 2018-08-24 19:05:46 +07:00
jl777
651cc7598a Merge pull request #828 from jl777/beta
Update KMDversion to 0.2.0
2018-08-24 00:55:18 -11:00
Anton Lysakov
482348dbbc more TokenCC tests
(cherry picked from commit f3b2377d34bb03bae58a558c5beff4bb3b9e37dc)
2018-08-24 18:54:52 +07:00
jl777
632f085fb3 Merge pull request #827 from jl777/dev
Update KMDversion to 0.2.0
2018-08-24 00:54:42 -11:00
jl777
6e6d793fb8 Merge pull request #826 from jl777/jl777
Update KMDversion to 0.2.0
2018-08-24 00:54:04 -11:00
jl777
47d91d28d3 Update KMDversion to 0.2.0 2018-08-24 00:53:30 -11:00
jl777
5959b6f5f9 Merge pull request #822 from tonymorony/master
Added more Token CC tests, faucet tests disabled for now
2018-08-24 00:43:42 -11:00
jl777
292ca01f22 Merge branch 'master' into master 2018-08-24 00:43:24 -11:00
jl777
d6b9f7f610 Merge pull request #825 from jl777/beta
1 million height Release Candidate 2
2018-08-24 00:39:37 -11:00
jl777
6e37694c2c Merge pull request #824 from jl777/dev
1 million height Release Candidate 2
2018-08-24 00:39:08 -11:00
jl777
772093a6a6 Merge pull request #823 from jl777/jl777
1 million height Release Candidate 2
2018-08-24 00:38:41 -11:00
Jonathan "Duke" Leto
b918152f30 Return more dicecalc errors in json response 2018-08-24 06:45:11 +02:00
Jonathan "Duke" Leto
0b3fb56593 Bubble up some more errors in dicestatus json responses 2018-08-24 06:21:55 +02:00
Jonathan "Duke" Leto
5dcef2eae0 Merge remote-tracking branch 'origin/jl777' into cctests 2018-08-24 02:24:36 +02:00
Jonathan "Duke" Leto
798686cb3c Fix up 2018-08-24 00:32:18 +02:00
Anton Lysakov
1c1efa160b more TokenCC tests
(cherry picked from commit f3b2377d34bb03bae58a558c5beff4bb3b9e37dc)
2018-08-24 04:44:41 +07:00