jl777
|
2e40a4d706
|
Update assets doc
|
2018-08-26 23:50:07 -11:00 |
|
jl777
|
6265d22574
|
Rebase
|
2018-08-26 23:42:26 -11: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 |
|
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
|
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 |
|
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 |
|