Provide channel origin tlv in the reader object (#233)

Otherwise we can write the tlv but not read it.

A regression happened due to conflict between 4343838 and 7dfe46a, now fixed.

Author: pm47

src/commonMain/kotlin/fr/acinq/eclair/wire/ChannelTlv.kt

@@ -64,12 +64,14 @@ sealed class ChannelTlv : Tlv {
                 is ChannelOrigin.PayToOpenOrigin -> {
                     LightningCodecs.writeU16(1, out)
                     LightningCodecs.writeBytes(channelOrigin.paymentHash, out)
+                    LightningCodecs.writeU64(channelOrigin.fee.toLong(), out)
                 }
                 is ChannelOrigin.SwapInOrigin -> {
                     LightningCodecs.writeU16(2, out)
                     val addressBytes = channelOrigin.bitcoinAddress.encodeToByteArray()
                     LightningCodecs.writeBigSize(addressBytes.size.toLong(), out)
                     LightningCodecs.writeBytes(addressBytes, out)
+                    LightningCodecs.writeU64(channelOrigin.fee.toLong(), out)
                 }
             }
         }

src/commonMain/kotlin/fr/acinq/eclair/wire/LightningMessages.kt

@@ -319,7 +319,8 @@ data class OpenChannel(
             @Suppress("UNCHECKED_CAST")
             val readers = mapOf(
                 ChannelTlv.UpfrontShutdownScript.tag to ChannelTlv.UpfrontShutdownScript.Companion as TlvValueReader<ChannelTlv>,
-                ChannelTlv.ChannelVersionTlv.tag to ChannelTlv.ChannelVersionTlv.Companion as TlvValueReader<ChannelTlv>
+                ChannelTlv.ChannelVersionTlv.tag to ChannelTlv.ChannelVersionTlv.Companion as TlvValueReader<ChannelTlv>,
+                ChannelTlv.ChannelOriginTlv.tag to ChannelTlv.ChannelOriginTlv.Companion as TlvValueReader<ChannelTlv>
             )
             return OpenChannel(
                 ByteVector32(LightningCodecs.bytes(input, 32)),

src/commonTest/kotlin/fr/acinq/eclair/wire/LightningCodecsTestsCommon.kt

@@ -12,6 +12,7 @@ import fr.acinq.eclair.Features
 import fr.acinq.eclair.MilliSatoshi
 import fr.acinq.eclair.ShortChannelId
 import fr.acinq.eclair.blockchain.fee.FeeratePerKw
+import fr.acinq.eclair.channel.ChannelOrigin
 import fr.acinq.eclair.crypto.assertArrayEquals
 import fr.acinq.eclair.tests.utils.EclairTestSuite
 import fr.acinq.eclair.utils.msat
@@ -264,7 +265,10 @@ class LightningCodecsTestsCommon : EclairTestSuite() {
                 )
             ),
             // non-empty upfront_shutdown_script + unknown odd tlv records
-            defaultEncoded + ByteVector("0002 1234 0303010203") to defaultOpen.copy(tlvStream = TlvStream(listOf(ChannelTlv.UpfrontShutdownScript(ByteVector("1234"))), listOf(GenericTlv(3L, ByteVector("010203")))))
+            defaultEncoded + ByteVector("0002 1234 0303010203") to defaultOpen.copy(tlvStream = TlvStream(listOf(ChannelTlv.UpfrontShutdownScript(ByteVector("1234"))), listOf(GenericTlv(3L, ByteVector("010203"))))),
+            // channel origin tlv records
+            defaultEncoded + ByteVector("fe47000005 2a 0001 187bf923f7f11ef732b73c417eb5a57cd4667b20a6f130ff505cd7ad3ab87281 00000000000004d2") to defaultOpen.copy(tlvStream = TlvStream(listOf(ChannelTlv.ChannelOriginTlv(ChannelOrigin.PayToOpenOrigin(ByteVector32.fromValidHex("187bf923f7f11ef732b73c417eb5a57cd4667b20a6f130ff505cd7ad3ab87281"), 1234.sat))))),
+            defaultEncoded + ByteVector("fe47000005 2d 0002 223341754d3868536b584265746a644878577468524669483668596871463250726a72 00000000000001a4") to defaultOpen.copy(tlvStream = TlvStream(listOf(ChannelTlv.ChannelOriginTlv(ChannelOrigin.SwapInOrigin("3AuM8hSkXBetjdHxWthRFiH6hYhqF2Prjr", 420.sat)))))
         )
 
         testCases.forEach {