Minh T. Nguyen
d5cb6b20b5
Merge branch 'edeykholt-develop' into develop
2014-07-31 00:04:28 -07:00
Minh T. Nguyen
713fe0e562
More revertion to original text or minor text adaptation following the merge from #74
2014-07-31 00:04:13 -07:00
Minh T. Nguyen
55ca4759ab
Undoing some merges from #74 where the text changed to drastically from its original
2014-07-30 23:44:12 -07:00
Minh T. Nguyen
3b094972b2
Merge branch 'develop' of https://github.com/edeykholt/bitcoinbook into edeykholt-develop
2014-07-30 23:20:34 -07:00
Minh T. Nguyen
87e7ddcd4a
Merge branch 'develop' of https://github.com/aantonop/bitcoinbook into develop
2014-07-30 22:31:58 -07:00
Minh T. Nguyen
b4fdbfae15
Change 'Contains a mining functions with...' to 'Contains a mining function with...' per Issue #71
2014-07-30 22:31:33 -07:00
Minh T. Nguyen
f40a8acd7e
Merge pull request #73 from erikwam/patch-13
...
Update ch07.asciidoc
2014-07-30 22:24:12 -07:00
Minh T. Nguyen
c0eb5371e5
Merge pull request #70 from erikwam/patch-9
...
Update ch06.asciidoc
2014-07-30 22:22:20 -07:00
Minh T. Nguyen
7b4423e291
Merge pull request #69 from kargakis/develop
...
Handle error when decoding address
2014-07-30 22:17:16 -07:00
Minh T. Nguyen
4339865c2e
Merge pull request #68 from kargakis/github-link
...
Dont use github link to line number
2014-07-30 22:16:52 -07:00
amacdonald@oreilly.com
908e9c2312
Made changes to ch07.asciidoc
2014-07-30 14:15:34 -07:00
amacdonald@oreilly.com
ad82782496
Made changes to ch06.asciidoc
2014-07-30 12:55:32 -07:00
Andreas M. Antonopoulos
4055987987
fixed intro and flow of mining.
2014-07-30 14:38:54 -04:00
Ed Eykholt
8c0e2d49ef
wordsmithing ch04.asciidoc
...
Also merged two tips that had duplicate wording.
2014-07-30 00:52:10 -07:00
Andreas M. Antonopoulos
fa657f5e40
chapter re-organization, mining first, then consensus
2014-07-29 22:42:11 -04:00
Ed Eykholt
e90eec2286
italics for hash() in ch03.asciidoc
...
italicized the 3 occurrences of inline hash() types, e.g.: _transaction hash (txid)_ so they are easier to parse when reading
2014-07-29 18:52:03 -07:00
Ed Eykholt
27b9676294
Two or three grammar fixes ch03.asciidoc
2014-07-29 18:34:43 -07:00
Andreas M. Antonopoulos
efe3a962a9
coinbase data
2014-07-29 11:54:24 -04:00
Andreas M. Antonopoulos
b1cd52b9e9
generation Tx example
2014-07-29 11:39:31 -04:00
Andreas M. Antonopoulos
88030ed78d
format fix
2014-07-29 11:22:32 -04:00
Andreas M. Antonopoulos
751780daf9
Merge branch 'chapter/Chapter8' into develop
2014-07-29 10:39:48 -04:00
Andreas M. Antonopoulos
d5e4a9f2da
block header and mining
2014-07-29 10:38:01 -04:00
Ed Eykholt
4d1f539560
wordsmithing ch02.asciidoc #11
2014-07-28 22:54:15 -07:00
Ed Eykholt
6f76de968c
wordsmithing ch02.asciidoc #5a
...
A better wording than "wordsmithing ch02.asciidoc #5 "
2014-07-28 22:47:50 -07:00
Ed Eykholt
7f7ad0cd65
wordsmithing ch02.asciidoc #10
2014-07-28 22:22:51 -07:00
Ed Eykholt
95bf1158ca
wordsmithing ch02.asciidoc #9
2014-07-28 22:06:22 -07:00
Ed Eykholt
556763749f
wordsmithing ch02.asciidoc #8
2014-07-28 21:52:13 -07:00
Ed Eykholt
a3b430e097
wordsmithing ch02.asciidoc #7
2014-07-28 21:30:42 -07:00
Ed Eykholt
1d419c9449
wordsmithing ch02.asciidoc #6
2014-07-28 21:17:57 -07:00
Ed Eykholt
e9d5c982cc
wordsmithing ch02.asciidoc #5
...
In the paragraph beginning "Transactions are like lines in a double-entry bookkeeping ledger." This paragraph needed to be re-written. It was incorrect from an accounting interpretation. Debits (meaning "left") are not really on the left side of the graphic and typical display for Inputs in this case, since this is in effect a balance sheet journal entry. Feel free to double check this with an actual accountant.
2014-07-28 21:15:47 -07:00
Ed Eykholt
aa0e6cfbca
wordsmithing ch02.asciidoc #4
2014-07-28 20:53:07 -07:00
Ed Eykholt
32d2c0bfb6
wordsmithing ch02.asciidoc #3
2014-07-28 20:45:14 -07:00
Ed Eykholt
6fd49cc2f5
wordsmithing ch02.asciidoc #2
2014-07-28 20:41:40 -07:00
Ed Eykholt
7c56fca0f0
wordsmithing ch02.asciidoc
2014-07-28 20:38:32 -07:00
Andreas M. Antonopoulos
5ff9890943
Constructing the block header, difficulty representation
2014-07-28 18:36:29 -04:00
Andreas M. Antonopoulos
4f4c60ca1f
corrections, generation Tx, reward calculation, coinbase data
2014-07-28 15:47:06 -04:00
Erik Wahlström
c1f8e543fc
Update ch07.asciidoc
...
Proposed rephrase of text in "tip box".
2014-07-28 08:46:47 +02:00
Michalis Kargakis
1e3306d47b
Dont use github link to line number
...
If any line above the linked line is ever added or removed from
chainparams.cpp, the link pointing to L.123 will continue to point to
L.123 but the start of the comment won't be there. See
andrew.yurisich.com/work/2014/07/16/dont-link-that-line-number/ for the
workaround i have used on this.
2014-07-26 22:45:36 +03:00
Erik Wahlström
ceaa91d28e
Update ch06.asciidoc
...
Typos
2014-07-26 15:30:57 +02:00
Michalis Kargakis
004c015db2
Handle error when decoding address
2014-07-26 15:58:56 +03:00
Minh T. Nguyen
38b4ec8ffa
Merge pull request #67 from kargakis/develop
...
pay-to-addr-script example code
2014-07-25 17:56:35 -07:00
Michalis Kargakis
61344a9a77
pay-to-addr-script example code
2014-07-25 20:42:30 +03:00
Andreas M. Antonopoulos
8cd15d9ae6
Merge pull request #65 from kargakis/btcd-info
...
Add info about btcd
2014-07-25 09:55:51 -05:00
Minh T. Nguyen
0874bc6e21
Merge branch 'kargakis-develop' into develop
2014-07-24 23:28:28 -07:00
Minh T. Nguyen
b4cb4da5de
I believe 'data' is always treated singular.
2014-07-24 23:27:59 -07:00
Minh T. Nguyen
a63ebecf96
Merge branch 'develop' of https://github.com/kargakis/bitcoinbook into kargakis-develop
2014-07-24 23:22:36 -07:00
Minh T. Nguyen
06ecd1c088
Merge branch 'develop' of https://github.com/aantonop/bitcoinbook into develop
2014-07-24 23:08:53 -07:00
Minh T. Nguyen
dfa9015167
Merge branch 'edeykholt-develop' into develop
2014-07-24 23:08:13 -07:00
Minh T. Nguyen
b970d2051c
Reverting some more text back to the original text
2014-07-24 23:06:44 -07:00
Minh T. Nguyen
e098389271
Reverting the mentioning of ATMs. While it's true, let's leave it to Andreas to update this chapter. We just finished half of 2014, and there is a lot that will change here in Bitcoin space. The previous sentence of using credit card is also already outdated
2014-07-24 23:03:51 -07:00
