From 75d171f671fd5bbb22d1a3aab422a1e68ba3f63a Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Fri, 15 Nov 2024 09:28:19 +0100
Subject: [PATCH] docs: formatting and typos/grammar

---
 docs/accounting.md | 174 ++++++++++++++++++++++++++++++---------------
 1 file changed, 117 insertions(+), 57 deletions(-)

diff --git a/docs/accounting.md b/docs/accounting.md
index cfbad51..0e083ab 100644
--- a/docs/accounting.md
+++ b/docs/accounting.md
@@ -1,19 +1,30 @@
 # Accounting Reports
 Faraday produces accounting reports on a node's on chain and off chain activity. 
-These reports are formatted using the [Harmony Reporting Standard](https://github.com/harmony-csv/harmony). 
+These reports are formatted using the [Harmony Reporting
+Standard](https://github.com/harmony-csv/harmony). 
 This document provides a description of the entries in these reports. 
 
 ## Bitcoin Backend
-It is strongly recommended that Faraday is run with a connection to a Bitcon node when these reports are generated. This is required to lookup fee entries for channel close transactions and sweep fees. If a connection to a bitcoin node is not provided, warnings will be logged for the transactions that do not have fee entries. 
+It is strongly recommended that Faraday is run with a connection to a Bitcoin
+node when these reports are generated. This is required to lookup fee entries
+for channel close transactions and sweep fees. If a connection to a bitcoin node
+is not provided, warnings will be logged for the transactions that do not have
+fee entries. 
 
 ## Common Fields
-For brevity, the following fields which have the same meaning for each entry will be omitted: 
-- Timestamp: The timestamp of the block that the channel open transaction appeared in. 
-- Fiat: The value of the amount field in specified currency. Note that values less than one satoshi will be rounded down to zero. 
+For brevity, the following fields which have the same meaning for each entry
+will be omitted: 
+- Timestamp: The timestamp of the block that the channel open transaction
+  appeared in. 
+- Fiat: The value of the amount field in specified currency. Note that values
+  less than one satoshi will be rounded down to zero. 
 - OnChain: Whether the transaction occurred off chain, or on chain.
-- Credit: True when an entry increased our balances, false when an entry decreased our balances. 
+- Credit: True when an entry increased our balances, false when an entry
+  decreased our balances. 
 
-Note that fee entries reference the entry they are associated with by appending a fee marker (:-1) to the original reference. The fee entry will have a reference formatted as follows: `original reference:-1`. 
+Note that fee entries reference the entry they are associated with by appending
+a fee marker (:-1) to the original reference. The fee entry will have a
+reference formatted as follows: `original reference:-1`. 
 
 ## On Chain Reports
 
@@ -22,8 +33,9 @@ Local channel open entry types represent channel opens that were initiated by
 our node. These entries are accompanied by a separate Channel Open Fees entry, 
 because the opening party pays on chain fees. 
 
-- Amount: The amount in millisatoshis that we added to the channel, excluding on chain fees. 
-- TxID: The on chain transaction ID for the channel open. 
+- Amount: The amount in millisatoshis that we added to the channel, excluding on
+  chain fees. 
+- TXID: The on chain transaction ID for the channel open. 
 - Reference: The unique channel ID assigned to the channel. 
 - Note: A note with details of who opened the channel. 
 
@@ -42,82 +54,113 @@ The fees paid to open a channel that we initiated.
 Remote channel open entry types represent channels that were opened by remote
 peers. 
 
-- Amount: Zero, our balance is unaffected by remote channel creation, with the exception of a push amount listed below. 
-- TxID: The on chain transaction ID for the channel open. 
+- Amount: Zero, our balance is unaffected by remote channel creation, except for
+  a push amount listed below. 
+- TXID: The on chain transaction ID for the channel open. 
 - Reference: The unique channel ID assigned to the channel. 
 - Note: A note containing the pubkey of the peer that opened a channel to us. 
 
 Known Omissions:
-- Remote peers may push balance to our node as part of the funding flow. This amount is not currently included in these reports. 
+- Remote peers may push balance to our node as part of the funding flow. This
+  amount is not currently included in these reports. 
 
 ### Channel Close 
 Channel close entries represent the on chain close of a channel. 
 
-- Amount: The amount in millisatoshis that was paid out to us immediately on channel close. 
-- TxID: The on chain transaction ID for the channel close. 
+- Amount: The amount in millisatoshis that was paid out to us immediately on
+  channel close. 
+- TXID: The on chain transaction ID for the channel close. 
 - Reference: The channel close transaction ID.
 - Note: A note indicating the type of channel close, and who initiated it. 
 
 Known Omissions: 
-- If our balance is encumbered behind a timelock, or in an unresolved htlc, it will not be paid out as part of this transaction and must be resolved by follow up on chain transactions. 
+- If our balance is encumbered behind a timelock, or in an unresolved HTLC, it
+  will not be paid out as part of this transaction and must be resolved by
+  follow up on chain transactions. 
 
 ### Channel Close Fee
-Channel close fee entries represent the fees we paid on chain to close channels that we initiated. Note that this includes the case where we opened the channel but the remote party closed the channel.
+Channel close fee entries represent the fees we paid on chain to close channels
+that we initiated. Note that this includes the case where we opened the channel
+but the remote party closed the channel.
 
-- Amount: The amount in millisatoshis that we paid in on chain fees to close the channel. 
-- TxID: The on chain transaction ID for the channel close. 
+- Amount: The amount in millisatoshis that we paid in on chain fees to close the
+  channel. 
+- TXID: The on chain transaction ID for the channel close. 
 - Reference: The channel close transaction ID:-1.
 - Note: Not set for close fees. 
 
 Known Omissions: 
-- If a channel was closed before we started saving our channel information for use after close (<lnd 0.9), we will not know which party opened the channel, so fees may be omitted.
+- If a channel was closed before we started saving our channel information for
+  use after close (<lnd 0.9), we will not know which party opened the channel,
+  so fees may be omitted.
 
 ### Receipt
-A receipt is an on chain transaction which paid to our wallet which was not related to the opening/closing of channels.
+A receipt is an on chain transaction which paid to our wallet which was not
+related to the opening/closing of channels.
 
-- Amount: The amount in millisatoshis that was paid to an address controlled by our wallet.
-- TxID: The on chain transaction ID.
+- Amount: The amount in millisatoshis that was paid to an address controlled by
+  our wallet.
+- TXID: The on chain transaction ID.
 - Reference: The on chain transaction ID.
-- Note: An optional label set on transaction publish (see [lnd transaction labels](https://github.com/lightningnetwork/lnd/blob/master/lnrpc/walletrpc/walletkit.proto#L136)). 
+- Note: An optional label set on transaction publish (see
+  [lnd transaction labels][1]). 
 
 Known Omissions:
-- This entry type will include on chain resolutions for channel closes that sweep balances back to our node.
+- This entry type will include on chain resolutions for channel closes that
+  sweep balances back to our node.
 
 ### Payment
-A payment is an on chain transaction which was paid from our wallet and was not related to the opening/closing of channels. 
-- Amount: The amount in millisatoshis that was paid from an address controlled by our wallet.
-- TxID: The on chain transaction ID.
+A payment is an on chain transaction which was paid from our wallet and was not
+related to the opening/closing of channels. 
+- Amount: The amount in millisatoshis that was paid from an address controlled
+  by our wallet.
+- TXID: The on chain transaction ID.
 - Reference: The on chain transaction ID.
-- Note: An optional label set on transaction publish (see [lnd transaction labels](https://github.com/lightningnetwork/lnd/blob/master/lnrpc/walletrpc/walletkit.proto#L136)). 
+- Note: An optional label set on transaction publish (see
+  [lnd transaction labels][1]). 
 
 Known Omissions:
-- This entry type will include the on chain resolution of htlcs when we force close on our peers and have to settle or fail them on chain. 
-- The current accounting package does not support accounting for payments with duplicate payment hashes, which were allowed in previous versions of lnd. Duplicate payments should be deleted or a time range that does not include them should be specified. 
-- Legacy payments that were made in older versions of lnd that were created without a payment request will not have any information stored about their destination. We therefore cannot identify whether these are circular payments (they will be identified as regular payments). A warning will be logged when we encounter this type of payment.
+- This entry type will include the on chain resolution of HTLCs when we force
+  close on our peers and have to settle or fail them on chain. 
+- The current accounting package does not support accounting for payments with
+  duplicate payment hashes, which were allowed in previous versions of lnd.
+  Duplicate payments should be deleted or a time range that does not include
+  them should be specified. 
+- Legacy payments that were made in older versions of lnd that were created
+  without a payment request will not have any information stored about their
+  destination. We therefore cannot identify whether these are circular payments
+  (they will be identified as regular payments). A warning will be logged when
+  we encounter this type of payment.
 
 ### Fee
 A fee entry represents the on chain fees we paid for a transaction. 
 
 - Amount: The amount in millisatoshis that was paid in fees from our wallet. 
-- TxID: The on chain transaction ID.
+- TXID: The on chain transaction ID.
 - Reference: TransactionID:-1. 
 - Note: Note set for fees. 
 
 ### Sweep
-A sweep is an on chain transaction which is used to sweep our own funds back to our wallet. This is required when a channel is force closed and need to sweep time locked commitment outputs, htlcs or both. 
+A sweep is an on chain transaction which is used to sweep our own funds back to
+our wallet. This is required when a channel is force closed and need to sweep
+time locked commitment outputs, HTLCs or both. 
 
-- TxID: The on chain transaction ID.
+- TXID: The on chain transaction ID.
 - Reference: The on chain transaction ID.
-- Note: An optional label set on transaction publish (see [lnd transaction labels](https://github.com/lightningnetwork/lnd/blob/master/lnrpc/walletrpc/walletkit.proto#L136)). 
+- Note: An optional label set on transaction publish (see
+  [lnd transaction labels][1]). 
 
 Known Omissions:
-- Note that this entry type does not include the first stage success/timeout transactions that are required to resolve htlcs when we force close on our peer. We currently do not have the information required to identify these transactions available, so they are included in payments, see known omissions. 
+- Note that this entry type does not include the first stage success/timeout
+  transactions that are required to resolve HTLCs when we force close on our
+  peer. We currently do not have the information required to identify these
+  transactions available, so they are included in payments, see known omissions. 
 
 ### Sweep Fee
 A fee entry represents the on chain fees we paid for a sweep.
 
 - Amount: The amount in millisatoshis that was paid in fees from our wallet. 
-- TxID: The on chain transaction ID.
+- TXID: The on chain transaction ID.
 - Reference: TransactionID:-1. 
 - Note: Not set for fees. 
 
@@ -126,68 +169,85 @@ A fee entry represents the on chain fees we paid for a sweep.
 ### Receipt
 Receipts off chain represent invoices that are paid via the Lightning Network.
 
-- Amount: The amount in millisatoshis that we were paid, note that this may be greater than the original invoice value.
-- TxID: The payment hash of the invoice.
+- Amount: The amount in millisatoshis that we were paid, note that this may be
+  greater than the original invoice value.
+- TXID: The payment hash of the invoice.
 - Reference: The preimage of the invoice.
-- Note: Optionally set if the invoice had a memo attached, was overpaid, or was a keysend.
+- Note: Optionally set if the invoice had a memo attached, was overpaid, or was
+  a keysend.
 
 ### Circular Receipt
 Circular receipts record instances where we have paid one of our own invoices. 
 
-- Amount: The amount in millisatoshis that we were paid, note that this may be greater than the original invoice value.
-- TxID: The payment hash of the invoice.
+- Amount: The amount in millisatoshis that we were paid, note that this may be
+  greater than the original invoice value.
+- TXID: The payment hash of the invoice.
 - Reference: The preimage of the invoice.
-- Note: Optionally set if the invoice had a memo attached, was overpaid, or was a keysend.
+- Note: Optionally set if the invoice had a memo attached, was overpaid, or was
+  a keysend.
 
 ### Payment
 Payments off chain represent payments made via the Lightning Network. 
 
-- Amount: The amount in millisatoshis that we paid, excluding the off chain fees paid. 
-- TxID: The payment hash. 
+- Amount: The amount in millisatoshis that we paid, excluding the off chain fees
+  paid. 
+- TXID: The payment hash. 
 - Reference: Unique payment ID: Payment Preimage. 
 - Note: The node pubkey that the payment was made to.
 
 ### Fee
 - Amount: The amount in millisatoshis that was paid in off chain fees. 
-- TxID: The payment hash. 
+- TXID: The payment hash. 
 - Reference: Unique payment ID: Payment Preimage: -1. 
 - Note: The node pubkey that the payment was made to.
 
 ### Circular Payment
-Circular payments represent payments made to our own node to rebalance channels. These payments are paid from our node to one of our own invoices.
+Circular payments represent payments made to our own node to re-balance
+channels. These payments are paid from our node to one of our own invoices.
 
 - Amount: The amount that was rebalanced.
-- TxID: The payment hash.
+- TXID: The payment hash.
 - Reference: Unique payment ID: Payment Preimage. 
 - Note: The node pubkey that the payment was made to.
 
 ### Circular Payment Fee
-Circular payment fees represent the fees we paid to loop a circular payment to ourselves.
+Circular payment fees represent the fees we paid to loop a circular payment to
+ourselves.
 
 - Amount: The amount that was paid in off chain fees. 
-- TxID: The payment hash.
+- TXID: The payment hash.
 - Reference: Unique payment ID: Payment Preimage: -1. 
 - Note: The node pubkey that the payment was made to.
 
 ### Forwards
-A forward represents a payment that arrives at our node on an incoming channel and is forwarded out on an outgoing channel in exchange for fees. The forward itself does not changes our balance, since it just shifts funds over our channels. We include forwarding entries with zero balances for completeness. Forwarding fee entries reflect the increase in our holdings from the fee we are paid. 
-
-- Amount: Zero, forwards do not change our balance except for fees, which are separated out.
-- TxID:  Timestamp: Incoming Channel ID: Outgoing Channel ID.
+A forward represents a payment that arrives at our node on an incoming channel
+and is forwarded out on an outgoing channel in exchange for fees. The forward
+itself does not changes our balance, since it just shifts funds over our
+channels. We include forwarding entries with zero balances for completeness.
+Forwarding fee entries reflect the increase in our holdings from the fee we are
+paid. 
+
+- Amount: Zero, forwards do not change our balance except for fees, which are
+  separated out.
+- TXID:  Timestamp: Incoming Channel ID: Outgoing Channel ID.
 - Reference: Not set for forwards.
 - Note: The amounts that were forwarded in and out of our node. 
 
 Known Omissions: 
-- We use incoming and outgoing channel ID paired with timestamp as a best-effort version of a txid. Note that this is not strictly unique for a single htlc, it is theoretically possible for two htlcs to pass through the same channel with the same timestamp.
+- We use incoming and outgoing channel ID paired with timestamp as a best-effort
+  version of a TXID. Note that this is not strictly unique for a single HTLC, it
+  is theoretically possible for two HTLCs to pass through the same channel with
+  the same timestamp.
 
 ### Forward Fee
 Forward fee entries represent the fees we earned from forwarding payments. 
 
 - Amount: The amount in millisatoshis of fees we earned from the forward. 
-- TxID: Timestamp: Incoming Channel ID: Outgoing Channel ID.
+- TXID: Timestamp: Incoming Channel ID: Outgoing Channel ID.
 - Reference: Not set for forwards.
 - Note: Not set for forwards.
 
 Known Omissions: 
-- See the note on txids in the Forwards section. 
+- See the note on TXIDs in the Forwards section. 
 
+[1]: https://github.com/lightningnetwork/lnd/blob/master/lnrpc/walletrpc/walletkit.proto#L136
\ No newline at end of file