arno/bitcoinbook
1
0
Fork 0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-12-25 07:58:15 +00:00
Code Issues Releases Wiki Activity
630 Commits 2 Branches 8 Tags 64 MiB
8828882153
Commit Graph

630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
andreas@antonopoulos.com
1106495ff3 Updated book.asciidoc 2014-07-06 12:29:09 -07:00
Andreas M. Antonopoulos
b43e48d871 Merge branch 'develop' 
Conflicts:
	ch05.asciidoc
 2014-07-06 15:26:02 -04:00
Andreas M. Antonopoulos
d6393ee97d Merge branch 'master' into chapter/Chapter5 
Conflicts:
	ch05.asciidoc

Fixed line termination
 2014-07-06 15:24:07 -04:00
andreas@antonopoulos.com
874fe9c4b1 Updated book.asciidoc 2014-07-06 15:21:37 -04:00
Andreas M. Antonopoulos
b15d4de982 fixed subscript in merkle section 2014-07-06 15:05:56 -04:00
Andreas M. Antonopoulos
46d2c1380e re-org pools, aggregation and block structure 2014-07-06 14:53:37 -04:00
Andreas M. Antonopoulos
b958f51ceb reformat code samples 2014-07-06 12:56:40 -04:00
Andreas M. Antonopoulos
364fa2d1b2 block structure and merkle trees 2014-07-06 12:23:47 -04:00
Andreas M. Antonopoulos
b750006003 ch5 orphan transactions and orphan pool 2014-07-05 16:36:35 -04:00
Andreas M. Antonopoulos
599bd6b8c4 ch6 transaction processing and fork images 2014-07-05 16:35:36 -04:00
Andreas M. Antonopoulos
3dba9c910e basic drafting of various sections 2014-07-01 22:26:34 -04:00
Richard Kiss
b6d32c4f11 Some starter text on elliptic curves. 2014-07-01 16:50:01 -07:00
Richard Kiss
c6967c19cf Added "discrete logarithm". 2014-07-01 16:47:44 -07:00
Richard Kiss
3664a80bba This doesn't seem like a trivial operation to me (ie. it can't reasonably 
be done by humans on paper).
 2014-07-01 16:46:12 -07:00
Andreas M. Antonopoulos
5f93027f08 Merge branch 'chapter/Chapter6' into develop 2014-06-28 16:15:55 -04:00
Andreas M. Antonopoulos
bf5e12fba2 block and merkle diagrams 2014-06-28 16:14:59 -04:00
Andreas M. Antonopoulos
0603d79682 Merge branch 'chapter/Chapter6' into develop 2014-06-28 12:28:46 -04:00
Andreas M. Antonopoulos
4a010418db separate block header in a different table 2014-06-28 12:27:49 -04:00
Andreas M. Antonopoulos
48887a1c0f Merge branch 'chapter/Chapter6' into develop 2014-06-28 12:22:07 -04:00
Andreas M. Antonopoulos
bf5fbb5dd5 into to blockchain and blocks 2014-06-28 12:21:07 -04:00
Minh T. Nguyen
009a1c7e07 Merge pull request #53 from Emzy/develop 
Spelling fix.
 2014-06-26 15:22:14 -07:00
Stephan Oeste
09553e11e9 Spelling fix. 
s/encumberance/encumbrance/
 2014-06-26 19:37:26 +02:00
Minh T. Nguyen
c185a29371 Merge pull request #52 from erikwam/patch-8 
Update ch05.asciidoc
 2014-06-26 07:24:18 -07:00
Minh T. Nguyen
87580891f0 Merge pull request #51 from erikwam/patch-7 
Update ch05.asciidoc
 2014-06-26 07:23:52 -07:00
Erik Wahlström
7335cf8c92 Update ch05.asciidoc 
typo
 2014-06-26 12:49:29 +02:00
Erik Wahlström
aa57657ab6 Update ch05.asciidoc 
typos
 2014-06-26 12:29:41 +02:00
Minh T. Nguyen
e4c1a740c3 Correcting the hexadecimal of the DOCPROOF identifier 2014-06-25 22:46:55 -07:00
Minh T. Nguyen
be23e23bd7 Changing Winter 2012 to late 2012, since Winter has a different time implications in other countries such as Australia 2014-06-25 22:40:59 -07:00
Minh T. Nguyen
53a1a7f17d Light copy-editing in chapter 5 2014-06-25 22:39:27 -07:00
Minh T. Nguyen
17eb6b378f Merge branch 'kargakis-develop' into develop 2014-06-25 21:14:23 -07:00
Minh T. Nguyen
9102c23db6 Merge conflicts from Pull #50 2014-06-25 21:14:09 -07:00
Andreas M. Antonopoulos
6e2caba813 Merge pull request #49 from richardkiss/develop 
First check-in of pycoin.asciidoc.
 2014-06-25 22:32:31 -04:00
amacdonald@oreilly.com
3142a92336 Made changes to ch05.asciidoc 2014-06-25 13:20:00 -07:00
Andreas M. Antonopoulos
141ef6a8bb ch6 outline 2014-06-25 12:44:27 -04:00
andreas@antonopoulos.com
970f0cae10 Updated book.asciidoc 2014-06-25 09:34:05 -07:00
Andreas M. Antonopoulos
3e6388c803 Merge branch 'chapter/Chapter5' into develop 2014-06-25 12:29:56 -04:00
Andreas M. Antonopoulos
81ea186efa clarified P2SH redeemScript requirements of isStandard 2014-06-25 12:29:24 -04:00
Andreas M. Antonopoulos
f4de47a3ac finished P2SH 2014-06-25 12:25:15 -04:00
Michalis Kargakis
503b0553db Minor syntax and grammar fixes 2014-06-25 15:44:30 +03:00
Minh T. Nguyen
69a4ec8ace Actual tiny merge of Issue #44 2014-06-24 23:44:51 -07:00
Minh T. Nguyen
578b3b6c75 Tiny partial merge of Issue #44 2014-06-24 23:31:31 -07:00
Andreas M. Antonopoulos
2c7a197045 updated scriptSig + scriptPubKey diagram 2014-06-24 20:31:18 -04:00
Andreas M. Antonopoulos
70dec1760e Merge branch 'develop' into chapter/Chapter5 2014-06-24 20:27:49 -04:00
Andreas M. Antonopoulos
67a77f49cf p2sh section 2014-06-24 20:27:02 -04:00
Andreas M. Antonopoulos
6ed49d07e7 Eugenia correction and gender pronoun fix 2014-06-24 14:26:33 -04:00
Andreas M. Antonopoulos
c14c56c23d Eugenia corrected gender pronouns 2014-06-24 14:23:10 -04:00
Andreas M. Antonopoulos
18daf24793 one OP_RETURN per Tx, small corrections 2014-06-24 13:06:40 -04:00
Andreas M. Antonopoulos
289523e9aa Corrections and new diagram for part 2 of P2PKH 2014-06-24 13:02:53 -04:00
Andreas M. Antonopoulos
d29c47fc49 Merge branch 'develop' into chapter/Chapter5 2014-06-24 12:43:13 -04:00
Andreas M. Antonopoulos
cf4b8963f1 Add simple match script execution steps 2014-06-24 12:33:35 -04:00