Commit Graph

18841 Commits

Author SHA1 Message Date
jl777
586c5462f0 opretbuf 2018-08-24 07:38:44 -11:00
jl777
01801559dc Bigger KV bugs 2018-08-24 07:36:47 -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
Anton Lysakov
482348dbbc more TokenCC tests
(cherry picked from commit f3b2377d34bb03bae58a558c5beff4bb3b9e37dc)
2018-08-24 18:54:52 +07: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
a9bbac3424 Sync to jl777 branch 2018-08-24 00:40:48 -11:00
jl777
cccd779df5 Merge branch 'jl777' into FSM
# Conflicts:
#	src/cc/CCinclude.h
2018-08-24 00:40:04 -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
jl777
dcdb45372d Require 100 coins to create a dice plan 2018-08-23 05:22:21 -11:00
Jonathan "Duke" Leto
e4452dc2dd Get tests passing again, by changing our test to check for an exception, which is the new behavior 2018-08-23 04:22:11 +02:00
jl777
1c75341741 -ac_ccactivate
Allows a chain to “dynamically” update to CC enabled
2018-08-22 08:17:20 -11:00
jl777
eb4cf14d40 Tweak message 2018-08-22 08:07:52 -11:00
jl777
eafcb94140 CCerror = ""; 2018-08-22 07:57:48 -11:00
jl777
692b653d79 Fix 2018-08-22 07:30:16 -11:00
jl777
6843837cda +prints 2018-08-22 07:18:22 -11:00
jl777
90c811557b Reorder eval checks 2018-08-22 06:51:21 -11:00
jl777
558b29ac15 -print 2018-08-22 06:47:06 -11:00
jl777
9b63f286da Fix dice bet without entropy tx 2018-08-22 04:52:51 -11:00
jl777
d7a84c7458 Fix no entropy for dice bet 2018-08-22 04:51:44 -11:00
jl777
d9de81b4b5 Merge branch 'jl777' into FSM 2018-08-22 04:51:20 -11:00
jl777
4a6cad3a52 Merge pull request #820 from letolabs/cctests
cctests sync
2018-08-22 04:18:59 -11:00
Jonathan "Duke" Leto
505634eeae Pass various internal dice errors back in JSON response 2018-08-22 17:07:04 +02:00
jl777
2492726dde Channel definition 2018-08-22 00:01:11 -11:00
Jonathan "Duke" Leto
b8245a9397 enable cross chain CC stuff in tests 2018-08-22 10:11:05 +02:00
Jonathan "Duke" Leto
df09c378ca Fix a test 2018-08-22 09:50:06 +02:00
Jonathan "Duke" Leto
47a5268bd4 Prevent useless prints in regtest 2018-08-22 09:49:55 +02:00
Jonathan "Duke" Leto
feff708dbe Merge remote-tracking branch 'origin/jl777' into cctests 2018-08-22 09:26:53 +02:00
Jonathan "Duke" Leto
a03146b340 Lots more error checking in rewards and dice 2018-08-22 09:26:37 +02:00
jl777
2cd8440c09 Second wave CC addresses complete 2018-08-21 09:26:29 -11:00
jl777
aed3f98794 Update CC privkeys 2018-08-21 09:21:51 -11:00
jl777
1afe09ff4e Fix include files 2018-08-21 09:01:43 -11:00
jl777
c926780fba Rest of second wave CC contract stubs 2018-08-21 08:58:19 -11:00
jl777
cce2a32b13 Fix channels address 2018-08-21 08:26:56 -11:00
jl777
287a373a05 +channels 2018-08-21 08:20:32 -11:00
jl777
5ed65e2d0d Test 2018-08-21 08:07:32 -11:00
jl777
b3965baaf2 Test 2018-08-21 08:03:35 -11:00