frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: rename esplora scan to full_scan

Browse Source
This commit is contained in:
thunderbiscuit 2024-01-11 07:13:04 -05:00
parent 54beb23f13
commit 7319aea562
No known key found for this signature in database
GPG Key ID: 88253696EB836462
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt
View File

@ -12,7 +12,7 @@ class LiveTxBuilderTest {
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET) val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET) val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
val esploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient = EsploraClient("https://mempool.space/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")
@ -34,7 +34,7 @@ class LiveTxBuilderTest {
val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.TESTNET) val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.TESTNET)
val wallet = Wallet.newNoPersist(externalDescriptor, changeDescriptor, Network.TESTNET) val wallet = Wallet.newNoPersist(externalDescriptor, changeDescriptor, Network.TESTNET)
val esploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient = EsploraClient("https://mempool.space/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")

4
bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt
View File

@ -12,7 +12,7 @@ class LiveWalletTest {
val descriptor: Descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET) val descriptor: Descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET) val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")
val balance: Balance = wallet.getBalance() val balance: Balance = wallet.getBalance()
@ -35,7 +35,7 @@ class LiveWalletTest {
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET) val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET) val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
val esploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient = EsploraClient("https://mempool.space/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")

2
bdk-ffi/Cargo.toml
View File

@ -19,6 +19,7 @@ default = ["uniffi/cli"]
[dependencies] [dependencies]
bdk = { version = "1.0.0-alpha.3", features = ["all-keys", "keys-bip39"] } bdk = { version = "1.0.0-alpha.3", features = ["all-keys", "keys-bip39"] }
bdk_esplora = { version = "0.5.0", default-features = false, features = ["std", "blocking"] }
# TODO 22: The bdk_esplora crate uses esplora_client which uses reqwest for async. By default it uses the system # TODO 22: The bdk_esplora crate uses esplora_client which uses reqwest for async. By default it uses the system
# openssl library, which is creating problems for cross-compilation. I'd rather use rustls, but it's hidden # openssl library, which is creating problems for cross-compilation. I'd rather use rustls, but it's hidden
@ -28,7 +29,6 @@ bdk = { version = "1.0.0-alpha.3", features = ["all-keys", "keys-bip39"] }
# bdk = { git = "https://github.com/thunderbiscuit/bdk.git", branch = "test-rust-tls", version = "1.0.0-alpha.2", features = ["all-keys", "keys-bip39"] } # bdk = { git = "https://github.com/thunderbiscuit/bdk.git", branch = "test-rust-tls", version = "1.0.0-alpha.2", features = ["all-keys", "keys-bip39"] }
# bdk_esplora = { git = "https://github.com/thunderbiscuit/bdk.git", branch = "test-rust-tls", version = "0.4.0", package = "bdk_esplora", default-features = false, features = ["std", "blocking", "async-https-rustls"] } # bdk_esplora = { git = "https://github.com/thunderbiscuit/bdk.git", branch = "test-rust-tls", version = "0.4.0", package = "bdk_esplora", default-features = false, features = ["std", "blocking", "async-https-rustls"] }
bdk_esplora = { version = "0.5.0", default-features = false, features = ["std", "blocking"] }
uniffi = { version = "=0.25.1" } uniffi = { version = "=0.25.1" }
[build-dependencies] [build-dependencies]

2
bdk-ffi/src/bdk.udl
View File

@ -255,7 +255,7 @@ interface EsploraClient {
constructor(string url); constructor(string url);
[Throws=Alpha3Error] [Throws=Alpha3Error]
Update scan(Wallet wallet, u64 stop_gap, u64 parallel_requests); Update full_scan(Wallet wallet, u64 stop_gap, u64 parallel_requests);
[Throws=Alpha3Error] [Throws=Alpha3Error]
void broadcast([ByRef] Transaction transaction); void broadcast([ByRef] Transaction transaction);

2
bdk-ffi/src/esplora.rs
View File

@ -19,7 +19,7 @@ impl EsploraClient {
// This is a temporary solution for scanning. The long-term solution involves not passing // This is a temporary solution for scanning. The long-term solution involves not passing
// the wallet to the client at all. // the wallet to the client at all.
pub fn scan( pub fn full_scan(
&self, &self,
wallet: Arc<Wallet>, wallet: Arc<Wallet>,
stop_gap: u64, stop_gap: u64,

4
bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt
View File

@ -9,7 +9,7 @@ class LiveTxBuilderTest {
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET) val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET) val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
val esploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient = EsploraClient("https://mempool.space/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")
@ -32,7 +32,7 @@ class LiveTxBuilderTest {
val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.TESTNET) val changeDescriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/1/*)", Network.TESTNET)
val wallet = Wallet.newNoPersist(externalDescriptor, changeDescriptor, Network.TESTNET) val wallet = Wallet.newNoPersist(externalDescriptor, changeDescriptor, Network.TESTNET)
val esploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient = EsploraClient("https://mempool.space/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")

4
bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt
View File

@ -10,7 +10,7 @@ class LiveWalletTest {
val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET) val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api")
// val esploraClient = EsploraClient("https://blockstream.info/testnet/api") // val esploraClient = EsploraClient("https://blockstream.info/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")
@ -31,7 +31,7 @@ class LiveWalletTest {
val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET) val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET) val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
val esploraClient = EsploraClient("https://mempool.space/testnet/api") val esploraClient = EsploraClient("https://mempool.space/testnet/api")
val update = esploraClient.scan(wallet, 10uL, 1uL) val update = esploraClient.fullScan(wallet, 10uL, 1uL)
wallet.applyUpdate(update) wallet.applyUpdate(update)
println("Balance: ${wallet.getBalance().total}") println("Balance: ${wallet.getBalance().total}")

4
bdk-python/tests/test_live_tx_builder.py
View File

@ -14,7 +14,7 @@ class TestLiveTxBuilder(unittest.TestCase):
bdk.Network.TESTNET bdk.Network.TESTNET
) )
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api") esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
update = esploraClient.scan( update = esploraClient.full_scan(
wallet = wallet, wallet = wallet,
stop_gap = 10, stop_gap = 10,
parallel_requests = 1 parallel_requests = 1
@ -48,7 +48,7 @@ class TestLiveTxBuilder(unittest.TestCase):
bdk.Network.TESTNET bdk.Network.TESTNET
) )
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api") esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
update = esploraClient.scan( update = esploraClient.full_scan(
wallet = wallet, wallet = wallet,
stop_gap = 10, stop_gap = 10,
parallel_requests = 1 parallel_requests = 1

4
bdk-python/tests/test_live_wallet.py
View File

@ -14,7 +14,7 @@ class TestLiveWallet(unittest.TestCase):
bdk.Network.TESTNET bdk.Network.TESTNET
) )
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api") esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
update = esploraClient.scan( update = esploraClient.full_scan(
wallet = wallet, wallet = wallet,
stop_gap = 10, stop_gap = 10,
parallel_requests = 1 parallel_requests = 1
@ -43,7 +43,7 @@ class TestLiveWallet(unittest.TestCase):
bdk.Network.TESTNET bdk.Network.TESTNET
) )
esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api") esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
update = esploraClient.scan( update = esploraClient.full_scan(
wallet = wallet, wallet = wallet,
stop_gap = 10, stop_gap = 10,
parallel_requests = 1 parallel_requests = 1

4
bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift
View File

@ -13,7 +13,7 @@ final class LiveTxBuilderTests: XCTestCase {
network: .testnet network: .testnet
) )
let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api") let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
let update = try esploraClient.scan( let update = try esploraClient.fullScan(
wallet: wallet, wallet: wallet,
stopGap: 10, stopGap: 10,
parallelRequests: 1 parallelRequests: 1
@ -47,7 +47,7 @@ final class LiveTxBuilderTests: XCTestCase {
network: .testnet network: .testnet
) )
let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api") let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
let update = try esploraClient.scan( let update = try esploraClient.fullScan(
wallet: wallet, wallet: wallet,
stopGap: 10, stopGap: 10,
parallelRequests: 1 parallelRequests: 1

4
bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift
View File

@ -13,7 +13,7 @@ final class LiveWalletTests: XCTestCase {
network: .testnet network: .testnet
) )
let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api") let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
let update = try esploraClient.scan( let update = try esploraClient.fullScan(
wallet: wallet, wallet: wallet,
stopGap: 10, stopGap: 10,
parallelRequests: 1 parallelRequests: 1
@ -43,7 +43,7 @@ final class LiveWalletTests: XCTestCase {
network: .testnet network: .testnet
) )
let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api") let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
let update = try esploraClient.scan( let update = try esploraClient.fullScan(
wallet: wallet, wallet: wallet,
stopGap: 10, stopGap: 10,
parallelRequests: 1 parallelRequests: 1