Skip to content
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.

Sign up for GitHub

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

fix: expose signer interface #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: expose signer interface #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/horizontalsystems/BitcoinCore.Swift.git", .upToNextMajor(from: "2.2.0")),
.package(url: "https://github.com/metalurgical/BitcoinCore.Swift.git", .branch("fix_expose_signer_interface")),
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need an edit.

.package(url: "https://github.com/horizontalsystems/Hodler.Swift.git", .upToNextMajor(from: "2.0.0")),
.package(url: "https://github.com/horizontalsystems/HdWalletKit.Swift.git", .upToNextMajor(from: "1.2.1")),
.package(url: "https://github.com/horizontalsystems/HsToolKit.Swift.git", .upToNextMajor(from: "2.0.5")),
Expand Down
15 changes: 8 additions & 7 deletions Sources/BitcoinKit/Classes/Core/Kit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class Kit: AbstractKit {
}
}

private init(extendedKey: HDExtendedKey?, watchAddressPublicKey: WatchAddressPublicKey?, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?) throws {
private init(extendedKey: HDExtendedKey?, watchAddressPublicKey: WatchAddressPublicKey?, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?, signer: ITransactionSigner?) throws {
let network = networkType.network
let logger = logger ?? Logger(minLogLevel: .verbose)
let databaseFilePath = try DirectoryHelper.directoryURL(for: Kit.name).appendingPathComponent(Kit.databaseFileName(walletId: walletId, networkType: networkType, purpose: purpose, syncMode: syncMode)).path
Expand Down Expand Up @@ -108,6 +108,7 @@ public class Kit: AbstractKit {
.set(purpose: purpose)
.set(extendedKey: extendedKey)
.set(watchAddressPublicKey: watchAddressPublicKey)
.set(signer: signer)
.build()

super.init(bitcoinCore: bitcoinCore, network: network)
Expand All @@ -117,7 +118,7 @@ public class Kit: AbstractKit {
}
}

public convenience init(seed: Data, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?) throws {
public convenience init(seed: Data, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?, signer: ITransactionSigner?) throws {
let version: HDExtendedKeyVersion
switch purpose {
case .bip44: version = .xprv
Expand All @@ -133,17 +134,17 @@ public class Kit: AbstractKit {
syncMode: syncMode,
networkType: networkType,
confirmationsThreshold: confirmationsThreshold,
logger: logger)
logger: logger, signer: signer)
}

public convenience init(extendedKey: HDExtendedKey, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?) throws {
public convenience init(extendedKey: HDExtendedKey, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?, signer: ITransactionSigner?) throws {
try self.init(extendedKey: extendedKey, watchAddressPublicKey: nil,
purpose: purpose,
walletId: walletId,
syncMode: syncMode,
networkType: networkType,
confirmationsThreshold: confirmationsThreshold,
logger: logger)
logger: logger, signer: signer)

let scriptConverter = ScriptConverter()
let bech32AddressConverter = SegWitBech32AddressConverter(prefix: network.bech32PrefixPattern, scriptConverter: scriptConverter)
Expand All @@ -165,7 +166,7 @@ public class Kit: AbstractKit {
}
}

public convenience init(watchAddress: String, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?) throws {
public convenience init(watchAddress: String, purpose: Purpose, walletId: String, syncMode: BitcoinCore.SyncMode = .api, networkType: NetworkType = .mainNet, confirmationsThreshold: Int = 6, logger: Logger?, signer: ITransactionSigner?) throws {
let network = networkType.network
let scriptConverter = ScriptConverter()
let bech32AddressConverter = SegWitBech32AddressConverter(prefix: network.bech32PrefixPattern, scriptConverter: scriptConverter)
Expand All @@ -183,7 +184,7 @@ public class Kit: AbstractKit {
syncMode: syncMode,
networkType: networkType,
confirmationsThreshold: confirmationsThreshold,
logger: logger)
logger: logger, signer: signer)

bitcoinCore.prepend(addressConverter: bech32AddressConverter)

Expand Down