Andreas M. Antonopoulos
|
26c381bf1c
|
Merge branch 'develop'
|
2018-02-03 16:35:33 -06:00 |
|
Andreas M. Antonopoulos
|
f5c0df0ed5
|
Merge pull request #493 from theStack/isstandard
replace "isStandard" by "IsStandard" (ref. to Bitcoin Core function)
|
2018-02-03 14:05:04 -08:00 |
|
Andreas M. Antonopoulos
|
bd730b5570
|
wording
|
2018-02-03 16:04:39 -06:00 |
|
Andreas M. Antonopoulos
|
76e44f226e
|
Rewrite 3-key limit information
|
2018-02-03 16:02:41 -06:00 |
|
Andreas M. Antonopoulos
|
f2b0d31346
|
Merge pull request #485 from theStack/develop
corrected standard multisignature tx limit to N=3
|
2018-02-03 13:55:22 -08:00 |
|
Andreas M. Antonopoulos
|
3e727fb760
|
Merge remote-tracking branch 'github/develop' into develop
|
2018-02-03 15:38:46 -06:00 |
|
Andreas M. Antonopoulos
|
1ddd89b658
|
Several fixes to Segwit/P2SH #440
There were several errors in the address and hash calculations. Fixed errors and added command line examples to clarify the process
|
2018-02-03 15:38:34 -06:00 |
|
Andreas M. Antonopoulos
|
240b5b0c1c
|
Better P2SH example with bx
|
2018-02-03 15:36:44 -06:00 |
|
Andreas M. Antonopoulos
|
2fcc1db70f
|
wording
|
2018-02-03 15:36:16 -06:00 |
|
Andreas M. Antonopoulos
|
4ebfce27d2
|
wording
|
2018-02-03 15:35:51 -06:00 |
|
theStack
|
2f1015c23f
|
s/isStandard/IsStandard/ (ref. to Bitcoin Core)
|
2018-02-03 05:58:52 -05:00 |
|
theStack
|
62d034b884
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-02-03 05:32:31 -05:00 |
|
theStack
|
41014a8c3a
|
Revert "corrected standard multisignature tx limit to N=3"
This reverts commit 1b2eb07bf1.
|
2018-02-03 05:28:31 -05:00 |
|
Andreas M. Antonopoulos
|
9f674c3cfe
|
Link book.asciidoc in README
|
2018-02-02 21:29:27 -06:00 |
|
Andreas M. Antonopoulos
|
4c8da579d6
|
Merge pull request #491 from cclauss/whitespace-fixes
Whitespace fixes to placate flake8
|
2018-02-02 19:27:40 -08:00 |
|
Andreas M. Antonopoulos
|
7a7cad2f93
|
Merge branch 'feature/move_segwit' into develop
|
2018-02-02 17:10:30 -08:00 |
|
Andreas M. Antonopoulos
|
3830fafc1d
|
Merge branch 'develop' into feature/move_segwit
|
2018-02-02 17:10:05 -08:00 |
|
Andreas M. Antonopoulos
|
3bf14a5e5d
|
Remove segwit appendix from book
Renumbered index references in subsequent chapters
|
2018-02-02 17:09:29 -08:00 |
|
Andreas M. Antonopoulos
|
06158f95bf
|
Moved segwit appendix to ch07
|
2018-02-02 17:08:49 -08:00 |
|
Andreas M. Antonopoulos
|
32464c86dd
|
Improved P2SH example
Showing use of bx to produce script-hash
|
2018-02-02 16:59:08 -08:00 |
|
Andreas M. Antonopoulos
|
7dfaf91542
|
Missing period at end of sentence
|
2018-02-02 16:58:14 -08:00 |
|
Andreas M. Antonopoulos
|
89ff9a6e82
|
Improved wording
|
2018-02-02 16:57:57 -08:00 |
|
Andreas M. Antonopoulos
|
6d1f105049
|
Added BIP-173 bech32 address section
|
2018-02-02 16:57:41 -08:00 |
|
cclauss
|
ecd13d3523
|
whitespace fixes to placate flake8
|
2018-02-03 01:33:46 +01:00 |
|
Andreas M. Antonopoulos
|
00851c44a8
|
Improve clarity of P2WSH to P2SH comparison
|
2018-02-02 15:46:46 -08:00 |
|
Andreas M. Antonopoulos
|
452bf49740
|
Correct wording to Segwit outputs
|
2018-02-02 15:46:22 -08:00 |
|
Andreas M. Antonopoulos
|
5924b349ec
|
Add chapter 7 ending index reference to segwit
|
2018-02-02 15:46:00 -08:00 |
|
Andreas M. Antonopoulos
|
14cde54626
|
Add segwit to chapter 7 intro
|
2018-02-02 15:43:48 -08:00 |
|
Andreas M. Antonopoulos
|
8bdfb3b7da
|
Remove end-of-chapter index reference
|
2018-02-02 15:42:28 -08:00 |
|
Andreas M. Antonopoulos
|
9511f12a37
|
Change heading level and index reference name
|
2018-02-02 15:41:21 -08:00 |
|
Andreas M. Antonopoulos
|
0721ab03e0
|
Merge branch 'develop'
|
2018-02-02 15:19:18 -08:00 |
|
Andreas M. Antonopoulos
|
6c980afdd0
|
Added Travis CI image
|
2018-02-02 16:58:56 -06:00 |
|
Andreas M. Antonopoulos
|
16939e29c0
|
Updated README
Changed branches to tags to avoid duplication of PRs, updated links in README to point to tags (releases)
|
2018-02-02 16:53:01 -06:00 |
|
Andreas M. Antonopoulos
|
b2553813dc
|
Merge branch 'master' into develop
|
2018-02-02 16:42:20 -06:00 |
|
Andreas M. Antonopoulos
|
4bad0fb922
|
Merge remote-tracking branch 'github/second_edition' into develop
|
2018-02-02 16:31:01 -06:00 |
|
Andreas M. Antonopoulos
|
b7d97a5e80
|
Use of print function from Python 3 requires ()
|
2018-02-02 16:29:36 -06:00 |
|
Andreas M. Antonopoulos
|
8b07de597e
|
Merge pull request #489 from ALeschinsky/patch-1
Tiny correction
|
2018-02-02 13:56:40 -08:00 |
|
Andreas M. Antonopoulos
|
34148102ba
|
Merge pull request #488 from cclauss/patch-2
Create .travis.yml for the second edition
|
2018-02-02 13:55:44 -08:00 |
|
Andreas M. Antonopoulos
|
75484bb05a
|
Merge branch 'second_edition'
|
2018-02-02 15:15:14 -06:00 |
|
Andreas M. Antonopoulos
|
7351d8af41
|
Merge branch 'second_edition' into develop
|
2018-02-02 15:11:59 -06:00 |
|
Andreas M. Antonopoulos
|
ef4b4f72f0
|
Merge remote-tracking branch 'github/develop' into develop
|
2018-02-02 15:09:38 -06:00 |
|
Andreas M. Antonopoulos
|
9dacbb40e3
|
Merge remote-tracking branch 'github/develop' into second_edition
|
2018-02-02 15:08:14 -06:00 |
|
Andrew Leschinsky
|
213271f59a
|
Tiny correction
|
2018-02-02 16:00:36 -05:00 |
|
cclauss
|
708caac14b
|
Create .travis.yml for the second edition
|
2018-02-02 21:57:46 +01:00 |
|
Andreas M. Antonopoulos
|
ec442a35f9
|
Merge pull request #483 from ChunshengZhao/patch-2
Update key-to-address-ecc-example.py
|
2018-02-02 12:42:51 -08:00 |
|
Andreas M. Antonopoulos
|
1622954c4e
|
Merge pull request #437 from JoKeyser/develop
Two typo fixes in Ch 12.
|
2018-02-02 12:39:23 -08:00 |
|
Andreas M. Antonopoulos
|
775c19605e
|
Merge pull request #436 from juzna/01
Fix minor grammatical issue
|
2018-02-02 12:38:15 -08:00 |
|
Andreas M. Antonopoulos
|
cbc23caf8a
|
Merge pull request #431 from cjjojoba/cjjojoba-patch-1
Update ec-math.py
|
2018-02-02 12:35:19 -08:00 |
|
Andreas M. Antonopoulos
|
225cb58c09
|
Merge pull request #430 from manjeetbhatia/patch-1
Update hash_example.py
|
2018-02-02 12:30:52 -08:00 |
|
Andreas M. Antonopoulos
|
ec281e811a
|
Merge pull request #425 from sunnyville01/wallet_key_path
Clearer description of the decendants in HD wallet key path table
|
2018-02-02 12:25:58 -08:00 |
|