Skip to content

Commit c14725c

Browse files
fix: enable cbf sync
1 parent ec7a7a9 commit c14725c

6 files changed

Lines changed: 8 additions & 18 deletions

File tree

app/src/main/java/org/bitcoindevkit/devkitwallet/domain/Wallet.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,12 @@ class Wallet private constructor(
184184

185185
fun startKyotoNode() {
186186
Log.i(TAG, "Starting Kyoto node")
187-
// val ip: IpAddress = IpAddress.fromIpv4(68u, 47u, 229u, 218u) // Signet
188-
val ip: IpAddress = IpAddress.fromIpv4(10u, 0u, 2u, 2u) // Regtest
189-
val peer1: Peer = Peer(ip, 18444u, false) // Regtest
187+
// Regtest
188+
val ip: IpAddress = IpAddress.fromIpv4(10u, 0u, 2u, 2u)
189+
val peer1: Peer = Peer(ip, 18444u, false)
190+
191+
// Signet
192+
// val ip: IpAddress = IpAddress.fromIpv4(68u, 47u, 229u, 218u)
190193
// val peer1: Peer = Peer(ip, null, false)
191194
val peers: List<Peer> = listOf(peer1)
192195

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/TransactionCards.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ fun ConfirmedTransactionCard(details: TxDetails, navController: NavController) {
4444
.background(
4545
color = colorScheme.surfaceVariant.copy(alpha = 0.5f),
4646
shape = RoundedCornerShape(16.dp),
47-
)
48-
.border(
47+
).border(
4948
width = 1.dp,
5049
color = colorScheme.outline.copy(alpha = 0.08f),
5150
shape = RoundedCornerShape(16.dp),
52-
)
53-
.clickable { viewTransaction(navController = navController, txid = details.txid) },
51+
).clickable { viewTransaction(navController = navController, txid = details.txid) },
5452
verticalAlignment = Alignment.CenterVertically,
5553
horizontalArrangement = Arrangement.Absolute.SpaceBetween,
5654
) {

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/BlockchainClientScreen.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ internal fun BlockchainClientScreen(
118118
enabled = state.kyotoNodeStatus == KyotoNodeStatus.Stopped,
119119
onClick = { onAction(WalletScreenAction.StartKyotoNode) },
120120
)
121-
NeutralButton(
122-
text = "Start Sync",
123-
enabled = state.kyotoNodeStatus == KyotoNodeStatus.Running,
124-
onClick = { onAction(WalletScreenAction.StartKyotoSync) },
125-
)
126121
NeutralButton(
127122
text = "Stop Node",
128123
enabled = state.kyotoNodeStatus == KyotoNodeStatus.Running,

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/TransactionScreen.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package org.bitcoindevkit.devkitwallet.presentation.ui.screens.wallet
77

8-
import androidx.compose.foundation.layout.Arrangement
98
import androidx.compose.foundation.layout.Column
109
import androidx.compose.foundation.layout.Spacer
1110
import androidx.compose.foundation.layout.fillMaxSize

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/viewmodels/WalletViewModel.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ internal class WalletViewModel(
4141
WalletScreenAction.UpdateBalance -> updateBalance()
4242
WalletScreenAction.StartKyotoNode -> startKyotoNode()
4343
WalletScreenAction.StopKyotoNode -> stopKyotoNode()
44-
WalletScreenAction.StartKyotoSync -> startKyotoSync()
4544
WalletScreenAction.ClearSnackbar -> clearSnackbar()
4645
}
4746
}
@@ -83,9 +82,7 @@ internal class WalletViewModel(
8382
DwLogger.log(INFO, "Starting Kyoto node")
8483
wallet.startKyotoNode()
8584
state = state.copy(kyotoNodeStatus = KyotoNodeStatus.Running)
86-
}
8785

88-
private fun startKyotoSync() {
8986
Log.i("Kyoto", "Starting Kyoto sync")
9087
DwLogger.log(INFO, "Starting Kyoto sync")
9188
kyotoCoroutineScope.launch {

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/viewmodels/mvi/MviWalletScreen.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ sealed interface WalletScreenAction {
2424

2525
data object StopKyotoNode : WalletScreenAction
2626

27-
data object StartKyotoSync : WalletScreenAction
28-
2927
data object ClearSnackbar : WalletScreenAction
3028
}
3129

0 commit comments

Comments
 (0)