1
0
mirror of https://github.com/bitcoinbook/bitcoinbook synced 2024-11-26 18:08:31 +00:00
Commit Graph

1704 Commits

Author SHA1 Message Date
Andreas M. Antonopoulos
75f0a4310a Merge branch 'tmcgovern-at72981563631' 2016-10-05 13:39:33 +02:00
Andreas M. Antonopoulos
c42e9c4ead Merge branch 'develop' 2016-10-05 13:37:31 +02:00
Andreas M. Antonopoulos
cb0de0b41c Merge branch 'segwit' 2016-10-05 13:36:10 +02:00
Andreas M. Antonopoulos
276b62d0da Merge branch 'ch05' 2016-10-05 13:35:38 +02:00
Andreas M. Antonopoulos
c3c911e1eb Revert "skeleton for timelocks and state channels"
This reverts commit 9b5f9d5e20.
2016-10-05 13:34:20 +02:00
Andreas M. Antonopoulos
84c1ddb69b Revert "chapter 5 "wallets" rewrite"
This reverts commit c2f995ad1b.
2016-10-05 13:31:07 +02:00
Andreas M. Antonopoulos
d6231e29dc memonic intro with example 2016-10-05 13:30:27 +02:00
Andreas M. Antonopoulos
e0650cb992 wallet chapter reorg and intro rewrite 2016-10-05 13:29:51 +02:00
Andreas M. Antonopoulos
c2f995ad1b chapter 5 "wallets" rewrite 2016-10-04 15:32:27 +02:00
Andreas M. Antonopoulos
eb40a2afc1 added BIPs and links 2016-09-11 20:37:45 -07:00
Andreas M. Antonopoulos
9b5f9d5e20 skeleton for timelocks and state channels 2016-09-11 15:55:27 -07:00
Andreas M. Antonopoulos
436ec1af72 segwit P2SH encapsulation, TxID and WTxID, differentiating
Misc corrections
2016-09-11 15:54:59 -07:00
Andreas M. Antonopoulos
d6dbaf758d segwit first draft done 2016-09-01 14:50:59 -04:00
Andreas M. Antonopoulos
a963eca951 correct to empty scriptSig in P2WPKH 2016-08-08 17:04:13 -05:00
Andreas M. Antonopoulos
9f58016b95 P2WPKH and P2WSH 2016-08-08 17:01:44 -05:00
Andreas M. Antonopoulos
206fbbf67c intro to segwit second draft 2016-08-02 11:15:50 -05:00
Andreas M. Antonopoulos
dd41311a85 segwit diagram 2016-08-01 22:43:57 -05:00
Will Binns
bc2aa7e8d1 Merge pull request #170 from Jorgeminator/patch-1
Update glossary.asciidoc
2016-08-01 21:39:12 -06:00
Will Binns
5aa5bc0d93 Merge pull request #182 from fabienhinault/fhi_img_0204
fix error in image 0204: wrong change in third transaction
2016-07-30 12:09:54 -06:00
Will Binns
660dd26fbf Merge pull request #190 from kargakis/btcd-dead-link-fix
Fix btcd dead link
2016-07-30 11:59:31 -06:00
Will Binns
d2e08bd764 Merge pull request #191 from dallyshalla/develop
Update ch06-orig.asciidoc
2016-07-30 01:18:10 -06:00
Will Binns
6d0f5a868a Merge pull request #194 from thiagoarrais/address-with-3
Addresses starting with digit 3
2016-07-30 01:08:25 -06:00
aseronick@oreilly.com
2212692355 Updated atlas.json 2016-06-21 06:01:48 -07:00
aseronick@oreilly.com
4b4006626c Updated atlas.json 2016-06-21 06:01:12 -07:00
aseronick@oreilly.com
e26f1c0bba Edited copyright.html with Atlas code editor 2016-06-21 06:00:54 -07:00
aseronick@oreilly.com
75598f829b Edited toc.html with Atlas code editor 2016-06-21 05:53:09 -07:00
aseronick@oreilly.com
7d45e79807 Updated images/cover.png 2016-06-21 05:51:02 -07:00
aseronick@oreilly.com
437d2909b3 Edited theme/epub/layout.html with Atlas code editor 2016-06-21 05:50:09 -07:00
aseronick@oreilly.com
acf035b176 Edited copyright.html with Atlas visual editor 2016-06-21 05:49:15 -07:00
Andreas M. Antonopoulos
b8e8f0af4f initial segwit draft 2016-06-10 19:45:17 -07:00
Thiago Arrais
b50e1ade45 Sync glossary with info from chapter 1 2016-06-10 13:55:06 -03:00
tmcgovern@oreilly.com
9068180d75 Edited ch04.asciidoc with Atlas code editor 2016-05-30 19:45:05 -07:00
tmcgovern@oreilly.com
f259891999 Edited preface.asciidoc with Atlas code editor 2016-05-30 19:43:44 -07:00
tmcgovern@oreilly.com
1160cd79cc Edited preface.asciidoc with Atlas code editor 2016-05-27 16:36:47 -07:00
tmcgovern@oreilly.com
f00b8a17cf Updated atlas.json 2016-05-27 14:25:40 -07:00
tmcgovern@oreilly.com
9885f6fb1f Updated atlas.json 2016-05-25 09:40:25 -07:00
dallyshalla
f7e4fbad7d Update ch06-orig.asciidoc
Fix 

Alerts are cryptographically signed by a public key. The corresponding private key is held by a few select members of the core development team. The digital signature ensures that fake alerts will not be propagated on the network.

Signatures are not done with public keys.
2016-05-21 23:11:09 +02:00
Michail Kargakis
fd4d290a0a Fix btcd dead link 2016-05-14 18:43:08 +02:00
Andreas M. Antonopoulos
c58a10394c intro to wallets and mnemonic word diagrams 2016-05-04 13:31:44 -05:00
Andreas M. Antonopoulos
73fb9c9219 renamed new part of chapter 4 to chapter 5 2016-04-16 09:30:56 -05:00
Andreas M. Antonopoulos
91d645fe31 split chapter 4 to separate wallets, as new chapter 5 2016-04-16 09:29:59 -05:00
Andreas M. Antonopoulos
d3aa7b84fd Merge branch 'ch04' 2016-04-16 09:20:12 -05:00
Andreas M. Antonopoulos
136ec9f83b ch4 revisions 2016-04-15 13:00:41 -05:00
Andreas M. Antonopoulos
b94e2712b4 Merge pull request #183 from phramz/patch-1
Fixed NXT 'Total currency'
2016-04-11 11:30:06 -05:00
Andreas M. Antonopoulos
9d525c7f43 Merge pull request #186 from coinradar/develop
Updated bitcoin ATM source site
2016-04-11 11:27:36 -05:00
Andreas M. Antonopoulos
dc9612a3b4 Merge pull request #187 from JerJohn15/develop
BOLDED Hardware and Paper Wallet Sections in Ch1
2016-04-11 11:27:05 -05:00
JerJohn15
9f0a507512 BOLDED Hardware and Paper Wallet Sections 2016-03-30 19:23:26 -04:00
coinradar
38dbaebd36 Updated bitcoin ATM source
Coindesk stopped updating map, Coin ATM Radar is a source for up-to-date bitcoin ATM info.
2016-03-30 22:46:41 +02:00
Andreas M. Antonopoulos
6f571790e3 Merge pull request #185 from marzig76/develop
P2PKH image was incorrectly in the P2PK section
2016-03-16 19:49:24 -05:00
Andreas M. Antonopoulos
4460038822 Merge pull request #184 from grkvlt/patch-1
Added PDF to .gitignore
2016-03-16 19:48:12 -05:00