David A. Harding
a4f337b840
All: update to comply with current draft of bip-bikeshed
2023-08-01 06:44:36 -10:00
David A. Harding
6ac0122731
CH07-13: edits for arufino feedback (thanks!)
2023-06-28 15:19:52 -10:00
David A. Harding
ea1a64bd61
CH14: small edits for style and consistency
2023-06-28 14:30:14 -10:00
David A. Harding
aeb9f81f26
CH14: s/bitcoin/Bitcoin/
2023-06-28 14:30:14 -10:00
David A. Harding
8ddd89270b
CH14: add details about modern colored coin protocols (rgb/taro)
2023-06-28 14:30:14 -10:00
David A. Harding
372ef38fdf
CH14: remove most of Colored Coined text
2023-06-28 14:28:25 -10:00
David A. Harding
c21794b44f
CH14: reflow text so that future diffs will be more readable
2023-06-26 09:33:13 -10:00
David A. Harding
2f0d7d8c3a
Revert CC-BY-SA material added since the second edition
...
The commit ab5ae32bae
is the last commit
for the second edition, so all changes since then are dropped except for
several commits for the third edition authored by Andreas Antonopoulos.
No attempt is made to remove CC-BY-SA or other licensed content present
in the already-published first or second editions.
This revert may itself be reverted for versions of the book published
under CC-BY-SA.
2023-02-01 06:31:10 -10:00
Andreas M. Antonopoulos
a3229bbbc0
bitcoin/Bitcoin capitalization changed everywhere
2021-10-25 23:51:17 +02:00
Dan Raviv
35b9de0cb4
Replace http scheme with https where appropriate
2021-04-10 10:51:03 +03:00
rating89us
729d37d71b
ch12: del double space
2021-04-04 10:51:25 +02:00
Will Binns
f7954eee1a
ch12: s/clicks/selects/
2021-03-11 09:00:22 +01:00
Will Binns
d7185b0d78
Merge pull request #764 from rating89us/patch-21
...
ch12: transaction -> transactions
2021-02-20 18:33:31 +00:00
Felix Filozov
71d99e62a2
Adding missing bitcoin amounts
2021-02-10 21:10:37 -05:00
rating89us
eb57ec48a0
ch12: transaction -> transactions
2021-01-31 18:22:49 +01:00
Will Binns
90c565a990
ch12: Drop reference to streamium.io
...
Resolves #627
2020-07-16 16:58:57 +02:00
Will Binns
694254ffc0
Drop references to Colored Coins
...
Context: https://github.com/bitcoinbook/bitcoinbook/issues/575
Closes #575
2020-05-04 17:26:26 -06:00
Will Binns
f35e09a9b5
Merge pull request #577 from oboukli/chapter-12-updates-001
...
Revise URLs in Chapter 12
2020-04-30 21:52:52 -06:00
Will Binns
2b96dae992
ch12: Revise URL reference
2020-04-30 21:52:00 -06:00
Will Binns
2db79a8001
Merge pull request #612 from ysangkok/patch-1
...
Segwit has been activated on mainnet
2019-05-14 21:30:09 +00:00
Janus Troelsen
29e3a0a267
Segwit has been activated on mainnet
...
Remove outdated sentence.
2018-11-14 12:47:56 +01:00
Omar Boukli-Hacene
32d597cf68
Revise URLs in Chapter 12
...
Use HTTPS scheme in URLs where applicable
Replace http://www.openassets.org/ with https://github.com/OpenAssets
Edit link title on line 86 to official one
Fix two spaces after period to one space (lines 105 and 412)
Remove duplicate URL on line 500 as it is appears at line 502
2018-06-01 14:43:18 +04:00
Lorenzo Manacorda
3a62587d88
Remove "short" from timelock sentence
...
I think that short provides an unnecessary detail to the explanation. The timelock can be short or long.
Also, in the provided example, the timelock expires after around 7 days, which may or may not be short.
2018-04-14 13:04:11 +02:00
kristen@oreilly.com
d03fba01d0
Edited ch12.asciidoc with Atlas code editor
2018-03-05 11:31:58 -08:00
Reuben Thomas
4e65d83bf5
Fix issue #454 : change adverbial “just like” → “just as”
2018-02-04 20:42:08 +00:00
Andreas M. Antonopoulos
f66e7c5f0e
Technical error. Refund to "Payer" #460
2018-02-04 10:54:39 -06:00
Andreas M. Antonopoulos
4cd7fc9af0
Wording "at anytime" to "at any time" #459
2018-02-04 10:52:15 -06:00
Andreas M. Antonopoulos
318e13c9b2
Wording #458
2018-02-04 10:48:57 -06:00
Andreas M. Antonopoulos
7422561304
Wording "spent whenever" to "spent at any time" #455
2018-02-04 10:45:15 -06:00
Andreas M. Antonopoulos
5b035b14db
Clarifying revocation fixes #406
2018-02-03 18:54:52 -06:00
Andreas M. Antonopoulos
e93a8c42b0
Clarifying revocation keys #406 , fixes
2018-02-03 18:54:17 -06:00
Andreas M. Antonopoulos
9dacbb40e3
Merge remote-tracking branch 'github/develop' into second_edition
2018-02-02 15:08:14 -06: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
Will Binns
1aa56ce982
ch12: Fix mistake in HTLC contract definition
...
Closes #476
2018-01-24 10:51:53 -06:00
Johannes Keyser
22a80a3789
Two typo fixes in Ch 12.
2017-12-25 23:45:40 +01:00
Lane Rettig
691fd4f3b5
Fix typo
2017-09-09 13:59:13 -04:00
Andreas M. Antonopoulos
c273e63f0d
improved wording
2017-07-18 12:20:06 +08:00
nadams
bc96667492
Edited ch12.asciidoc with Atlas code editor
2017-05-30 12:37:07 -07:00
nadams
6aa53bd439
Edited ch12.asciidoc with Atlas code editor
2017-05-30 12:28:06 -07:00
nadams
17ebb81c12
Edited ch12.asciidoc with Atlas code editor
2017-05-30 12:18:36 -07:00
nadams
e5d1277e58
Edited ch12.asciidoc with Atlas code editor
2017-05-30 12:17:57 -07:00
nadams
5eadd22d8d
Edited ch12.asciidoc with Atlas code editor
2017-05-18 11:58:27 -07:00
nadams
74d84db0a1
Edited ch12.asciidoc with Atlas code editor
2017-05-18 09:18:59 -07:00
nadams
9237505486
Edited ch12.asciidoc with Atlas code editor
2017-05-18 09:18:34 -07:00
nadams
92da7887fb
Edited ch12.asciidoc with Atlas code editor
2017-05-18 09:15:24 -07:00
nadams
828c1a10c6
Edited ch12.asciidoc with Atlas code editor
2017-05-18 09:14:49 -07:00
nadams
8d97035dff
Edited ch12.asciidoc with Atlas code editor
2017-05-18 09:14:15 -07:00
nadams
bce9daca4a
Edited ch12.asciidoc with Atlas code editor
2017-05-18 09:10:02 -07:00
nadams
addad45271
Edited ch12.asciidoc with Atlas code editor
2017-05-18 06:45:22 -07:00
nadams
1b17addde2
Edited ch12.asciidoc with Atlas code editor
2017-05-18 06:44:26 -07:00