1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-10-09 17:39:16 +00:00
Commit Graph

496 Commits

Author SHA1 Message Date
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
Minh T. Nguyen
2577657b54 Undoing the digital signature part, as signature that produces a signature sounds unnecessary 2014-07-24 23:02:19 -07:00
Minh T. Nguyen
4b0cbee547 Merge branch 'develop' of https://github.com/edeykholt/bitcoinbook into edeykholt-develop 2014-07-24 22:40:54 -07:00
Michalis Kargakis
5966a9ecb8 Various fixes 2014-07-24 22:35:08 +03:00
Andreas M. Antonopoulos
d50e287197 Merge branch 'develop' 2014-07-24 11:20:44 -05:00
Andreas M. Antonopoulos
7c2f4f085e removed draft warning 2014-07-24 11:19:57 -05:00
andreas@antonopoulos.com
fe9039ad1f Updated book.asciidoc 2014-07-24 09:14:42 -07:00
Andreas M. Antonopoulos
21a1cfd363 Merge branch 'develop' 2014-07-24 11:11:30 -05:00
Andreas M. Antonopoulos
bbfaf331d0 Merge branch 'develop' into chapter/Chapter7 2014-07-24 11:10:41 -05:00
Andreas M. Antonopoulos
2e379c5f5f merkle path and SPV, few changes to intro 2014-07-24 11:03:17 -05:00
Andreas M. Antonopoulos
06a97e1b68 merkle clarification 2014-07-24 11:03:16 -05:00
Andreas M. Antonopoulos
7a35a6ea04 merkle path and SPV, few changes to intro 2014-07-23 23:31:31 -05:00
Andreas M. Antonopoulos
95cef90b8c merkle clarification 2014-07-23 11:39:53 -05:00
Michalis Kargakis
a6936290ec Add info about btcd 2014-07-23 14:06:58 +03:00
edeykholt
5eed7fe509 Update ch01.asciidoc
not "remove" but "replace"
2014-07-23 00:31:43 -07:00
edeykholt
9d7ef19a37 Update ch01.asciidoc
Clarifications and grammar suggestions
2014-07-23 00:07:20 -07:00
Minh T. Nguyen
4a6b313469 Merge branch 'kargakis-develop' into develop 2014-07-22 23:02:27 -07:00
Minh T. Nguyen
9148f4decc The comma around 'any orphans found' is not needed AFAIK 2014-07-22 23:02:13 -07:00
Minh T. Nguyen
f8b062b881 Merge branch 'develop' of https://github.com/kargakis/bitcoinbook into kargakis-develop 2014-07-22 23:00:39 -07:00
Andreas M. Antonopoulos
d6aeddfb73 ch7 first draft 2014-07-22 21:35:05 -05:00
Michalis Kargakis
3bdd05e248 Various fixes 2014-07-23 00:06:19 +03:00
Andreas M. Antonopoulos
eda80d6fc4 Merge branch 'develop' 2014-07-21 20:45:49 -05:00
Andreas M. Antonopoulos
1ccff083c9 minor fixes to layout and flow on chapter 6 2014-07-21 20:45:12 -05:00
Andreas M. Antonopoulos
c235408ceb Merge branch 'develop' and 'Chapter6-Reorg'
Conflicts:
	ch05.asciidoc
2014-07-21 20:30:23 -05:00
Andreas M. Antonopoulos
81f84d1bef Merge branch 'chapter/Chapter6-Reorg' into develop 2014-07-21 20:25:05 -05:00
Andreas M. Antonopoulos
bb54b4806c alert 2014-07-21 20:24:35 -05:00
Andreas M. Antonopoulos
21f7f2d6e3 Transaction Verification moved to chapter 8. 2014-07-21 20:06:33 -05:00
Andreas M. Antonopoulos
391b561735 SPV synch and bloom filters. Merkle trees moved to chapter 7 2014-07-21 19:59:24 -05:00
Andreas M. Antonopoulos
513e4e32be SPV fixes and inventory-getheaders-headers section 2014-07-21 12:37:31 -05:00
Andreas M. Antonopoulos
50468780b8 SPV nodes 2014-07-20 21:49:14 -05:00
Andreas M. Antonopoulos
1d70dfa96b address propagation and discovery 2014-07-20 12:41:13 -05:00
Andreas M. Antonopoulos
b5a903a66a handshake and inventory diagrams 2014-07-20 12:30:35 -05:00
Andreas M. Antonopoulos
8eb8bb4946 version, verack, getblocks, inv, getdata network messages 2014-07-19 21:52:42 -05:00
Minh T. Nguyen
544f0efdb9 Updated acknowledgement cross-referenced from https://github.com/aantonop/bitcoinbook/graphs/contributors 2014-07-17 08:33:06 -07:00
Minh T. Nguyen
ed7f48d0f7 Merge branch 'richardkiss-develop' into develop 2014-07-17 08:21:02 -07:00
Minh T. Nguyen
8320b175e7 Minor revertion to its original sentence structure albeit keeping Richard's ;calculation' 2014-07-17 08:20:33 -07:00
Minh T. Nguyen
20fea47e40 Merge branch 'develop' of https://github.com/richardkiss/bitcoinbook into richardkiss-develop 2014-07-17 08:14:42 -07:00
Andreas M. Antonopoulos
17203dda13 higher resolution network diagram 2014-07-17 10:24:29 -04:00
Andreas M. Antonopoulos
a8c1e18bca images added to network chapter 2014-07-17 10:13:39 -04:00
Andreas M. Antonopoulos
40ad072d32 network node diagrams and extended network diagram 2014-07-17 10:11:27 -04:00
Andreas M. Antonopoulos
977ee6a746 Merge branch 'develop' into chapter/Chapter6-Reorg 2014-07-17 08:47:07 -04:00
Andreas M. Antonopoulos
09a73c4e56 bitcoin network diagrams 2014-07-17 08:44:12 -04:00
Minh T. Nguyen
9cfb054fb1 Change 'acknowledge range of locking script requirement' to 'acknowledge range of possibilities in scripting technology 2014-07-16 22:23:08 -07:00
Minh T. Nguyen
5acff1cc95 Change sentence to better describe how confirmations are counted as reported by Issue #54 2014-07-16 22:06:01 -07:00