Commit Graph

22197 Commits

Author SHA1 Message Date
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
Homu
6868aaff00 Auto merge of #3468 - sandakersmann:patch-1, r=bitcartel
Fix copyright attribution to match upstream

This has to be included to not violate the license.

Ref: https://github.com/bitcoin/bitcoin/blob/master/COPYING
2018-08-24 14:13:09 -07: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
6206088760 Merge pull request #833 from jl777/beta
Beta
2018-08-24 09:01:03 -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
Marius Kjærstad
0200e5ed36 Update debian package copyright license
Fix debian package copyright attribution to match upstream.
2018-08-24 20:25:00 +02: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
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