make htlc outputs of the commitment tx spendable with revocation key

(Merge conflict in test vectors fixed by selecting Pierre's, will have to be re-evaluated). Closes: #105
2024-11-19 01:50:03 +01:00 · 2017-02-10 12:23:32 +01:00 · 2017-02-10 12:23:32 +01:00 · 557db43378
commit 557db43378
parent 034c234829
3 changed files with 405 additions and 302 deletions
--- a/02-peer-protocol.md
+++ b/02-peer-protocol.md
@ -742,9 +742,6 @@ to apply to its own commitment, any pending updates it sent before
 that `commitment_signed`.


-This message also supplies the signatures for the sender's HTLC-timeout transactions. See [BOLT #5](05-onchain.md) for how this is used with a penalty transaction.
-
-
 The description of key derivation is in [BOLT #3](03-transactions.md#key-derivation).


@ -753,9 +750,6 @@ The description of key derivation is in [BOLT #3](03-transactions.md#key-derivat
   * [32:channel-id]
   * [32:per-commitment-secret]
   * [33:next-per-commitment-point]
-   * [1:padding]
-   * [2:num-htlc-timeouts]
-   * [num-htlc-timeouts*64:htlc-timeout-signature]

 #### Requirements

@ -765,17 +759,6 @@ previous commitment transaction, MUST set `next-per-commitment-point` to the val

 A receiving node MUST check that `per-commitment-secret` generates the previous `per-commitment-point`, and MUST fail if it does not. A receiving node MUST ignore the value of `padding`.  A receiving node MAY fail if the `per-commitment-secret` was not generated by the protocol in [BOLT #3](03-transactions.md#per-commitment-secret-requirements).

-A sending node MUST include one `htlc-timeout-signature` for every HTLC
-it offered in the commitment transaction, in the same BIP69 
-lexicographic ordering as the corresponding outputs in the commitment
-transaction.
-
-A receiving node MUST fail the channel if `num-htlc-timeout` is not
-equal to the number of outputs in the sending node's commitment
-transaction corresponding to HTLCs offered by the sending node. A
-receiving node MUST fail the channel if any `htlc-timeout-signature`
-is not valid for the corresponding HTLC transaction.
-
 Nodes MUST NOT broadcast old (revoked) commitment transactions; doing
 so will allow the other node to seize all the funds.  Nodes SHOULD NOT
 sign commitment transactions unless it is about to broadcast them (due
--- a/03-transactions.md
+++ b/03-transactions.md
@ -107,13 +107,13 @@ This output sends funds to the other peer, thus is a simple P2WPKH to `remotekey

 #### Offered HTLC Outputs

-This output sends funds to a HTLC-timeout transaction after the HTLC timeout, or to the remote peer on successful payment preimage.  The output is a P2WSH, with a witness script:
+This output sends funds to a HTLC-timeout transaction after the HTLC timeout, or to the remote peer using the payment preimage or the revocation key.  The output is a P2WSH, with a witness script:

    <remotekey> OP_SWAP
        OP_SIZE 32 OP_EQUAL
    OP_NOTIF
-        # To me via HTLC-timeout transaction (timelocked).
-        OP_DROP 2 OP_SWAP <localkey> 2 OP_CHECKMULTISIG
+        # To me via HTLC-timeout transaction (timelocked) or to you with revocation key.
+        OP_DROP 2 OP_SWAP <localkey> <revocationkey> 3 OP_CHECKMULTISIG
    OP_ELSE
        # To you with preimage.
        OP_HASH160 <ripemd-of-payment-hash> OP_EQUALVERIFY
@ -124,11 +124,15 @@ The remote node can redeem the HTLC with the witness:

    <remotesig> <payment-preimage>

-Either node can use the HTLC-timeout transaction to time out the HTLC once the HTLC is expired, as shown below.
+If a revoked commitment transaction is published, the remote node can spend this output immediately with the following witness:
+
+    0 <remote-sig> <revocation-sig> 0
+
+The sending node can use the HTLC-timeout transaction to time out the HTLC once the HTLC is expired, as shown below.

 #### Received HTLC Outputs

-This output sends funds to the remote peer after the HTLC timeout, or to an HTLC-success transaction with a successful payment preimage. The output is a P2WSH, with a witness script:
+This output sends funds to the remote peer after the HTLC timeout or using the revocation key, or to an HTLC-success transaction with a successful payment preimage. The output is a P2WSH, with a witness script:

    <remotekey> OP_SWAP
        OP_SIZE 32 OP_EQUAL
@ -137,15 +141,25 @@ This output sends funds to the remote peer after the HTLC timeout, or to an HTLC
        OP_HASH160 <ripemd-of-payment-hash> OP_EQUALVERIFY
        2 OP_SWAP <localkey> 2 OP_CHECKMULTISIG
    OP_ELSE
-        # To you after timeout.
-        OP_DROP <locktime> OP_CHECKLOCKTIMEVERIFY OP_DROP
-        OP_CHECKSIG
+        OP_SIZE 0 OP_EQUAL
+        OP_IF
+            # To you after timeout.
+            OP_DROP <locktime> OP_CHECKLOCKTIMEVERIFY OP_DROP
+            OP_CHECKSIG
+        OP_ELSE
+            # To you if you have the revocation key  
+            OP_SWAP 2 OP_SWAP <revocationkey> 2 OP_CHECKMULTISIG
+        OP_ENDIF
    OP_ENDIF

 To timeout the htlc, the remote node spends it with the witness:

    <remotesig> 0

+If a revoked commitment transaction is published, the remote node can spend this output immediately with the following witness:
+
+    0 <remote-sig> <revocation-sig>
+
 To redeem the HTLC, the HTLC-success transaction is used as detailed below.

 ### Trimmed Outputs
@ -239,8 +253,8 @@ Thus we use a simplified formula for *expected weight*, which assumes:
 This gives us the following *expected weights* (details of the computation in [Appendix A](#appendix-a-expected-weights)):

    Commitment weight:   724 + 172 * num-untrimmed-htlc-outputs
-    HTLC-timeout weight: 635
-    HTLC-success weight: 673
+    HTLC-timeout weight: 669
+    HTLC-success weight: 718

 Note that we refer to the "base fee" for a commitment transaction in the requirements below, which is what the funder pays.  The actual fee may be higher than the amount calculated here, due to rounding and trimmed outputs.

@ -248,11 +262,11 @@ Note that we refer to the "base fee" for a commitment transaction in the require

 The fee for an HTLC-timeout transaction MUST BE calculated to match:

-1. Multiply `feerate-per-kw` by 635 and divide by 1000 (rounding down).
+1. Multiply `feerate-per-kw` by 669 and divide by 1000 (rounding down).

 The fee for an HTLC-success transaction MUST BE calculated to match:

-1. Multiply `feerate-per-kw` by 673 and divide by 1000 (rounding down).
+1. Multiply `feerate-per-kw` by 718 and divide by 1000 (rounding down).

 The base fee for a commitment transaction MUST BE calculated to match:

@ -269,26 +283,26 @@ For example, suppose that we have a `feerate-per-kw` of 5000, a `dust-limit-sato
 * 2 offered HTLCs of 5000000 and 1000000 millisatoshis (5000 and 1000 satoshis)
 * 2 received HTLCs of 7000000 and 800000 millisatoshis (7000 and 800 satoshis)

-The HTLC timeout transaction weight is 635, thus fee would be 3175 satoshis.
-The HTLC success transaction weight is 673, thus fee would be 3365 satoshis
+The HTLC timeout transaction weight is 669, thus fee would be 3345 satoshis.
+The HTLC success transaction weight is 718, thus fee would be 3590 satoshis

 The commitment transaction weight would be calculated as follows:

 * weight starts at 724.

-* The offered HTLC of 5000 satoshis is above 546 + 3175 and would result in:
+* The offered HTLC of 5000 satoshis is above 546 + 3345 and would result in:
  * an output of 5000 satoshi in the commitment transaction
-  * a HTLC timeout transaction of 5000 - 3175 satoshis which spends this output
+  * a HTLC timeout transaction of 5000 - 3345 satoshis which spends this output
  * weight increases to 896

-* The offered HTLC of 1000 satoshis is below 546 + 3175, so would be trimmed.
+* The offered HTLC of 1000 satoshis is below 546 + 3345, so would be trimmed.

-* The received HTLC of 7000 satoshis is above 546 + 3365 and would result in:
+* The received HTLC of 7000 satoshis is above 546 + 3590 and would result in:
  * an output of 7000 satoshi in the commitment transaction
-  * a HTLC success transaction of 7000 - 3365 satoshis which spends this output
+  * a HTLC success transaction of 7000 - 3590 satoshis which spends this output
  * weight increases to 1068

-* The received HTLC of 800 satoshis is below 546 + 3365 so would be trimmed.
+* The received HTLC of 800 satoshis is below 546 + 3590 so would be trimmed.

 The base commitment transaction fee would be 5340 satoshi; the actual
 fee (adding the 1000 and 800 satoshi HTLCs which would have made dust
@ -588,8 +602,8 @@ Multiplying non-witness data by 4, this gives a weight of:

 The *expected weight* of an HTLC transaction is calculated as follows:

-    accepted_htlc_script: 111 bytes
-	    - OP_DATA: 1 byte (remotekey length)
+    accepted_htlc_script: 156 bytes
+        - OP_DATA: 1 byte (remotekey length)
 		- remotekey: 33 bytes
 		- OP_SWAP: 1 byte
 		- OP_SIZE: 1 byte
@ -608,15 +622,28 @@ The *expected weight* of an HTLC transaction is calculated as follows:
 		- 2: 1 byte
 		- OP_CHECKMULTISIG: 1 byte
 		- OP_ELSE: 1 byte
+		- OP_SIZE: 1 byte
+        - 0: 1 byte
+        - OP_EQUAL: 1 byte
+        - OP_IF: 1 byte
 		- OP_DROP: 1 byte
 		- OP_DATA: 1 byte (locktime length)
 		- locktime: 3 bytes
 		- OP_CHECKLOCKTIMEVERIFY: 1 byte
 		- OP_DROP: 1 byte
        - OP_CHECKSIG: 1 byte
+        - OP_ELSE: 1 byte
+        - OP_SWAP: 1 byte
+        - 2: 1 byte
+        - OP_SWAP: 1 byte
+        - OP_DATA: 1 byte (revocationkey length)
+        - revocationkey: 33 bytes
+        - 2: 1 byte
+        - OP_CHECKMULTISIG: 1 byte
+        - OP_ENDIF: 1 byte
 		- OP_ENDIF: 1 byte

-    offered_htlc_script: 105 bytes
+    offered_htlc_script: 139 bytes
 		- OP_DATA: 1 byte (remotekey length)
 		- remotekey: 33 bytes
 		- OP_SWAP: 1 byte
@ -630,7 +657,9 @@ The *expected weight* of an HTLC transaction is calculated as follows:
 		- OP_SWAP: 1 byte
 		- OP_DATA: 1 byte (localkey length)
 		- localkey: 33 bytes
-		- 2: 1 byte
+		- OP_DATA: 1 byte (revocationkey length)
+        - revocationkey: 33 bytes
+		- 3: 1 byte
 		- OP_CHECKMULTISIG: 1 byte
 		- OP_ELSE: 1 byte
 		- OP_HASH160: 1 byte
@ -640,7 +669,7 @@ The *expected weight* of an HTLC transaction is calculated as follows:
 		- OP_CHECKSIG: 1 byte
 		- OP_ENDIF: 1 byte

-    timeout_witness: 257 bytes
+    timeout_witness: 291 bytes
 		- number_of_witness_elements: 1 byte
 		- nil_length: 1 byte
 		- sig_alice_length: 1 byte
@ -651,7 +680,7 @@ The *expected weight* of an HTLC transaction is calculated as follows:
 		- witness_script_length: 1 byte
 		- witness_script (offered_htlc_script)

-    success_witness: 295 bytes
+    success_witness: 340 bytes
 		- number_of_witness_elements: 1 byte
 		- nil_length: 1 byte
 		- sig_alice_length: 1 byte
@ -672,7 +701,7 @@ The *expected weight* of an HTLC transaction is calculated as follows:
 		- witness (success_witness or timeout_witness)
 		- sequence: 4 bytes

-    htlc_tx_output: 43 bytes
+    htlc_output: 43 bytes
 		- value: 8 bytes
 		- var_int: 1 byte (pk_script length)
 		- pk_script (p2wsh): 34 bytes
@ -685,15 +714,15 @@ The *expected weight* of an HTLC transaction is calculated as follows:
 			commitment_input
 		- count_tx_out: 1 byte
 		- tx_out: 43
-			htlc_tx_output
+			htlc_output
 		- lock_time: 4 bytes

 Multiplying non-witness data by 4, this gives a weight of 376.  Adding
-the witness data for each case (257 + 2 for HTLC-timeout, 295 + 2 for
+the witness data for each case (291 + 2 for HTLC-timeout, 340 + 2 for
 HTLC-success) gives a weight of:

-	635 (HTLC-timeout)
-	673 (HTLC-success)
+	669 (HTLC-timeout)
+	718 (HTLC-success)

 # Appendix C: Funding Transaction Test Vectors

@ -817,331 +846,347 @@ And here are the test vectors themselves:
    name: simple commitment tx with no HTLCs
    to_local_msat: 7000000000
    to_remote_msat: 3000000000
-    feerate_per_kw: 15000
+    local_feerate_per_kw: 15000
    # base commitment transaction fee = 10860
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
    # to-local amount 6989140 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c0
-    # local_signature = 3044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c3836939
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311054a56a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022051b75c73198c6deee1a875871c3961832909acd297c6b908d59e3319e5185a46022055c419379c5051a78d00dbbce11b5b664a0c22815fbcc6fcef6b1937c383693901483045022100f51d2e566a70ba740fc5d8c0f07b9b93d2ed741c3c0860c613173de7d39e7968022041376d520e9c0e1ad52248ddf4b22e12be8763007df977253ef45a4ca3bdb7c001475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    # local_signature = 304402205fdea103b8eb092e46362bbc8d80c790dd3756db2474baaf538bf96039a2670c02206dc19fb7e152382887018f5f76047d0b0d75e0876f06663a49c59d8f6d40895401
+    remote_signature: 3045022100f732ff890ea9af685f9577bd38f11ceb77f5ead254af663638bbf80bbfa180da022005bb3493d2ba28e6ea43db36d156f5c2befa5de469d118a321a3fd3f3f356dcd01
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a03654a56a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402205fdea103b8eb092e46362bbc8d80c790dd3756db2474baaf538bf96039a2670c02206dc19fb7e152382887018f5f76047d0b0d75e0876f06663a49c59d8f6d40895401483045022100f732ff890ea9af685f9577bd38f11ceb77f5ead254af663638bbf80bbfa180da022005bb3493d2ba28e6ea43db36d156f5c2befa5de469d118a321a3fd3f3f356dcd01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 0
-    
-    name: commitment tx with all 5 htlcs untrimmed (minimum feerate)
+
+    name: commitment tx with all 5 htlcs untrimmed (minimum feerate
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
    local_feerate_per_kw: 0
    # base commitment transaction fee = 0
-    # HTLC 2 offered amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 0 received amount 1000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac68
-    # HTLC 1 received amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
+    # actual commitment transaction fee = 0
+    # HTLC received amount 1000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f401b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # HTLC received amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # HTLC offered amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
    # to-local amount 6988000 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 30450221008f60b91c64ffaeb498bca51827c378a5a0c3488888677cd8483b42bae7222269022028e7ff07936b62327bd43f5c27c2cbc28351242bcb3b4a9f77e0fc3ee8558c93
-    # local_signature = 3045022100ce8a5a47e1377b7878c65209affe5645e400f0b834ddcbd2248a961c034686590220349d27b5a3bd2dac4117bdcf6a94449b0e4a5b179aef1d6b23f526081cdfe8ab
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e8030000000000002200207eaf624c3ab8f5cad0589f46db3fed940bf79a88fb5ab7fa3a6e1d071b5845bfd00700000000000022002083975515b28ad8c03b0915cae90787ff5f1a0ad8f313806a71ef6152fd5ecc78d007000000000000220020edcdff3e4bb6b538c0ee9639f56dfc4f222e5077bface165abc48764160da0c2b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110e0a06a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100ce8a5a47e1377b7878c65209affe5645e400f0b834ddcbd2248a961c034686590220349d27b5a3bd2dac4117bdcf6a94449b0e4a5b179aef1d6b23f526081cdfe8ab014830450221008f60b91c64ffaeb498bca51827c378a5a0c3488888677cd8483b42bae7222269022028e7ff07936b62327bd43f5c27c2cbc28351242bcb3b4a9f77e0fc3ee8558c9301475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    # local_signature = 3045022100dabc698daa9a1affd35b44b83beaaba5d78f7feb2de77eea75a1b6aa26c70f0b02207ca677bed690437a35e0a817363d83c42616db5ea6e6522173145c09a11e5d5701
+    remote_signature: 3045022100e7564212fdec08e782390799593a363d8a7d79fb658abdba1cef67ea0a5f621902206c24282cae485cd43134861ba4f666397c55355e79b2015315904c1e010ae73a01
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e803000000000000220020b1990f5a65230fc39e4ef790f3907d8f1a587d15b0810e89f9a6c68343767a1ad0070000000000002200207fca09ebacdfe6a4f704e8e3c1767bee0ede006ca7107b4358b34eb96c50bacfd007000000000000220020d9d8939fbb5b6f47577992ec878bcc4ee58272696dcef62607e152c29b6cd995b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a036e0a06a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100dabc698daa9a1affd35b44b83beaaba5d78f7feb2de77eea75a1b6aa26c70f0b02207ca677bed690437a35e0a817363d83c42616db5ea6e6522173145c09a11e5d5701483045022100e7564212fdec08e782390799593a363d8a7d79fb658abdba1cef67ea0a5f621902206c24282cae485cd43134861ba4f666397c55355e79b2015315904c1e010ae73a01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 5
    # signature for output 0 (htlc 0)
-    remote_htlc_signature = 3044022056ac6967aa077841c05f0913c1b053802cfd151bb1fcf37c2d1d7b83222d2b4902207b549e33be640a9832987349fd9eb3ecafae20fdf22fa9f131bde787fbf46313
-    # signature for output 1 (htlc 2)
-    remote_htlc_signature = 3045022100a34b05a95f131afb1b459d29a975a9c7c9b3ffd65a334958e4427697fb16c2ae0220233c50db9fd05eb9abce00225af2c5b33ffb595b88d3aa347b1198c4f46cd255
-    # signature for output 2 (htlc 1)
-    remote_htlc_signature = 3044022018115b421de0a76eba67a932bbe6004f031cf3019330d13fa57bea4c2478bb81022000d6bbbc1e2aee760ff0d3e4b94a194b1a1f7f8f8681357ff1ee655bde2dc27a
+    remote_htlc_signature: 3044022038c1ecb18f42fafa1558d34c41cabc473c1b2ce4025cadb08fef217b7d8e61f302204ae9ea4c869848d51dbf0044f9b8bf7b9691ba853670a983000c5af2e5db9ea301
+    # signature for output 1 (htlc 1)
+    remote_htlc_signature: 304402200484125dc1430266f9e9156cc2ab59670781b6fae87dd5cc41bd9913c568dac50220020bf414550a39a559b2b2ba2431c4cba562c00fd16aae809412132f00b1175c01
+    # signature for output 2 (htlc 2)
+    remote_htlc_signature: 3045022100e8e8aac4e31d2f6574df3414ead1ff33b0a5b27e19b36b542706587093932ba1022074b35e23a40f2db0db5d0b73392debcca7a05998beab2916f9ab38274f003bd701
    # signature for output 3 (htlc 3)
-    remote_htlc_signature = 30450221009f8aa1b587474f4b4af7dd9795287aa038e3b064d0d781acd047b14d6708756b022044e6ce746548a99f01f1beb0fc09e996dd9e893895fd184477d79d44ba087a2b
+    remote_htlc_signature: 3045022100a2f77f721bed8b3d181ec324fa78632e145f74cc43d32f6934caf00e364995030220309d309b215a9dca1bd721f56434d509016cff414845753d18d17656de32986001
    # signature for output 4 (htlc 4)
-    remote_htlc_signature = 3045022100d41900c2f5539f97c8dde8b3d26906e94cc9f84ee8f4fba408b49d88713df6320220296f4886681f2bb8fd120bcb8b8bc50a7e0c90b4d5b62ab953ff8eb2c68ecbdc
-    # local_signature = 30440220789e447081e83c7248c85badd21c5cbdd3336091628514744011b504600b7ed8022053bbbb93c761e6784d45ab16226d9b59afbf1fa4490332df7e7764326c2ed065
-    output htlc_success_tx 0: 02000000000101e7ba31f387356434fbfcb332390bf7c98934445aa5b011d06efc3a2337777e1f00000000000000000001e8030000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022056ac6967aa077841c05f0913c1b053802cfd151bb1fcf37c2d1d7b83222d2b4902207b549e33be640a9832987349fd9eb3ecafae20fdf22fa9f131bde787fbf46313014730440220789e447081e83c7248c85badd21c5cbdd3336091628514744011b504600b7ed8022053bbbb93c761e6784d45ab16226d9b59afbf1fa4490332df7e7764326c2ed065012000000000000000000000000000000000000000000000000000000000000000006e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac6800000000
-    # local_signature = 30450221008b4943e473ae4457124b7bf05ff4b12a4a2eddee33689a841464b40ec2e6018802202c5515d12df8f06c71ff868dd0bd9ad172deef69101debb3b8c77bb30042ccf4
-    output htlc_timeout_tx 2: 02000000000101e7ba31f387356434fbfcb332390bf7c98934445aa5b011d06efc3a2337777e1f01000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a34b05a95f131afb1b459d29a975a9c7c9b3ffd65a334958e4427697fb16c2ae0220233c50db9fd05eb9abce00225af2c5b33ffb595b88d3aa347b1198c4f46cd255014830450221008b4943e473ae4457124b7bf05ff4b12a4a2eddee33689a841464b40ec2e6018802202c5515d12df8f06c71ff868dd0bd9ad172deef69101debb3b8c77bb30042ccf4010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
-    # local_signature = 3044022011d3237aa0e2d885b5e59196adad4d217a30ffeebb59fdf0213e29d3f8c3b9ad02206048b2c00e481e9f6d23f094ba991a387babe0302c639b872e986badcc042845
-    output htlc_success_tx 1: 02000000000101e7ba31f387356434fbfcb332390bf7c98934445aa5b011d06efc3a2337777e1f02000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022018115b421de0a76eba67a932bbe6004f031cf3019330d13fa57bea4c2478bb81022000d6bbbc1e2aee760ff0d3e4b94a194b1a1f7f8f8681357ff1ee655bde2dc27a01473044022011d3237aa0e2d885b5e59196adad4d217a30ffeebb59fdf0213e29d3f8c3b9ad02206048b2c00e481e9f6d23f094ba991a387babe0302c639b872e986badcc042845012001010101010101010101010101010101010101010101010101010101010101016e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac6800000000
-    # local_signature = 3044022035a12e30fa72206d12ba8d576fa6c5d7573af8bf465b53be0816aeb0350a0c120220288c3cedbdf16100f55bc00e67c67c28525cbd1b1f9fdd9c12fc83dcebf6642f
-    output htlc_timeout_tx 3: 02000000000101e7ba31f387356434fbfcb332390bf7c98934445aa5b011d06efc3a2337777e1f03000000000000000001b80b0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221009f8aa1b587474f4b4af7dd9795287aa038e3b064d0d781acd047b14d6708756b022044e6ce746548a99f01f1beb0fc09e996dd9e893895fd184477d79d44ba087a2b01473044022035a12e30fa72206d12ba8d576fa6c5d7573af8bf465b53be0816aeb0350a0c120220288c3cedbdf16100f55bc00e67c67c28525cbd1b1f9fdd9c12fc83dcebf6642f010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 3045022100e9e55274fdbbe7d096f568eaadb005e790fcfc3612f581c706f95cd3ec6008fd0220539348f7618b50317765c99358027cb1dbd27c9354159d3c918bd58aa43c573b
-    output htlc_success_tx 4: 02000000000101e7ba31f387356434fbfcb332390bf7c98934445aa5b011d06efc3a2337777e1f04000000000000000001a00f0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d41900c2f5539f97c8dde8b3d26906e94cc9f84ee8f4fba408b49d88713df6320220296f4886681f2bb8fd120bcb8b8bc50a7e0c90b4d5b62ab953ff8eb2c68ecbdc01483045022100e9e55274fdbbe7d096f568eaadb005e790fcfc3612f581c706f95cd3ec6008fd0220539348f7618b50317765c99358027cb1dbd27c9354159d3c918bd58aa43c573b012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 30450221009b7b7aafcc807df5a151bc9d15247deb7e9b68dc434212a7fd425644f4c09eb302207a8a632ead288e9f10d807435b493416740d3ce29e5b47a5551ca9575f47ac5a01
+    # local signature 304402202e8d081f0386f76cf7eccb674d278b92af3f9f2e13ece232dcdf76899798f7490220359a4bb41f0eb93840f12dbcd7564cb346f2d0a1b436338eaca45d61b680090001
+    output htlc_success_tx 0: 0200000000010178ed57e0737ae43861bef7c080dd7689e49f0e7465994f8bed5c7e57a3d541b700000000000000000001e8030000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022038c1ecb18f42fafa1558d34c41cabc473c1b2ce4025cadb08fef217b7d8e61f302204ae9ea4c869848d51dbf0044f9b8bf7b9691ba853670a983000c5af2e5db9ea30147304402202e8d081f0386f76cf7eccb674d278b92af3f9f2e13ece232dcdf76899798f7490220359a4bb41f0eb93840f12dbcd7564cb346f2d0a1b436338eaca45d61b6800900012000000000000000000000000000000000000000000000000000000000000000009921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f401b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+    # local signature 3045022100e019321dbc1304a22f824ef7842d6562eea06a5d17771f6aa490d306f60ca2be02205657043cbe93d5ca20466fb3b195f9a33e5a9e2d85627d15c3c285e93212834c01
+    output htlc_success_tx 1: 0200000000010178ed57e0737ae43861bef7c080dd7689e49f0e7465994f8bed5c7e57a3d541b701000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402200484125dc1430266f9e9156cc2ab59670781b6fae87dd5cc41bd9913c568dac50220020bf414550a39a559b2b2ba2431c4cba562c00fd16aae809412132f00b1175c01483045022100e019321dbc1304a22f824ef7842d6562eea06a5d17771f6aa490d306f60ca2be02205657043cbe93d5ca20466fb3b195f9a33e5a9e2d85627d15c3c285e93212834c012001010101010101010101010101010101010101010101010101010101010101019921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+    # local signature 3044022023c25f082b0095437ae4f4d467b9fbdcd5f43129e7c31e7ac96b4fb0e06939b702203a3df0e4eee9a1a29b4c8e0ef79249285638e4927f72ac0198e121989aec018f01
+    output htlc_timeout_tx 2: 0200000000010178ed57e0737ae43861bef7c080dd7689e49f0e7465994f8bed5c7e57a3d541b702000000000000000001d0070000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e8e8aac4e31d2f6574df3414ead1ff33b0a5b27e19b36b542706587093932ba1022074b35e23a40f2db0db5d0b73392debcca7a05998beab2916f9ab38274f003bd701473044022023c25f082b0095437ae4f4d467b9fbdcd5f43129e7c31e7ac96b4fb0e06939b702203a3df0e4eee9a1a29b4c8e0ef79249285638e4927f72ac0198e121989aec018f01008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
+    # local signature 3045022100d72c4203c2818332e0f4eaf82e4c3ab31d32b3b22e57e5b7f7b225f500789ebb02200ff78f4b3ecc6e502e50f9925b0f3f8fd5e13f0c9d0045c42157d60f42034c7701
+    output htlc_timeout_tx 3: 0200000000010178ed57e0737ae43861bef7c080dd7689e49f0e7465994f8bed5c7e57a3d541b703000000000000000001b80b0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a2f77f721bed8b3d181ec324fa78632e145f74cc43d32f6934caf00e364995030220309d309b215a9dca1bd721f56434d509016cff414845753d18d17656de32986001483045022100d72c4203c2818332e0f4eaf82e4c3ab31d32b3b22e57e5b7f7b225f500789ebb02200ff78f4b3ecc6e502e50f9925b0f3f8fd5e13f0c9d0045c42157d60f42034c7701008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 30450221009a151261208bb52d2b2972b503bf403532ea94ec1f803c7281ae5f4a48489dfa02205384911c7dfd44f5e7656e08ee83a70630e1ed9c75d84749d868d1e14a359b7901
+    output htlc_success_tx 4: 0200000000010178ed57e0737ae43861bef7c080dd7689e49f0e7465994f8bed5c7e57a3d541b704000000000000000001a00f0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221009b7b7aafcc807df5a151bc9d15247deb7e9b68dc434212a7fd425644f4c09eb302207a8a632ead288e9f10d807435b493416740d3ce29e5b47a5551ca9575f47ac5a014830450221009a151261208bb52d2b2972b503bf403532ea94ec1f803c7281ae5f4a48489dfa02205384911c7dfd44f5e7656e08ee83a70630e1ed9c75d84749d868d1e14a359b79012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 7 outputs untrimmed (maximum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 676
-    # base commitment transaction fee = 1070
-    # HTLC 2 offered amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 0 received amount 1000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac68
-    # HTLC 1 received amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6986930 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3045022100f46729e7a3126cf03d94691f814405b26cf896ecd6617d565aba6915c68de3a202204ca52c50b0c6fe424671b9986907f6180d8c65b289347fa02aac3c69065c6b97
-    # local_signature = 30450221009fb6cb38db01817f77a5f973729948b8af0b3a6dad3429e2bd7a88b7b3d1de8b022025e1cd9f23dfe3f87e39e8c14fd054771758287e35aa1b4499de99427844abf2
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e8030000000000002200207eaf624c3ab8f5cad0589f46db3fed940bf79a88fb5ab7fa3a6e1d071b5845bfd00700000000000022002083975515b28ad8c03b0915cae90787ff5f1a0ad8f313806a71ef6152fd5ecc78d007000000000000220020edcdff3e4bb6b538c0ee9639f56dfc4f222e5077bface165abc48764160da0c2b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110b29c6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e04004830450221009fb6cb38db01817f77a5f973729948b8af0b3a6dad3429e2bd7a88b7b3d1de8b022025e1cd9f23dfe3f87e39e8c14fd054771758287e35aa1b4499de99427844abf201483045022100f46729e7a3126cf03d94691f814405b26cf896ecd6617d565aba6915c68de3a202204ca52c50b0c6fe424671b9986907f6180d8c65b289347fa02aac3c69065c6b9701475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 633
+    # base commitment transaction fee = 1002
+    # actual commitment transaction fee = 1002
+    # HTLC received amount 1000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f401b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # HTLC received amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # HTLC offered amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6986998 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 3045022100fe6350065023bca5f1101e9512240db9d5498e9d500d4972a300901d61eb4c6002207f46f0235759d52919afdbcb01d89dc584c7af3012e8e45679333cfba700d13001
+    remote_signature: 3045022100b97814fe4df75aae650c070f5cd417231970af1686d7f73275735d886156b05d0220052e9537b3ff5826cd7e82f0186ee9043cae0f6974ec442d6b3b4e8903ef9bd501
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8007e803000000000000220020b1990f5a65230fc39e4ef790f3907d8f1a587d15b0810e89f9a6c68343767a1ad0070000000000002200207fca09ebacdfe6a4f704e8e3c1767bee0ede006ca7107b4358b34eb96c50bacfd007000000000000220020d9d8939fbb5b6f47577992ec878bcc4ee58272696dcef62607e152c29b6cd995b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a036f69c6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100fe6350065023bca5f1101e9512240db9d5498e9d500d4972a300901d61eb4c6002207f46f0235759d52919afdbcb01d89dc584c7af3012e8e45679333cfba700d13001483045022100b97814fe4df75aae650c070f5cd417231970af1686d7f73275735d886156b05d0220052e9537b3ff5826cd7e82f0186ee9043cae0f6974ec442d6b3b4e8903ef9bd501475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 5
    # signature for output 0 (htlc 0)
-    remote_htlc_signature = 3044022056bebc4022fd5fbf2476ca55a855f062850ffc8ea1f9bb35cd39b7bdc64ac573022009e29305705e4807b6caaa3f574292b62933474ca469a6b0b0ed9c2d33c8e1a3
-    # signature for output 1 (htlc 2)
-    remote_htlc_signature = 304402201355346d12f88fcee4e79e093e89527339ea1e560c0c2ea3d1279ef5f3aced4a022039b3e9856d2250b3a7e151ab960c2c5b9e7dfced40da41fb80177e4738767422
-    # signature for output 2 (htlc 1)
-    remote_htlc_signature = 3045022100cd05e73a45c0eb3fcaf35728c27cba2ebc9e6b490615a94d0108238559794aab0220242975b8644e94691f4a8840bec81c27faca10e221440af1922f8b041fea107a
+    remote_htlc_signature: 3045022100f5920bcb9567cee174eb06b8e8e29a9ecb1605208cccb4f7a402a0da58af928d02206889a4a1ce98a2e1c79d357769a5bdd74f95e48cc8b3501749783423a86a060901
+    # signature for output 1 (htlc 1)
+    remote_htlc_signature: 3045022100c3a25a2faf093f5b5b2f5ecef0b4ba5e16424316a5eba32649d7a6b41448fbd402203895febc3f5ce6cc0d629e9f6808ce9271873a8dccd07eb6271d4b5f913d4e2301
+    # signature for output 2 (htlc 2)
+    remote_htlc_signature: 30450221008ccea0eb640ba92ea1778ce9e44bd650ae22778d0f655d3d182d2445da560684022079d7eb827f7fab92c4aea19c57756a8d91035804a756ceeb83392cab21ac318d01
    # signature for output 3 (htlc 3)
-    remote_htlc_signature = 3045022100d72170b2c83f7077da0f420f38a6261eaf672b220fb148b1e7a50006614c196002200be39c59743a1752dea8f77fc1a664bd4c0eee7f721ba4d532e97421552a52f4
+    remote_htlc_signature: 3044022079eac866205ca8e7274cbf194dccc7a0f1a504ceea252e504d13dc2208712b6402204dc67e95f8532954e2aa617d8cdcf4d97311293c301e8b9aa2cab6324609f8d601
    # signature for output 4 (htlc 4)
-    remote_htlc_signature = 3045022100da8218fc0d6d01dd14ac50a4f3eed4a6ace56268f617511694382a3abc5fd91202206d51f9530723ee3a5cbbc5d85f11fd91008384fab48dbf05caff666e99513744
-    # local_signature = 3045022100b5ec2a995317b3dfa98377240f1b06e86e03d04131543306173cb34fc640a2b50220797a3ef9d1c4b7fda79263c310df5a291d2c10beb540d83aea2325f2581e0dc2
-    output htlc_success_tx 0: 020000000001017644b6a9fb53bbc752147b6bb88b1a90ab5bfca44d7a87b8f993f83446b418b30000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022056bebc4022fd5fbf2476ca55a855f062850ffc8ea1f9bb35cd39b7bdc64ac573022009e29305705e4807b6caaa3f574292b62933474ca469a6b0b0ed9c2d33c8e1a301483045022100b5ec2a995317b3dfa98377240f1b06e86e03d04131543306173cb34fc640a2b50220797a3ef9d1c4b7fda79263c310df5a291d2c10beb540d83aea2325f2581e0dc2012000000000000000000000000000000000000000000000000000000000000000006e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f401b175ac6800000000
-    # local_signature = 3044022056f350b2a0c004b5a7ef94258962788cea6eee47642dfda0863db0efda8d5dfb02203e542f1cbf95961953c3bee001e77f959460f81b3687451d75e7430e97bcdc1d
-    output htlc_timeout_tx 2: 020000000001017644b6a9fb53bbc752147b6bb88b1a90ab5bfca44d7a87b8f993f83446b418b30100000000000000000123060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402201355346d12f88fcee4e79e093e89527339ea1e560c0c2ea3d1279ef5f3aced4a022039b3e9856d2250b3a7e151ab960c2c5b9e7dfced40da41fb80177e473876742201473044022056f350b2a0c004b5a7ef94258962788cea6eee47642dfda0863db0efda8d5dfb02203e542f1cbf95961953c3bee001e77f959460f81b3687451d75e7430e97bcdc1d010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
-    # local_signature = 3045022100e64eee114e87eb70756de34a4ca4ef1cfa1d84b67144761b4136d72514bc40f9022014e895f8039db06a0654fe2bd66f8be721537cc6ddae52d4d65a53e2012fd3eb
-    output htlc_success_tx 1: 020000000001017644b6a9fb53bbc752147b6bb88b1a90ab5bfca44d7a87b8f993f83446b418b3020000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100cd05e73a45c0eb3fcaf35728c27cba2ebc9e6b490615a94d0108238559794aab0220242975b8644e94691f4a8840bec81c27faca10e221440af1922f8b041fea107a01483045022100e64eee114e87eb70756de34a4ca4ef1cfa1d84b67144761b4136d72514bc40f9022014e895f8039db06a0654fe2bd66f8be721537cc6ddae52d4d65a53e2012fd3eb012001010101010101010101010101010101010101010101010101010101010101016e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac6800000000
-    # local_signature = 304402206e361b4d177ede694046c294fd1d6d408228fd25f55c2b5f00ba4ef3690292bd022028306fb9fb21013eaa6d04083e2946ae6ea6c7038ad8e920adb358f36488241d
-    output htlc_timeout_tx 3: 020000000001017644b6a9fb53bbc752147b6bb88b1a90ab5bfca44d7a87b8f993f83446b418b3030000000000000000010b0a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d72170b2c83f7077da0f420f38a6261eaf672b220fb148b1e7a50006614c196002200be39c59743a1752dea8f77fc1a664bd4c0eee7f721ba4d532e97421552a52f40147304402206e361b4d177ede694046c294fd1d6d408228fd25f55c2b5f00ba4ef3690292bd022028306fb9fb21013eaa6d04083e2946ae6ea6c7038ad8e920adb358f36488241d010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 3045022100ea1f5e5c1a0f0b4387cd6e0be9f6f4dc73aa225154a89359a76dfe886badbb5d02205b035bc9730928871dd77c35619a672d44183a55020c4bf24b6bf8fc32c68d8c
-    output htlc_success_tx 4: 020000000001017644b6a9fb53bbc752147b6bb88b1a90ab5bfca44d7a87b8f993f83446b418b304000000000000000001da0d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100da8218fc0d6d01dd14ac50a4f3eed4a6ace56268f617511694382a3abc5fd91202206d51f9530723ee3a5cbbc5d85f11fd91008384fab48dbf05caff666e9951374401483045022100ea1f5e5c1a0f0b4387cd6e0be9f6f4dc73aa225154a89359a76dfe886badbb5d02205b035bc9730928871dd77c35619a672d44183a55020c4bf24b6bf8fc32c68d8c012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 304402204a7c48b23e29f3771ea13867646d0cceb61c371a6c6c052dade95041186e868c02200d15508115b07340e212a634fe029c77d30cecdfe035db229d9142fb7896ebc101
+    # local signature 30440220768a159111a177add5a15227890866fd28ceb8a9d936ae2f4f2c42c993f1dbf402202dd7c8fb78664a970f1f6f030983bbcda9c51f8565ce09d8e5aab5cd3dfb014001
+    output htlc_success_tx 0: 02000000000101808804573e07544dfec1226db93a232a921c8001693611bec48b2d79cd516ae00000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100f5920bcb9567cee174eb06b8e8e29a9ecb1605208cccb4f7a402a0da58af928d02206889a4a1ce98a2e1c79d357769a5bdd74f95e48cc8b3501749783423a86a0609014730440220768a159111a177add5a15227890866fd28ceb8a9d936ae2f4f2c42c993f1dbf402202dd7c8fb78664a970f1f6f030983bbcda9c51f8565ce09d8e5aab5cd3dfb0140012000000000000000000000000000000000000000000000000000000000000000009921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a914b8bcb07f6344b42ab04250c86a6e8b75d3fdbbc688527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f401b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+    # local signature 30440220442d9864b014a51bf893bd0219dfead878aaaa6290f08345073a54565c4de34b022053f36c62f37c89078031c4d23c85fb746dcf107af59b678654c27e9a4126d72d01
+    output htlc_success_tx 1: 02000000000101808804573e07544dfec1226db93a232a921c8001693611bec48b2d79cd516ae0010000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100c3a25a2faf093f5b5b2f5ecef0b4ba5e16424316a5eba32649d7a6b41448fbd402203895febc3f5ce6cc0d629e9f6808ce9271873a8dccd07eb6271d4b5f913d4e23014730440220442d9864b014a51bf893bd0219dfead878aaaa6290f08345073a54565c4de34b022053f36c62f37c89078031c4d23c85fb746dcf107af59b678654c27e9a4126d72d012001010101010101010101010101010101010101010101010101010101010101019921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+    # local signature 30440220374299bca4f2c7faa34207dd25bc666ac10084664e551cc8da3343efb769bfc502204fa914b98bc8d53176c4cdb74d850b03ec54448a5f9a6f7ce046683dfb45c3fc01
+    output htlc_timeout_tx 2: 02000000000101808804573e07544dfec1226db93a232a921c8001693611bec48b2d79cd516ae00200000000000000000129060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221008ccea0eb640ba92ea1778ce9e44bd650ae22778d0f655d3d182d2445da560684022079d7eb827f7fab92c4aea19c57756a8d91035804a756ceeb83392cab21ac318d014730440220374299bca4f2c7faa34207dd25bc666ac10084664e551cc8da3343efb769bfc502204fa914b98bc8d53176c4cdb74d850b03ec54448a5f9a6f7ce046683dfb45c3fc01008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
+    # local signature 304402207321402614ec8d604af1d701725a24bbf563e463a44f011873a35bcf8951ca4302201af0c6bc443ec09b8c123ebfbd12411cbe9b2161fa03e094aa0f7bd7731c81be01
+    output htlc_timeout_tx 3: 02000000000101808804573e07544dfec1226db93a232a921c8001693611bec48b2d79cd516ae003000000000000000001110a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022079eac866205ca8e7274cbf194dccc7a0f1a504ceea252e504d13dc2208712b6402204dc67e95f8532954e2aa617d8cdcf4d97311293c301e8b9aa2cab6324609f8d60147304402207321402614ec8d604af1d701725a24bbf563e463a44f011873a35bcf8951ca4302201af0c6bc443ec09b8c123ebfbd12411cbe9b2161fa03e094aa0f7bd7731c81be01008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 3044022051df0562fb628047ebb9a3453af55908617fbe0c4102cb248b4bcd7caf0b0b0e0220262dbf209f5b4a70ab25b215f5cf07433fb1fc1c93f5ea692495bf7ff7e27f1801
+    output htlc_success_tx 4: 02000000000101808804573e07544dfec1226db93a232a921c8001693611bec48b2d79cd516ae004000000000000000001da0d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402204a7c48b23e29f3771ea13867646d0cceb61c371a6c6c052dade95041186e868c02200d15508115b07340e212a634fe029c77d30cecdfe035db229d9142fb7896ebc101473044022051df0562fb628047ebb9a3453af55908617fbe0c4102cb248b4bcd7caf0b0b0e0220262dbf209f5b4a70ab25b215f5cf07433fb1fc1c93f5ea692495bf7ff7e27f18012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 6 outputs untrimmed (minimum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 677
-    # base commitment transaction fee = 955
-    # HTLC 2 offered amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 1 received amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6987045 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3044022025a153b4c6310fa5f1825a077625054f993e07540149ef76f39d41fdbfa3432402202ff44666e56a9cfc3dbca68d26d2174f09a7aad9f2ca0741f3e7373686ff7c9d
-    # local_signature = 30450221008acdee277c284cacc3c0b64b0724d459bcae09e3390cd36767f6a65bb265ccfe0220608b5459263c4a80fa30ca3901c08642df793d3048bf985df7da66d6dbb5d4b9
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d00700000000000022002083975515b28ad8c03b0915cae90787ff5f1a0ad8f313806a71ef6152fd5ecc78d007000000000000220020edcdff3e4bb6b538c0ee9639f56dfc4f222e5077bface165abc48764160da0c2b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110259d6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e04004830450221008acdee277c284cacc3c0b64b0724d459bcae09e3390cd36767f6a65bb265ccfe0220608b5459263c4a80fa30ca3901c08642df793d3048bf985df7da66d6dbb5d4b901473044022025a153b4c6310fa5f1825a077625054f993e07540149ef76f39d41fdbfa3432402202ff44666e56a9cfc3dbca68d26d2174f09a7aad9f2ca0741f3e7373686ff7c9d01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 634
+    # base commitment transaction fee = 895
+    # actual commitment transaction fee = 1895
+    # HTLC received amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # HTLC offered amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6987105 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 3045022100e1c5157d9ac24eea2ead29c12c26e2f8efdabcbbfc7abc73d5d0faa5cb85503102207bb244b9a2877a5bc6232ad88561f3ad02de54217dcf02bbe1b28bd51318fb6901
+    remote_signature: 3045022100b88d68334f6699ac0b10aec7d0f7274628249517181c148119da7cc37cdc98b9022040ff3ed18cec6fa06bfb6a404393d073157e3eb5451904499b79e91a1011879c01
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d0070000000000002200207fca09ebacdfe6a4f704e8e3c1767bee0ede006ca7107b4358b34eb96c50bacfd007000000000000220020d9d8939fbb5b6f47577992ec878bcc4ee58272696dcef62607e152c29b6cd995b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a036619d6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100e1c5157d9ac24eea2ead29c12c26e2f8efdabcbbfc7abc73d5d0faa5cb85503102207bb244b9a2877a5bc6232ad88561f3ad02de54217dcf02bbe1b28bd51318fb6901483045022100b88d68334f6699ac0b10aec7d0f7274628249517181c148119da7cc37cdc98b9022040ff3ed18cec6fa06bfb6a404393d073157e3eb5451904499b79e91a1011879c01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 4
-    # signature for output 0 (htlc 2)
-    remote_htlc_signature = 304402200b99af3616ff5bf54e09bc09d2c5ebf9f2b37665af54bf4458a4adf4154b60ad022047680a6c88e0360b578567937262a9f8a865df62e138ad7668f0bfef004f1681
-    # signature for output 1 (htlc 1)
-    remote_htlc_signature = 304502210092b842a1d8cd997498efb58153d059f47388f928656adaa9e321ed5a8a2aef8602203cf1e01c6d20925f8082b5e993b9992fb24ed1ec07c14e7725b4b22a3262f57a
+    # signature for output 0 (htlc 1)
+    remote_htlc_signature: 3045022100d995ca72c1fe434247a19b676e92c13a0647017d27fd98bfb2eea72244820abb022059ade937a1c486863a297daec0a9a06f2b290e551622a5ff0cfc9603ef3f2cd501
+    # signature for output 1 (htlc 2)
+    remote_htlc_signature: 30440220724e33a9a4359e54451e43235b08db1ab0aca996ab70a712a4026a52c29db87802204047add11a8ba1f3a49595ef6c6c1c90483d2ef90a35f64463fd8af57942d41801
    # signature for output 2 (htlc 3)
-    remote_htlc_signature = 304402207490b35056190b32ed34528ffec3a5753466c369b4657bc212daf030d7b9ffcb022023f0628ff934b97faebc3c6d2c65da2d3c9b58a2264fd45cc794dc68b66bb0b4
+    remote_htlc_signature: 30450221008889477f5d321983202eb581f98c71c3deabcaf316cd3b14df0a4cedaa7bf02c022072750593042c01ea63d4b8d57cab4f86ac4e68312cfabf49e2550e2a51e26b2201
    # signature for output 3 (htlc 4)
-    remote_htlc_signature = 3045022100bb73d81662e1dd73083c8302695d8364ebb136cffb1c079268ffb41bae0e14a8022048996892352789e47f9459cb3cbd80ad6b9b75ee2c2188b21925c2938cdc0c90
-    # local_signature = 3045022100a4f249efd68e88a54e037ac4caa6b595dd54da07fa1495ffe489847ae13d7f380220488231fb716770c32310496dd763c18ec4350bcc255aba6227858310e1739e7f
-    output htlc_timeout_tx 2: 0200000000010134b61a3d1d1d3cd46c7629aa6ca01bd424b88efd417a9e8ec5ab53ba850fabea0000000000000000000123060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402200b99af3616ff5bf54e09bc09d2c5ebf9f2b37665af54bf4458a4adf4154b60ad022047680a6c88e0360b578567937262a9f8a865df62e138ad7668f0bfef004f168101483045022100a4f249efd68e88a54e037ac4caa6b595dd54da07fa1495ffe489847ae13d7f380220488231fb716770c32310496dd763c18ec4350bcc255aba6227858310e1739e7f010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
-    # local_signature = 30440220123df40dd4eb163f79ebef3f65ab3fead75602714c6b14ae3deb4e1b8580fbb202200fe4305c2d51880a5019788b1f17ee4db48ba061351727c6f30487a1ff880939
-    output htlc_success_tx 1: 0200000000010134b61a3d1d1d3cd46c7629aa6ca01bd424b88efd417a9e8ec5ab53ba850fabea0100000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050048304502210092b842a1d8cd997498efb58153d059f47388f928656adaa9e321ed5a8a2aef8602203cf1e01c6d20925f8082b5e993b9992fb24ed1ec07c14e7725b4b22a3262f57a014730440220123df40dd4eb163f79ebef3f65ab3fead75602714c6b14ae3deb4e1b8580fbb202200fe4305c2d51880a5019788b1f17ee4db48ba061351727c6f30487a1ff880939012001010101010101010101010101010101010101010101010101010101010101016e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac6800000000
-    # local_signature = 3045022100f49d6833dbc36beb93a55fcd985111f9e0fa5bf8218658444c618f45fb74c167022073deecf585665a25178658833fb75577264ecfa392412e4548bbade9fbf1cc67
-    output htlc_timeout_tx 3: 0200000000010134b61a3d1d1d3cd46c7629aa6ca01bd424b88efd417a9e8ec5ab53ba850fabea020000000000000000010b0a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402207490b35056190b32ed34528ffec3a5753466c369b4657bc212daf030d7b9ffcb022023f0628ff934b97faebc3c6d2c65da2d3c9b58a2264fd45cc794dc68b66bb0b401483045022100f49d6833dbc36beb93a55fcd985111f9e0fa5bf8218658444c618f45fb74c167022073deecf585665a25178658833fb75577264ecfa392412e4548bbade9fbf1cc67010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 304402201189fdb64c5fd545dccdf8411ce8bae8a60ea0a5470fb0874a3770b9ba26ac0e0220759e339a19feb419f869962e2d3f8911aeac8408b16959252a725605eb39744a
-    output htlc_success_tx 4: 0200000000010134b61a3d1d1d3cd46c7629aa6ca01bd424b88efd417a9e8ec5ab53ba850fabea03000000000000000001d90d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100bb73d81662e1dd73083c8302695d8364ebb136cffb1c079268ffb41bae0e14a8022048996892352789e47f9459cb3cbd80ad6b9b75ee2c2188b21925c2938cdc0c900147304402201189fdb64c5fd545dccdf8411ce8bae8a60ea0a5470fb0874a3770b9ba26ac0e0220759e339a19feb419f869962e2d3f8911aeac8408b16959252a725605eb39744a012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 30440220332c90c60799b563c84a018a639c98c3e5ecf3c0b374872b831bd4479b77da2802206d6157634fe81124c7f2fcd448830442b35f23760ba4e5eaab909e713344258901
+    # local signature 30450221009b9d8bccc9272a37b83ed1fa6f745bbea07965f6d2144236d8d5a2b5b70f09bf022053d742b839dbf1005b4ec614c3cf4e7d102784e1df7653ad9c61bd0e14c266d501
+    output htlc_success_tx 1: 02000000000101cd9cb94b99aaa9cae794ff7d8149b7f4f3a02879249b79234377281d056b44350000000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d995ca72c1fe434247a19b676e92c13a0647017d27fd98bfb2eea72244820abb022059ade937a1c486863a297daec0a9a06f2b290e551622a5ff0cfc9603ef3f2cd5014830450221009b9d8bccc9272a37b83ed1fa6f745bbea07965f6d2144236d8d5a2b5b70f09bf022053d742b839dbf1005b4ec614c3cf4e7d102784e1df7653ad9c61bd0e14c266d5012001010101010101010101010101010101010101010101010101010101010101019921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+    # local signature 304502210088a0db8203ef8ee44ea008c092d4e27ce144c6c207d54da499a4e64fde592b6402203d2cc31da39b659ad16e1c5e857124c3220602cb1b5857d6a52b39c56945645b01
+    output htlc_timeout_tx 2: 02000000000101cd9cb94b99aaa9cae794ff7d8149b7f4f3a02879249b79234377281d056b44350100000000000000000128060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220724e33a9a4359e54451e43235b08db1ab0aca996ab70a712a4026a52c29db87802204047add11a8ba1f3a49595ef6c6c1c90483d2ef90a35f64463fd8af57942d4180148304502210088a0db8203ef8ee44ea008c092d4e27ce144c6c207d54da499a4e64fde592b6402203d2cc31da39b659ad16e1c5e857124c3220602cb1b5857d6a52b39c56945645b01008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
+    # local signature 30440220052b4b1c9fdad0b8cd6ec7ab26c9f7d8e45e5c93c820702c712ea09dc34cc49c02202098bd434c57644a78b1b873b70d1fdf52ce2e0f02234313f2115c3e85ad3f9001
+    output htlc_timeout_tx 3: 02000000000101cd9cb94b99aaa9cae794ff7d8149b7f4f3a02879249b79234377281d056b443502000000000000000001100a0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221008889477f5d321983202eb581f98c71c3deabcaf316cd3b14df0a4cedaa7bf02c022072750593042c01ea63d4b8d57cab4f86ac4e68312cfabf49e2550e2a51e26b22014730440220052b4b1c9fdad0b8cd6ec7ab26c9f7d8e45e5c93c820702c712ea09dc34cc49c02202098bd434c57644a78b1b873b70d1fdf52ce2e0f02234313f2115c3e85ad3f9001008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 3045022100d653f99f84792215cb7150a8dfb44a44996a2b376baef729197a32d92bd094c3022060164b561ae395b430cf701a5080e6483a660412748b7c1a9d0671632dc8f62d01
+    output htlc_success_tx 4: 02000000000101cd9cb94b99aaa9cae794ff7d8149b7f4f3a02879249b79234377281d056b443503000000000000000001d90d0000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220332c90c60799b563c84a018a639c98c3e5ecf3c0b374872b831bd4479b77da2802206d6157634fe81124c7f2fcd448830442b35f23760ba4e5eaab909e713344258901483045022100d653f99f84792215cb7150a8dfb44a44996a2b376baef729197a32d92bd094c3022060164b561ae395b430cf701a5080e6483a660412748b7c1a9d0671632dc8f62d012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 6 outputs untrimmed (maximum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 2161
-    # base commitment transaction fee = 3051
-    # HTLC 2 offered amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 1 received amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6984949 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3045022100a9976e89763982487b7ff07a26347d398b9f19c0fb01046c8a787d7cd6068f440220224138e065ed31f248fd2756d3e209c0cab69ea5e1ede66d019e18072267284f
-    # local_signature = 3045022100b42a3229202c8c5ddbff95efa6aa2d48c39b57d437ad4a8b2a917d11a3ca55ff02205bb9c65d06656222ced3bfd804145f658d1fa11804b20ef44962a9ea547bd6b7
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d00700000000000022002083975515b28ad8c03b0915cae90787ff5f1a0ad8f313806a71ef6152fd5ecc78d007000000000000220020edcdff3e4bb6b538c0ee9639f56dfc4f222e5077bface165abc48764160da0c2b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110f5946a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100b42a3229202c8c5ddbff95efa6aa2d48c39b57d437ad4a8b2a917d11a3ca55ff02205bb9c65d06656222ced3bfd804145f658d1fa11804b20ef44962a9ea547bd6b701483045022100a9976e89763982487b7ff07a26347d398b9f19c0fb01046c8a787d7cd6068f440220224138e065ed31f248fd2756d3e209c0cab69ea5e1ede66d019e18072267284f01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 2026
+    # base commitment transaction fee = 2860
+    # actual commitment transaction fee = 3860
+    # HTLC received amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # HTLC offered amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6985140 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 3045022100dee408978d75349528d11b5a4e7f083b8b159dd697cac53a67222e81b146be71022038a877cecd6b89c227bf7971d34214b3033238e1fd1c9b45ade9a032c83ed63301
+    remote_signature: 30440220328749aa5f57a878685524d7893f1669a618c92494c2cdbb6836b0ca26f6b4cb0220184fa3cd9375a7869633726ffbe5e8ebafefafbe534198034c70ad65bf1ec0e501
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8006d0070000000000002200207fca09ebacdfe6a4f704e8e3c1767bee0ede006ca7107b4358b34eb96c50bacfd007000000000000220020d9d8939fbb5b6f47577992ec878bcc4ee58272696dcef62607e152c29b6cd995b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a036b4956a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100dee408978d75349528d11b5a4e7f083b8b159dd697cac53a67222e81b146be71022038a877cecd6b89c227bf7971d34214b3033238e1fd1c9b45ade9a032c83ed633014730440220328749aa5f57a878685524d7893f1669a618c92494c2cdbb6836b0ca26f6b4cb0220184fa3cd9375a7869633726ffbe5e8ebafefafbe534198034c70ad65bf1ec0e501475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 4
-    # signature for output 0 (htlc 2)
-    remote_htlc_signature = 3045022100f3e6e01988f50a0eb0ea811af3b3b716293a353ae8e3d47e2b87abd2c98c6a12022025b4d26a915b2854d81f377def7cbbbc7249aad11570c304687a1ec546c8f6e4
-    # signature for output 1 (htlc 1)
-    remote_htlc_signature = 3044022044e4357623253d491447e2174093b4fae67b9c65e166ccf783ad8c66556424e002206bc129d62fc6536262973cf9363622af4142af8cedaff41543fd54565e4d1767
+    # signature for output 0 (htlc 1)
+    remote_htlc_signature: 3045022100a8a065322199d515ed0a562101c2aed0c220dec3598f1e523733b82f684a66c902200feb709e3cf48771d6fca9f1dc125b10e07c252f1f3f85386c46cd9b1231e57c01
+    # signature for output 1 (htlc 2)
+    remote_htlc_signature: 304502210084763c1e9fd96e612c41e793a3e8beaaa64b0d2420b097abecd7df7d634a52f9022037115669e1676009dba6969cb4a8676270a685855e9c70f43069e4659259c1aa01
    # signature for output 2 (htlc 3)
-    remote_htlc_signature = 3045022100f81e573131abf61f9ffc0901777caf674f9426dc5abe257f1df5c20a078421f902207c2fa5afa0b74d2916aa6651a51305287ef23ca1ad82c1a26e73fac2c9ca8f72
+    remote_htlc_signature: 3045022100db93f5c9188ee45194397502e89d3329d03f7b716a12ba38453c9fe84b3703e802206ca4b20c79f8e8647f2ca0d5573824f86cdc0b24d66c3b0a56ac2287e0646d6101
    # signature for output 3 (htlc 4)
-    remote_htlc_signature = 3045022100bae10b27ee2b973f9125cc6477caaa0d9391a68ac494a269b9751d12a6fa2a2f02206d1bb6b5bc3d274c35b3de9a757b26b15a518ae37b3e638ea757e0bd92c2fede
-    # local_signature = 3045022100dd0da1cc28939c4557cca12ea7dc79e2c2b6062b30dc5783176a9d47a13b55e30220117f8707fe2f1a9906c1266bd304fb9470ef8ca7a22b7dde87ec17ae6bb65807
-    output htlc_timeout_tx 2: 02000000000101f5d95dc4771c3e5529cb497b33d38ef187851266ab5e4f387208009bf4b9ede70000000000000000000174020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100f3e6e01988f50a0eb0ea811af3b3b716293a353ae8e3d47e2b87abd2c98c6a12022025b4d26a915b2854d81f377def7cbbbc7249aad11570c304687a1ec546c8f6e401483045022100dd0da1cc28939c4557cca12ea7dc79e2c2b6062b30dc5783176a9d47a13b55e30220117f8707fe2f1a9906c1266bd304fb9470ef8ca7a22b7dde87ec17ae6bb65807010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
-    # local_signature = 3045022100ab4059b7672cb8c55153574b9e467cae0e0f3bccf29bd5d1ef68565a91c68804022023a6c4018bade67d8def5218eb61b5ad2572a30277903ffd09e677f117313c6d
-    output htlc_success_tx 1: 02000000000101f5d95dc4771c3e5529cb497b33d38ef187851266ab5e4f387208009bf4b9ede70100000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022044e4357623253d491447e2174093b4fae67b9c65e166ccf783ad8c66556424e002206bc129d62fc6536262973cf9363622af4142af8cedaff41543fd54565e4d176701483045022100ab4059b7672cb8c55153574b9e467cae0e0f3bccf29bd5d1ef68565a91c68804022023a6c4018bade67d8def5218eb61b5ad2572a30277903ffd09e677f117313c6d012001010101010101010101010101010101010101010101010101010101010101016e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f501b175ac6800000000
-    # local_signature = 3045022100f556f34674d72aa5ce638b549f70a9129bc9dd0ab58ebf966c759b334d1915660220108e20d1a66821ffe24505c4709521981e52f090f269a0e1de4a96e0aacc19f9
-    output htlc_timeout_tx 3: 02000000000101f5d95dc4771c3e5529cb497b33d38ef187851266ab5e4f387208009bf4b9ede7020000000000000000015c060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100f81e573131abf61f9ffc0901777caf674f9426dc5abe257f1df5c20a078421f902207c2fa5afa0b74d2916aa6651a51305287ef23ca1ad82c1a26e73fac2c9ca8f7201483045022100f556f34674d72aa5ce638b549f70a9129bc9dd0ab58ebf966c759b334d1915660220108e20d1a66821ffe24505c4709521981e52f090f269a0e1de4a96e0aacc19f9010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 3044022006292dcb6d8e574d70bc40965efb6f618bb30b7a0efef53b460cdbd52ed164f802201a979d4ca50257731bdeda47a2a519f480ea62b0c2650835c4c16cab0f444c02
-    output htlc_success_tx 4: 02000000000101f5d95dc4771c3e5529cb497b33d38ef187851266ab5e4f387208009bf4b9ede703000000000000000001f2090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100bae10b27ee2b973f9125cc6477caaa0d9391a68ac494a269b9751d12a6fa2a2f02206d1bb6b5bc3d274c35b3de9a757b26b15a518ae37b3e638ea757e0bd92c2fede01473044022006292dcb6d8e574d70bc40965efb6f618bb30b7a0efef53b460cdbd52ed164f802201a979d4ca50257731bdeda47a2a519f480ea62b0c2650835c4c16cab0f444c02012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 3044022011c590a78cb5af7307ec42965545fa622c6750f76f8c70380636516ac666ff4502201173e0b45f1d8af493e70b63d86e56aefeac252d06101f8071779b739cb82f6001
+    # local signature 3045022100ff3ff587d6d5d0b44c754d6132b875c94ddb29964d2082a254f92d90aab6267102203d0beb25adffbe135e43d32ebb9c9fad056fbeb063cda2c555d9be7df427e50c01
+    output htlc_success_tx 1: 02000000000101fa20f7106f0a300a5555526642cdf6e37af85da7006e6fe26e6213789e8336c10000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a8a065322199d515ed0a562101c2aed0c220dec3598f1e523733b82f684a66c902200feb709e3cf48771d6fca9f1dc125b10e07c252f1f3f85386c46cd9b1231e57c01483045022100ff3ff587d6d5d0b44c754d6132b875c94ddb29964d2082a254f92d90aab6267102203d0beb25adffbe135e43d32ebb9c9fad056fbeb063cda2c555d9be7df427e50c012001010101010101010101010101010101010101010101010101010101010101019921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a9144b6b2e5444c2639cc0fb7bcea5afba3f3cdce23988527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f501b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+    # local signature 3045022100c37ff49b78cfd0951da0c2f44b04ad965498ff7840f7156104854d329bfc129a022079df3fc312a560cab4d73ad099ed5c469d1cd55ad3d3aecc126423507be954a001
+    output htlc_timeout_tx 2: 02000000000101fa20f7106f0a300a5555526642cdf6e37af85da7006e6fe26e6213789e8336c10100000000000000000185020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050048304502210084763c1e9fd96e612c41e793a3e8beaaa64b0d2420b097abecd7df7d634a52f9022037115669e1676009dba6969cb4a8676270a685855e9c70f43069e4659259c1aa01483045022100c37ff49b78cfd0951da0c2f44b04ad965498ff7840f7156104854d329bfc129a022079df3fc312a560cab4d73ad099ed5c469d1cd55ad3d3aecc126423507be954a001008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
+    # local signature 30440220148dfbadce7f89eb34e66f7c092d43fc1dcf24a3fdb6d89d20ffdfb458a7aebc02202da1e7df63657820d74930ebd918f0c565f3671fa81ea4b8e64206704f7e563901
+    output htlc_timeout_tx 3: 02000000000101fa20f7106f0a300a5555526642cdf6e37af85da7006e6fe26e6213789e8336c1020000000000000000016d060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100db93f5c9188ee45194397502e89d3329d03f7b716a12ba38453c9fe84b3703e802206ca4b20c79f8e8647f2ca0d5573824f86cdc0b24d66c3b0a56ac2287e0646d61014730440220148dfbadce7f89eb34e66f7c092d43fc1dcf24a3fdb6d89d20ffdfb458a7aebc02202da1e7df63657820d74930ebd918f0c565f3671fa81ea4b8e64206704f7e563901008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 3045022100e156dc322fe686a5e1dfd605c282d3375d96d98a5691a21b3d6b5bced601869102206f1db61a9e96b0cd82e5828b94eada83f45cd80f60f5328f48dfa894718ae7e501
+    output htlc_success_tx 4: 02000000000101fa20f7106f0a300a5555526642cdf6e37af85da7006e6fe26e6213789e8336c103000000000000000001f2090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022011c590a78cb5af7307ec42965545fa622c6750f76f8c70380636516ac666ff4502201173e0b45f1d8af493e70b63d86e56aefeac252d06101f8071779b739cb82f6001483045022100e156dc322fe686a5e1dfd605c282d3375d96d98a5691a21b3d6b5bced601869102206f1db61a9e96b0cd82e5828b94eada83f45cd80f60f5328f48dfa894718ae7e5012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 5 outputs untrimmed (minimum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 2162
-    # base commitment transaction fee = 2680
-    # HTLC 2 offered amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6985320 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3045022100e7b45245c3b6079d0606000d1e340f6957621ab09fa8feb28ec69272851ed9650220299ecd0833d086d97a094b0e1b82be2b878fbd03b15616ee06e40ca8b909d84c
-    # local_signature = 3045022100bfcdea8720cb25031a4ffa9f44195b2b66922183af9fcf040281b60ebcaa1dac0220636987b0fbacd90ea9ba6262d675f97d77aeaf8808ed0aaeecca20991b19c7d5
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d00700000000000022002083975515b28ad8c03b0915cae90787ff5f1a0ad8f313806a71ef6152fd5ecc78b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311068966a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100bfcdea8720cb25031a4ffa9f44195b2b66922183af9fcf040281b60ebcaa1dac0220636987b0fbacd90ea9ba6262d675f97d77aeaf8808ed0aaeecca20991b19c7d501483045022100e7b45245c3b6079d0606000d1e340f6957621ab09fa8feb28ec69272851ed9650220299ecd0833d086d97a094b0e1b82be2b878fbd03b15616ee06e40ca8b909d84c01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 2027
+    # base commitment transaction fee = 2513
+    # actual commitment transaction fee = 5513
+    # HTLC offered amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6985487 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 304402200fceec155e8791c96133ab30eeb41cacbd8d80c50cf2d285c7003ec3930ed40a0220388170a673a8c15ed331a5a24b7feae581d4aac0dc10e933a187ed93033fbf5c01
+    remote_signature: 30450221008bc83955f695d3ddac27b928d02f36b8325d52a66c102466caa6264690dff1ca02206cc3b7540c1e06aa3ba981c72a6cc42bc37386f2ff3ea61b4d52ca471aac65ea01
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d007000000000000220020d9d8939fbb5b6f47577992ec878bcc4ee58272696dcef62607e152c29b6cd995b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a0360f976a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402200fceec155e8791c96133ab30eeb41cacbd8d80c50cf2d285c7003ec3930ed40a0220388170a673a8c15ed331a5a24b7feae581d4aac0dc10e933a187ed93033fbf5c014830450221008bc83955f695d3ddac27b928d02f36b8325d52a66c102466caa6264690dff1ca02206cc3b7540c1e06aa3ba981c72a6cc42bc37386f2ff3ea61b4d52ca471aac65ea01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 3
    # signature for output 0 (htlc 2)
-    remote_htlc_signature = 3045022100a04f5b2f9d29610afd8381096f6ccf78f649f875224b505741b730b32eb5836402207054c0e91ef09fb9c1fe06d6449d9383551d94463600395924b92dc758352e78
+    remote_htlc_signature: 3044022002998cbdd14679f75cb6e5673906d5a48d149aa8a4a161b8e7b28743b56f9d890220532775eba61d9e338c064303475f5954e45f8ef39bbb6202b42136fe27d24e2401
    # signature for output 1 (htlc 3)
-    remote_htlc_signature = 3045022100916b4d9e90b4fb8744b1459c9d37f1e724c5bd64caef2e1a3ae7f5610057fca1022072e980b5ba830f3b7b9cc6f0fae9c28ed31093e6409f15e7253a68c0617f0d16
+    remote_htlc_signature: 3045022100cbf3323089fbd7d2b2994e66b1360cefc2bbb3fd52ace115f1a48f053a59fdbe022016388da5e0d6c5c6736d0ee4f4f1ad94f5c29319e9eba2b5ca30a33209c0663301
    # signature for output 2 (htlc 4)
-    remote_htlc_signature = 30440220389760f23945771d62e56a7359c86421f041ef48266afc5b4e2289cd3ade4caa022051fa511b1823af90711b2d52ffdfe8199242016f2c7f4d97c9e0f7c033a6f291
-    # local_signature = 3045022100f3ac249aadab618ed1348e7f97dcda549259f6fafd077b5567c3a651118f387f02202dfe392548f29f97f9bc2dc07e849bdd79f994c4ac4198995249428761df9c5c
-    output htlc_timeout_tx 2: 0200000000010129d38824741464418e2c9d0090584d909fb13c996845369706e4b969999e156d0000000000000000000174020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a04f5b2f9d29610afd8381096f6ccf78f649f875224b505741b730b32eb5836402207054c0e91ef09fb9c1fe06d6449d9383551d94463600395924b92dc758352e7801483045022100f3ac249aadab618ed1348e7f97dcda549259f6fafd077b5567c3a651118f387f02202dfe392548f29f97f9bc2dc07e849bdd79f994c4ac4198995249428761df9c5c010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
-    # local_signature = 3045022100f158da7f08390b84376e7ca8df04e147b999800dd71b3ef6410efb8dbfe0ed6702207154e65eaaf5369d9ae04321cd41c64cbc9c376dca81229b808c7e922a413f03
-    output htlc_timeout_tx 3: 0200000000010129d38824741464418e2c9d0090584d909fb13c996845369706e4b969999e156d010000000000000000015c060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100916b4d9e90b4fb8744b1459c9d37f1e724c5bd64caef2e1a3ae7f5610057fca1022072e980b5ba830f3b7b9cc6f0fae9c28ed31093e6409f15e7253a68c0617f0d1601483045022100f158da7f08390b84376e7ca8df04e147b999800dd71b3ef6410efb8dbfe0ed6702207154e65eaaf5369d9ae04321cd41c64cbc9c376dca81229b808c7e922a413f03010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 3045022100f252e2b953f7150bed0650740dee62a6b54a5dd443667907fbc8250bc05a65ac02206589d94bc9468a89925dc11ad393c56c39222a5210860925fb9cc08dc86bd374
-    output htlc_success_tx 4: 0200000000010129d38824741464418e2c9d0090584d909fb13c996845369706e4b969999e156d02000000000000000001f1090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220389760f23945771d62e56a7359c86421f041ef48266afc5b4e2289cd3ade4caa022051fa511b1823af90711b2d52ffdfe8199242016f2c7f4d97c9e0f7c033a6f29101483045022100f252e2b953f7150bed0650740dee62a6b54a5dd443667907fbc8250bc05a65ac02206589d94bc9468a89925dc11ad393c56c39222a5210860925fb9cc08dc86bd374012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 30450221008425ccfbdcc627c86ec7f934df87bd7ee3adf8134623c21269006ec89d16ae440220124661889f9944fef9209b7735b316ecbf145ff0c2d733be200354ddb67b0eb801
+    # local signature 30450221009b8eec79ffea7f06d60373cf77f6e2bcddcfce4118b29c66e5660c4d46f4067f02201b4e37893090ddb41993d8325f881641126fed685019a6560beab6d58358700001
+    output htlc_timeout_tx 2: 02000000000101482c4e556cf79e904c70b389470c3d79aaa98a0cd347b6844df3fba2781f02cf0000000000000000000184020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022002998cbdd14679f75cb6e5673906d5a48d149aa8a4a161b8e7b28743b56f9d890220532775eba61d9e338c064303475f5954e45f8ef39bbb6202b42136fe27d24e24014830450221009b8eec79ffea7f06d60373cf77f6e2bcddcfce4118b29c66e5660c4d46f4067f02201b4e37893090ddb41993d8325f881641126fed685019a6560beab6d58358700001008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
+    # local signature 30440220511c97e26c5bb36d40b107d72693f589628c896f3211d4c28ab1e7f0c221362102200c8ec78bafa30aaa6e725f4cd01ca17ca1e6aa3dc67b53627f3612eb68bacb8501
+    output htlc_timeout_tx 3: 02000000000101482c4e556cf79e904c70b389470c3d79aaa98a0cd347b6844df3fba2781f02cf010000000000000000016c060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100cbf3323089fbd7d2b2994e66b1360cefc2bbb3fd52ace115f1a48f053a59fdbe022016388da5e0d6c5c6736d0ee4f4f1ad94f5c29319e9eba2b5ca30a33209c06633014730440220511c97e26c5bb36d40b107d72693f589628c896f3211d4c28ab1e7f0c221362102200c8ec78bafa30aaa6e725f4cd01ca17ca1e6aa3dc67b53627f3612eb68bacb8501008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 304502210080724c54b972ac9deed054418ea8d5655ea94d8e160e7998776e34138718516102204488f7495e7866c33ca9291a5935936736ffd4f124a1a4e48b6efa1ef93315b701
+    output htlc_success_tx 4: 02000000000101482c4e556cf79e904c70b389470c3d79aaa98a0cd347b6844df3fba2781f02cf02000000000000000001f1090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004830450221008425ccfbdcc627c86ec7f934df87bd7ee3adf8134623c21269006ec89d16ae440220124661889f9944fef9209b7735b316ecbf145ff0c2d733be200354ddb67b0eb80148304502210080724c54b972ac9deed054418ea8d5655ea94d8e160e7998776e34138718516102204488f7495e7866c33ca9291a5935936736ffd4f124a1a4e48b6efa1ef93315b7012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 5 outputs untrimmed (maximum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 2291
-    # base commitment transaction fee = 2840
-    # HTLC 2 offered amount 2000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6985160 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 30440220204316f3553a265922a99c207addeae456349e0aca229d809a526193d5ebd03002206bb618812f43efff52bbf48ca4cbb92529ef0bd6dcfaae4235ff8aebde1b121f
-    # local_signature = 3045022100b9174ba09413297731a39e245d1b7fda4cb363c333b58dd6f7f780b9ec2497f102205da2fca746fa0b4516f5e0d4d9cb8ecdf5cf241b44dd33c4b24e8313e844df72
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d00700000000000022002083975515b28ad8c03b0915cae90787ff5f1a0ad8f313806a71ef6152fd5ecc78b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110c8956a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100b9174ba09413297731a39e245d1b7fda4cb363c333b58dd6f7f780b9ec2497f102205da2fca746fa0b4516f5e0d4d9cb8ecdf5cf241b44dd33c4b24e8313e844df72014730440220204316f3553a265922a99c207addeae456349e0aca229d809a526193d5ebd03002206bb618812f43efff52bbf48ca4cbb92529ef0bd6dcfaae4235ff8aebde1b121f01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 2174
+    # base commitment transaction fee = 2695
+    # actual commitment transaction fee = 5695
+    # HTLC offered amount 2000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6985305 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 3045022100eac9149bf220051543ae6b99805cb2176943d86059a4af1bb3aa24993defe4d4022065c47cf6f35dd1aa6e99ae1d3dd34a134d4fe9a60e761f5f05baabaab102e9d801
+    remote_signature: 30440220248683e4ed5b7e83111d0d4292fc0109e77dd6553be813f32f5bbad96e7715d002203bed55e5402616f9b4b9c5690598c7426999814247b6c3bb3efe313509bb4ecf01
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8005d007000000000000220020d9d8939fbb5b6f47577992ec878bcc4ee58272696dcef62607e152c29b6cd995b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a03659966a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100eac9149bf220051543ae6b99805cb2176943d86059a4af1bb3aa24993defe4d4022065c47cf6f35dd1aa6e99ae1d3dd34a134d4fe9a60e761f5f05baabaab102e9d8014730440220248683e4ed5b7e83111d0d4292fc0109e77dd6553be813f32f5bbad96e7715d002203bed55e5402616f9b4b9c5690598c7426999814247b6c3bb3efe313509bb4ecf01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 3
    # signature for output 0 (htlc 2)
-    remote_htlc_signature = 3045022100e703e0c17a734382ac58ef10aed5cdbaf0383b4c5b0437ca03bb3a0b7b17089902201d8e60fa3bfd73657d1be755952e8d65d5bae0fe577907acbd115080e0ef0a06
+    remote_htlc_signature: 3045022100c409f0b837b72813e22dac88681cb2329e6a9e19b4698baaf20bbed991247e2f02201c5163bdd64f41566eaa46427bf637252875e7cb08d14816ae47089ed31549a801
    # signature for output 1 (htlc 3)
-    remote_htlc_signature = 3044022048f3fdb4f73979aa094ebf21381bc2bce380efc01c1f273276b42e9d45b9ea5802203399f857b4a405bfac204cf20ce112f64aaf183254e1d277a5fab23f5de0ef92
+    remote_htlc_signature: 304402207b4abf8978d9aaf3029d36e70bc1648c3f54d05543a03ebc48f3a900ec82d8e102202c7a46e77385c4289b6ea0286e3f293f93be32a7f3457dde70f717aa124f409401
    # signature for output 2 (htlc 4)
-    remote_htlc_signature = 3045022100da1da796de2d7a36a78095c91506bb2681c2f84040ddf60c44b18fff8c643eb00220307fd2bdf460f1448ee6bef270303976cbfd22e8bd179e2576e63f3e90c181be
-    # local_signature = 30450221009422776299ddfc9a0d3eb16aefb9b6a575cfa3798726fd35eec2f6d03a3a019a022017a8641446f9d7380c98c3b2fe2717a5e86b46321bc5d9858ead0229e2fbd3f2
-    output htlc_timeout_tx 2: 0200000000010186bfaebdd8e7b7d864bcce7797f09ef8eff68ad8a99bdcc4f02f7a15b04555420000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e703e0c17a734382ac58ef10aed5cdbaf0383b4c5b0437ca03bb3a0b7b17089902201d8e60fa3bfd73657d1be755952e8d65d5bae0fe577907acbd115080e0ef0a06014830450221009422776299ddfc9a0d3eb16aefb9b6a575cfa3798726fd35eec2f6d03a3a019a022017a8641446f9d7380c98c3b2fe2717a5e86b46321bc5d9858ead0229e2fbd3f2010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
-    # local_signature = 304402204b9a0da0a36d6709040c4c1cdb77baa740333ad5e03386f0054e70eb61acf851022000977f3b17d37f4d8497ac59ec173d5db1b01949a0a3bd2ac49d25c7420844e8
-    output htlc_timeout_tx 3: 0200000000010186bfaebdd8e7b7d864bcce7797f09ef8eff68ad8a99bdcc4f02f7a15b0455542010000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022048f3fdb4f73979aa094ebf21381bc2bce380efc01c1f273276b42e9d45b9ea5802203399f857b4a405bfac204cf20ce112f64aaf183254e1d277a5fab23f5de0ef920147304402204b9a0da0a36d6709040c4c1cdb77baa740333ad5e03386f0054e70eb61acf851022000977f3b17d37f4d8497ac59ec173d5db1b01949a0a3bd2ac49d25c7420844e8010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 3045022100de51aa4c8cfd02b2dc218dc2e59e4b44bc44f26d4dd207eb8dea4b96ae1a35ea022069cd4117c233bd19f9a63d549e1d22ce5f854b5d13b7a5de65550addf379565f
-    output htlc_success_tx 4: 0200000000010186bfaebdd8e7b7d864bcce7797f09ef8eff68ad8a99bdcc4f02f7a15b0455542020000000000000000019b090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100da1da796de2d7a36a78095c91506bb2681c2f84040ddf60c44b18fff8c643eb00220307fd2bdf460f1448ee6bef270303976cbfd22e8bd179e2576e63f3e90c181be01483045022100de51aa4c8cfd02b2dc218dc2e59e4b44bc44f26d4dd207eb8dea4b96ae1a35ea022069cd4117c233bd19f9a63d549e1d22ce5f854b5d13b7a5de65550addf379565f012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 304402205335cda43561c3eba06a332a21aa91e06bd7d5bb09e3f1c3fbf830e2d2a8764c0220548d3073a6e6782823449118adc59244de7ab72507396c072aebabcd3045f81401
+    # local signature 304402207f7746fb57c46e08f18936a3a0897d1a150ed5c54637804a1c1df5ac2285321502207809c813dbc3e326dd8e695039e4053a57650b2876f0b261fe45d281de64802201
+    output htlc_timeout_tx 2: 02000000000101aec1b3b2fa3939292a491575c41f8bce6eed5dac22bb53a407d3186b7c7a0ff00000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100c409f0b837b72813e22dac88681cb2329e6a9e19b4698baaf20bbed991247e2f02201c5163bdd64f41566eaa46427bf637252875e7cb08d14816ae47089ed31549a80147304402207f7746fb57c46e08f18936a3a0897d1a150ed5c54637804a1c1df5ac2285321502207809c813dbc3e326dd8e695039e4053a57650b2876f0b261fe45d281de64802201008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a914b43e1b38138a41b37f7cd9a1d274bc63e3a9b5d188ac68f6010000
+    # local signature 3045022100ff7d0e998a574cf077bc07eca4d821db732c4dd74c04347334b711ae6c5aac4002203dba96a98b2a18c23a4e1c9e45bc78176bb57e295d89da5ed6cbcb47dcb80a6c01
+    output htlc_timeout_tx 3: 02000000000101aec1b3b2fa3939292a491575c41f8bce6eed5dac22bb53a407d3186b7c7a0ff0010000000000000000010a060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402207b4abf8978d9aaf3029d36e70bc1648c3f54d05543a03ebc48f3a900ec82d8e102202c7a46e77385c4289b6ea0286e3f293f93be32a7f3457dde70f717aa124f409401483045022100ff7d0e998a574cf077bc07eca4d821db732c4dd74c04347334b711ae6c5aac4002203dba96a98b2a18c23a4e1c9e45bc78176bb57e295d89da5ed6cbcb47dcb80a6c01008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 304502210097942fb769275ae8e259d7522ff176c2e0c143274aef1abd8c5a4f637e8f262e022064d0268e134b64ccfc785c987fd02009a2f628bf0e74daf96139afcdcfa64cfd01
+    output htlc_success_tx 4: 02000000000101aec1b3b2fa3939292a491575c41f8bce6eed5dac22bb53a407d3186b7c7a0ff00200000000000000000188090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402205335cda43561c3eba06a332a21aa91e06bd7d5bb09e3f1c3fbf830e2d2a8764c0220548d3073a6e6782823449118adc59244de7ab72507396c072aebabcd3045f8140148304502210097942fb769275ae8e259d7522ff176c2e0c143274aef1abd8c5a4f637e8f262e022064d0268e134b64ccfc785c987fd02009a2f628bf0e74daf96139afcdcfa64cfd012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 4 outputs untrimmed (minimum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 2292
-    # base commitment transaction fee = 2447
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6985553 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 304502210085ef217e4ee408810c1be4994bb671b2c4868c37169a3d853f8f122bdfb87be9022003188677686ebf025849b67ad49babff11325b5255fe9b608fbfac16722e47a4
-    # local_signature = 3045022100e0b270640f8fd88e51f75c5142443b943e6a349671fa7eae0325bdaff86a87c40220009796bfc452cb6c49a3286defea2ac8efaf4721bcc643eb92a7e93bb9c5b4d3
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311051976a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100e0b270640f8fd88e51f75c5142443b943e6a349671fa7eae0325bdaff86a87c40220009796bfc452cb6c49a3286defea2ac8efaf4721bcc643eb92a7e93bb9c5b4d30148304502210085ef217e4ee408810c1be4994bb671b2c4868c37169a3d853f8f122bdfb87be9022003188677686ebf025849b67ad49babff11325b5255fe9b608fbfac16722e47a401475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 2175
+    # base commitment transaction fee = 2322
+    # actual commitment transaction fee = 7322
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6985678 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 304402204d4a74ffac48c65088a2ef7db905bec7754846f2150c5a530be18b7507d0be2702204fd27cf59239b188ff385ca259b0affe52fa875efad3848440dc01f44488692901
+    remote_signature: 3045022100f03478bf2564b442175564720be7343042e2781513049445d4f40224c9d01e5802203d2d45140a0177605afc250b991c86089ddbb9ec733bd581e8400cf93f09b1f101
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a036ce976a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402204d4a74ffac48c65088a2ef7db905bec7754846f2150c5a530be18b7507d0be2702204fd27cf59239b188ff385ca259b0affe52fa875efad3848440dc01f44488692901483045022100f03478bf2564b442175564720be7343042e2781513049445d4f40224c9d01e5802203d2d45140a0177605afc250b991c86089ddbb9ec733bd581e8400cf93f09b1f101475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 2
    # signature for output 0 (htlc 3)
-    remote_htlc_signature = 3045022100cf2c946eef75296dd18956639914b7709e59f62f00f08735f8745af591449f6f02205bd75f75967b83deb31986488bb5f7073cce9857591fe6c18feba2bf0cfa1e7c
+    remote_htlc_signature: 3045022100b1004ab07a3b6308ea376b93e20eb965d92c13de0593a349990ff3d91be93d3b02200bc2ae5be86690a482d17cb1fd334d7c8cce4d27549cc30fde1a360588aa592201
    # signature for output 1 (htlc 4)
-    remote_htlc_signature = 30440220107e3d519087ba5a2244ea685b2921e5c8d1645cb03a7996ec2a043eeb24a0d102207a78d35e72a077dc11ac6adad1e0a1f0ffd25ce6d55ee8302c5e094a2280883d
-    # local_signature = 304402204c3dd73943f0633888a14602e8ceb1f4f134688a7bdadb540c16a463ca3d5b4d022048a619753ecf56e4c709d625dbe2eba9f87069a0fd172ddd8382e2c0d5e13a51
-    output htlc_timeout_tx 3: 02000000000101a585726f1d0fae46f9b04685641fbf9db0193c342efb3c78b2bb82f8e49bab960000000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100cf2c946eef75296dd18956639914b7709e59f62f00f08735f8745af591449f6f02205bd75f75967b83deb31986488bb5f7073cce9857591fe6c18feba2bf0cfa1e7c0147304402204c3dd73943f0633888a14602e8ceb1f4f134688a7bdadb540c16a463ca3d5b4d022048a619753ecf56e4c709d625dbe2eba9f87069a0fd172ddd8382e2c0d5e13a51010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 3045022100dd9079a96e09d38bc08c5a3ccf478edd1d87bdc35ad0538f962a8ab970541b0d02207e10942952071edca58206f64c8cefff385e941c449d6ef7949026cdf66fdd35
-    output htlc_success_tx 4: 02000000000101a585726f1d0fae46f9b04685641fbf9db0193c342efb3c78b2bb82f8e49bab96010000000000000000019a090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e05004730440220107e3d519087ba5a2244ea685b2921e5c8d1645cb03a7996ec2a043eeb24a0d102207a78d35e72a077dc11ac6adad1e0a1f0ffd25ce6d55ee8302c5e094a2280883d01483045022100dd9079a96e09d38bc08c5a3ccf478edd1d87bdc35ad0538f962a8ab970541b0d02207e10942952071edca58206f64c8cefff385e941c449d6ef7949026cdf66fdd35012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 3045022100f3ac5f3eaed3242350eec14f4b16f0a858a4c6b7693c700cc198cc17c0feb761022026b0cd3b4edcc3546bcf312fa925bb5d9e0663234d09bb850798e2097b802f3701
+    # local signature 304402206433ae4be2f3731d2db8a93c6c290fca5d2b5a872cbe33c581bd110b7241517a02201e99df3bb8e0ec6f879371703661c569804d2b3f2d0bd19b9aa43868e05f7fb301
+    output htlc_timeout_tx 3: 02000000000101ccfa675a6dd0917873436d6c22f9c8a8193cc116b9605d74d19d1478405cdaba0000000000000000000109060000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100b1004ab07a3b6308ea376b93e20eb965d92c13de0593a349990ff3d91be93d3b02200bc2ae5be86690a482d17cb1fd334d7c8cce4d27549cc30fde1a360588aa59220147304402206433ae4be2f3731d2db8a93c6c290fca5d2b5a872cbe33c581bd110b7241517a02201e99df3bb8e0ec6f879371703661c569804d2b3f2d0bd19b9aa43868e05f7fb301008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 304402206c914b42e5647c8c827152e1766bb81d85c2d158d6afe6e50e892d0ed61cec5b022034460704644e0ecb1272cee36f0f4e9c0eb657d4dbbab7dc05a098fd4f6ec2e601
+    output htlc_success_tx 4: 02000000000101ccfa675a6dd0917873436d6c22f9c8a8193cc116b9605d74d19d1478405cdaba0100000000000000000187090000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100f3ac5f3eaed3242350eec14f4b16f0a858a4c6b7693c700cc198cc17c0feb761022026b0cd3b4edcc3546bcf312fa925bb5d9e0663234d09bb850798e2097b802f370147304402206c914b42e5647c8c827152e1766bb81d85c2d158d6afe6e50e892d0ed61cec5b022034460704644e0ecb1272cee36f0f4e9c0eb657d4dbbab7dc05a098fd4f6ec2e6012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 4 outputs untrimmed (maximum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 3866
-    # base commitment transaction fee = 4128
-    # HTLC 3 offered amount 3000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6983872 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3045022100efb46b8a0ab766a7c81de0deb00985eed8a9928d055485ef12bd554cf8afa84e02207dfcff213f6e6c5ef4c369a0aaafadfcc9fad3a21a7888919cfeee114755d03d
-    # local_signature = 304502210080b66478598786deb4bdb9d49574012b0a8c988d5d784f14a42e9329569ae52802207276e265d0c3a86d97cfe97d6491a51c3c2013ff762fb1caced12d5b31f0029a
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b000000000000220020311b8632d824446eb4104b5eac4c95ea8efc3f84f7863b772586c57b62450312a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110c0906a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040048304502210080b66478598786deb4bdb9d49574012b0a8c988d5d784f14a42e9329569ae52802207276e265d0c3a86d97cfe97d6491a51c3c2013ff762fb1caced12d5b31f0029a01483045022100efb46b8a0ab766a7c81de0deb00985eed8a9928d055485ef12bd554cf8afa84e02207dfcff213f6e6c5ef4c369a0aaafadfcc9fad3a21a7888919cfeee114755d03d01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 3669
+    # base commitment transaction fee = 3918
+    # actual commitment transaction fee = 8918
+    # HTLC offered amount 3000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6984082 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 3044022044b576ba804b1dd3b9481394de0805dd5fd366bd3c54b7c2a4da689b4cdbee4d02204a61b159659dc9f9d03d613b9667d53f56354cdf628c89500001124e79afa6f701
+    remote_signature: 3044022035491b89b74fd3548cb831d0a50019b57aaac9e53f37a155c4df6c617c014f7d02206a853485f51b6a8d4a9cfe46f34b697cb3135f67b05a096512c97b9b0e5df29d01
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8004b80b00000000000022002013cb27c5d1f5f13a763a06fa3299218fb51504a84bd10809f2be730407ff1b72a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a03692916a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022044b576ba804b1dd3b9481394de0805dd5fd366bd3c54b7c2a4da689b4cdbee4d02204a61b159659dc9f9d03d613b9667d53f56354cdf628c89500001124e79afa6f701473044022035491b89b74fd3548cb831d0a50019b57aaac9e53f37a155c4df6c617c014f7d02206a853485f51b6a8d4a9cfe46f34b697cb3135f67b05a096512c97b9b0e5df29d01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 2
    # signature for output 0 (htlc 3)
-    remote_htlc_signature = 3045022100a67d0fb628a0100c6b05f1ed7558d6e0844b5e6d281b920978c343c1271d893d0220629c6ebb8458fd8a1f15c803c17a74b2a6d9e736d1fbe8a469d67e9ca82aac9c
+    remote_htlc_signature: 3045022100d4e27b76ff58c494414ca6fcdd1ab68e476c48f5f282dabc5939d1f0c851ab1f022016c14d82494ae59d9c89c3be1d5eb6ac33b17426ca59856c5a410816d647503601
    # signature for output 1 (htlc 4)
-    remote_htlc_signature = 3044022001efdca09d42146f8e6226adbb27c549b61bedc2ebed1add558f24b9ffbea59a022006655453e8889f4d3389fa6a82f2982397c291cbb2fd4407ebcdcd35282ddf9c
-    # local_signature = 3045022100f4eeae7293e3f53040fdb7ef790b02394933460afd89ba41a2f16dcc4318ac4d022078b0f801a58667c98b20db8abc9a9156ad960b891060564bbe58a3968a64b899
-    output htlc_timeout_tx 3: 0200000000010148439aa5723b46460760747bd9fece11423a1e864e82e040d7203c558adc0b600000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100a67d0fb628a0100c6b05f1ed7558d6e0844b5e6d281b920978c343c1271d893d0220629c6ebb8458fd8a1f15c803c17a74b2a6d9e736d1fbe8a469d67e9ca82aac9c01483045022100f4eeae7293e3f53040fdb7ef790b02394933460afd89ba41a2f16dcc4318ac4d022078b0f801a58667c98b20db8abc9a9156ad960b891060564bbe58a3968a64b899010069210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
-    # local_signature = 304402205343a840479e665e9453af5461dc093e9d9fee203ccf31dc5fbe21ec02da398e022009051bc6717b04351df8159e0b06d2c2e6cb7bb3c2d4318b5b5e571f70abdc0f
-    output htlc_success_tx 4: 0200000000010148439aa5723b46460760747bd9fece11423a1e864e82e040d7203c558adc0b600100000000000000000177050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022001efdca09d42146f8e6226adbb27c549b61bedc2ebed1add558f24b9ffbea59a022006655453e8889f4d3389fa6a82f2982397c291cbb2fd4407ebcdcd35282ddf9c0147304402205343a840479e665e9453af5461dc093e9d9fee203ccf31dc5fbe21ec02da398e022009051bc6717b04351df8159e0b06d2c2e6cb7bb3c2d4318b5b5e571f70abdc0f012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 304402200284714d8473b03ff3e5c3cdcfbb7f2942c9a6d87aa9300a157df8e18cce137702202993c34c175a34638e0cd9e2c136803b9e1b01e400443ea0a57998909893ff7001
+    # local signature 30440220137e8d2d847ecaea675fa8d6e8240cb9f91a1f6f59d11c6f1023083904894fbb022004b05f7e46ae21621b609e769c71e939affc38f2680d7d8549c73774e49c98c001
+    output htlc_timeout_tx 3: 0200000000010157594e8e515d8e0676b3a0e60996cff25c1708200ce76231b60f772d0d9f66c90000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100d4e27b76ff58c494414ca6fcdd1ab68e476c48f5f282dabc5939d1f0c851ab1f022016c14d82494ae59d9c89c3be1d5eb6ac33b17426ca59856c5a410816d6475036014730440220137e8d2d847ecaea675fa8d6e8240cb9f91a1f6f59d11c6f1023083904894fbb022004b05f7e46ae21621b609e769c71e939affc38f2680d7d8549c73774e49c98c001008b21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c820120876475527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e7210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1953ae67a9148a486ff2e31d6158bf39e2608864d63fefd09d5b88ac68f7010000
+    # local signature 3045022100a67d0e82a436e333c999f49cccee6a88c82ff23b5ddfdabec2d4e169d7926974022054e085af4b31f33fadcd7f113ffad550fab6705658c78be121dcbf47e186bafc01
+    output htlc_success_tx 4: 0200000000010157594e8e515d8e0676b3a0e60996cff25c1708200ce76231b60f772d0d9f66c90100000000000000000156050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e050047304402200284714d8473b03ff3e5c3cdcfbb7f2942c9a6d87aa9300a157df8e18cce137702202993c34c175a34638e0cd9e2c136803b9e1b01e400443ea0a57998909893ff7001483045022100a67d0e82a436e333c999f49cccee6a88c82ff23b5ddfdabec2d4e169d7926974022054e085af4b31f33fadcd7f113ffad550fab6705658c78be121dcbf47e186bafc012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 3 outputs untrimmed (minimum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 3867
-    # base commitment transaction fee = 3464
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6984536 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3044022045b6ce3604bbd13d2bf83d003f721dd726bfb8357e5a68b6f8a49db5a86faf48022070b95df3fadd1244c53cca7a62d1e128085d5138bd9b70be61662c09d4a60853
-    # local_signature = 304402201923a8d7909f2c8708863ba70b2ba5c20939abffd603cf937c54129e5c6b28b2022018ca56507178141663fe1fac2a55d9e9b4278b8324a5f880464d3e6edbc44a1b
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311058936a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e040047304402201923a8d7909f2c8708863ba70b2ba5c20939abffd603cf937c54129e5c6b28b2022018ca56507178141663fe1fac2a55d9e9b4278b8324a5f880464d3e6edbc44a1b01473044022045b6ce3604bbd13d2bf83d003f721dd726bfb8357e5a68b6f8a49db5a86faf48022070b95df3fadd1244c53cca7a62d1e128085d5138bd9b70be61662c09d4a6085301475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 3670
+    # base commitment transaction fee = 3288
+    # actual commitment transaction fee = 11288
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6984712 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 3044022034eb7f35e028a65a81b6355aa082dd0f542e1b0563f0ac5dcd1019b90a99c7f3022063f3a220d1791674a03f9d3cda4029d17c831300e764c4a9413113fdffefd95601
+    remote_signature: 3045022100843080ce69800b044dd0a510548e5ec24809310338cf34d42bdd2a5534e5d3f20220747eed13e771530625d1c3f169287fcd000913586fcd1067d7094959aedbee8301
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a03608946a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022034eb7f35e028a65a81b6355aa082dd0f542e1b0563f0ac5dcd1019b90a99c7f3022063f3a220d1791674a03f9d3cda4029d17c831300e764c4a9413113fdffefd95601483045022100843080ce69800b044dd0a510548e5ec24809310338cf34d42bdd2a5534e5d3f20220747eed13e771530625d1c3f169287fcd000913586fcd1067d7094959aedbee8301475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 1
    # signature for output 0 (htlc 4)
-    remote_htlc_signature = 3045022100e5591d515991ee3e6d48033e470a032cdb29450005f08586eadcd0ec297ae9f702207c8c13f5f2159382a3af0c160d58c39982718bcac5eea7b3cb77698b2b5816ad
-    # local_signature = 3044022053248ffdd9dde75e1c2af20b7d7359de98b7896df019aa232f99770fef087ef2022060cc04fe2726d86e178efc3618d6d79750d081bc315c8b7bbfb5292ca6c99c73
-    output htlc_success_tx 4: 02000000000101e1a9f9f4ba9519f8845cfbcac71ec3fc5144778ed23c3ba85b40eb09bd2687740000000000000000000176050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e5591d515991ee3e6d48033e470a032cdb29450005f08586eadcd0ec297ae9f702207c8c13f5f2159382a3af0c160d58c39982718bcac5eea7b3cb77698b2b5816ad01473044022053248ffdd9dde75e1c2af20b7d7359de98b7896df019aa232f99770fef087ef2022060cc04fe2726d86e178efc3618d6d79750d081bc315c8b7bbfb5292ca6c99c73012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 3044022034b3310f79b81599b91bcb836ac7b080d22f25eb4ee8df0e0a38a9d7a635664102206aba667077a98c6f4855da94ec18b242624ec25286e3363fc5db6c460fa5556401
+    # local signature 3045022100fb48f200883979f341117f57dc16dfd268e977e2f7c20ac6f08e02323108c4a502202d73cbf0276be30e08b636d6a5018549fcb6bfc67423a77e71a4d6375b734e2901
+    output htlc_success_tx 4: 0200000000010111ac9bcf5f21b0850a04052c3f239bdc4a56bba7655f4285e0bf1f43d412d7960000000000000000000155050000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500473044022034b3310f79b81599b91bcb836ac7b080d22f25eb4ee8df0e0a38a9d7a635664102206aba667077a98c6f4855da94ec18b242624ec25286e3363fc5db6c460fa5556401483045022100fb48f200883979f341117f57dc16dfd268e977e2f7c20ac6f08e02323108c4a502202d73cbf0276be30e08b636d6a5018549fcb6bfc67423a77e71a4d6375b734e29012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 3 outputs untrimmed (maximum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 5133
-    # base commitment transaction fee = 4599
-    # HTLC 4 received amount 4000 wscript 210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac68
-    # to-local amount 6983401 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3045022100f7164661832d55b28789b7b63690bee01b43bde46fd713ca7e8747258b00d7410220602329a65ab366e99ec2c68b91acf7162fff7d61298e78472d1544d7dd2204a8
-    # local_signature = 3045022100b413ebb50e942ae53fea93578a0122603b79af5b1daac71a35e52cc176e8247d022066eca652a57ec48eab57ebfe719dcf17aad8e0e746f4b0fb10bad866693e2014
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f00000000000022002022ca70b9138696c383f9da5e3250280d26b993e13eb55f19cd841d7dc966d3c8c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de843110e98e6a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100b413ebb50e942ae53fea93578a0122603b79af5b1daac71a35e52cc176e8247d022066eca652a57ec48eab57ebfe719dcf17aad8e0e746f4b0fb10bad866693e201401483045022100f7164661832d55b28789b7b63690bee01b43bde46fd713ca7e8747258b00d7410220602329a65ab366e99ec2c68b91acf7162fff7d61298e78472d1544d7dd2204a801475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 4811
+    # base commitment transaction fee = 4310
+    # actual commitment transaction fee = 12310
+    # HTLC received amount 4000 wscript 21039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac6868
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6983690 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 3044022025ab42ceb2823e79671f6e2b941dae7749b02965d1e9e75120531a48a9effb58022058a9775823a2fa39f5adc192aa6cb548bbabf62d42c54a80e80fead2c3dc209f01
+    remote_signature: 30440220122c6d961fcb24de2ed36146209e6c94cf2afb20f37c51aa47bca1a793522f6702206552ccb157494dde384f78836f5029dc9aa62b91df6426f2613d03560835118601
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8003a00f000000000000220020d59585bda139e78d4bbb1abf59962c8c3fd2a52104b29c4c91b45d1f6af90eccc0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a0360a906a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400473044022025ab42ceb2823e79671f6e2b941dae7749b02965d1e9e75120531a48a9effb58022058a9775823a2fa39f5adc192aa6cb548bbabf62d42c54a80e80fead2c3dc209f014730440220122c6d961fcb24de2ed36146209e6c94cf2afb20f37c51aa47bca1a793522f6702206552ccb157494dde384f78836f5029dc9aa62b91df6426f2613d03560835118601475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 1
    # signature for output 0 (htlc 4)
-    remote_htlc_signature = 3045022100e7bd4ef16506505f4ba310ea26fd73bc11d4944b97e23f5df18c052d6c062ee80220692f4ad7cc206e1f8f8588ed74059042a58a464d8b2ecef92fe41efac25e907c
-    # local_signature = 304402205484ad6d8270c4f5ae59869392e1a9ba47fadfa849e01bf116859046e3112a350220244573b2bce282b8381b00af3d40ecc55144482aedf39044f7652b0eb05d84be
-    output htlc_success_tx 4: 0200000000010177c0ecdcafa956808c24108cfa273705470aa53829781677f73aafe4ca80b69f0000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100e7bd4ef16506505f4ba310ea26fd73bc11d4944b97e23f5df18c052d6c062ee80220692f4ad7cc206e1f8f8588ed74059042a58a464d8b2ecef92fe41efac25e907c0147304402205484ad6d8270c4f5ae59869392e1a9ba47fadfa849e01bf116859046e3112a350220244573b2bce282b8381b00af3d40ecc55144482aedf39044f7652b0eb05d84be012004040404040404040404040404040404040404040404040404040404040404046e210394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b7c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae677502f801b175ac6800000000
-    
+    remote_htlc_signature: 3045022100cc46ce8f23ddf35df08c03a812cb963ad92b0876a6f99d49d32a8322519944bc022030f74bc5c5c726f253bdc68690af39dbd8c55ec89009ef8048aba6c5f5a5241c01
+    # local signature 3044022014a7c5f58ebf3eefca61974920168c128ddf106e2817744a6498dc85656f773c0220590e3e68e854429e70a75d26372d73451e2e8f0709505b268d15585fb41c452b01
+    output htlc_success_tx 4: 020000000001016795164953c30a73c87e4ab782f7a9fca81eb97fb47175977916919da39cc4460000000000000000000122020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0500483045022100cc46ce8f23ddf35df08c03a812cb963ad92b0876a6f99d49d32a8322519944bc022030f74bc5c5c726f253bdc68690af39dbd8c55ec89009ef8048aba6c5f5a5241c01473044022014a7c5f58ebf3eefca61974920168c128ddf106e2817744a6498dc85656f773c0220590e3e68e854429e70a75d26372d73451e2e8f0709505b268d15585fb41c452b012004040404040404040404040404040404040404040404040404040404040404049921039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac8787c8201208763a91418bc1a114ccf9c052d3d23e28d3b0a9d1227434288527c21030d417a46946384f88d5f3337267c5e579765875dc4daca813e21734b140639e752ae67820087637502f801b175ac677c75210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b19ac686800000000
+
    name: commitment tx with 2 outputs untrimmed (minimum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
-    local_feerate_per_kw: 5134
-    # base commitment transaction fee = 3717
-    # to-local amount 6984283 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3045022100c386d933436598ea7c33491ef464300a214cff27a0f7312d99ab3768326d7b8d02204df07a4f71c5dbd697032c50b9819f2519d604219a097dd0fab61377ece322a2
-    # local_signature = 3045022100fc35aae81065b76858d692233d20fd3b249fefbacc14eb4caf001a0347cc00670220613311610016742e609e19d1bc1e6b5a1f5ff9dc080f443633afdbc953c119c0
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431105b926a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e0400483045022100fc35aae81065b76858d692233d20fd3b249fefbacc14eb4caf001a0347cc00670220613311610016742e609e19d1bc1e6b5a1f5ff9dc080f443633afdbc953c119c001483045022100c386d933436598ea7c33491ef464300a214cff27a0f7312d99ab3768326d7b8d02204df07a4f71c5dbd697032c50b9819f2519d604219a097dd0fab61377ece322a201475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    local_feerate_per_kw: 4812
+    # base commitment transaction fee = 3483
+    # actual commitment transaction fee = 15483
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # to-local amount 6984517 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
+    # local_signature = 30450221009041d59c3b3729e786f53a734a667e78cf5e8634b21c5e73ebda05e690b9858302202a2c685a61acfe352c2fbdce442578c1326f36de8faeaa316f7a5e4aac78384701
+    remote_signature: 304402205b8c12c827c4066c6117dda6333fd8ae98edc3a816339d8674f808bcaa834dcd022005876f3497b9c53a41c4c7ebf6aaa0a93474123c2abcbe8267a97d61e22fbaa401
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8002c0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a03645936a00000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80e04004830450221009041d59c3b3729e786f53a734a667e78cf5e8634b21c5e73ebda05e690b9858302202a2c685a61acfe352c2fbdce442578c1326f36de8faeaa316f7a5e4aac7838470147304402205b8c12c827c4066c6117dda6333fd8ae98edc3a816339d8674f808bcaa834dcd022005876f3497b9c53a41c4c7ebf6aaa0a93474123c2abcbe8267a97d61e22fbaa401475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 0
-    
+
    name: commitment tx with 2 outputs untrimmed (maximum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
    local_feerate_per_kw: 9651180
    # base commitment transaction fee = 6987454
+    # actual commitment transaction fee = 6999454
    # to-local amount 546 wscript 63210212a140cd0c6539d07cd08dfe09984dec3251ea808b892efeac3ede9402bf2b1967029000b2752103fd5960528dc152014952efdb702a88f71e3c1653b2314431701ec77e57fde83c68ac
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3044022037f83ff00c8e5fb18ae1f918ffc24e54581775a20ff1ae719297ef066c71caa9022039c529cccd89ff6c5ed1db799614533844bd6d101da503761c45c713996e3bbd
-    # local_signature = 30440220514f977bf7edc442de8ce43ace9686e5ebdc0f893033f13e40fb46c8b8c6e1f90220188006227d175f5c35da0b092c57bea82537aed89f7778204dc5bacf4f29f2b9
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b800222020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80ec0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de84311004004730440220514f977bf7edc442de8ce43ace9686e5ebdc0f893033f13e40fb46c8b8c6e1f90220188006227d175f5c35da0b092c57bea82537aed89f7778204dc5bacf4f29f2b901473044022037f83ff00c8e5fb18ae1f918ffc24e54581775a20ff1ae719297ef066c71caa9022039c529cccd89ff6c5ed1db799614533844bd6d101da503761c45c713996e3bbd01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # local_signature = 3045022100bab11758e8182f7957047c19033df1b8294bc623a474efe4e1eb6519e49c7147022018af25c278ed3e9809dbf7f0b132ffccce6ff7b59a4a67f507a3648c46e5b3e501
+    remote_signature: 3044022017f82cdb8e5b1c443afe9191efdde7aa742e8f03c265bdab7df18a74b30711a7022009a5b4c676778c6bda8d87db551ae5d89ac792aff62011734afa1caf4bc857dd01
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b800222020000000000002200204adb4e2f00643db396dd120d4e7dc17625f5f2c11a40d857accc862d6b7dd80ec0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a0360400483045022100bab11758e8182f7957047c19033df1b8294bc623a474efe4e1eb6519e49c7147022018af25c278ed3e9809dbf7f0b132ffccce6ff7b59a4a67f507a3648c46e5b3e501473044022017f82cdb8e5b1c443afe9191efdde7aa742e8f03c265bdab7df18a74b30711a7022009a5b4c676778c6bda8d87db551ae5d89ac792aff62011734afa1caf4bc857dd01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 0
-    
+
    name: commitment tx with 1 output untrimmed (minimum feerate)
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
    local_feerate_per_kw: 9651181
    # base commitment transaction fee = 6987455
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e
-    # local_signature = 3044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b1
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    # actual commitment transaction fee = 7000000
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # local_signature = 304402204788ebe839058b6d917999d82ffa7ad235710d49b8f99aea7c8d95fe60ecc26502200c6ad2bcec214d83e66570bf22fa383f8e71b8991cd63feea018d2cd610b86f601
+    remote_signature: 30450221008dc967ec76f7a4837f00bdab1dc3e93c62cd28ec9931649dbb5f0b9105615bf702203fa4646c7f85b19d0bd4691a7ab89ee7243aa6f14a3a3744bed6fd6e0b6b17b901
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a036040047304402204788ebe839058b6d917999d82ffa7ad235710d49b8f99aea7c8d95fe60ecc26502200c6ad2bcec214d83e66570bf22fa383f8e71b8991cd63feea018d2cd610b86f6014830450221008dc967ec76f7a4837f00bdab1dc3e93c62cd28ec9931649dbb5f0b9105615bf702203fa4646c7f85b19d0bd4691a7ab89ee7243aa6f14a3a3744bed6fd6e0b6b17b901475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 0
-    
+
    name: commitment tx with fee greater than funder amount
    to_local_msat: 6988000000
    to_remote_msat: 3000000000
    local_feerate_per_kw: 9651936
    # base commitment transaction fee = 6988001
-    # to-remote amount 3000000 P2WPKH(0394854aa6eab5b2a8122cc726e9dded053a2184d88256816826d6231c068d4a5b)
-    remote_signature = 3044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e
-    # local_signature = 3044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b1
-    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014ccf1af2f2aabee14bb40fa3851ab2301de8431100400473044022031a82b51bd014915fe68928d1abf4b9885353fb896cac10c3fdd88d7f9c7f2e00220716bda819641d2c63e65d3549b6120112e1aeaf1742eed94a471488e79e206b101473044022064901950be922e62cbe3f2ab93de2b99f37cff9fc473e73e394b27f88ef0731d02206d1dfa227527b4df44a07599289e207d6fd9cca60c0365682dcd3deaf739567e01475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
+    # actual commitment transaction fee = 7000000
+    # to-remote amount 3000000 P2WPKH(039390232673a9de88820d44ea910f364a332dc815cb0122bf5088d581dcbac878)
+    # local_signature = 304402204788ebe839058b6d917999d82ffa7ad235710d49b8f99aea7c8d95fe60ecc26502200c6ad2bcec214d83e66570bf22fa383f8e71b8991cd63feea018d2cd610b86f601
+    remote_signature: 30450221008dc967ec76f7a4837f00bdab1dc3e93c62cd28ec9931649dbb5f0b9105615bf702203fa4646c7f85b19d0bd4691a7ab89ee7243aa6f14a3a3744bed6fd6e0b6b17b901
+    output commit_tx: 02000000000101bef67e4e2fb9ddeeb3461973cd4c62abb35050b1add772995b820b584a488489000000000038b02b8001c0c62d0000000000160014e2f14ead9ca9a2f4c8b8a3f9bd109762ed33a036040047304402204788ebe839058b6d917999d82ffa7ad235710d49b8f99aea7c8d95fe60ecc26502200c6ad2bcec214d83e66570bf22fa383f8e71b8991cd63feea018d2cd610b86f6014830450221008dc967ec76f7a4837f00bdab1dc3e93c62cd28ec9931649dbb5f0b9105615bf702203fa4646c7f85b19d0bd4691a7ab89ee7243aa6f14a3a3744bed6fd6e0b6b17b901475221023da092f6980e58d2c037173180e9a465476026ee50f96695963e8efe436f54eb21030e9f7b623d2ccc7c9bd44d66d5ce21ce504c0acf6385a132cec6d3c39fa711c152ae3e195220
    num_htlcs: 0

+
+
 # Appendix D: Per-commitment Secret Generation Test Vectors

 These test the generation algorithm which all nodes use.
--- a/05-onchain.md
+++ b/05-onchain.md
@ -290,8 +290,13 @@ A node MUST resolve all unresolved outputs as follows:
   This output is considered *resolved* by the *commitment transaction*.
 2. _B's main output_: The node MUST *resolve* this by spending using the
   revocation key.
-3. _A's offered HTLCs_: The node MUST *resolve* this in one of two ways: either by spending using the payment preimage if known, or spending using B's HTLC-timeout transaction.
-4. _B's offered HTLCs_: The node MUST *resolve* this by spending once the HTLC timeout has passed.
+3. _A's offered HTLCs_: The node MUST *resolve* this in one of three ways by spending: 
+  * the *commitment tx* using the payment revocation
+  * the *commitment tx* using the payment preimage if known
+  * the *HTLC-timeout tx* if B publishes them
+4. _B's offered HTLCs_: The node MUST *resolve* this in one of two ways by spending:
+  * the *commitment tx* using the payment revocation
+  * the *commitment tx* once the HTLC timeout has passed.
 5. _B's HTLC-timeout transaction_: The node MUST *resolve* this by
   spending using the revocation key.
 6. _B's HTLC-success transaction_: The node MUST *resolve* this by
@ -315,32 +320,33 @@ broadcasts HTLC-timeout and HTLC-success transactions, but the
 requirement that we persist until all outputs are irrevocably resolved
 should cover this. [FIXME: May have to divide and conquer here, since they may be able to delay us long enough to avoid successful penalty spend? ]

-## Penalty Transaction Weight Calculation
+## Penalty Transactions Weight Calculation

-As described in [BOLT #3](03-transactions.md), the witness for
-a penalty transaction is:
+There are three different scripts for penalty transactions, with the following witnesses weight (details of the computation in [Appendix A](#appendix-a-expected-weights)):

-    <sig> 1 { OP_IF <key> OP_ELSE to-self-delay OP_CSV OP_DROP <key> OP_ENDIF OP_CHECKSIG }
+    to_local_penalty_witness: 154 bytes
+    offered_htlc_penalty_witness: 291 bytes
+    accepted_htlc_penalty_witness: 307 bytes

-Which takes 1 byte to indicate the number of stack elements, plus one
-byte for the size of each element (+3), 73 bytes worst-case for
-`<sig>` (+73), one byte for the `1` (+1), nine bytes for the script
-instructions (+9), 33 bytes for each of the keys (+66), and two bytes
-for `to-self-delay` (+2).
+The penalty txinput itself takes 41 bytes, thus has a weight of 164, making the weight of each input:

-This gives 1+3+73+1+9+66+2=155 bytes of witness data, weight 155.
-
-The penalty txinput itself takes 41 bytes, thus has a weight of 164,
-meaning each input adds 319 weight.
+    to_local_penalty_input_weight: 318 bytes
+    offered_htlc_penalty_input_weight: 455 bytes
+    accepted_htlc_penalty_input_weight: 471 bytes

 The rest of the penalty transaction takes 4+3+1+8+1+34+4=55 bytes
 assuming it has a pay-to-witness-script-hash (the largest standard
-output script), thus a base weight of 220.
+output script).

-With a maximum standard weight of 400000, this means a standard
-penalty transaction can have up to 1253 inputs.  Thus we could allow
-626 HTLCs in each direction (with one output to-self) and still
-resolve it with a single penalty transaction.
+In a worst case scenario, we have only incoming htlcs and the HTLC-timeout transactions are not published, forcing
+us to spend from the commitment transaction.
+
+With a maximum standard weight of 400000:
+ 
+    max_num_htlcs = (400000 - 318 - 55) / 471  = 848
+ 
+Thus we could allow 424 HTLCs in each direction (with one output to-self) and still resolve it with a single penalty 
+transaction.

 # General Requirements

@ -358,6 +364,75 @@ mempool.  Considering mempool transactions should cause lower latency
 for HTLC redemption, but on-chain HTLCs should be such an unusual case
 that speed cannot be considered critical.

+# Appendix A: Expected weights
+
+## Expected weight of the to-local penalty transaction witness
+
+As described in [BOLT #3](03-transactions.md), the witness for
+this transaction is:
+
+    <sig> 1 { OP_IF <key> OP_ELSE to-self-delay OP_CSV OP_DROP <key> OP_ENDIF OP_CHECKSIG }
+
+The *expected weight* is calculated as follows:
+
+    to_local_script: 77 bytes
+        - OP_IF: 1 byte
+        - OP_DATA: 1 byte (revocationkey length)
+		- revocationkey: 33 bytes
+		- OP_ELSE: 1 byte
+		- OP_DATA: 1 byte (delay length)
+		- delay: 2 bytes
+		- OP_CSV: 1 byte
+		- OP_DROP: 1 byte
+		- OP_DATA: 1 byte (localkey length)
+		- localkey: 33 bytes
+		- OP_ENDIF: 1 byte
+		- OP_CHECKSIG: 1 byte
+		
+    to_local_penalty_witness: 154 bytes
+        - number_of_witness_elements: 1 byte
+        - revocation_sig_length: 1 byte
+        - revocation_sig: 73 bytes
+        - one_length: 1 byte
+        - witness_script_length: 1 byte
+        - witness_script (to_local_script)
+    
+    
+## Expected weight of the offered-htlc penalty transaction witness
+
+The *expected weight* is calculated as follows (some calculations have already been made in [BOLT #3](03-transactions.md)):
+
+    offered_htlc_script: 139 bytes
+		
+    offered_htlc_penalty_witness: 291 bytes
+        - number_of_witness_elements: 1 byte
+        - nil_length: 1 byte
+        - remote_sig_length: 1 byte
+        - remote_sig: 73 bytes
+        - revocation_sig_length: 1 byte
+        - revocation_sig: 73 bytes
+        - nil_length: 1 byte
+        - witness_script_length: 1 byte
+        - witness_script (to_local_script)
+
+      
+## Expected weight of the received-htlc penalty transaction witness
+
+The *expected weight* is calculated as follows (some calculations have already been made in [BOLT #3](03-transactions.md)):
+
+    accepted_htlc_script: 156 bytes
+		
+    accepted_htlc_penalty_witness: 307 bytes
+        - number_of_witness_elements: 1 byte
+        - nil_length: 1 byte
+        - remote_sig_length: 1 byte
+        - remote_sig: 73 bytes
+        - revocation_sig_length: 1 byte
+        - revocation_sig: 73 bytes
+        - witness_script_length: 1 byte
+        - witness_script (to_local_script)
+            
+
 ![Creative Commons License](https://i.creativecommons.org/l/by/4.0/88x31.png "License CC-BY")
 <br>
 This work is licensed under a [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/).