Remove duration_based_funding_leases

t-bast · t-bast · commit d30aa2b2ab09 · 2024-04-23T11:43:07.000+02:00
It makes more sense to start with only the most basic liquidity ads type
and add more `lease_type`s in the future, as needed.

It may be useful to readers to see how different lease types can be
introduced. The previous commit is a good example of that.
diff --git a/02-peer-protocol.md b/02-peer-protocol.md
@@ -1304,9 +1304,8 @@ The receiving node:
     - `provide_funding` is set and:
       - the `will_fund.lease_witness` does not match the `request_funds.funding_lease`.
       - the `will_fund.signature` is invalid.
-      - a `duration_based_funding_lease_witness` is provided but its `lease_expiry` is too close.
   - MUST pay fees for the `option_will_fund` amount (if any) as detailed in the
-    [liquidity ads section](07-routing-gossip.md#paying-the-funding_lease_fee).
+    [liquidity ads section](07-routing-gossip.md#liquidity-ads).
 
 #### Rationale
 
diff --git a/07-routing-gossip.md b/07-routing-gossip.md
@@ -514,11 +514,6 @@ The origin node:
   - SHOULD NOT create redundant `channel_update`s
   - If it creates a new `channel_update` with updated channel parameters:
     - SHOULD keep accepting the previous channel parameters for 10 minutes
-  - If it is the seller of a currently active `duration_based_funding_lease` on this channel:
-    - MUST NOT set `fee_base_msat` greater than `max_channel_fee_base_msat`
-      (as committed to in `will_fund.signature`).
-    - MUST NOT set `fee_proportional_millionths` greater than `max_channel_fee_basis * 100`
-      (as committed to in `will_fund.signature`).
 
 The receiving node:
   - if the `short_channel_id` does NOT match a previous `channel_announcement`,
@@ -1172,9 +1167,6 @@ are selling depending on the guarantees offered to buyers.
     1. type: 1 (`basic_funding_leases`)
     2. data:
         * [`...*basic_funding_lease`:`funding_lease_rates`]
-    1. type: 3 (`duration_based_funding_leases`)
-    2. data:
-        * [`...*duration_based_funding_lease`:`funding_lease_rates`]
 
 1. subtype: `request_funds`
 2. data:
@@ -1186,19 +1178,6 @@ are selling depending on the guarantees offered to buyers.
 2. data:
     * [`u32`:`min_lease_amount_sat`]
     * [`u32`:`max_lease_amount_sat`]
-    * [`funding_lease_fee`:`funding_lease_fee`]
-
-1. `lease_type`: 3 (`duration_based_funding_lease`)
-2. data:
-    * [`u16`:`lease_duration`]
-    * [`u32`:`min_lease_amount_sat`]
-    * [`u32`:`max_lease_amount_sat`]
-    * [`funding_lease_fee`:`funding_lease_fee`]
-    * [`u16`:`max_channel_fee_basis`]
-    * [`u32`:`max_channel_fee_base_msat`]
-
-1. subtype: `funding_lease_fee`
-2. data:
     * [`u16`:`funding_weight`]
     * [`u16`:`lease_fee_basis`]
     * [`u32`:`lease_fee_base_sat`]
@@ -1214,14 +1193,6 @@ are selling depending on the guarantees offered to buyers.
     * [`u16`:`funding_script_size`]
     * [`funding_script_size`:`funding_script`]
 
-1. `lease_witness_type`: 3 (`duration_based_funding_lease_witness`)
-2. data:
-    * [`u32`:`lease_expiry`]
-    * [`u16`:`funding_script_size`]
-    * [`funding_script_size`:`funding_script`]
-    * [`u16`:`max_channel_fee_basis`]
-    * [`u32`:`max_channel_fee_base_msat`]
-
 Sellers may offer multiple `lease_type`s, described in the following sections.
 Buyers select a specific lease offered by the seller and use `request_funds`
 to purchase that lease. Sellers answer with `will_fund` containing a signature
@@ -1233,8 +1204,27 @@ A `basic_funding_lease` does not provide any guarantee that the seller won't
 close the channel or increase their routing fees after the purchase, if the
 liquidity isn't actually used.
 
-The `funding_lease_fee` is paid as detailed in the `funding_lease_fee` section
-below.
+When `request_funds` and `will_fund` have been exchanged, the buyer must pay
+fees to the seller for the funding they provide to the channel based on the
+agreed upon `funding_weight`, `lease_fee_basis` and `lease_fee_base_sat`.
+
+The lease fee is taken from the buyer's funding inputs and added to the
+seller's channel balance during the funding flow. The buyer must contribute
+enough funds to cover their channel balance, the lease fee, and the on-chain
+fees for the weight of the funding transaction they're responsible for.
+
+The lease fee has three components:
+
+* a fixed amount: `lease_fee_base_sat`
+* a proportional amount based on the seller's `funding_amount`:
+  * `paid_funding_contribution = min(funding_amount, request_funds.requested_sats)`
+  * `lease_fee_proportional_sat = paid_funding_contribution * lease_fee_basis / 10_000`
+* a contribution to the on-chain fees paid by the seller:
+  * `lease_fee_mining_sat = funding_weight * funding_feerate_perkw / 1000`
+
+The lease fee is then:
+
+    lease_fee_total = lease_fee_base_sat + lease_fee_proportional_sat + lease_fee_mining_sat
 
 The seller provides an ECDSA signature in `will_fund` using the private key
 associated with their `node_id`. The data signed is:
@@ -1256,58 +1246,6 @@ A node selling a `basic_funding_lease`:
     It ensures that the funding node is refunded for some of the on-chain
     fees it will pay to contribute the requested funds to a channel.
 
-### The `duration_based_funding_lease` type
-
-A `duration_based_funding_lease` commits to a duration during which the seller
-will not remove the funds nor increase their routing fees above the maximum
-values provided in the lease. It is impossible to actually prevent them from
-doing so, but the signature they provide in `will_fund` can be used to prove
-that they cheated.
-
-The `funding_lease_fee` is paid as detailed in the `funding_lease_fee` section
-below.
-
-The seller provides an ECDSA signature in `will_fund` using the private key
-associated with their `node_id`. The data signed is:
-
-    SHA256("duration_based_funding_lease" || duration_based_funding_lease_witness)
-
-We use a tagged hash to ensure that this signature cannot be used in a
-different context.
-
-#### Requirements
-
-A node selling a `duration_based_funding_lease`:
-  - MUST set `lease_duration` to the number of blocks during which the lease
-    will be active.
-  - MUST set `max_channel_fee_base_msat` to the maximum `fee_base_msat` it
-    will use in its `channel_update` while the lease is active.
-  - MUST set `max_channel_fee_basis` to match (when converted from basis
-    points to millionths) the maximum `fee_proportional_millionths` it will
-    use in its `channel_update` while the lease is active.
-
-### Paying the `funding_lease_fee`
-
-When `request_funds` and `will_fund` have been exchanged, the buyer must pay
-fees to the seller for the funding they provide to the channel based on the
-agreed upon `funding_lease_fee`.
-
-The lease fee is taken from the buyer's funding inputs and added to the
-seller's channel balance during the funding flow. The buyer must contribute
-enough funds to cover their channel balance, the lease fee, and the on-chain
-fees for the weight of the funding transaction they're responsible for.
-
-The lease fee has three components:
-
-* a fixed amount: `lease_fee_base_sat`
-* a proportional amount based on the seller's `funding_amount`:
-  * `paid_funding_contribution = min(funding_amount, request_funds.requested_sats)`
-  * `lease_fee_proportional_sat = paid_funding_contribution * lease_fee_basis / 10_000`
-* a contribution to the on-chain fees paid by the seller:
-  * `lease_fee_mining_sat = funding_weight * funding_feerate_perkw / 1000`
-
-The lease fee is then `lease_fee_total = lease_fee_base_sat + lease_fee_proportional_sat + lease_fee_mining_sat`.
-
 #### Example
 
 A node contributes `500_000 sats` to a channel and requests `1_000_000 sats`
diff --git a/bolt07/liquidity-ads.json b/bolt07/liquidity-ads.json
@@ -30,30 +30,6 @@
             "lease_fee_base_sat": 0,
             "encoded": "0007a120 004c4b40 044c 004b 00000000"
           }
-        ],
-        "duration_based_funding_leases": [
-          {
-            "lease_duration": 1008,
-            "min_lease_amount_sat": 100000,
-            "max_lease_amount_sat": 1000000,
-            "funding_weight": 600,
-            "lease_fee_basis": 150,
-            "lease_fee_base_sat": 1000,
-            "max_channel_fee_basis": 75,
-            "max_channel_fee_base_msat": 10000,
-            "encoded": "03f0 000186a0 000f4240 0258 0096 000003e8 004b 00002710"
-          },
-          {
-            "lease_duration": 2016,
-            "min_lease_amount_sat": 500000,
-            "max_lease_amount_sat": 1500000,
-            "funding_weight": 1000,
-            "lease_fee_basis": 250,
-            "lease_fee_base_sat": 10000,
-            "max_channel_fee_basis": 100,
-            "max_channel_fee_base_msat": 10000,
-            "encoded": "07e0 0007a120 0016e360 03e8 00fa 00002710 0064 00002710"
-          }
         ]
       }
     },
@@ -123,75 +99,5 @@
       },
       "encoded": "0041 0100000000000000000000000000000000000000000000000000000000000000 00000000000aae60 00000000000001d9 0000000005f5e100 0000000000000001 00000006 0090 0032 031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f 024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d0766 02531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe337 03462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b 0362c0a046dacce86ddd0343c6d3c7c79c2208ba0d9c9cf24a6d046d21d21f90f7 03f006a18d5653c4edf5391ff23a61f03ff83d237e880ee61187fa9f379a028e0a 02989c0b76cb563971fdc9bef31ec06c3560f3249d6ee9e5d83c57625596e05f6f 03 65 01 002200202ec38203f4cf37a3b377d9a55c7ae0153c643046dbdbe2ffccfb11b74420103c 2766629334a0cd5a8835fe6fb1790fea7a85da49dab7740d72c8b591247f905a5400c576bd196e9394a92c4340179f0aaf5076b4b4953b3ca2928ded94d1dc8b"
     }
-  },
-  "open_channel2_with_duration_lease": {
-    "chainHash": "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
-    "temporaryChannelId": "0100000000000000000000000000000000000000000000000000000000000000",
-    "fundingFeerate": 5000,
-    "commitmentFeerate": 4000,
-    "fundingAmount": 250000,
-    "dustLimit": 500,
-    "maxHtlcValueInFlightMsat": 50000,
-    "htlcMinimum": 15,
-    "toSelfDelay": 144,
-    "maxAcceptedHtlcs": 483,
-    "lockTime": 650000,
-    "fundingPubkey": "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f",
-    "revocationBasepoint": "024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d0766",
-    "paymentBasepoint": "02531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe337",
-    "delayedPaymentBasepoint": "03462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b",
-    "htlcBasepoint": "0362c0a046dacce86ddd0343c6d3c7c79c2208ba0d9c9cf24a6d046d21d21f90f7",
-    "firstPerCommitmentPoint": "03f006a18d5653c4edf5391ff23a61f03ff83d237e880ee61187fa9f379a028e0a",
-    "secondPerCommitmentPoint": "02989c0b76cb563971fdc9bef31ec06c3560f3249d6ee9e5d83c57625596e05f6f",
-    "channelFlags": {
-      "announceChannel": true
-    },
-    "tlvStream": {
-      "request_funding": {
-        "requested_sats": 750000,
-        "lease_type": 3,
-        "funding_lease": {
-          "lease_duration": 1008,
-          "min_lease_amount_sat": 100000,
-          "max_lease_amount_sat": 1000000,
-          "funding_weight": 600,
-          "lease_fee_basis": 150,
-          "lease_fee_base_sat": 1000,
-          "max_channel_fee_basis": 75,
-          "max_channel_fee_base_msat": 10000
-        }
-      }
-    },
-    "encoded": "0040 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000 0100000000000000000000000000000000000000000000000000000000000000 00001388 00000fa0 000000000003d090 00000000000001f4 000000000000c350 000000000000000f 0090 01e3 0009eb10 031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f 024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d0766 02531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe337 03462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b 0362c0a046dacce86ddd0343c6d3c7c79c2208ba0d9c9cf24a6d046d21d21f90f7 03f006a18d5653c4edf5391ff23a61f03ff83d237e880ee61187fa9f379a028e0a 02989c0b76cb563971fdc9bef31ec06c3560f3249d6ee9e5d83c57625596e05f6f 01 03 21 00000000000b71b0 03 03f0 000186a0 000f4240 0258 0096 000003e8 004b 00002710"
-  },
-  "accept_channel2_with_duration_lease": {
-    "temporaryChannelId": "0100000000000000000000000000000000000000000000000000000000000000",
-    "fundingAmount": 700000,
-    "dustLimit": 473,
-    "maxHtlcValueInFlightMsat": 100000000,
-    "htlcMinimum": 1,
-    "minimumDepth": 6,
-    "toSelfDelay": 144,
-    "maxAcceptedHtlcs": 50,
-    "fundingPubkey": "031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f",
-    "revocationBasepoint": "024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d0766",
-    "paymentBasepoint": "02531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe337",
-    "delayedPaymentBasepoint": "03462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b",
-    "htlcBasepoint": "0362c0a046dacce86ddd0343c6d3c7c79c2208ba0d9c9cf24a6d046d21d21f90f7",
-    "firstPerCommitmentPoint": "03f006a18d5653c4edf5391ff23a61f03ff83d237e880ee61187fa9f379a028e0a",
-    "secondPerCommitmentPoint": "02989c0b76cb563971fdc9bef31ec06c3560f3249d6ee9e5d83c57625596e05f6f",
-    "tlvStream": {
-      "provide_funding": {
-        "lease_witness_type": 3,
-        "lease_witness": {
-          "lease_expiry": 840330,
-          "funding_script": "00202ec38203f4cf37a3b377d9a55c7ae0153c643046dbdbe2ffccfb11b74420103c",
-          "max_channel_fee_basis": 75,
-          "max_channel_fee_base_msat": 10000
-        },
-        "signature": "5b8e3c79db5f2144ea4d4573c033c36c601ab705afe0fab305b8b78a6551d4873ccca86d9e68ae896e722d0008c653b4c253398c266ed039c4776fd0f492d10d"
-      }
-    },
-    "encoded": "0041 0100000000000000000000000000000000000000000000000000000000000000 00000000000aae60 00000000000001d9 0000000005f5e100 0000000000000001 00000006 0090 0032 031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f 024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d0766 02531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe337 03462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b 0362c0a046dacce86ddd0343c6d3c7c79c2208ba0d9c9cf24a6d046d21d21f90f7 03f006a18d5653c4edf5391ff23a61f03ff83d237e880ee61187fa9f379a028e0a 02989c0b76cb563971fdc9bef31ec06c3560f3249d6ee9e5d83c57625596e05f6f 03 6f 03 000cd28a 002200202ec38203f4cf37a3b377d9a55c7ae0153c643046dbdbe2ffccfb11b74420103c 004b 00002710 5b8e3c79db5f2144ea4d4573c033c36c601ab705afe0fab305b8b78a6551d4873ccca86d9e68ae896e722d0008c653b4c253398c266ed039c4776fd0f492d10d"
   }
 }
