From 7382a37da1b600049dd31c04a6796809d880516b Mon Sep 17 00:00:00 2001 From: pm47 Date: Fri, 27 Sep 2024 11:08:03 +0200 Subject: [PATCH] Revert "Upgrade to kotlin 2.0.20 (#701)" This reverts commit 0d85f888c0124e9a9eb8ab4825dbc909b3a78ca5. --- .gitignore | 18 ++++++- build.gradle.kts | 49 +++++++++--------- .../noise/Chacha20Poly1305CipherFunctions.kt | 11 ++-- .../fr/acinq/lightning/crypto/noise/Noise.kt | 2 +- .../kotlin/fr/acinq/lightning/io/TcpSocket.kt | 5 +- .../nonreg/v2/Closing_0ba41d17/data.json | 24 ++++++--- .../nonreg/v2/Closing_0ed6ff68/data.json | 45 ++++++++++------ .../nonreg/v2/Closing_0efffae3/data.json | 45 ++++++++++------ .../nonreg/v2/Closing_2fd2a3fa/data.json | 21 +++++--- .../nonreg/v2/Closing_3bb07fb6/data.json | 24 ++++++--- .../nonreg/v2/Closing_8f1a524e/data.json | 45 ++++++++++------ .../nonreg/v2/Closing_ef682e2e/data.json | 33 ++++++++---- .../nonreg/v2/Negotiating_c8d15808/data.json | 45 ++++++++++------ .../nonreg/v2/Negotiating_d9b4cd96/data.json | 48 +++++++++++------ .../nonreg/v2/Negotiating_ee10091c/data.json | 45 ++++++++++------ .../nonreg/v2/Negotiating_f52b19b8/data.json | 45 ++++++++++------ .../nonreg/v2/Normal_748a735b/data.json | 45 ++++++++++------ .../nonreg/v2/Normal_e2253ddd/data.json | 27 ++++++---- .../nonreg/v2/Normal_ff248f8d/data.json | 45 ++++++++++------ .../nonreg/v2/Normal_ff4a71b6/data.json | 27 ++++++---- .../nonreg/v2/Normal_ffd9f5db/data.json | 51 ++++++++++++------- .../nonreg/v2/ShuttingDown_c321b947/data.json | 33 ++++++++---- .../nonreg/v2/ShuttingDown_f89ecd50/data.json | 36 ++++++++----- .../data.json | 45 ++++++++++------ .../data.json | 45 ++++++++++------ .../data.json | 45 ++++++++++------ .../WaitForFundingLocked_f3437082/data.json | 45 ++++++++++------ .../data.json | 45 ++++++++++------ .../data.json | 33 ++++++++---- .../nonreg/v3/Closing_029bf8f3/data.json | 21 +++++--- .../nonreg/v3/Closing_0ba41d17/data.json | 24 ++++++--- .../nonreg/v3/Closing_0ed6ff68/data.json | 45 ++++++++++------ .../nonreg/v3/Closing_0efffae3/data.json | 45 ++++++++++------ .../nonreg/v3/Closing_ebbd24bc/data.json | 24 ++++++--- .../nonreg/v3/Closing_f137669f/data.json | 45 ++++++++++------ .../nonreg/v3/Negotiating_da44c6e2/data.json | 45 ++++++++++------ .../nonreg/v3/Negotiating_dabbed55/data.json | 45 ++++++++++------ .../nonreg/v3/Negotiating_fadb50c1/data.json | 48 +++++++++++------ .../nonreg/v3/Normal_fd10d3cc/data.json | 33 ++++++++---- .../nonreg/v3/Normal_fe897b64/data.json | 42 ++++++++++----- .../nonreg/v3/Normal_ff248f8d/data.json | 45 ++++++++++------ .../nonreg/v3/Normal_ff4a71b6/data.json | 27 ++++++---- .../nonreg/v3/ShuttingDown_ef41a1a5/data.json | 36 ++++++++----- .../nonreg/v3/ShuttingDown_ef7081a1/data.json | 33 ++++++++---- .../data.json | 45 ++++++++++------ .../data.json | 45 ++++++++++------ .../WaitForFundingLocked_f3437082/data.json | 45 ++++++++++------ .../data.json | 45 ++++++++++------ .../data.json | 33 ++++++++---- .../noise/Chacha20Poly1305CipherFunctions.kt | 7 +-- .../fr/acinq/lightning/io/IosTcpSocket.kt | 2 +- .../fr/acinq/lightning/io/JvmTcpSocket.kt | 2 +- 52 files changed, 1196 insertions(+), 613 deletions(-) diff --git a/.gitignore b/.gitignore index fca906950..a6d348611 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .gradle build/ .cxx -.kotlin # this file is local to the dev environment and must not be pushed! local.properties @@ -25,8 +24,23 @@ gradle-app.setting *.class *.log +# sbt specific +.cache/ +.history/ +.lib/ +dist/* +target/ +lib_managed/ +src_managed/ +project/boot/ +project/plugins/project/ + +# Scala-IDE specific +.scala_dependencies +.worksheet + .idea *.iml target/ project/target - +DeleteMe*.scala diff --git a/build.gradle.kts b/build.gradle.kts index 80f49ee05..468e57e93 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,11 @@ -import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest plugins { - kotlin("multiplatform") version "2.0.20" - kotlin("plugin.serialization") version "2.0.20" - id("org.jetbrains.dokka") version "1.9.20" + kotlin("multiplatform") version "1.9.23" + kotlin("plugin.serialization") version "1.9.23" + id("org.jetbrains.dokka") version "1.9.10" `maven-publish` } @@ -32,17 +30,16 @@ kotlin { val bitcoinKmpVersion = "0.20.0" // when upgrading bitcoin-kmp, keep secpJniJvmVersion in sync! val secpJniJvmVersion = "0.15.0" - val serializationVersion = "1.7.1" - val coroutineVersion = "1.9.0" + val serializationVersion = "1.6.2" + val coroutineVersion = "1.7.3" val datetimeVersion = "0.6.0" - val ktorVersion = "2.3.12" + val ktorVersion = "2.3.7" fun ktor(module: String) = "io.ktor:ktor-$module:$ktorVersion" - val kermitLoggerVersion = "2.0.4" + val kermitLoggerVersion = "2.0.2" jvm { - @OptIn(ExperimentalKotlinGradlePluginApi::class) - compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) // TODO: update this? + compilations.all { + kotlinOptions.jvmTarget = "1.8" } } @@ -156,12 +153,15 @@ kotlin { resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) } - @OptIn(ExperimentalKotlinGradlePluginApi::class) - compilerOptions { - allWarningsAsErrors.set(true) - // We use expect/actual for classes (see Chacha20Poly1305CipherFunctions). This feature is in beta and raises a warning. - // See https://youtrack.jetbrains.com/issue/KT-61573 - freeCompilerArgs.add("-Xexpect-actual-classes") + targets.all { + compilations.all { + kotlinOptions { + allWarningsAsErrors = true + // We use expect/actual for classes (see Chacha20Poly1305CipherFunctions). This feature is in beta and raises a warning. + // See https://youtrack.jetbrains.com/issue/KT-61573 + kotlinOptions.freeCompilerArgs += "-Xexpect-actual-classes" + } + } } } @@ -237,11 +237,7 @@ afterEvaluate { compileTaskProvider.get().enabled = false tasks[processResourcesTaskName].enabled = false } - binaries.all { - linkTaskProvider { - enabled = false - } - } + binaries.all { linkTask.enabled = false } mavenPublication { val publicationToDisable = this @@ -321,3 +317,10 @@ tasks .map { it.filter.excludeTestsMatching("*MempoolSpace*Test") } + +// Make NS_FORMAT_ARGUMENT(1) a no-op +// This fixes an issue when building PhoenixCrypto using XCode 13 +// More on this: https://youtrack.jetbrains.com/issue/KT-48807#focus=Comments-27-5210791.0-0 +tasks.withType(org.jetbrains.kotlin.gradle.tasks.CInteropProcess::class.java) { + settings.compilerOpts("-DNS_FORMAT_ARGUMENT(A)=") +} diff --git a/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt b/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt index ea10a8971..87ffb098f 100644 --- a/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt +++ b/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt @@ -2,18 +2,14 @@ package fr.acinq.lightning.crypto.noise import fr.acinq.lightning.crypto.ChaCha20Poly1305 -expect object Chacha20Poly1305CipherFunctions : CipherFunctions { - override fun name(): String - override fun encrypt(k: ByteArray, n: Long, ad: ByteArray, plaintext: ByteArray): ByteArray - override fun decrypt(k: ByteArray, n: Long, ad: ByteArray, ciphertextAndMac: ByteArray): ByteArray -} +expect object Chacha20Poly1305CipherFunctions : CipherFunctions /** - * Default implementation for [Chacha20Poly1305CipherFunctions]. Can be used by modules by + * Default implementation for [[Chacha20Poly1305CipherFunctions]]. Can be used by modules by * defining a type alias. */ object Chacha20Poly1305CipherFunctionsDefault : CipherFunctions { - override fun name(): String = "ChaChaPoly" + override fun name() = "ChaChaPoly" // as specified in BOLT #8 fun nonce(n: Long): ByteArray = ByteArray(4) + ChaCha20Poly1305.write64(n) @@ -25,6 +21,7 @@ object Chacha20Poly1305CipherFunctionsDefault : CipherFunctions { } // Decrypts ciphertext using a cipher key k of 32 bytes, an 8-byte unsigned integer nonce n, and associated data ad. + @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") override fun decrypt(k: ByteArray, n: Long, ad: ByteArray, ciphertextAndMac: ByteArray): ByteArray { val ciphertext = ciphertextAndMac.dropLast(16).toByteArray() val mac = ciphertextAndMac.takeLast(16).toByteArray() diff --git a/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Noise.kt b/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Noise.kt index da629b9b2..7daa1b71a 100644 --- a/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Noise.kt +++ b/src/commonMain/kotlin/fr/acinq/lightning/crypto/noise/Noise.kt @@ -24,7 +24,7 @@ interface CipherFunctions { // Decrypts ciphertext using a cipher key k of 32 bytes, an 8-byte unsigned integer nonce n, and associated data ad. // Returns the plaintext, unless authentication fails, in which case an error is signaled to the caller. - fun decrypt(k: ByteArray, n: Long, ad: ByteArray, ciphertextAndMac: ByteArray): ByteArray + fun decrypt(k: ByteArray, n: Long, ad: ByteArray, ciphertext: ByteArray): ByteArray } /** diff --git a/src/commonMain/kotlin/fr/acinq/lightning/io/TcpSocket.kt b/src/commonMain/kotlin/fr/acinq/lightning/io/TcpSocket.kt index dd502e9b0..3e1d18d02 100644 --- a/src/commonMain/kotlin/fr/acinq/lightning/io/TcpSocket.kt +++ b/src/commonMain/kotlin/fr/acinq/lightning/io/TcpSocket.kt @@ -1,6 +1,5 @@ package fr.acinq.lightning.io -import fr.acinq.lightning.io.TcpSocket.TLS import fr.acinq.lightning.logging.LoggerFactory interface TcpSocket { @@ -66,8 +65,6 @@ suspend fun TcpSocket.send(bytes: ByteArray, flush: Boolean = true) = send(bytes suspend fun TcpSocket.receiveFully(buffer: ByteArray) = receiveFully(buffer, 0, buffer.size) suspend fun TcpSocket.receiveAvailable(buffer: ByteArray) = receiveAvailable(buffer, 0, buffer.size) -internal expect object PlatformSocketBuilder : TcpSocket.Builder { - override suspend fun connect(host: String, port: Int, tls: TLS, loggerFactory: LoggerFactory): TcpSocket -} +internal expect object PlatformSocketBuilder : TcpSocket.Builder suspend fun TcpSocket.receiveFully(size: Int): ByteArray = ByteArray(size).also { receiveFully(it) } diff --git a/src/commonTest/resources/nonreg/v2/Closing_0ba41d17/data.json b/src/commonTest/resources/nonreg/v2/Closing_0ba41d17/data.json index 4a95ea4b8..9df86d5ac 100644 --- a/src/commonTest/resources/nonreg/v2/Closing_0ba41d17/data.json +++ b/src/commonTest/resources/nonreg/v2/Closing_0ba41d17/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -96,13 +98,18 @@ "paymentPreimage": "470394f1ea93ed652ed8fba12c00dcfe8212c4fd3295f7413f7a927e002ea4eb" } ], - "signed": [], - "acked": [] + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 1, "remoteNextHtlcId": 1 @@ -229,7 +236,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "a63c8f54-772a-4912-9b2a-055f7f64ce56" }, diff --git a/src/commonTest/resources/nonreg/v2/Closing_0ed6ff68/data.json b/src/commonTest/resources/nonreg/v2/Closing_0ed6ff68/data.json index 5d3bbb100..0594d10ee 100644 --- a/src/commonTest/resources/nonreg/v2/Closing_0ed6ff68/data.json +++ b/src/commonTest/resources/nonreg/v2/Closing_0ed6ff68/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0234ea3e3929ca115acc645d07c40eada7a98d86017614c3fa466d7e19760917e4" diff --git a/src/commonTest/resources/nonreg/v2/Closing_0efffae3/data.json b/src/commonTest/resources/nonreg/v2/Closing_0efffae3/data.json index 88f4ea5e0..d6913f41d 100644 --- a/src/commonTest/resources/nonreg/v2/Closing_0efffae3/data.json +++ b/src/commonTest/resources/nonreg/v2/Closing_0efffae3/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 2, "remoteNextHtlcId": 2 @@ -114,8 +122,10 @@ "localCommit": { "index": 5, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202bf8e35df3ccae49bcd2036ec55d8450741336530017d00f4f41dc44d69675b7040047304402202f27c14d4a412b64c8ca226b9a20c51068f6b939bad70d46dfc1600c39617552022066f267b145178f5a69d69fee8ae6930ded1d1dc96a746e79ea3302b7df989b6601483045022100e75f4f2e202db89d24d221c7c9329411a85876e00996499b5031c1ab094afdf3022044c7c948e25282f17396385eed0efca8d7a3226ce002fad2e48cca9afae5c43b0147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aedb99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 6, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0323e9618cf8548e5b78a14529e1c8df51895e47ae6026bf23f5f130299bbc92b0" diff --git a/src/commonTest/resources/nonreg/v2/Closing_2fd2a3fa/data.json b/src/commonTest/resources/nonreg/v2/Closing_2fd2a3fa/data.json index 26f1cbbbd..efd21a097 100644 --- a/src/commonTest/resources/nonreg/v2/Closing_2fd2a3fa/data.json +++ b/src/commonTest/resources/nonreg/v2/Closing_2fd2a3fa/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -113,12 +115,16 @@ "onionRoutingPacket": "" } ], - "acked": [] + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 3, "remoteNextHtlcId": 2 @@ -378,7 +384,8 @@ } } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "d6ad5565-c4cb-454a-a05f-398ed8d8127b", "1": "cb0ca39b-c603-4952-a45b-70f119c594c3", diff --git a/src/commonTest/resources/nonreg/v2/Closing_3bb07fb6/data.json b/src/commonTest/resources/nonreg/v2/Closing_3bb07fb6/data.json index e45f340f5..01168c1b0 100644 --- a/src/commonTest/resources/nonreg/v2/Closing_3bb07fb6/data.json +++ b/src/commonTest/resources/nonreg/v2/Closing_3bb07fb6/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -96,13 +98,18 @@ "paymentPreimage": "ece8429c09332ef2f819c5886b71cc500b21956b3faa6f3ab3f9005010c9655a" } ], - "signed": [], - "acked": [] + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 1, "remoteNextHtlcId": 1 @@ -229,7 +236,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "c88282fa-5e7b-43d5-b72c-883708000c69" }, diff --git a/src/commonTest/resources/nonreg/v2/Closing_8f1a524e/data.json b/src/commonTest/resources/nonreg/v2/Closing_8f1a524e/data.json index 6c47ac089..f85fd3400 100644 --- a/src/commonTest/resources/nonreg/v2/Closing_8f1a524e/data.json +++ b/src/commonTest/resources/nonreg/v2/Closing_8f1a524e/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v2/Closing_ef682e2e/data.json b/src/commonTest/resources/nonreg/v2/Closing_ef682e2e/data.json index c4afcbc46..de2e5dd2b 100644 --- a/src/commonTest/resources/nonreg/v2/Closing_ef682e2e/data.json +++ b/src/commonTest/resources/nonreg/v2/Closing_ef682e2e/data.json @@ -44,7 +44,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -77,7 +78,8 @@ "trusted_swap_in_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -87,14 +89,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 3, "remoteNextHtlcId": 0 @@ -113,7 +121,8 @@ "localCommit": { "index": 3, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -223,7 +232,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 449990000 @@ -234,7 +244,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "d4f57ab7-0de9-4440-9aea-debd7c80496c", "1": "bbac2fe3-1c00-4426-804f-24fd754236ef", diff --git a/src/commonTest/resources/nonreg/v2/Negotiating_c8d15808/data.json b/src/commonTest/resources/nonreg/v2/Negotiating_c8d15808/data.json index d11f3451c..adf1a8f6f 100644 --- a/src/commonTest/resources/nonreg/v2/Negotiating_c8d15808/data.json +++ b/src/commonTest/resources/nonreg/v2/Negotiating_c8d15808/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v2/Negotiating_d9b4cd96/data.json b/src/commonTest/resources/nonreg/v2/Negotiating_d9b4cd96/data.json index 93b457720..1630cbe83 100644 --- a/src/commonTest/resources/nonreg/v2/Negotiating_d9b4cd96/data.json +++ b/src/commonTest/resources/nonreg/v2/Negotiating_d9b4cd96/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0234ea3e3929ca115acc645d07c40eada7a98d86017614c3fa466d7e19760917e4" @@ -167,7 +182,8 @@ "scriptPubKey": "001405e0104aa726e34ff5cd3a6320d05c0862b5b01c" }, "closingTxProposed": [ - [] + [ + ] ], "bestUnpublishedClosingTx": null, "closingFeerates": null diff --git a/src/commonTest/resources/nonreg/v2/Negotiating_ee10091c/data.json b/src/commonTest/resources/nonreg/v2/Negotiating_ee10091c/data.json index f6569bd10..7b9031ac8 100644 --- a/src/commonTest/resources/nonreg/v2/Negotiating_ee10091c/data.json +++ b/src/commonTest/resources/nonreg/v2/Negotiating_ee10091c/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0234ea3e3929ca115acc645d07c40eada7a98d86017614c3fa466d7e19760917e4" diff --git a/src/commonTest/resources/nonreg/v2/Negotiating_f52b19b8/data.json b/src/commonTest/resources/nonreg/v2/Negotiating_f52b19b8/data.json index 80d2aeba6..4e47c6c15 100644 --- a/src/commonTest/resources/nonreg/v2/Negotiating_f52b19b8/data.json +++ b/src/commonTest/resources/nonreg/v2/Negotiating_f52b19b8/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v2/Normal_748a735b/data.json b/src/commonTest/resources/nonreg/v2/Normal_748a735b/data.json index 602f95563..dc5f9ac36 100644 --- a/src/commonTest/resources/nonreg/v2/Normal_748a735b/data.json +++ b/src/commonTest/resources/nonreg/v2/Normal_748a735b/data.json @@ -44,7 +44,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -77,7 +78,8 @@ "trusted_swap_in_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -87,14 +89,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 2 @@ -113,8 +121,10 @@ "localCommit": { "index": 4, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 840000000, "toRemote": 160000000 @@ -131,14 +141,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da0320071020000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990b8b80c00000000002200205079bfdf0d2b5e13578de7bd639aba698df8785dbbe1a40907add319c71494f704004830450221008a0e5f22c602c0a8518a624bf145aa91b59c14b6e091d21788a579425236558002206b86a5048942a76e5fa3aaae2501c69cfbf0ca712aaa059a4b5d59ccaf8b48a301483045022100ecbd1de0aa98cfb38c3dd8ead1ea17ac5b33abf2d69e56bbd52b0d1f796f9ad702207041efe3996e9a41d00ca924a79c5d734ccc289a3370ea71f6408906adf2a4c60147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aeda99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 4, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 160000000, "toRemote": 840000000 @@ -149,8 +162,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03fc9e0ff6fbb2af495d07b96f42c88d4bbc89ea4d75714eb660d9408db65ccde3" diff --git a/src/commonTest/resources/nonreg/v2/Normal_e2253ddd/data.json b/src/commonTest/resources/nonreg/v2/Normal_e2253ddd/data.json index e72eeab7f..19c16c145 100644 --- a/src/commonTest/resources/nonreg/v2/Normal_e2253ddd/data.json +++ b/src/commonTest/resources/nonreg/v2/Normal_e2253ddd/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,12 +90,16 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], + "proposed": [ + ], "acked": [ { "type": "fr.acinq.lightning.wire.UpdateAddHtlc", @@ -123,7 +129,8 @@ "onionRoutingPacket": "" } ], - "signed": [] + "signed": [ + ] }, "localNextHtlcId": 4, "remoteNextHtlcId": 3 @@ -311,7 +318,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 740500000 @@ -322,7 +330,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "fc04440c-9db0-4d12-98bc-ab3197ddd10a", "1": "cc5751b1-6c0a-4828-a26c-6a6e57fd4eaa", diff --git a/src/commonTest/resources/nonreg/v2/Normal_ff248f8d/data.json b/src/commonTest/resources/nonreg/v2/Normal_ff248f8d/data.json index c11a9729d..6e05cb781 100644 --- a/src/commonTest/resources/nonreg/v2/Normal_ff248f8d/data.json +++ b/src/commonTest/resources/nonreg/v2/Normal_ff248f8d/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0234ea3e3929ca115acc645d07c40eada7a98d86017614c3fa466d7e19760917e4" diff --git a/src/commonTest/resources/nonreg/v2/Normal_ff4a71b6/data.json b/src/commonTest/resources/nonreg/v2/Normal_ff4a71b6/data.json index 632438fee..074594c09 100644 --- a/src/commonTest/resources/nonreg/v2/Normal_ff4a71b6/data.json +++ b/src/commonTest/resources/nonreg/v2/Normal_ff4a71b6/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,13 +90,18 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], + "proposed": [ + ], + "acked": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateAddHtlc", @@ -262,7 +269,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 790910000 @@ -330,7 +338,8 @@ } } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "7e780474-04b9-41db-94b9-7ef99349408f", "1": "683c4687-c4b7-4cb1-ac82-6808f57f4409" diff --git a/src/commonTest/resources/nonreg/v2/Normal_ffd9f5db/data.json b/src/commonTest/resources/nonreg/v2/Normal_ffd9f5db/data.json index 8ab396eb4..379308d25 100644 --- a/src/commonTest/resources/nonreg/v2/Normal_ffd9f5db/data.json +++ b/src/commonTest/resources/nonreg/v2/Normal_ffd9f5db/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,7 +90,8 @@ }, "changes": { "localChanges": { - "proposed": [], + "proposed": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateFee", @@ -96,12 +99,16 @@ "feeratePerKw": 6000 } ], - "acked": [] + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -120,8 +127,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -138,14 +147,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -157,13 +169,16 @@ "sig": { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", "signature": "264a5ee8dfd9bd8302af0a7a71821b1cdb434421da261fcc8beddb72a851cf1832ad6cb93ab09b8d6b704d9e7eff9c3ce1570e2ef2c6794007f735d3dc50ca8b", - "htlcSignatures": [] + "htlcSignatures": [ + ] }, "commit": { "index": 1, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 6000, "toLocal": 200000000, "toRemote": 800000000 @@ -174,8 +189,10 @@ } } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": { "sentAfterLocalCommitIndex": 0 diff --git a/src/commonTest/resources/nonreg/v2/ShuttingDown_c321b947/data.json b/src/commonTest/resources/nonreg/v2/ShuttingDown_c321b947/data.json index 7af3c7ae3..51a957638 100644 --- a/src/commonTest/resources/nonreg/v2/ShuttingDown_c321b947/data.json +++ b/src/commonTest/resources/nonreg/v2/ShuttingDown_c321b947/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 2, "remoteNextHtlcId": 0 @@ -114,7 +122,8 @@ "localCommit": { "index": 1, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -208,7 +217,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 300000000 @@ -219,7 +229,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "7df1b9cf-c6fa-4fe2-bcb3-ca42ee8a5d25", "1": "0be929fc-3824-48c2-8247-927bc54b2611" diff --git a/src/commonTest/resources/nonreg/v2/ShuttingDown_f89ecd50/data.json b/src/commonTest/resources/nonreg/v2/ShuttingDown_f89ecd50/data.json index 679424d87..f259c7f52 100644 --- a/src/commonTest/resources/nonreg/v2/ShuttingDown_f89ecd50/data.json +++ b/src/commonTest/resources/nonreg/v2/ShuttingDown_f89ecd50/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,7 +90,8 @@ }, "changes": { "localChanges": { - "proposed": [], + "proposed": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateFulfillHtlc", @@ -97,12 +100,16 @@ "paymentPreimage": "2afc28d3ad7a8a83426769f6765edbcd9e320335a2e4200df95f54f22472fe3d" } ], - "acked": [] + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 2 @@ -139,7 +146,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 300000000 @@ -199,7 +207,8 @@ "remoteCommit": { "index": 1, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -236,7 +245,8 @@ "commit": { "index": 2, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -257,8 +267,10 @@ } } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": { "sentAfterLocalCommitIndex": 1 diff --git a/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_f7421b49/data.json b/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_f7421b49/data.json index 53698523e..cf60cf169 100644 --- a/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_f7421b49/data.json +++ b/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_f7421b49/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0322de78372f8cc69c1bb97cce09072d84a4daf9cc77715ee429fb5153f2a292f2" diff --git a/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_fe3c5978/data.json b/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_fe3c5978/data.json index a86556ee2..883fb2068 100644 --- a/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_fe3c5978/data.json +++ b/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_fe3c5978/data.json @@ -45,7 +45,8 @@ "channel_backup_client": "Optional", "zero_conf_channels": "Mandatory" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -79,7 +80,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -89,14 +91,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -115,8 +123,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -133,14 +143,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -151,8 +164,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0354950a7fbbf53329f8a3f912cbc734d94134da30555ed28470ceab5daea6fba9" diff --git a/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_ff74dd33/data.json b/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_ff74dd33/data.json index bb25ba1b6..404bec841 100644 --- a/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_ff74dd33/data.json +++ b/src/commonTest/resources/nonreg/v2/WaitForFundingConfirmed_ff74dd33/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03bd8a174751163f38af0abc6c513d98f05d66080e67061cadf5e2b11b665579d9" diff --git a/src/commonTest/resources/nonreg/v2/WaitForFundingLocked_f3437082/data.json b/src/commonTest/resources/nonreg/v2/WaitForFundingLocked_f3437082/data.json index 0dee1662d..21de20e8d 100644 --- a/src/commonTest/resources/nonreg/v2/WaitForFundingLocked_f3437082/data.json +++ b/src/commonTest/resources/nonreg/v2/WaitForFundingLocked_f3437082/data.json @@ -44,7 +44,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03bb831ea93a1d0d2540af20196552beabb0c5e385e6b358516d3c40ccde7723b1" diff --git a/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_ae47fde9/data.json b/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_ae47fde9/data.json index 25fb5c97f..3c0739391 100644 --- a/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_ae47fde9/data.json +++ b/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_ae47fde9/data.json @@ -44,7 +44,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -77,7 +78,8 @@ "trusted_swap_in_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -87,14 +89,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -113,8 +121,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -131,14 +141,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -149,8 +162,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_d803549f/data.json b/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_d803549f/data.json index b2209f2a9..c8498287c 100644 --- a/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_d803549f/data.json +++ b/src/commonTest/resources/nonreg/v2/WaitForRemotePublishFutureCommitment_d803549f/data.json @@ -44,7 +44,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -77,7 +78,8 @@ "trusted_swap_in_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -87,14 +89,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 3, "remoteNextHtlcId": 0 @@ -113,7 +121,8 @@ "localCommit": { "index": 3, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -223,7 +232,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 449990000 @@ -234,7 +244,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "d4f57ab7-0de9-4440-9aea-debd7c80496c", "1": "bbac2fe3-1c00-4426-804f-24fd754236ef", diff --git a/src/commonTest/resources/nonreg/v3/Closing_029bf8f3/data.json b/src/commonTest/resources/nonreg/v3/Closing_029bf8f3/data.json index 2d57e4eeb..3938b1644 100644 --- a/src/commonTest/resources/nonreg/v3/Closing_029bf8f3/data.json +++ b/src/commonTest/resources/nonreg/v3/Closing_029bf8f3/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,7 +88,8 @@ }, "changes": { "localChanges": { - "proposed": [], + "proposed": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateFulfillHtlc", @@ -95,7 +98,8 @@ "paymentPreimage": "96abc2a3f0ed17d9ec5cddc3f67e76d94d500daccc0ca85407b2ca6caf515bba" } ], - "acked": [] + "acked": [ + ] }, "remoteChanges": { "proposed": [ @@ -106,8 +110,10 @@ "paymentPreimage": "53c9ce2b799dcafac3fdd3123faecd8e2995202c39911f7f26ca016e5acabe3f" } ], - "acked": [], - "signed": [] + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 3, "remoteNextHtlcId": 2 @@ -373,7 +379,8 @@ } } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "63bcda18-e368-4b94-8f92-f584b22f5f39", "1": "10a0c73e-8c05-4825-a46a-98166a75e9d9", diff --git a/src/commonTest/resources/nonreg/v3/Closing_0ba41d17/data.json b/src/commonTest/resources/nonreg/v3/Closing_0ba41d17/data.json index c9c73f51c..84f7f42a6 100644 --- a/src/commonTest/resources/nonreg/v3/Closing_0ba41d17/data.json +++ b/src/commonTest/resources/nonreg/v3/Closing_0ba41d17/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -94,13 +96,18 @@ "paymentPreimage": "470394f1ea93ed652ed8fba12c00dcfe8212c4fd3295f7413f7a927e002ea4eb" } ], - "signed": [], - "acked": [] + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 1, "remoteNextHtlcId": 1 @@ -227,7 +234,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "a63c8f54-772a-4912-9b2a-055f7f64ce56" }, diff --git a/src/commonTest/resources/nonreg/v3/Closing_0ed6ff68/data.json b/src/commonTest/resources/nonreg/v3/Closing_0ed6ff68/data.json index b44ecb4f7..8010f2104 100644 --- a/src/commonTest/resources/nonreg/v3/Closing_0ed6ff68/data.json +++ b/src/commonTest/resources/nonreg/v3/Closing_0ed6ff68/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -112,8 +120,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -130,14 +140,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -148,8 +161,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0234ea3e3929ca115acc645d07c40eada7a98d86017614c3fa466d7e19760917e4" diff --git a/src/commonTest/resources/nonreg/v3/Closing_0efffae3/data.json b/src/commonTest/resources/nonreg/v3/Closing_0efffae3/data.json index 9fe8fd38d..aae32e267 100644 --- a/src/commonTest/resources/nonreg/v3/Closing_0efffae3/data.json +++ b/src/commonTest/resources/nonreg/v3/Closing_0efffae3/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 2, "remoteNextHtlcId": 2 @@ -112,8 +120,10 @@ "localCommit": { "index": 5, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -130,14 +140,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202bf8e35df3ccae49bcd2036ec55d8450741336530017d00f4f41dc44d69675b7040047304402202f27c14d4a412b64c8ca226b9a20c51068f6b939bad70d46dfc1600c39617552022066f267b145178f5a69d69fee8ae6930ded1d1dc96a746e79ea3302b7df989b6601483045022100e75f4f2e202db89d24d221c7c9329411a85876e00996499b5031c1ab094afdf3022044c7c948e25282f17396385eed0efca8d7a3226ce002fad2e48cca9afae5c43b0147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aedb99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 6, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -148,8 +161,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0323e9618cf8548e5b78a14529e1c8df51895e47ae6026bf23f5f130299bbc92b0" diff --git a/src/commonTest/resources/nonreg/v3/Closing_ebbd24bc/data.json b/src/commonTest/resources/nonreg/v3/Closing_ebbd24bc/data.json index 2ff5cbc8c..6c50f2218 100644 --- a/src/commonTest/resources/nonreg/v3/Closing_ebbd24bc/data.json +++ b/src/commonTest/resources/nonreg/v3/Closing_ebbd24bc/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -94,13 +96,18 @@ "paymentPreimage": "ece8429c09332ef2f819c5886b71cc500b21956b3faa6f3ab3f9005010c9655a" } ], - "signed": [], - "acked": [] + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 1, "remoteNextHtlcId": 1 @@ -227,7 +234,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "c88282fa-5e7b-43d5-b72c-883708000c69" }, diff --git a/src/commonTest/resources/nonreg/v3/Closing_f137669f/data.json b/src/commonTest/resources/nonreg/v3/Closing_f137669f/data.json index 9b3aa9aaa..1b3d23107 100644 --- a/src/commonTest/resources/nonreg/v3/Closing_f137669f/data.json +++ b/src/commonTest/resources/nonreg/v3/Closing_f137669f/data.json @@ -42,7 +42,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -75,7 +76,8 @@ "trusted_swap_in_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -85,14 +87,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -111,8 +119,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -129,14 +139,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -147,8 +160,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v3/Negotiating_da44c6e2/data.json b/src/commonTest/resources/nonreg/v3/Negotiating_da44c6e2/data.json index 6b9cdd587..65dbbdfbd 100644 --- a/src/commonTest/resources/nonreg/v3/Negotiating_da44c6e2/data.json +++ b/src/commonTest/resources/nonreg/v3/Negotiating_da44c6e2/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -112,8 +120,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -130,14 +140,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -148,8 +161,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v3/Negotiating_dabbed55/data.json b/src/commonTest/resources/nonreg/v3/Negotiating_dabbed55/data.json index 72e70b027..7cadbc73e 100644 --- a/src/commonTest/resources/nonreg/v3/Negotiating_dabbed55/data.json +++ b/src/commonTest/resources/nonreg/v3/Negotiating_dabbed55/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -112,8 +120,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -130,14 +140,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -148,8 +161,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v3/Negotiating_fadb50c1/data.json b/src/commonTest/resources/nonreg/v3/Negotiating_fadb50c1/data.json index cf146d3bc..8269f04df 100644 --- a/src/commonTest/resources/nonreg/v3/Negotiating_fadb50c1/data.json +++ b/src/commonTest/resources/nonreg/v3/Negotiating_fadb50c1/data.json @@ -43,7 +43,8 @@ "channel_backup_client": "Optional", "option_shutdown_anysegwit": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -78,7 +79,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -88,14 +90,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -114,8 +122,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -132,14 +142,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -150,8 +163,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0234ea3e3929ca115acc645d07c40eada7a98d86017614c3fa466d7e19760917e4" @@ -167,7 +182,8 @@ "scriptPubKey": "51050102030405" }, "closingTxProposed": [ - [] + [ + ] ], "bestUnpublishedClosingTx": null, "closingFeerates": null diff --git a/src/commonTest/resources/nonreg/v3/Normal_fd10d3cc/data.json b/src/commonTest/resources/nonreg/v3/Normal_fd10d3cc/data.json index 512ac704c..bc1a7bcdf 100644 --- a/src/commonTest/resources/nonreg/v3/Normal_fd10d3cc/data.json +++ b/src/commonTest/resources/nonreg/v3/Normal_fd10d3cc/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 2, "remoteNextHtlcId": 0 @@ -112,7 +120,8 @@ "localCommit": { "index": 1, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -206,7 +215,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 300000000 @@ -217,7 +227,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "28f366cb-6c14-4100-a33e-b85b809ed38a", "1": "c6dca627-db1e-47d7-b7a5-abe70d276099" diff --git a/src/commonTest/resources/nonreg/v3/Normal_fe897b64/data.json b/src/commonTest/resources/nonreg/v3/Normal_fe897b64/data.json index 2b92004d7..01a0bcfe3 100644 --- a/src/commonTest/resources/nonreg/v3/Normal_fe897b64/data.json +++ b/src/commonTest/resources/nonreg/v3/Normal_fe897b64/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,7 +88,8 @@ }, "changes": { "localChanges": { - "proposed": [], + "proposed": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateAddHtlc", @@ -98,12 +101,16 @@ "onionRoutingPacket": "" } ], - "acked": [] + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 1, "remoteNextHtlcId": 0 @@ -122,8 +129,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -140,14 +149,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -176,7 +188,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 750000000 @@ -187,7 +200,8 @@ } } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "c10720b8-745f-4450-8f6f-1ca7472ecc76" }, diff --git a/src/commonTest/resources/nonreg/v3/Normal_ff248f8d/data.json b/src/commonTest/resources/nonreg/v3/Normal_ff248f8d/data.json index e1ee17f9b..dec32f7ff 100644 --- a/src/commonTest/resources/nonreg/v3/Normal_ff248f8d/data.json +++ b/src/commonTest/resources/nonreg/v3/Normal_ff248f8d/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -112,8 +120,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -130,14 +140,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -148,8 +161,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0234ea3e3929ca115acc645d07c40eada7a98d86017614c3fa466d7e19760917e4" diff --git a/src/commonTest/resources/nonreg/v3/Normal_ff4a71b6/data.json b/src/commonTest/resources/nonreg/v3/Normal_ff4a71b6/data.json index c544a46fc..5fe2fa192 100644 --- a/src/commonTest/resources/nonreg/v3/Normal_ff4a71b6/data.json +++ b/src/commonTest/resources/nonreg/v3/Normal_ff4a71b6/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,13 +88,18 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], + "proposed": [ + ], + "acked": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateAddHtlc", @@ -260,7 +267,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 790910000 @@ -328,7 +336,8 @@ } } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "7e780474-04b9-41db-94b9-7ef99349408f", "1": "683c4687-c4b7-4cb1-ac82-6808f57f4409" diff --git a/src/commonTest/resources/nonreg/v3/ShuttingDown_ef41a1a5/data.json b/src/commonTest/resources/nonreg/v3/ShuttingDown_ef41a1a5/data.json index e9cc3eb21..397d90e94 100644 --- a/src/commonTest/resources/nonreg/v3/ShuttingDown_ef41a1a5/data.json +++ b/src/commonTest/resources/nonreg/v3/ShuttingDown_ef41a1a5/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,7 +88,8 @@ }, "changes": { "localChanges": { - "proposed": [], + "proposed": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateFulfillHtlc", @@ -95,12 +98,16 @@ "paymentPreimage": "2afc28d3ad7a8a83426769f6765edbcd9e320335a2e4200df95f54f22472fe3d" } ], - "acked": [] + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 2 @@ -137,7 +144,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 300000000 @@ -197,7 +205,8 @@ "remoteCommit": { "index": 1, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -234,7 +243,8 @@ "commit": { "index": 2, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -255,8 +265,10 @@ } } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": { "sentAfterLocalCommitIndex": 1 diff --git a/src/commonTest/resources/nonreg/v3/ShuttingDown_ef7081a1/data.json b/src/commonTest/resources/nonreg/v3/ShuttingDown_ef7081a1/data.json index 83e5f8439..e63f60088 100644 --- a/src/commonTest/resources/nonreg/v3/ShuttingDown_ef7081a1/data.json +++ b/src/commonTest/resources/nonreg/v3/ShuttingDown_ef7081a1/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,7 +88,8 @@ }, "changes": { "localChanges": { - "proposed": [], + "proposed": [ + ], "signed": [ { "type": "fr.acinq.lightning.wire.UpdateAddHtlc", @@ -98,12 +101,16 @@ "onionRoutingPacket": "" } ], - "acked": [] + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 2, "remoteNextHtlcId": 0 @@ -122,7 +129,8 @@ "localCommit": { "index": 1, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -183,7 +191,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 775000000 @@ -221,7 +230,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 740000000 @@ -232,7 +242,8 @@ } } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "87833a1a-fec1-47cd-a68b-3ebfbb2330ce", "1": "7c68b0d3-68a7-425a-8601-37d35d4bd2f1" diff --git a/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_fe3c5978/data.json b/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_fe3c5978/data.json index 771038e28..29ddcbe28 100644 --- a/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_fe3c5978/data.json +++ b/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_fe3c5978/data.json @@ -45,7 +45,8 @@ "channel_backup_client": "Optional", "zero_conf_channels": "Mandatory" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -79,7 +80,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -89,14 +91,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -115,8 +123,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -133,14 +143,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -151,8 +164,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "0354950a7fbbf53329f8a3f912cbc734d94134da30555ed28470ceab5daea6fba9" diff --git a/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_ff74dd33/data.json b/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_ff74dd33/data.json index e9b8d4857..931e7fdc6 100644 --- a/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_ff74dd33/data.json +++ b/src/commonTest/resources/nonreg/v3/WaitForFundingConfirmed_ff74dd33/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_provider": "Optional", "channel_backup_provider": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -112,8 +120,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -130,14 +140,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -148,8 +161,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03bd8a174751163f38af0abc6c513d98f05d66080e67061cadf5e2b11b665579d9" diff --git a/src/commonTest/resources/nonreg/v3/WaitForFundingLocked_f3437082/data.json b/src/commonTest/resources/nonreg/v3/WaitForFundingLocked_f3437082/data.json index 6663b2af0..ed1b39903 100644 --- a/src/commonTest/resources/nonreg/v3/WaitForFundingLocked_f3437082/data.json +++ b/src/commonTest/resources/nonreg/v3/WaitForFundingLocked_f3437082/data.json @@ -42,7 +42,8 @@ "trusted_swap_in_client": "Optional", "channel_backup_client": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -76,7 +77,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -86,14 +88,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -112,8 +120,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -130,14 +140,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d03000000000022002031dbc67ef6930d0825de6c23bd311eb93d40430d543c0555aa0f15b7aaab0cbc781c0c0000000000220020958bb43c9e6d1b985001c2f4dc38d286d7fde78bb04d7ec5a5ae44d8ebf0c40c040047304402201991b61ae8ef7bf6bd03f6f965552294e7941fce3fc91a024094cbd9b3464dd202206068ef64671e59b5825408e58462613a6ad0edfc7aa23853aea36187298c493901483045022100cca233f9a14605a7adab49f959c5b42260a55156282cbc802397fc934d5e537c02203504b82653044526706d76d3ddf0f083ea77a16f6cc13c93add344069a55cb940147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -148,8 +161,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03bb831ea93a1d0d2540af20196552beabb0c5e385e6b358516d3c40ccde7723b1" diff --git a/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_ae47fde9/data.json b/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_ae47fde9/data.json index 8b6b7b1b6..dceaa38bd 100644 --- a/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_ae47fde9/data.json +++ b/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_ae47fde9/data.json @@ -42,7 +42,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -75,7 +76,8 @@ "trusted_swap_in_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -85,14 +87,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 0, "remoteNextHtlcId": 0 @@ -111,8 +119,10 @@ "localCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 800000000, "toRemote": 200000000 @@ -129,14 +139,17 @@ }, "tx": "020000000001012f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd000000000000b77080044a0100000000000022002046672803839d10e21d43eafb532bc37cd21bd97dec7f9b50d45380cd1cce69654a01000000000000220020bbd7f17366848d8f624c28438128ce4dc8c72ea21deb0ccf25bee110920da032400d030000000000220020cb93e3adb8d213704e9a07ea2a6ce91dca51a9b76fcb6bef3cc9b5b7e10a7990781c0c00000000002200202f0860cd1fe361a1aaf5708f75b6511c92cd5a51bdaaccfbda77aead550d875104004730440220672323ca34b85c2a43e3e93ac8a642a8293b1483392f531736db975d05f3ad3c022019f7b5044cd2a230dc49484c219fd96485f98d21c6add317566f4b21816a2fb101483045022100956b481822da569bc75c1f7ab6ec34c0a1e14dd5b4701ea8473e5bfe6b6ad41702202b1a987850611c0f52cccbb6016c735a08572f61fe03616a186ca39a8b2e07970147522102b6eaf304d966a6df90f3b3df7af7be6b1625854bbc096cb8b3507b2a37c2bf9c210385cfd7d8850e4cb8fcbed57310911218e5d5e1fd34f92ef5d9db14d56418caa452aede99dc20" }, - "htlcTxsAndSigs": [] + "htlcTxsAndSigs": [ + ] } }, "remoteCommit": { "index": 0, "spec": { - "htlcsIn": [], - "htlcsOut": [], + "htlcsIn": [ + ], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 800000000 @@ -147,8 +160,10 @@ "nextRemoteCommit": null } ], - "inactive": [], - "payments": {}, + "inactive": [ + ], + "payments": { + }, "remoteNextCommitInfo": { "left": null, "right": "03c57839fd412868a398bea05d01678a752661126a2d1357a0f7cb6f0c60311125" diff --git a/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_d803549f/data.json b/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_d803549f/data.json index 5162faaed..915c45bc2 100644 --- a/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_d803549f/data.json +++ b/src/commonTest/resources/nonreg/v3/WaitForRemotePublishFutureCommitment_d803549f/data.json @@ -42,7 +42,8 @@ "channel_backup_provider": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "remoteParams": { @@ -75,7 +76,8 @@ "trusted_swap_in_client": "Optional", "trampoline_payment_experimental": "Optional" }, - "unknown": [] + "unknown": [ + ] } }, "channelFlags": { @@ -85,14 +87,20 @@ }, "changes": { "localChanges": { - "proposed": [], - "signed": [], - "acked": [] + "proposed": [ + ], + "signed": [ + ], + "acked": [ + ] }, "remoteChanges": { - "proposed": [], - "acked": [], - "signed": [] + "proposed": [ + ], + "acked": [ + ], + "signed": [ + ] }, "localNextHtlcId": 3, "remoteNextHtlcId": 0 @@ -111,7 +119,8 @@ "localCommit": { "index": 3, "spec": { - "htlcsIn": [], + "htlcsIn": [ + ], "htlcsOut": [ { "channelId": "2f7c825b61cbbf0e685aef20f8923a8cd28943346e59301b629cc89b4e27cdbd", @@ -221,7 +230,8 @@ "onionRoutingPacket": "" } ], - "htlcsOut": [], + "htlcsOut": [ + ], "feerate": 5000, "toLocal": 200000000, "toRemote": 449990000 @@ -232,7 +242,8 @@ "nextRemoteCommit": null } ], - "inactive": [], + "inactive": [ + ], "payments": { "0": "d4f57ab7-0de9-4440-9aea-debd7c80496c", "1": "bbac2fe3-1c00-4426-804f-24fd754236ef", diff --git a/src/iosMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt b/src/iosMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt index 11d54ea49..c02f47164 100644 --- a/src/iosMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt +++ b/src/iosMain/kotlin/fr/acinq/lightning/crypto/noise/Chacha20Poly1305CipherFunctions.kt @@ -9,14 +9,14 @@ import kotlinx.cinterop.autoreleasepool actual object Chacha20Poly1305CipherFunctions : CipherFunctions { - actual override fun name() = "ChaChaPoly" + override fun name() = "ChaChaPoly" // as specified in BOLT #8 fun nonce(n: Long): ByteArray = ByteArray(4) + ChaCha20Poly1305.write64(n) // Encrypts plaintext using the cipher key k of 32 bytes and an 8-byte unsigned integer nonce n which must be unique. @OptIn(ExperimentalForeignApi::class, BetaInteropApi::class) - actual override fun encrypt(k: ByteArray, n: Long, ad: ByteArray, plaintext: ByteArray): ByteArray { + override fun encrypt(k: ByteArray, n: Long, ad: ByteArray, plaintext: ByteArray): ByteArray { autoreleasepool { val ciphertextAndMac = NativeChaChaPoly.chachapoly_encryptWithKey( key = k.toNSData(), @@ -31,7 +31,8 @@ actual object Chacha20Poly1305CipherFunctions : CipherFunctions { // Decrypts ciphertext using a cipher key k of 32 bytes, an 8-byte unsigned integer nonce n, and associated data ad. @OptIn(ExperimentalForeignApi::class, BetaInteropApi::class) - actual override fun decrypt(k: ByteArray, n: Long, ad: ByteArray, ciphertextAndMac: ByteArray): ByteArray { + @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") + override fun decrypt(k: ByteArray, n: Long, ad: ByteArray, ciphertextAndMac: ByteArray): ByteArray { autoreleasepool { val plaintext = NativeChaChaPoly.chachapoly_decryptWithKey( key = k.toNSData(), diff --git a/src/iosMain/kotlin/fr/acinq/lightning/io/IosTcpSocket.kt b/src/iosMain/kotlin/fr/acinq/lightning/io/IosTcpSocket.kt index 18c032b66..c520faafe 100644 --- a/src/iosMain/kotlin/fr/acinq/lightning/io/IosTcpSocket.kt +++ b/src/iosMain/kotlin/fr/acinq/lightning/io/IosTcpSocket.kt @@ -130,7 +130,7 @@ class IosTcpSocket @OptIn(ExperimentalForeignApi::class) constructor(private val internal actual object PlatformSocketBuilder : TcpSocket.Builder { @OptIn(ExperimentalUnsignedTypes::class, ExperimentalForeignApi::class) - actual override suspend fun connect( + override suspend fun connect( host: String, port: Int, tls: TcpSocket.TLS, diff --git a/src/jvmMain/kotlin/fr/acinq/lightning/io/JvmTcpSocket.kt b/src/jvmMain/kotlin/fr/acinq/lightning/io/JvmTcpSocket.kt index b0158b200..93a98d745 100644 --- a/src/jvmMain/kotlin/fr/acinq/lightning/io/JvmTcpSocket.kt +++ b/src/jvmMain/kotlin/fr/acinq/lightning/io/JvmTcpSocket.kt @@ -159,7 +159,7 @@ class JvmTcpSocket(val socket: Socket, val loggerFactory: LoggerFactory) : TcpSo } internal actual object PlatformSocketBuilder : TcpSocket.Builder { - actual override suspend fun connect(host: String, port: Int, tls: TcpSocket.TLS, loggerFactory: LoggerFactory): TcpSocket { + override suspend fun connect(host: String, port: Int, tls: TcpSocket.TLS, loggerFactory: LoggerFactory): TcpSocket { val logger = loggerFactory.newLogger(this::class) return withContext(Dispatchers.IO) { try {