diff --git a/build.gradle.kts b/build.gradle.kts index 56b5cd7..0330431 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -119,8 +119,6 @@ kotlin { kotlin.srcDir(buildVersionsTask.map { it.destinationDir }) dependencies { implementation("com.github.raymond98.lightning-kmp:lightning-kmp:v1.6.2-FEECREDIT-8") - //implementation("com.github.raymond98.vsockj:vsockj-native:1.0.3") - //implementation("com.github.raymond98.vsockj:vsockj-core:1.0.3") implementation("org.bytedeco:javacpp:1.5.10") implementation(kotlin("stdlib-jdk8")) diff --git a/src/commonMain/kotlin/fr/acinq/lightning/bin/Main.kt b/src/commonMain/kotlin/fr/acinq/lightning/bin/Main.kt index 9706a80..0739f6e 100644 --- a/src/commonMain/kotlin/fr/acinq/lightning/bin/Main.kt +++ b/src/commonMain/kotlin/fr/acinq/lightning/bin/Main.kt @@ -128,8 +128,9 @@ class Phoenixd : CliktCommand() { } //Electrum has a list of testnet and mainnet servers we can use to randomly find available ones https://github.com/spesmilo/electrum/blob/afa1a4d22a31d23d088c6670e1588eed32f7114d/lib/network.py#L57 - private val electrumServerIp by option("--electrum-server-ip", help = "An IP for the Electrum server").default("testnet.qtornado.com") - private val electrumServerPort by option("--electrum-server-port", help = "Port for the electrum server").int().default(51002) + //Testnet testnet.qtornado.com:51002 + private val electrumServerIp by option("--electrum-server-ip", help = "An IP for the Electrum server").default("E-X.not.fyi") + private val electrumServerPort by option("--electrum-server-port", help = "Port for the electrum server").int().default(50002) private val startVsock by option("--start-vsock-server", help = "Start the vsock server for API calls").boolean().default(true) private val vsockCID by option("--vsock-server-cid", help = "CID for the Vsock server").int().default(4) diff --git a/src/commonMain/kotlin/fr/acinq/lightning/bin/conf/Lsp.kt b/src/commonMain/kotlin/fr/acinq/lightning/bin/conf/Lsp.kt index 40fb579..c4515c1 100644 --- a/src/commonMain/kotlin/fr/acinq/lightning/bin/conf/Lsp.kt +++ b/src/commonMain/kotlin/fr/acinq/lightning/bin/conf/Lsp.kt @@ -41,10 +41,12 @@ data class LSP(val walletParams: WalletParams, val swapInXpub: String) { swapInParams ) ) + //tpubDCbLTyj9J59ygFSXyFxssuCFzLLD6ccfQmGdEmwb4miv33NAa7VyRdhDBJRUcsR987cMRm8ufCvdXBphT79QAYWczZJ8mqHeKtrXeE9PVD5 + //02cb140e651b9bef52dfe8976ac08336414373d738d161fcf479f98a1ae4416c92 is Chain.Testnet -> LSP( - swapInXpub = "tpubDCbLTyj9J59ygFSXyFxssuCFzLLD6ccfQmGdEmwb4miv33NAa7VyRdhDBJRUcsR987cMRm8ufCvdXBphT79QAYWczZJ8mqHeKtrXeE9PVD5", + swapInXpub = "tpubDAmCFB21J9ExKBRPDcVxSvGs9jtcf8U1wWWbS1xTYmnUsuUHPCoFdCnEGxLE3THSWcQE48GHJnyz8XPbYUivBMbLSMBifFd3G9KmafkM9og", walletParams = WalletParams( - trampolineNode = NodeUri(PublicKey.fromHex("02cb140e651b9bef52dfe8976ac08336414373d738d161fcf479f98a1ae4416c92"), "10.0.0.137", 9735), + trampolineNode = NodeUri(PublicKey.fromHex("03933884aaf1d6b108397e5efe5c86bcf2d8ca8d2f700eda99db9214fc2712b134"), "13.248.222.197", 9735), trampolineFees, invoiceDefaultRoutingFees, swapInParams