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
ca333
83e336bce7
Merge pull request #55 from jl777/dev
...
update dev
2018-08-24 14:05:35 +02: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
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
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
Homu
ad8d4d831c
Auto merge of #3427 - mdr0id:readme_update_rtd, r=daira
...
Readme update for ReadtheDocs migration
This PR is intended to provide a README that points to new ReadtheDocs locations.
2018-08-23 13:28:44 -07:00
Homu
582ca87bd4
Auto merge of #3451 - zancas:master, r=daira
...
Revise help output for z_sendmany
The previous version of the usage message for z_sendmany used the word "Change"
in an ambiguous way.
The intent was to describe "Change" the noun that indicates the portion of a
transaction's funds that are returned to the payer, however the context did not
provide an immediate cue to differentiate from the verb form meaning
"to alter". Indeed, in other help strings in the same file that meaning of the
word is correct, i.e. the verb form is used. Moreover a typo in the form of a
missing "a" later in the same sentence exacerbated the problem, by decreasing
readability precisely where context could reduce confusion.
2018-08-23 11:23:23 -07:00
ca333
b944c16998
Merge pull request #52 from jl777/dev
...
update dev
2018-08-23 20:22:23 +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
mdr0id
48f1728009
Resolve final edits for README
...
Update README.md
Update README with final edits
2018-08-22 13:21:35 -07: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
Jack Grigg
d316992f55
rpc: Clarify Sprout shielded addresses in help text
2018-08-22 12:33:30 +01: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
