1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-12-26 08:28:15 +00:00
Commit Graph

2363 Commits

Author SHA1 Message Date
Will Binns
24877cea80 Merge pull request #272 from dimitris-t/patch-6
Typo in ch12.asciidoc
2017-03-19 08:07:09 -06:00
Will Binns
fc59ec4cd3 Merge pull request #273 from dimitris-t/patch-7
Typo in ch12.asciidoc
2017-03-19 08:06:17 -06:00
Will Binns
f11f67579e Merge pull request #274 from dimitris-t/patch-8
Typo in ch12.asciidoc
2017-03-19 08:04:29 -06:00
Will Binns
2c5b5b6648 Merge pull request #275 from dimitris-t/patch-9
Typo in ch12.asciidoc
2017-03-19 08:03:54 -06:00
Will Binns
f863406422 Merge pull request #276 from dimitris-t/patch-10
Update ch12.asciidoc
2017-03-19 08:02:20 -06:00
Will Binns
ce20d4814b Merge pull request #277 from dimitris-t/patch-11
Typos in glossary.asciidoc
2017-03-19 08:01:30 -06:00
Will Binns
e48695808e Merge pull request #279 from halseth/develop
Lightning Network announced in 2015
2017-03-19 07:59:45 -06:00
Will Binns
dbab2f368f Merge pull request #280 from bokobza/patch-2
build-msw.md is now called build-windows.md
2017-03-19 07:57:56 -06:00
Jeremy Bokobza
5ae641fce6 build-msw.md is now called build-windows.md 2017-03-16 13:37:24 +00:00
halseth
f24b5cee96 Set first LN draft to Feb 2015 2017-03-16 00:40:20 +00:00
Dimitris Tsapakidis
56326b5154 Typos in glossary.asciidoc
"the the block chain" -> "the blockchain"
spendingy -> spending
commiting -> committing
unlimted -> unlimited
2017-03-15 05:32:07 +04:00
Dimitris Tsapakidis
91590abd8f Update ch12.asciidoc
Fixes #256. Merged these two fragments into a sentence: "The second problem is that" and "Since each subsequent commitment transaction"
2017-03-15 05:12:03 +04:00
Dimitris Tsapakidis
d2b7a90b25 Typo in ch12.asciidoc
Fixes #252. Added full stop at the end of "The output containing the OP_RETURN is called the marker output"
2017-03-15 05:00:25 +04:00
Dimitris Tsapakidis
59a4532f40 Update ch12.asciidoc
Fixes #259. "Anyone who know he secret" -> "Anyone who know the secret"
2017-03-15 04:55:09 +04:00
Dimitris Tsapakidis
e31564f751 Typo in ch12.asciidoc
Fixes #255. "The most form of unidirectional payment channel was demonstrated as a prototype" -> "The first form of unidirectional payment channel was demonstrated as a prototype"
2017-03-15 04:51:22 +04:00
Dimitris Tsapakidis
8bef1344ed Typo in ch12.asciidoc
Fixes #261. "Alice LN node" -> "Alice's LN node"
2017-03-15 04:46:53 +04:00
Dimitris Tsapakidis
ee7c24aacc Typo in ch01.asciidoc
"including the users identity" -> "including the user's identity"
2017-03-15 03:54:31 +04:00
Dimitris Tsapakidis
7a4cc0f52d Typos in ch10.asciidoc
"involve  tradeoffs" -> "involve tradeoffs" (dropped double space)
"and  bitcoin" -> "and bitcoin" (dropped double space) 
beging -> begin
$1000 -> $1,000 (all other figures on this space are formatted with a thousand separator)
approximaely  -> approximately
commmon -> common
2017-03-15 02:58:52 +04:00
dimitris-t
bd23893df6 Typo in ch12.asciidoc
"a application platform" -> "an application platform"
2017-03-15 02:27:26 +04:00
BitcoinCTF
44c7738930 Fix two typos/spelling errors 2017-03-15 00:00:22 +10:00
Andreas M. Antonopoulos
e586379e00 Merged branch develop into master 2017-03-14 14:33:10 +02:00
Andreas M. Antonopoulos
a17f6ae6e0 Merged branch ch12 into develop 2017-03-14 14:30:58 +02:00
Andreas M. Antonopoulos
aa07050981 LN routing and conclusion of ch12 2017-03-14 14:30:09 +02:00
Andreas M. Antonopoulos
a68a30ba5a intro fixes, HTLC and LN sections added 2017-03-12 09:44:47 +02:00
Will Binns
3371febb2d
preface: Add new contributor 2017-03-10 16:00:14 -06:00
Will Binns
470ce9b306 Merge pull request #249 from bokobza/develop
Fixed small spelling mistake
2017-03-10 15:57:57 -06:00
Will Binns
bbada73301 Merge pull request #248 from cherouvim/develop
fixed missing parenthesis
2017-03-10 15:56:10 -06:00
Andreas M. Antonopoulos
9dc152ebf2 payment channels with commitment revocation 2017-03-08 20:50:10 +02:00
Andreas M. Antonopoulos
921a2bf8a3 payment channels part 1 2017-03-08 09:21:59 +02:00
Jeremy Bokobza
c948117d2f Fixed small spelling mistake 2017-03-05 23:06:18 +00:00
Ioannis Cherouvim
f8dda721c1 fixed missing parenthesis 2017-03-03 23:02:23 +02:00
Will Binns
0e607515b7 Merge pull request #247 from cherouvim/develop
typo in ch01.asciidoc
2017-03-01 10:43:17 -06:00
Will Binns
bcdb6bc5eb
preface: Add new contributors 2017-03-01 10:42:32 -06:00
Will Binns
45735945d1 Merge pull request #245 from Rfurse/patch-8
Added verb "is" to sentence
2017-03-01 10:15:23 -06:00
Will Binns
013c5f211c Merge pull request #244 from topecongiro/develop
Fix a typo in ch01.asciidoc: add '?'
2017-03-01 10:13:10 -06:00
Ioannis Cherouvim
4783510460 typo in ch01.asciidoc 2017-02-28 09:58:43 +02:00
Seiichi Uchida
93ec8fa20e Merge branch 'develop' into develop 2017-02-23 11:03:02 +09:00
Rfurse
08f263b79a Added verb "is" to sentence 2017-02-19 07:14:51 -05:00
Seiichi Uchida
6ad7ac07e7 Fix a typo in ch01.asciidoc: add '?' 2017-02-18 15:12:45 +09:00
Andreas M. Antonopoulos
4f79a62790 segwit moved to appendix
appdx-future-segwit
2017-02-18 11:53:19 +07:00
Andreas M. Antonopoulos
d3950ded82 duplicate word (typo) 2017-02-18 11:12:38 +07:00
Andreas M. Antonopoulos
49e8b56533 corrected P2SH(P2WPKH) and P2SH(P2WSH) HASH160 and addresses
Resolve issue: https://github.com/bitcoinbook/bitcoinbook/issues/228
2017-02-18 11:09:12 +07:00
Andreas M. Antonopoulos
f318dcf7f7 ch12 intro & colored coins 2017-02-15 21:30:47 +07:00
Andreas M. Antonopoulos
57520b2eec update scriptops appendix
add timelock opcodes
add missing attribution to Wiki
2017-02-15 14:30:43 +07:00
Andreas M. Antonopoulos
77f1c37cbe Merged branch colored_coins into ch12 2017-02-12 17:53:46 +07:00
Andreas M. Antonopoulos
6ce2096bd6 Removed old files 2017-02-10 15:40:46 +07:00
Andreas M. Antonopoulos
8b69458b20 Merged branch develop into master 2017-02-10 15:37:04 +07:00
Andreas M. Antonopoulos
9546fad1cc Merged branch ch10 into develop 2017-02-10 15:35:11 +07:00
Andreas M. Antonopoulos
c4385fce76 illustration of a fork
A fork illustrated with shapes instead of colors, so that it works in black-and-white print.
2017-02-10 14:35:01 +07:00
Andreas M. Antonopoulos
d31f9a21bb updated hash rate, difficulty and profitability metrics 2017-02-09 19:44:59 +07:00