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

Update to bdk-ffi 0.6.0

Browse Source
This commit is contained in:
Steve Myers 2022-04-22 14:50:40 -07:00
parent a9f42dd945
commit 44b724ea9f
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
android/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
View File

@ -46,7 +46,7 @@ class AndroidLibTest {
@Test @Test
fun memoryWalletNewAddress() { fun memoryWalletNewAddress() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress() val address = wallet.getNewAddress()
assertNotNull(address) assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
@ -54,14 +54,14 @@ class AndroidLibTest {
@Test(expected = BdkException.Descriptor::class) @Test(expected = BdkException.Descriptor::class)
fun invalidDescriptorExceptionIsThrown() { fun invalidDescriptorExceptionIsThrown() {
Wallet("invalid-descriptor", null, Network.TESTNET, databaseConfig, blockchainConfig) Wallet("invalid-descriptor", null, Network.TESTNET, databaseConfig)
} }
@Test @Test
fun sledWalletNewAddress() { fun sledWalletNewAddress() {
val testDataDir = getTestDataDir() val testDataDir = getTestDataDir()
val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb")) val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb"))
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress() val address = wallet.getNewAddress()
assertNotNull(address) assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
@ -72,8 +72,9 @@ class AndroidLibTest {
fun sqliteWalletSyncGetBalance() { fun sqliteWalletSyncGetBalance() {
val testDataDir = getTestDataDir()+"/bdk-wallet.sqlite" val testDataDir = getTestDataDir()+"/bdk-wallet.sqlite"
val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir)) val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir))
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
wallet.sync(LogProgress(), null) val blockchain = Blockchain(blockchainConfig);
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance() val balance = wallet.getBalance()
assertTrue(balance > 0u) assertTrue(balance > 0u)
cleanupTestDataDir(testDataDir) cleanupTestDataDir(testDataDir)
@ -90,13 +91,13 @@ class AndroidLibTest {
100u 100u
) )
) )
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchain) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
assertNotNull(wallet) assertNotNull(wallet)
val network = wallet.getNetwork() val network = wallet.getNetwork()
assertEquals(network, Network.TESTNET) assertEquals(network, Network.TESTNET)
} }
class LogProgress : BdkProgress { class LogProgress : Progress {
val log: Logger = LoggerFactory.getLogger(AndroidLibTest::class.java) val log: Logger = LoggerFactory.getLogger(AndroidLibTest::class.java)
override fun update(progress: Float, message: String?) { override fun update(progress: Float, message: String?) {
@ -106,8 +107,9 @@ class AndroidLibTest {
@Test @Test
fun onlineWalletSyncGetBalance() { fun onlineWalletSyncGetBalance() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
wallet.sync(LogProgress(), null) val blockchain = Blockchain(blockchainConfig);
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance() val balance = wallet.getBalance()
assertTrue(balance > 0u) assertTrue(balance > 0u)
} }

2
bdk-ffi

@ -1 +1 @@
Subproject commit 8a556d0ba0d5cd499b39dd65ca073229a45ffce2 Subproject commit 30e54ac067f68e8c22d652837b4d5901c12e3384

30
jvm/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
View File

@ -40,7 +40,7 @@ class JvmLibTest {
@Test @Test
fun memoryWalletNewAddress() { fun memoryWalletNewAddress() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress() val address = wallet.getNewAddress()
assertNotNull(address) assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
@ -48,14 +48,14 @@ class JvmLibTest {
@Test(expected = BdkException.Descriptor::class) @Test(expected = BdkException.Descriptor::class)
fun invalidDescriptorExceptionIsThrown() { fun invalidDescriptorExceptionIsThrown() {
Wallet("invalid-descriptor", null, Network.TESTNET, databaseConfig, blockchainConfig) Wallet("invalid-descriptor", null, Network.TESTNET, databaseConfig)
} }
@Test @Test
fun sledWalletNewAddress() { fun sledWalletNewAddress() {
val testDataDir = getTestDataDir() val testDataDir = getTestDataDir()
val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb")) val databaseConfig = DatabaseConfig.Sled(SledDbConfiguration(testDataDir, "testdb"))
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val address = wallet.getNewAddress() val address = wallet.getNewAddress()
assertNotNull(address) assertNotNull(address)
assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address) assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", address)
@ -66,8 +66,9 @@ class JvmLibTest {
fun sqliteWalletSyncGetBalance() { fun sqliteWalletSyncGetBalance() {
val testDataDir = getTestDataDir() + "/bdk-wallet.sqlite" val testDataDir = getTestDataDir() + "/bdk-wallet.sqlite"
val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir)) val databaseConfig = DatabaseConfig.Sqlite(SqliteDbConfiguration(testDataDir))
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
wallet.sync(LogProgress(), null) val blockchain = Blockchain(blockchainConfig);
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance() val balance = wallet.getBalance()
assertTrue(balance > 0u) assertTrue(balance > 0u)
cleanupTestDataDir(testDataDir) cleanupTestDataDir(testDataDir)
@ -85,13 +86,13 @@ class JvmLibTest {
100u 100u
) )
) )
val wallet = Wallet(descriptor, null, Network.TESTNET, database, blockchain) val wallet = Wallet(descriptor, null, Network.TESTNET, database)
assertNotNull(wallet) assertNotNull(wallet)
val network = wallet.getNetwork() val network = wallet.getNetwork()
assertEquals(network, Network.TESTNET) assertEquals(network, Network.TESTNET)
} }
class LogProgress : BdkProgress { class LogProgress : Progress {
val log: Logger = LoggerFactory.getLogger(JvmLibTest::class.java) val log: Logger = LoggerFactory.getLogger(JvmLibTest::class.java)
override fun update(progress: Float, message: String?) { override fun update(progress: Float, message: String?) {
@ -101,8 +102,9 @@ class JvmLibTest {
@Test @Test
fun onlineWalletSyncGetBalance() { fun onlineWalletSyncGetBalance() {
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
wallet.sync(LogProgress(), null) val blockchain = Blockchain(blockchainConfig);
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance() val balance = wallet.getBalance()
assertTrue(balance > 0u) assertTrue(balance > 0u)
} }
@ -121,8 +123,9 @@ class JvmLibTest {
fun walletTxBuilderBroadcast() { fun walletTxBuilderBroadcast() {
val descriptor = val descriptor =
"wpkh([c1ed86ca/84'/1'/0'/0]tprv8hTkxK6QT7fCQx1wbuHuwbNh4STr2Ruz8RwEX7ymk6qnpixtbRG4T99mHxJwKTHPuKQ61heWrrpxZ8jpHj4sbisrQhDxnyx3HoQEZebtraN/*)" "wpkh([c1ed86ca/84'/1'/0'/0]tprv8hTkxK6QT7fCQx1wbuHuwbNh4STr2Ruz8RwEX7ymk6qnpixtbRG4T99mHxJwKTHPuKQ61heWrrpxZ8jpHj4sbisrQhDxnyx3HoQEZebtraN/*)"
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
wallet.sync(LogProgress(), null) val blockchain = Blockchain(blockchainConfig);
wallet.sync(blockchain, LogProgress())
val balance = wallet.getBalance() val balance = wallet.getBalance()
if (balance > 2000u) { if (balance > 2000u) {
println("balance $balance") println("balance $balance")
@ -131,7 +134,8 @@ class JvmLibTest {
val txBuilder = TxBuilder().addRecipient(faucetAddress, 1000u).feeRate(1.2f) val txBuilder = TxBuilder().addRecipient(faucetAddress, 1000u).feeRate(1.2f)
val psbt = txBuilder.build(wallet) val psbt = txBuilder.build(wallet)
wallet.sign(psbt) wallet.sign(psbt)
val txid = wallet.broadcast(psbt) blockchain.broadcast(psbt)
val txid = psbt.txid()
println("https://mempool.space/testnet/tx/$txid") println("https://mempool.space/testnet/tx/$txid")
assertNotNull(txid) assertNotNull(txid)
} else { } else {
@ -144,7 +148,7 @@ class JvmLibTest {
fun walletTxBuilderInvalidAddress() { fun walletTxBuilderInvalidAddress() {
val descriptor = val descriptor =
"wpkh([c1ed86ca/84'/1'/0'/0]tprv8hTkxK6QT7fCQx1wbuHuwbNh4STr2Ruz8RwEX7ymk6qnpixtbRG4T99mHxJwKTHPuKQ61heWrrpxZ8jpHj4sbisrQhDxnyx3HoQEZebtraN/*)" "wpkh([c1ed86ca/84'/1'/0'/0]tprv8hTkxK6QT7fCQx1wbuHuwbNh4STr2Ruz8RwEX7ymk6qnpixtbRG4T99mHxJwKTHPuKQ61heWrrpxZ8jpHj4sbisrQhDxnyx3HoQEZebtraN/*)"
val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig, blockchainConfig) val wallet = Wallet(descriptor, null, Network.TESTNET, databaseConfig)
val txBuilder = TxBuilder().addRecipient("INVALID_ADDRESS", 1000u).feeRate(1.2f) val txBuilder = TxBuilder().addRecipient("INVALID_ADDRESS", 1000u).feeRate(1.2f)
txBuilder.build(wallet) txBuilder.build(wallet)
} }