1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-11-23 08:38:10 +00:00
Commit Graph

2127 Commits

Author SHA1 Message Date
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
Will Binns
2da0e056c0 Merge pull request #240 from Rfurse/patch-5
Updated current mining reward from 25 to 12.5
2017-02-09 06:14:51 -06:00
Will Binns
165de958ff Merge pull request #241 from Rfurse/patch-6
Changed "discreet" to "discrete"
2017-02-09 06:14:02 -06:00
Will Binns
627a003d43 Merge pull request #242 from Rfurse/patch-7
Removed Random Header Text
2017-02-09 06:13:06 -06:00
Andreas M. Antonopoulos
87fb1dd2c1 rewording and clarification
reworded difficulty, target, retarget, work, greatest-cumulative-work chain
2017-02-09 19:12:22 +07:00
Andreas M. Antonopoulos
e104a9784e soft fork signaling and activation 2017-02-09 17:59:41 +07:00
Andreas M. Antonopoulos
dbd1f5eb5e hard forks, soft forks, consensus development 2017-02-08 15:34:08 +07:00
Rfurse
3c75aecadb Removed Random Header Text
Removed the following text "tcoin ccooiinn  sssystem yysstteemm  iiss  tthis t"
2017-02-07 23:00:49 -05:00
Rfurse
7dd4c27c35 Changed "discreet" to "discrete" 2017-02-07 22:57:42 -05:00
Andreas M. Antonopoulos
fd3ec5b0f6 initial changes and revisions to ch10 2017-02-07 11:45:54 +07:00
Rfurse
296267da69 Updated current mining reward from 25 to 12.5 2017-02-06 22:07:10 -05:00
Will Binns
b184cb0875 Merge pull request #234 from juanesarango/develop
Fixed the number of basic questions
2017-02-05 11:13:21 -06:00
Will Binns
141d399987 Merge pull request #231 from francyi/patch-1
Fix typo in ch07
2017-02-05 11:09:39 -06:00
Will Binns
38d363eb81 Merge pull request #230 from michaelcippolito/develop
Suspected typo in acknowledgements section
2017-02-05 11:07:46 -06:00
Will Binns
d9bd861c97 Merge pull request #229 from topecongiro/develop
Fix a typo in ch06.asciidoc: 'an' to 'and'
2017-02-05 11:04:37 -06:00
Will Binns
ff70a0dfb1 Merge pull request #232 from yurigeorgiev4/patch-2
Fix BTC to Satoshi calc second try
2017-02-05 11:02:31 -06:00
Will Binns
90f03e4640 Merge pull request #233 from Rfurse/patch-1
Update ch06.asciidoc
2017-02-05 10:59:50 -06:00
Will Binns
9d17fe0565 Merge pull request #236 from edposnak/ch07-CSV-fix
nSequence must be greater than or equal to the CSV parameter
2017-02-05 10:54:21 -06:00
Will Binns
41833a480c Merge pull request #237 from edposnak/ch07-nSequence-fix
nSequence discussion
2017-02-05 10:52:13 -06:00
Will Binns
100eaeb4bb Merge pull request #238 from Rfurse/patch-4
Changed "Two" to "Three" to agree with the number questions listed be…
2017-02-05 10:49:58 -06:00
Rfurse
948c62ac8b Changed "Two" to "Three" to agree with the number questions listed below this sentence. 2017-02-03 15:35:14 -05:00
Ed Posnak
89826827dd add brief explanation for why nSequence cannot be 2^32 2017-02-03 13:04:19 -05:00
Ed Posnak
a08378be7a remove some redundancy about meaning of nSequence values less than 2^31
replace "the new consensus rules" with "new consensus rules"
2017-02-03 13:02:25 -05:00
Ed Posnak
820875d403 move discussion of consensus to consensus section 2017-02-03 12:56:35 -05:00
Ed Posnak
5eda229055 nSequence must be greater than or equal to the CSV parameter for the required number of blocks or seconds have elapsed. 2017-02-03 12:17:30 -05:00
Andreas M. Antonopoulos
f8a9017830 newbie proofing
sometimes people send money to burned addresses
2017-01-28 13:02:07 +07:00
Juan Esteban Arango
4d827c3a02 A little fix in the number of basic question around the main challenges of bitcoin 2017-01-26 16:18:01 -05:00
Rfurse
2d78285b5c Update ch06.asciidoc
I think you meant discrete rather than discreet, although that would be a clever pun.
2017-01-26 12:58:25 -05:00
yurigeorgiev4
7f9cc1d4ab Update ch06.asciidoc 2017-01-25 20:14:08 +02:00
yurigeorgiev4
04382e0dbd Fix BTC to Satoshi calc second try
In my initial read I fixed the wrong part of the calc sorry about that, it should be 0.015 instead of 0.15 to be inline with the rest of the example so the change is - 0.015 bitcoin is 1,5000,000 satoshis
2017-01-25 20:12:02 +02:00
francyi
78936b0d2b Fix typo in ch07
Change 'a output' to 'an output'
2017-01-24 22:02:14 +01:00
michaelcippolito
62ecf90b67 Suspected typo in acknowledgements section
Seems odd to switch from 'on' to 'in' within the same sentence:

"Every time I pulled on one thread of the bitcoin technology, I had to pull in the whole thing."

Changed 'in' to 'on':

"Every time I pulled on one thread of the bitcoin technology, I had to pull on the whole thing."
2017-01-22 15:20:36 -05:00
Seiichi Uchida
b6b5a5b4bb Fix a typo in ch06.asciidoc: 'an' to 'and' 2017-01-20 00:32:09 +09:00
Andreas M. Antonopoulos
d3a5dfac56 Merged branch develop into master 2017-01-19 13:16:35 +07:00
Andreas M. Antonopoulos
b799bdd2be Merged branch ch09 into develop 2017-01-19 13:15:58 +07:00
Andreas M. Antonopoulos
b2188d5075 ch09 added testnet, segnet, regtest and testing pipeline 2017-01-19 13:15:32 +07:00
Will Binns
80efbc0aef Merge pull request #227 from dimitris-t/patch-2
Fixes typo in ch08.asciidoc
2017-01-18 13:48:03 -06:00