1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-12-24 23:48:32 +00:00
Commit Graph

614 Commits

Author SHA1 Message Date
Andreas M. Antonopoulos
ba54306a8d Merge branch 'develop' 2014-08-07 13:39:42 -05:00
Andreas M. Antonopoulos
1e4501283e Merge branch 'chapter/Chapter8' into develop 2014-08-07 13:38:52 -05:00
Andreas M. Antonopoulos
e173d9e826 mining pools, p2pool, consensus attacks 2014-08-07 13:38:02 -05:00
Michalis Kargakis
db9d1352b1 Add websocket example 2014-08-07 15:01:22 +03:00
Minh T. Nguyen
433381f6a6 Fix spelling of frequency hopping from Issue #82 2014-08-05 23:37:56 -07:00
Minh T. Nguyen
c97ba5a949 Merge branch 'develop' of https://github.com/aantonop/bitcoinbook into develop 2014-08-05 23:33:36 -07:00
Minh T. Nguyen
83f0f8aa5c Resolve merge conflicts in chapter 5 2014-08-05 23:33:20 -07:00
Minh T. Nguyen
d9e0b6911d Resolving merge conflicts 2014-08-05 23:25:43 -07:00
Minh T. Nguyen
3f52762ee4 Merge pull request #79 from kargakis/btcd-info
More info about btcd
2014-08-05 22:57:31 -07:00
Minh T. Nguyen
272f66f167 Merge pull request #77 from kargakis/add-example
Extract info from pk script example
2014-08-05 22:38:06 -07:00
Ed Eykholt
1235ee6b74 Grammar changes for Chapter 6 2014-08-02 09:50:28 -07:00
Ed Eykholt
7e472c28b9 grammar fixes for ch05.asciidoc
This change still reads somewhat ambiguous. Although clearly lightweight clients don't contain a full blockchain, some mining nodes do.
2014-08-02 09:43:52 -07:00
Ed Eykholt
482ca6354e grammar fixes for ch06.asciidoc 2014-08-02 09:33:15 -07:00
Ed Eykholt
f553fdc4ab Update ch06.asciidoc 2014-08-02 07:53:16 -07:00
Michalis Kargakis
ca0b8fd8c9 More info about btcd 2014-08-02 15:12:22 +03:00
Ed Eykholt
02888c1c0b grammar fixes for ch05.asciidoc 2014-08-01 17:46:47 -07:00
andreas@antonopoulos.com
02c6ea5f63 Updated book.asciidoc 2014-08-01 08:15:08 -07:00
Andreas M. Antonopoulos
1d0cf1166d forks, difficulty target, two new diagrams 2014-08-01 11:11:54 -04:00
Andreas M. Antonopoulos
e2d4d7099f Merge branch 'develop' 2014-07-31 18:12:18 -04:00
Andreas M. Antonopoulos
51198bdd99 undo CR/LF line ending 2014-07-31 18:11:11 -04:00
Andreas M. Antonopoulos
d5dd47b7d2 Merge branch 'chapter/Chapter8' into develop 2014-07-31 17:22:39 -04:00
Andreas M. Antonopoulos
c335c1cf6d difficulty targeting, block validation, chain selection 2014-07-31 17:22:08 -04:00
Michalis Kargakis
5da0b85ced Extract info from pk script example
Code example where we extract information from a public key script. Use
go run [filename].go to run every go example instead of go build.
2014-07-31 20:21:26 +03:00
Ed Eykholt
87b5e66dab minor grammar fixes ch05.asciidoc 2014-07-31 09:32:44 -07:00
Ed Eykholt
84ce904466 Grammar changes (mostly) for ch05.asciidoc 2014-07-31 09:15:51 -07:00
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