Skip to content

feat(wip): sub 1 sat fee #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions BDKSwiftExampleWallet/Service/BDK Service/BDKService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -462,17 +462,28 @@ private class BDKService {
amount: UInt64,
feeRate: UInt64
) async throws {
print("[BDKService.send] Starting send with address: \(address), amount: \(amount), feeRate: \(feeRate)")
let psbt = try buildTransaction(
address: address,
amount: amount,
feeRate: feeRate
)
print("[BDKService.send] PSBT built successfully")
try signAndBroadcast(psbt: psbt)
print("[BDKService.send] Transaction signed and broadcast successfully")
}

func buildTransaction(address: String, amount: UInt64, feeRate: UInt64) throws
-> Psbt
{
print("[BDKService.buildTransaction] Building transaction with:")
print(" - Network: \(self.network)")
print(" - Esplora URL: \(self.blockchainURL)")
print(" - Address: \(address)")
print(" - Amount: \(amount) sats")
print(" - Original feeRate param: \(feeRate) sat/vB")
print(" - Using hardcoded: 247 sat/kwu (0.99 sat/vB)")

guard let wallet = self.wallet else { throw WalletError.walletNotFound }
let script = try Address(address: address, network: self.network)
.scriptPubkey()
Expand All @@ -481,18 +492,36 @@ private class BDKService {
script: script,
amount: Amount.fromSat(satoshi: amount)
)
.feeRate(feeRate: FeeRate.fromSatPerVb(satVb: feeRate))
.feeRate(feeRate: FeeRate.fromSatPerKwu(satKwu: 247)) // for 0.99 sat/vB //.feeRate(feeRate: FeeRate.fromSatPerVb(satVb: feeRate))
.finish(wallet: wallet)

print("[BDKService.buildTransaction] Transaction built successfully")
return txBuilder
}

private func signAndBroadcast(psbt: Psbt) throws {
print("[BDKService.signAndBroadcast] Starting sign and broadcast")
guard let wallet = self.wallet else { throw WalletError.walletNotFound }

let isSigned = try wallet.sign(psbt: psbt)
print("[BDKService.signAndBroadcast] Signing result: \(isSigned)")

if isSigned {
let transaction = try psbt.extractTx()
try self.blockchainClient.broadcast(transaction)
let txid = transaction.computeTxid()
print("[BDKService.signAndBroadcast] Transaction ID: \(txid)")

do {
try self.blockchainClient.broadcast(transaction)
print("[BDKService.signAndBroadcast] Broadcast successful!")
} catch {
print("[BDKService.signAndBroadcast] Broadcast failed with error: \(error)")
print("[BDKService.signAndBroadcast] Error type: \(type(of: error))")
print("[BDKService.signAndBroadcast] Error details: \(error.localizedDescription)")
throw error
}
} else {
print("[BDKService.signAndBroadcast] Failed to sign transaction")
throw WalletError.notSigned
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,26 @@ class BuildTransactionViewModel {
}

func buildTransaction(address: String, amount: UInt64, feeRate: UInt64) {
print("[BuildTransactionViewModel.buildTransaction] Called with:")
print(" - Address: \(address)")
print(" - Amount: \(amount) sats")
print(" - FeeRate: \(feeRate) sat/vB")

do {
let txBuilderResult = try bdkClient.buildTransaction(address, amount, feeRate)
self.psbt = txBuilderResult
print("[BuildTransactionViewModel.buildTransaction] PSBT created successfully")
} catch let error as WalletError {
print("[BuildTransactionViewModel.buildTransaction] WalletError: \(error.localizedDescription)")
self.buildTransactionViewError = .generic(message: error.localizedDescription)
self.showingBuildTransactionViewErrorAlert = true
} catch let error as AddressParseError {
print("[BuildTransactionViewModel.buildTransaction] AddressParseError: \(error.localizedDescription)")
self.buildTransactionViewError = .generic(message: error.localizedDescription)
self.showingBuildTransactionViewErrorAlert = true
} catch {
print("[BuildTransactionViewModel.buildTransaction] Unknown error: \(error.localizedDescription)")
print("[BuildTransactionViewModel.buildTransaction] Error type: \(type(of: error))")
self.buildTransactionViewError = .generic(message: error.localizedDescription)
self.showingBuildTransactionViewErrorAlert = true
}
Expand Down Expand Up @@ -69,22 +79,33 @@ class BuildTransactionViewModel {
}

func send(address: String, amount: UInt64, feeRate: UInt64) {
print("[BuildTransactionViewModel.send] Called with:")
print(" - Address: \(address)")
print(" - Amount: \(amount) sats")
print(" - FeeRate: \(feeRate) sat/vB")

do {
try bdkClient.send(address, amount, feeRate)
print("[BuildTransactionViewModel.send] Transaction sent successfully!")
NotificationCenter.default.post(
name: Notification.Name("TransactionSent"),
object: nil
)
} catch let error as EsploraError {
print("[BuildTransactionViewModel.send] EsploraError: \(error.localizedDescription)")
self.buildTransactionViewError = .generic(message: error.localizedDescription)
self.showingBuildTransactionViewErrorAlert = true
} catch let error as SignerError {
print("[BuildTransactionViewModel.send] SignerError: \(error.localizedDescription)")
self.buildTransactionViewError = .generic(message: error.localizedDescription)
self.showingBuildTransactionViewErrorAlert = true
} catch let error as WalletError {
print("[BuildTransactionViewModel.send] WalletError: \(error.localizedDescription)")
self.buildTransactionViewError = .generic(message: error.localizedDescription)
self.showingBuildTransactionViewErrorAlert = true
} catch {
print("[BuildTransactionViewModel.send] Unknown error: \(error.localizedDescription)")
print("[BuildTransactionViewModel.send] Error type: \(type(of: error))")
self.buildTransactionViewError = .generic(message: error.localizedDescription)
self.showingBuildTransactionViewErrorAlert = true
}
Expand Down
11 changes: 11 additions & 0 deletions BDKSwiftExampleWallet/View/Send/BuildTransactionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ struct BuildTransactionView: View {
if !isSent {
Button {
if let amt = UInt64(amount) {
print("[BuildTransactionView] Send button pressed with:")
print(" - Address: \(address)")
print(" - Amount: \(amt) sats")
print(" - Fee: \(fee) sat/vB")
viewModel.buildTransactionViewError = nil
isError = false
viewModel.send(
Expand Down Expand Up @@ -208,13 +212,20 @@ struct BuildTransactionView: View {
.padding()
.navigationTitle("Transaction")
.onAppear {
print("[BuildTransactionView.onAppear] View appeared with:")
print(" - Address: \(address)")
print(" - Amount: \(amount) sats")
print(" - Fee: \(fee) sat/vB")
viewModel.buildTransaction(
address: address,
amount: UInt64(amount) ?? 0,
feeRate: UInt64(fee)
)
if let tx = viewModel.extractTransaction() {
print("[BuildTransactionView.onAppear] Extracted transaction, calculating fee")
viewModel.getCalulateFee(tx: tx)
} else {
print("[BuildTransactionView.onAppear] Failed to extract transaction")
}
}
.alert(isPresented: $viewModel.showingBuildTransactionViewErrorAlert) {
Expand Down