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

4506 Commits

Author SHA1 Message Date
Andreas M. Antonopoulos
6c2c6039a9 Merge branch 'multibit' 2014-09-17 10:10:09 -04:00
Andreas M. Antonopoulos
42a975730a replaced example of blockchain wallet with multibit wallet. Even though the blockchain wallet examples were written before I got a job at Blockchain, I want to remove even the appearance of bias. 2014-09-17 10:09:34 -04:00
Andreas M. Antonopoulos
eb63810135 Update bitcoin overview image 2014-09-16 10:48:42 -04:00
aseronick@oreilly.com
7b291da900 Updated book.asciidoc 2014-09-16 07:08:09 -07:00
Andreas M. Antonopoulos
d8deac7d7a Merge branch 'develop' 2014-09-10 12:52:48 -04:00
Andreas M. Antonopoulos
7aab2b58b0 Merge branch 'white_rabbit' into develop 2014-09-10 12:52:16 -04:00
Andreas M. Antonopoulos
a42063616d It takes a 51% attack to cause a double-spend. 2014-09-10 12:51:04 -04:00
Minh T. Nguyen
973f57549f Merge pull request #134 from erikwam/patch-16
Update ch05.asciidoc
2014-09-08 23:00:19 -07:00
Erik Wahlström
d9b774c7a7 Update ch05.asciidoc
Minor typo
2014-09-09 07:42:59 +02:00
andreas@antonopoulos.com
4148091d82 Updated book.asciidoc 2014-09-08 09:13:22 -07:00
Andreas M. Antonopoulos
47052c6322 Merge branch 'develop' 2014-09-08 12:08:58 -04:00
Andreas M. Antonopoulos
46c2394a07 move OP appendix 2014-09-08 11:49:56 -04:00
Andreas M. Antonopoulos
23a6c8276c ch4 and ch5 fixes, moved OP list to appendix 2014-09-07 13:39:44 -04:00
Andreas M. Antonopoulos
d4a2526c32 cleaned up ECC math, fixed to ch4 2014-09-07 13:22:17 -04:00
Andreas M. Antonopoulos
14aeecaba9 ch1 and ch2 fixes and diagram improvements 2014-09-07 12:52:06 -04:00
Andreas M. Antonopoulos
98d78e7bbc Merge branch 'develop' 2014-09-07 11:54:25 -04:00
Andreas M. Antonopoulos
e8bb0e7dae Merge branch 'code_samples' into develop 2014-09-07 11:53:18 -04:00
Andreas M. Antonopoulos
5b887594a4 preface and ch1 fixes 2014-09-07 11:52:11 -04:00
Andreas M. Antonopoulos
aee105fc54 github update, removed early release info 2014-09-06 16:07:14 -04:00
Andreas M. Antonopoulos
c822f19e09 preface/intro 2014-09-06 16:06:48 -04:00
Andreas M. Antonopoulos
e4510ad0f1 ch10 additions 2014-09-06 11:29:54 -04:00
Minh T. Nguyen
23b83c354f Reverting 3rd paragraph back to its original for issue #132. We'll change this later. 2014-09-05 06:55:35 -07:00
Minh T. Nguyen
13c3cb61d5 Merge branch 'bitcoinsSG-develop' into develop 2014-09-04 21:52:35 -07:00
Minh T. Nguyen
85654d7367 Revert some change from pull request #132. You don't 'unlock' an address. No need to mention paper walllets; keeping it simple 2014-09-04 21:52:20 -07:00
bitcoins.SG
e2f7349fe2 Update ch01.asciidoc, What is bitcoin 3rd para
Made a few implied points more explicit and changed "transaction" to "address" in a few occasions where it was more appropriate
for e.g.  
"Users of bitcoin own keys which allow them to prove ownership of transactions in the bitcoin network, unlocking the value to spend it and transfer it to a new recipient. " to 
"Users of bitcoin own keys which allow them to prove ownership of addresses in the bitcoin network. Unlocking these addresses, unlocks any value associated to it and grants the user the ability to spend and thus transfer value from it."

Do key holders really own transactions? when someone transfers bitcoin to a user's address, is that transaction really theirs rather than the spender's? Isn't it more appropriate to say that the bitcoins associated to their address is theirs.

"Unlocking value to spend it and transfer it to a new recipient"
here unlocking value implies the "value to spend" instead of "spend the value", also, isn't spend and transfer the same thing? and a user could transfer bitcoins to an old recipient instead of a new one.
2014-09-04 14:20:45 +05:45
Minh T. Nguyen
0973a2da88 Merge pull request #130 from edeykholt/patch-3
Minor grammar fixes Ch9
2014-08-30 20:06:05 -07:00
Ed Eykholt
f6265bbd09 Minor grammar fixes Ch9 2014-08-30 17:35:07 -07:00
Andreas M. Antonopoulos
117ddc4006 example transition 2014-08-29 12:36:26 -04:00
Andreas M. Antonopoulos
08055ea163 get_utxo and select_utxo 2014-08-29 12:35:42 -04:00
Minh T. Nguyen
66c571bbc9 Merge pull request #129 from sritchie/patch-1
Small typo re: x axis reflection
2014-08-29 09:00:26 -07:00
Minh T. Nguyen
9fd4213d48 Merge pull request #128 from hizzvizz/patch-1
Update ch08.asciidoc
2014-08-29 08:56:45 -07:00
Sam Ritchie
47a79e36e0 Small typo re: x axis reflection
Following the previous example, reflecting -4G should give us 4G, not G.
2014-08-29 09:49:20 -06:00
hizzvizz
a450708b4a Update ch08.asciidoc
Minor grammar fixes.
2014-08-29 11:33:53 -04:00
Andreas M. Antonopoulos
8828882153 added max_money.py code example 2014-08-29 10:51:02 -04:00
Andreas M. Antonopoulos
5ec6b5a94a ch10 frame 2014-08-29 10:00:03 -04:00
Minh T. Nguyen
03c579c278 Merge pull request #127 from drstrangeM/develop
Bytecoin BCN release date
2014-08-28 22:29:42 -07:00
Minh T. Nguyen
a7003ef8b1 Merge pull request #126 from Siecje/long_lines
Fixing long lines that are cut off in PDF
2014-08-28 22:19:15 -07:00
drstrangeM
90ea370a78 Bytecoin BCN release date 2014-08-28 15:49:51 +04:00
Cody Scott
e970ea97ee Fixing long lines that are cut off in PDF 2014-08-27 16:08:43 -04:00
Minh T. Nguyen
e1f63981c8 Merge branch 'physicsdude-develop' into develop 2014-08-25 21:35:04 -07:00
Bryan Gmyrek
fb85f8a14d more grammar fixes 2014-08-25 19:24:24 -07:00
Bryan Gmyrek
7622f0c77f grammar fix 2014-08-25 18:32:24 -07:00
Bryan Gmyrek
d28e0bc1a4 Merge pull request #1 from aantonop/develop
Update from original
2014-08-25 18:28:36 -07:00
Andreas M. Antonopoulos
24eb22f0da Amir Taaki's comments and corrections 2014-08-25 11:37:56 -04:00
Andreas M. Antonopoulos
209e6a808c Amir Taaki's comments and corrections 2014-08-25 11:36:44 -04:00
Andreas M. Antonopoulos
e826281007 Merge branch 'gavin_review' 2014-08-25 11:26:34 -04:00
Andreas M. Antonopoulos
e0cd0073e5 Gavin Andresen's comments and corrections. 2014-08-25 11:23:46 -04:00
Andreas M. Antonopoulos
2e3c66d627 Merge branch 'lornestar_suggestions'
Conflicts:
	book.asciidoc, resolved to master
2014-08-25 10:56:21 -04:00
Andreas M. Antonopoulos
cdc838b51a Merge branch 'lornestar_suggestions' into develop 2014-08-25 10:54:07 -04:00
Andreas M. Antonopoulos
770115bab2 removed section describing the economic benefits of bitcoin. Do not want to add political and economic statements that are not easily substantiated and seem off-topic. 2014-08-25 10:53:48 -04:00