Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
aantonop committed Sep 17, 2021
2 parents b4adfba + 57ff046 commit eb332ec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion 03_how_ln_works.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ Let us go through the channel construction scenario again, adding a penalty mech
* Alice sends 30k satoshi to Bob.
* Alice tries to cheat Bob out of his earned 30k satoshi by publishing an old commitment transaction claiming the full 100k satoshi for herself.
* Bob detects the fraud and punishes Alice by taking the full 100k satoshi for himself.
* Bob ends up with 100k satoshi, gaining 70k satoshi for catching Alice cheat.
* Bob ends up with 100k satoshi, gaining 70k satoshi for catching Alice cheating.
* Alice ends up with 0 satoshi.
* Trying to cheat Bob out of 30k satoshi, she loses the 70k satoshi she owned.

Expand Down
8 changes: 4 additions & 4 deletions glossary.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,15 @@ Neutrino::
Neutrino is a later alternative to SPV that also verifies whether certain transactions are contained in a block without downloading the entire block. However, it offers a number of improvements over SPV: Neutrino does not transmit any information that would allow a third party to determine users’ identities, it facilitates the use of non-custodial apps, and it reduces the computational load on full nodes. The trade-off for these improvements is that Neutrino requires more data from the full node than SPV.

node::
See Lightning Network Node
See _Lightning Network Node_

network capacity::
Lightning network capacity is the total amount of bitcoin locked and circulated inside the Lightning Network.
It is the sum of capacities of each public channel.
It reflects the usage of the Lightning Network to some extent because we expect that people lock bitcoin into Lightning channels in order to spend it or forward other users' payments.
Hence the higher the amount of bitcoin locked in channels, the higher the expected usage of the Lightning Network.
Note that since only public channel capacity can be observed, the true network capacity is unknown.
See private channel.
See _private channel_.

Noise_XK::
The template of the Noise protocol framework to establish an authenticated and encrypted communication channel between two peers of the Lightning Network.
Expand Down Expand Up @@ -364,7 +364,7 @@ peer::
In particular, they are connected via an encrypted, authenticated communication over a TCP Socket.

penalty transaction::
See Breach Remedy Transaction.
See _Breach Remedy Transaction_.

private channel::
A channel not announced to the rest of the network.
Expand All @@ -386,7 +386,7 @@ preimage::
proof of work::
A piece of data that requires significant computation to find.
In Bitcoin, miners must find a numeric solution to the SHA256 algorithm that meets a network-wide target, called the difficulty target.
See _bitcoin mining_
See _bitcoin mining_.

Relative Timelock::
Relative Timelock is a type of timelock which allows an input to specify the earliest time the input can be added to a block. The time is relative and is based on when the output referenced by that input was included in a block. Such a feature is jointly achieved by nSequence field and CheckSequenceVerify opcode, which was introduced by BIP68/112/113.
Expand Down

0 comments on commit eb332ec

Please sign in to comment.