Skip to content
This repository was archived by the owner on Apr 17, 2020. It is now read-only.

Commit 6394d2d

Browse files
Douglas Roarkrustyrussell
Douglas Roark
authored andcommitted
Minor "Reaching the Ground With Lightning" fixes.
- Added a reference to BIP112 and to the deployment of BIP68. - Minor typo, grammar and formatting fixes.
1 parent 6b2d844 commit 6394d2d

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

doc/bitcoin.bib

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@InProceedings{Decker2015Making,
2-
author = {Christian Decker and James Guthrie and Jochen Seidel and Roger Wattenhofer},
2+
author = {Christian Decker, James Guthrie, Jochen Seidel and Roger Wattenhofer},
33
note = {\tt decker@ethz.ch and wattenhofer@ethz.ch},
44
title = {{Making Bitcoin Exchanges Transparent}},
55
booktitle = {{20th European Symposium on Research in Computer Security (ESORICS), Vienna, Austria}},
@@ -24,8 +24,7 @@ @misc{BitcoinChannels
2424
note = {\url{https://bitcointalk.org/index.php?topic=25786.0}}
2525
}
2626
@article{DBLP:journals/corr/DeckerW14,
27-
author = {Christian Decker and
28-
Roger Wattenhofer},
27+
author = {Christian Decker and Roger Wattenhofer},
2928
title = {Bitcoin Transaction Malleability and MtGox},
3029
journal = {CoRR},
3130
volume = {abs/1403.6676},
@@ -47,6 +46,12 @@ @misc{BIP65
4746
urldate = {2015-07-13},
4847
note = {\url{https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki}}
4948
}
49+
@misc{BIP112,
50+
author = { BtcDrak, Mark Freidenbach, and Eric Lombrozo },
51+
title = {{CHECKSEQUENCEVERIFY}},
52+
urldate = {2015-08-10},
53+
note = {\url{https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki}}
54+
}
5055
@misc{friedenbach_bitcoin-development_2015,
5156
title = {[Bitcoin-development] [{BIP} draft] Consensus-enforced transaction replacement signalled via sequence numbers},
5257
note = {\url{http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-June/008452.html}},

doc/deployable-lightning.lyx

+21-10
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ on, and B sends A a signature for A's new commitment transaction.
479479
As before, each commitment transaction contains two outputs, one for A and
480480
one for B; but A's commitment transaction output to itself is encumbered
481481
by an additional restriction (as is B's output to itself).
482-
Instead of paying A directly, needs both A and B's signature.
482+
Instead of paying A directly, A's output needs both A and B's signature.
483483
B provides such a signature, but on a
484484
\begin_inset Quotes eld
485485
\end_inset
@@ -633,27 +633,33 @@ A and B's signature, OR
633633
A's signature and OP_CHECKLOCKTIMEVERIFY <40 days>
634634
\end_layout
635635

636+
\begin_layout Standard
637+
As of Nov.
638+
13, 2015, BIP65 has been deployed and is in the process of being activated.
639+
\end_layout
640+
636641
\begin_layout Subsubsection
637642
Using Relative Locktime
638643
\end_layout
639644

640645
\begin_layout Standard
641646
The Poon-Dryja channel uses a 40 day locktime, because transaction locktime
642647
is absolute.
643-
Before 40 days the channel must be closed otherwise spending a revoked
648+
Before 40 days the channel must be closed, otherwise spending a revoked
644649
transaction and immediately following it with the commit refund transaction
645650
is possible.
646651
\end_layout
647652

648653
\begin_layout Standard
649-
A proposal to extend output scripts to specify a minimum
654+
BIP112[#BIP112] proposes OP_CHECKSEQUENCEVERIFY, an opcode which allows
655+
an output to specify a minimum
650656
\emph on
651657
relative
652658
\emph default
653-
time before they can be spent
659+
time before the output can be spent
654660
\begin_inset CommandInset citation
655661
LatexCommand cite
656-
key "friedenbach_bitcoin-development_2015"
662+
key "friedenbach_bitcoin-development_2015,BIP112"
657663

658664
\end_inset
659665

@@ -669,6 +675,11 @@ A and B's signature, OR
669675
A's signature and OP_CHECKSEQUENCEVERIFY <1 day>
670676
\end_layout
671677

678+
\begin_layout Standard
679+
As of Nov.
680+
13, 2015, BIP112 has not been deployed.
681+
\end_layout
682+
672683
\begin_layout Subsubsection
673684
Using Revocation Preimages Instead of Private Keys
674685
\end_layout
@@ -872,7 +883,7 @@ status open
872883
\begin_inset Caption Standard
873884

874885
\begin_layout Plain Layout
875-
HTLC Using Revocation Preimages, OP_CLV and OP_CSV (simplified)
886+
HTLC Using Revocation Preimages, OP_CLTV and OP_CSV (simplified)
876887
\begin_inset CommandInset label
877888
LatexCommand label
878889
name "fig:HTLC-Using-Revocation"
@@ -1800,7 +1811,7 @@ reference "fig:Final-Dual-Anchor"
18001811
\end_inset
18011812

18021813
.
1803-
Thus, if the B broadcasts its escape transaction after it has been revoked,
1814+
Thus, if B broadcasts its escape transaction after it has been revoked,
18041815
A can (after ensuring escape B is sufficiently deep in the block chain)
18051816
broadcast its fast escape transaction and use B's secret to immediately
18061817
spend the output.
@@ -1939,7 +1950,7 @@ OP_HASH160
19391950
\begin_inset space ~
19401951
\end_inset
19411952

1942-
OP_EQUAL Check if the top of stack is the revocation image.
1953+
OP_EQUAL Check if the top of the stack contains the revocation image.
19431954
\end_layout
19441955

19451956
\begin_layout Description
@@ -2058,7 +2069,7 @@ Fast-Escape Output Redeemscript
20582069
This allows two paths: one for this side to use the other side's secret
20592070
(revealed by them using an escape transaction), and one for the other side
20602071
to claim this side's anchor funds after a delay.
2061-
This show's A's script, but B's is the same with A and B exchanged.
2072+
This shows A's script, but B's is the same with A and B exchanged.
20622073
\end_layout
20632074

20642075
\begin_layout Description
@@ -2118,7 +2129,7 @@ Spending The Fast-Escape Output
21182129
\end_layout
21192130

21202131
\begin_layout Standard
2121-
Either A using a B's secret revealed by B using its own escape transaction:
2132+
Either A using B's secret revealed by B using its own escape transaction:
21222133
\end_layout
21232134

21242135
\begin_layout Description

0 commit comments

Comments
 (0)