Commit Graph

19437 Commits

Author SHA1 Message Date
jl777
9bcc458ddf Merge pull request #845 from jl777/dev
Dev
2018-08-25 10:06:43 -11:00
jl777
470f3b4e17 Merge pull request #844 from jl777/jl777
Jl777
2018-08-25 10:05:20 -11:00
jl777
717ede079e Required locked tx 2018-08-25 09:43:48 -11:00
jl777
8254d65aa1 Prevent unlocking the fundingtxid 2018-08-25 09:36:07 -11:00
jl777
4208083103 +print 2018-08-25 09:20:57 -11:00
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
d2eccba5a5 -<<<<< 2018-08-24 14:02:45 -11:00
jl777
7cb141476c Merge branch 'jl777' into FSM
# Conflicts:
#	src/main.cpp
2018-08-24 14:02:07 -11: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
jl777
0f05fc9ae5 print 2018-08-24 11:21:59 -11:00
Anton Lysakov
fd2fd9a7e5 Errors printout define moved to wallet.h 2018-08-25 03:59:03 +07:00
jl777
a0cf278da1 More chapters 2018-08-24 09:50:22 -11:00
jl777
8796e6ab42 -prints 2018-08-24 09:33:30 -11:00
jl777
10c03713d8 Chapter 12 2018-08-24 09:26:22 -11: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
dcde53cb6e Hardcap on maxscriptsize 2018-08-24 08:30:45 -11:00
jl777
28b37d0346 test 2018-08-24 08:12:01 -11:00
jl777
681d0c6604 Fix compiler error in dice.cpp 2018-08-24 07:49:58 -11:00
jl777
7a1b708faf Bigger buf 2018-08-24 07:40:47 -11:00
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