Require explicit channel type negotiation

This feature was introduced by lightning/bolts#880 and the feature bit was added in lightning/bolts#906 We also clean up the channel state machine to leverage the feature bits added in #237
ACINQ · Dec 9, 2021 · 7554588 · 7554588
1 parent 83416bf
commit 7554588
Show file tree

Hide file tree

Showing 50 changed files with 2,688 additions and 556 deletions.
diff --git a/lightning-kmp-test-fixtures/src/commonMain/kotlin/fr/acinq/lightning/tests/TestConstants.kt b/lightning-kmp-test-fixtures/src/commonMain/kotlin/fr/acinq/lightning/tests/TestConstants.kt
@@ -34,8 +34,8 @@ object TestConstants {
 
     object Alice {
         private val entropy = Hex.decode("0101010101010101010101010101010101010101010101010101010101010101")
-        val mnemonics = MnemonicCode.toMnemonics(entropy)
-        val seed = MnemonicCode.toSeed(mnemonics, "").toByteVector32()
+        private val mnemonics = MnemonicCode.toMnemonics(entropy)
+        private val seed = MnemonicCode.toSeed(mnemonics, "").toByteVector32()
 
         val keyManager = LocalKeyManager(seed, Block.RegtestGenesisBlock.hash)
         val walletParams = WalletParams(NodeUri(randomKey().publicKey(), "alice.com", 9735), trampolineFees, InvoiceDefaultRoutingFees(1_000.msat, 100, CltvExpiryDelta(144)))
@@ -53,13 +53,12 @@ object TestConstants {
                 Feature.Wumbo to FeatureSupport.Optional,
                 Feature.StaticRemoteKey to FeatureSupport.Mandatory,
                 Feature.AnchorOutputs to FeatureSupport.Mandatory,
+                Feature.ChannelType to FeatureSupport.Mandatory,
                 Feature.TrampolinePayment to FeatureSupport.Optional,
-                Feature.ZeroReserveChannels to FeatureSupport.Optional,
-                Feature.ZeroConfChannels to FeatureSupport.Optional,
-                Feature.WakeUpNotificationClient to FeatureSupport.Optional,
-                Feature.PayToOpenClient to FeatureSupport.Optional,
-                Feature.TrustedSwapInClient to FeatureSupport.Optional,
-                Feature.ChannelBackupClient to FeatureSupport.Optional,
+                Feature.WakeUpNotificationProvider to FeatureSupport.Optional,
+                Feature.PayToOpenProvider to FeatureSupport.Optional,
+                Feature.TrustedSwapInProvider to FeatureSupport.Optional,
+                Feature.ChannelBackupProvider to FeatureSupport.Optional,
             ),
             dustLimit = 1_100.sat,
             maxRemoteDustLimit = 1_500.sat,
@@ -100,7 +99,7 @@ object TestConstants {
             enableTrampolinePayment = true
         )
 
-        val closingPubKeyInfo = keyManager.closingPubkeyScript(PublicKey.Generator)
+        private val closingPubKeyInfo = keyManager.closingPubkeyScript(PublicKey.Generator)
         val channelParams: LocalParams = PeerChannels.makeChannelParams(
             nodeParams,
             defaultFinalScriptPubkey = ByteVector(closingPubKeyInfo.second),
@@ -112,7 +111,7 @@ object TestConstants {
     object Bob {
         private val entropy = Hex.decode("0202020202020202020202020202020202020202020202020202020202020202")
         val mnemonics = MnemonicCode.toMnemonics(entropy)
-        val seed = MnemonicCode.toSeed(mnemonics, "").toByteVector32()
+        private val seed = MnemonicCode.toSeed(mnemonics, "").toByteVector32()
         val keyManager = LocalKeyManager(seed, Block.RegtestGenesisBlock.hash)
         val walletParams = WalletParams(NodeUri(randomKey().publicKey(), "bob.com", 9735), trampolineFees, InvoiceDefaultRoutingFees(1_000.msat, 100, CltvExpiryDelta(144)))
         val nodeParams = NodeParams(
@@ -129,9 +128,8 @@ object TestConstants {
                 Feature.Wumbo to FeatureSupport.Optional,
                 Feature.StaticRemoteKey to FeatureSupport.Mandatory,
                 Feature.AnchorOutputs to FeatureSupport.Mandatory,
+                Feature.ChannelType to FeatureSupport.Mandatory,
                 Feature.TrampolinePayment to FeatureSupport.Optional,
-                Feature.ZeroReserveChannels to FeatureSupport.Optional,
-                Feature.ZeroConfChannels to FeatureSupport.Optional,
                 Feature.WakeUpNotificationClient to FeatureSupport.Optional,
                 Feature.PayToOpenClient to FeatureSupport.Optional,
                 Feature.TrustedSwapInClient to FeatureSupport.Optional,
@@ -176,7 +174,7 @@ object TestConstants {
             enableTrampolinePayment = true
         )
 
-        val closingPubKeyInfo = keyManager.closingPubkeyScript(PublicKey.Generator)
+        private val closingPubKeyInfo = keyManager.closingPubkeyScript(PublicKey.Generator)
         val channelParams: LocalParams = PeerChannels.makeChannelParams(
             nodeParams,
             defaultFinalScriptPubkey = ByteVector(closingPubKeyInfo.second),

diff --git a/...ning-kmp-test-fixtures/src/commonMain/kotlin/fr/acinq/lightning/tests/io/peer/builders.kt b/...ning-kmp-test-fixtures/src/commonMain/kotlin/fr/acinq/lightning/tests/io/peer/builders.kt
@@ -136,7 +136,7 @@ public suspend fun CoroutineScope.newPeer(
         }
 
         val yourLastPerCommitmentSecret = state.commitments.remotePerCommitmentSecrets.lastIndex?.let { state.commitments.remotePerCommitmentSecrets.getHash(it) } ?: ByteVector32.Zeroes
-        val channelKeyPath = peer.nodeParams.keyManager.channelKeyPath(state.commitments.localParams, state.commitments.channelVersion)
+        val channelKeyPath = peer.nodeParams.keyManager.channelKeyPath(state.commitments.localParams, state.commitments.channelConfig)
         val myCurrentPerCommitmentPoint = peer.nodeParams.keyManager.commitmentPoint(channelKeyPath, state.commitments.localCommit.index)
 
         val channelReestablish = ChannelReestablish(

diff --git a/src/commonMain/kotlin/fr/acinq/lightning/Features.kt b/src/commonMain/kotlin/fr/acinq/lightning/Features.kt
@@ -91,6 +91,12 @@ sealed class Feature {
         override val mandatory get() = 20
     }
 
+    @Serializable
+    object ChannelType : Feature() {
+        override val rfcName get() = "option_channel_type"
+        override val mandatory get() = 44
+    }
+
     // The following features have not been standardised, hence the high feature bits to avoid conflicts.
 
     @Serializable
@@ -222,6 +228,7 @@ data class Features(val activated: Map<Feature, FeatureSupport>, val unknown: Se
             Feature.BasicMultiPartPayment,
             Feature.Wumbo,
             Feature.AnchorOutputs,
+            Feature.ChannelType,
             Feature.TrampolinePayment,
             Feature.ZeroReserveChannels,
             Feature.ZeroConfChannels,

diff --git a/src/commonMain/kotlin/fr/acinq/lightning/NodeParams.kt b/src/commonMain/kotlin/fr/acinq/lightning/NodeParams.kt
@@ -120,6 +120,7 @@ data class NodeParams(
     init {
         require(features.hasFeature(Feature.VariableLengthOnion, FeatureSupport.Mandatory)) { "${Feature.VariableLengthOnion.rfcName} should be mandatory" }
         require(features.hasFeature(Feature.PaymentSecret, FeatureSupport.Mandatory)) { "${Feature.PaymentSecret.rfcName} should be mandatory" }
+        require(features.hasFeature(Feature.ChannelType, FeatureSupport.Mandatory)) { "${Feature.ChannelType.rfcName} should be mandatory" }
         Features.validateFeatureGraph(features)
     }
 }