machankura/phoenixd_enclave
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use lightning-kmp 1.6.2-FEECREDIT-3

Browse Source
This commit is contained in:
pm47 2024-03-21 15:42:15 +01:00
parent 1dc4d16543
commit a012a7098b
No known key found for this signature in database
GPG Key ID: E434ED292E85643A
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/Versions.kt
View File

@ -1,6 +1,6 @@
object Versions { object Versions {
val kotlin = "1.9.23" val kotlin = "1.9.23"
val lightningKmp = "1.6.2-FEECREDIT-2" val lightningKmp = "1.6.2-FEECREDIT-3"
val sqlDelight = "2.0.1" val sqlDelight = "2.0.1"
val okio = "3.8.0" val okio = "3.8.0"
val clikt = "4.2.2" val clikt = "4.2.2"

9
src/commonMain/kotlin/fr/acinq/lightning/bin/Main.kt
View File

@ -9,8 +9,6 @@ import com.github.ajalt.clikt.core.context
import com.github.ajalt.clikt.core.terminal import com.github.ajalt.clikt.core.terminal
import com.github.ajalt.clikt.output.MordantHelpFormatter import com.github.ajalt.clikt.output.MordantHelpFormatter
import com.github.ajalt.clikt.parameters.groups.OptionGroup import com.github.ajalt.clikt.parameters.groups.OptionGroup
import com.github.ajalt.clikt.parameters.groups.default
import com.github.ajalt.clikt.parameters.groups.mutuallyExclusiveOptions
import com.github.ajalt.clikt.parameters.groups.provideDelegate import com.github.ajalt.clikt.parameters.groups.provideDelegate
import com.github.ajalt.clikt.parameters.options.* import com.github.ajalt.clikt.parameters.options.*
import com.github.ajalt.clikt.parameters.types.choice import com.github.ajalt.clikt.parameters.types.choice
@ -19,7 +17,6 @@ import com.github.ajalt.clikt.parameters.types.restrictTo
import com.github.ajalt.clikt.sources.MapValueSource import com.github.ajalt.clikt.sources.MapValueSource
import com.github.ajalt.mordant.rendering.TextColors.* import com.github.ajalt.mordant.rendering.TextColors.*
import com.github.ajalt.mordant.rendering.TextStyles.bold import com.github.ajalt.mordant.rendering.TextStyles.bold
import com.github.ajalt.mordant.rendering.TextStyles.underline
import fr.acinq.bitcoin.Chain import fr.acinq.bitcoin.Chain
import fr.acinq.lightning.BuildVersions import fr.acinq.lightning.BuildVersions
import fr.acinq.lightning.Lightning.randomBytes32 import fr.acinq.lightning.Lightning.randomBytes32
@ -62,6 +59,7 @@ import okio.buffer
import okio.use import okio.use
import kotlin.system.exitProcess import kotlin.system.exitProcess
import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.minutes
import kotlin.time.Duration.Companion.seconds import kotlin.time.Duration.Companion.seconds
@ -77,6 +75,9 @@ class Phoenixd : CliktCommand() {
"mainnet" to Chain.Mainnet, "testnet" to Chain.Testnet "mainnet" to Chain.Mainnet, "testnet" to Chain.Testnet
).default(Chain.Mainnet, defaultForHelp = "mainnet") ).default(Chain.Mainnet, defaultForHelp = "mainnet")
private val customMempoolSpaceHost by option("--mempool-space", help = "Custom mempool.space instance") private val customMempoolSpaceHost by option("--mempool-space", help = "Custom mempool.space instance")
private val mempoolPollingInterval by option("--mempool-space-polling-interval-minutes", help = "Polling interval for mempool.space API", hidden = true)
.int().convert { it.minutes }
.default(10.minutes)
private val httpBindIp by option("--http-bind-ip", help = "Bind ip for the http api").default("127.0.0.1") private val httpBindIp by option("--http-bind-ip", help = "Bind ip for the http api").default("127.0.0.1")
private val httpBindPort by option("--http-bind-port", help = "Bind port for the http api").int().default(9740) private val httpBindPort by option("--http-bind-port", help = "Bind port for the http api").int().default(9740)
private val httpPassword by option("--http-password", help = "Password for the http api").defaultLazy { private val httpPassword by option("--http-password", help = "Password for the http api").defaultLazy {
@ -241,7 +242,7 @@ class Phoenixd : CliktCommand() {
val paymentsDb = SqlitePaymentsDb(database) val paymentsDb = SqlitePaymentsDb(database)
val mempoolSpace = MempoolSpaceClient(mempoolSpaceHost, loggerFactory) val mempoolSpace = MempoolSpaceClient(mempoolSpaceHost, loggerFactory)
val watcher = MempoolSpaceWatcher(mempoolSpace, scope, loggerFactory) val watcher = MempoolSpaceWatcher(mempoolSpace, scope, loggerFactory, pollingInterval = mempoolPollingInterval)
val peer = Peer( val peer = Peer(
nodeParams = nodeParams, walletParams = lsp.walletParams, client = mempoolSpace, watcher = watcher, db = object : Databases { nodeParams = nodeParams, walletParams = lsp.walletParams, client = mempoolSpace, watcher = watcher, db = object : Databases {
override val channels: ChannelsDb get() = channelsDb override val channels: ChannelsDb get() = channelsDb