Upgrade bdk dependency to 0.11
This commit is contained in:
Steve Myers
parent
e5a74344f3
commit
c11e17b5e2
3
.gitignore
vendored
3
.gitignore
vendored
@ -5,4 +5,5 @@ Cargo.lock
|
||||
.gradle
|
||||
wallet_db
|
||||
bdk_ffi_test
|
||||
local.properties
|
||||
local.properties
|
||||
*.log
|
||||
@ -9,7 +9,7 @@ edition = "2018"
|
||||
crate-type = ["cdylib"]
|
||||
|
||||
[dependencies]
|
||||
bdk = { version = "^0.7", features = ["all-keys"] }
|
||||
bdk = { version = "^0.11", features = ["all-keys"] }
|
||||
safer-ffi = { version = "0.0.6", features = ["proc_macros"]}
|
||||
|
||||
[features]
|
||||
|
||||
12
README.md
12
README.md
@ -1,4 +1,16 @@
|
||||
Setup build environment
|
||||
|
||||
1. Add Android rust targets
|
||||
|
||||
```sh
|
||||
rustup target add x86_64-apple-darwin x86_64-unknown-linux-gnu x86_64-linux-android aarch64-linux-android armv7-linux-androideabi i686-linux-android
|
||||
```
|
||||
|
||||
2. Set ANDROID_NDK_HOME
|
||||
|
||||
```sh
|
||||
export ANDROID_NDK_HOME=/home/<user>/Android/Sdk/ndk/<NDK version, ie. 21.4.7075529>
|
||||
```
|
||||
|
||||
Adding new structs and functions
|
||||
|
||||
|
||||
BIN
bdk-kotlin/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
bdk-kotlin/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1,6 +1,5 @@
|
||||
#Thu Jun 10 21:43:37 PDT 2021
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
185
bdk-kotlin/gradlew
vendored
Executable file
185
bdk-kotlin/gradlew
vendored
Executable file
@ -0,0 +1,185 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
89
bdk-kotlin/gradlew.bat
vendored
Normal file
89
bdk-kotlin/gradlew.bat
vendored
Normal file
@ -0,0 +1,89 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@ -61,12 +61,14 @@ interface LibJna : Library {
|
||||
// char const * url,
|
||||
// char const * socks5,
|
||||
// int16_t retry,
|
||||
// int16_t timeout);
|
||||
// int16_t timeout,
|
||||
// size_t stop_gap);
|
||||
fun new_electrum_config(
|
||||
url: String,
|
||||
socks5: String?,
|
||||
retry: Short,
|
||||
timeout: Short
|
||||
timeout: Short,
|
||||
stop_gap: Long,
|
||||
): BlockchainConfig_t
|
||||
|
||||
// void free_blockchain_config (
|
||||
@ -108,11 +110,13 @@ interface LibJna : Library {
|
||||
// FfiResult_OpaqueWallet_ptr_t new_wallet_result (
|
||||
// char const * descriptor,
|
||||
// char const * change_descriptor,
|
||||
// char const * network,
|
||||
// BlockchainConfig_t const * blockchain_config,
|
||||
// DatabaseConfig_t const * database_config);
|
||||
fun new_wallet_result(
|
||||
descriptor: String,
|
||||
changeDescriptor: String?,
|
||||
network: String,
|
||||
blockchainConfig: BlockchainConfig_t,
|
||||
databaseConfig: DatabaseConfig_t,
|
||||
): FfiResult_OpaqueWallet_ptr_t.ByValue
|
||||
@ -288,21 +292,33 @@ interface LibJna : Library {
|
||||
// void free_database_config (
|
||||
// DatabaseConfig_t * database_config);
|
||||
fun free_database_config(database_config: DatabaseConfig_t)
|
||||
|
||||
|
||||
// typedef struct {
|
||||
//
|
||||
// char * txid;
|
||||
//
|
||||
// uint32_t height;
|
||||
// uint64_t timestamp;
|
||||
//
|
||||
// } ConfirmationTime_t;
|
||||
open class ConfirmationTime_t : Structure() {
|
||||
|
||||
class ByValue : ConfirmationTime_t(), Structure.ByValue
|
||||
class ByReference : ConfirmationTime_t(), Structure.ByReference
|
||||
|
||||
@JvmField
|
||||
var height: Int? = null
|
||||
|
||||
@JvmField
|
||||
var timestamp: Long? = null
|
||||
|
||||
override fun getFieldOrder() = listOf("height", "timestamp")
|
||||
}
|
||||
|
||||
// typedef struct {
|
||||
// char * txid;
|
||||
// uint64_t received;
|
||||
//
|
||||
// uint64_t sent;
|
||||
//
|
||||
// uint64_t fees;
|
||||
//
|
||||
// int32_t height;
|
||||
//
|
||||
// int64_t fee;
|
||||
// bool is_confirmed;
|
||||
// ConfirmationTime_t confirmation_time;
|
||||
// bool verified;
|
||||
// } TransactionDetails_t;
|
||||
open class TransactionDetails_t : Structure() {
|
||||
|
||||
@ -312,9 +328,6 @@ interface LibJna : Library {
|
||||
@JvmField
|
||||
var txid: String? = null
|
||||
|
||||
@JvmField
|
||||
var timestamp: Long? = null
|
||||
|
||||
@JvmField
|
||||
var received: Long? = null
|
||||
|
||||
@ -322,12 +335,18 @@ interface LibJna : Library {
|
||||
var sent: Long? = null
|
||||
|
||||
@JvmField
|
||||
var fees: Long? = null
|
||||
var fee: Long? = null
|
||||
|
||||
@JvmField
|
||||
var is_confirmed: Boolean? = null
|
||||
|
||||
@JvmField
|
||||
var height: Int? = null
|
||||
var confirmation_time: ConfirmationTime_t? = null
|
||||
|
||||
@JvmField
|
||||
var verified: Boolean? = null
|
||||
|
||||
override fun getFieldOrder() = listOf("txid", "timestamp", "received", "sent", "fees", "height")
|
||||
override fun getFieldOrder() = listOf("txid", "received", "sent", "fee", "is_confirmed", "confirmation_time", "verified")
|
||||
}
|
||||
|
||||
// typedef struct {
|
||||
|
||||
@ -17,9 +17,10 @@ class ElectrumConfig(
|
||||
url: String,
|
||||
socks5: String?,
|
||||
retry: Short,
|
||||
timeout: Short
|
||||
timeout: Short,
|
||||
stopGap: Long,
|
||||
) : BlockchainConfig() {
|
||||
|
||||
private val log: Logger = LoggerFactory.getLogger(ElectrumConfig::class.java)
|
||||
override val blockchainConfigT = libJna.new_electrum_config(url, socks5, retry, timeout)
|
||||
override val blockchainConfigT = libJna.new_electrum_config(url, socks5, retry, timeout, stopGap)
|
||||
}
|
||||
@ -10,9 +10,17 @@ import org.bitcoindevkit.bdk.types.VoidResult
|
||||
import org.slf4j.Logger
|
||||
import org.slf4j.LoggerFactory
|
||||
|
||||
enum class Network {
|
||||
Bitcoin,
|
||||
Testnet,
|
||||
Signet,
|
||||
Regtest,
|
||||
}
|
||||
|
||||
class Wallet constructor(
|
||||
descriptor: String,
|
||||
changeDescriptor: String?,
|
||||
network: Network,
|
||||
blockchainConfig: BlockchainConfig,
|
||||
databaseConfig: DatabaseConfig,
|
||||
) : LibBase() {
|
||||
@ -23,6 +31,7 @@ class Wallet constructor(
|
||||
libJna.new_wallet_result(
|
||||
descriptor,
|
||||
changeDescriptor,
|
||||
network.toString().lowercase(),
|
||||
blockchainConfig.blockchainConfigT,
|
||||
databaseConfig.databaseConfigT
|
||||
)
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package org.bitcoindevkit.bdk
|
||||
|
||||
import org.bitcoindevkit.bdk.wallet.Network
|
||||
import org.bitcoindevkit.bdk.wallet.Wallet
|
||||
import org.junit.Assert.*
|
||||
import org.junit.Test
|
||||
@ -19,8 +20,9 @@ abstract class LibTest : LibBase() {
|
||||
"wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)"
|
||||
val change =
|
||||
"wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)"
|
||||
|
||||
val blockchainConfig = ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5, 30)
|
||||
val network = Network.Testnet
|
||||
|
||||
val blockchainConfig = ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5, 30, 100)
|
||||
val databaseConfig = MemoryConfig()
|
||||
|
||||
abstract fun getTestDataDir(): String
|
||||
@ -32,7 +34,7 @@ abstract class LibTest : LibBase() {
|
||||
@Test
|
||||
fun walletResultError() {
|
||||
val jnaException = assertThrows(FfiException::class.java) {
|
||||
Wallet("bad", "bad", blockchainConfig, databaseConfig)
|
||||
Wallet("bad", "bad", network, blockchainConfig, databaseConfig)
|
||||
}
|
||||
assertEquals(jnaException.err, FfiError.Descriptor)
|
||||
}
|
||||
@ -58,18 +60,18 @@ abstract class LibTest : LibBase() {
|
||||
|
||||
@Test
|
||||
fun walletSync() {
|
||||
val blockchainConfig = ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5, 30)
|
||||
val blockchainConfig = ElectrumConfig("ssl://electrum.blockstream.info:60002", null, 5, 30, 100)
|
||||
val testDataDir = getTestDataDir()
|
||||
// log.debug("testDataDir = $testDataDir")
|
||||
val databaseConfig = SledConfig(testDataDir, "steve-test")
|
||||
val wallet = Wallet(desc, change, blockchainConfig, databaseConfig)
|
||||
val wallet = Wallet(desc, change, network, blockchainConfig, databaseConfig)
|
||||
wallet.sync()
|
||||
cleanupTestDataDir()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun walletNewAddress() {
|
||||
val wallet = Wallet(desc, change, blockchainConfig, databaseConfig)
|
||||
val wallet = Wallet(desc, change, network, blockchainConfig, databaseConfig)
|
||||
val address = wallet.getAddress()
|
||||
assertNotNull(address)
|
||||
// log.debug("address created from kotlin: $address")
|
||||
@ -78,7 +80,7 @@ abstract class LibTest : LibBase() {
|
||||
|
||||
@Test
|
||||
fun walletUnspent() {
|
||||
val wallet = Wallet(desc, change, blockchainConfig, databaseConfig)
|
||||
val wallet = Wallet(desc, change, network, blockchainConfig, databaseConfig)
|
||||
wallet.sync()
|
||||
val unspent = wallet.listUnspent()
|
||||
assertTrue(unspent.isNotEmpty())
|
||||
@ -99,7 +101,7 @@ abstract class LibTest : LibBase() {
|
||||
|
||||
@Test
|
||||
fun walletBalance() {
|
||||
val wallet = Wallet(desc, change, blockchainConfig, databaseConfig)
|
||||
val wallet = Wallet(desc, change, network, blockchainConfig, databaseConfig)
|
||||
wallet.sync()
|
||||
val balance = wallet.balance()
|
||||
//log.debug("balance from kotlin: $balance")
|
||||
@ -108,7 +110,7 @@ abstract class LibTest : LibBase() {
|
||||
|
||||
@Test
|
||||
fun walletTxDetails() {
|
||||
val wallet = Wallet(desc, change, blockchainConfig, databaseConfig)
|
||||
val wallet = Wallet(desc, change, network, blockchainConfig, databaseConfig)
|
||||
wallet.sync()
|
||||
val txDetails = wallet.listTransactionDetails()
|
||||
assertTrue(txDetails.isNotEmpty())
|
||||
@ -116,15 +118,18 @@ abstract class LibTest : LibBase() {
|
||||
txDetails.iterator().forEach {
|
||||
//log.debug("txDetails.txid: ${it.txid}")
|
||||
assertNotNull(it.txid)
|
||||
//log.debug("txDetails.timestamp: ${it.timestamp}")
|
||||
assertTrue(it.timestamp!! > 0)
|
||||
//log.debug("txDetails.received: ${it.received}")
|
||||
//log.debug("txDetails.sent: ${it.sent}")
|
||||
assertTrue(it.received!! > 0 || it.sent!! > 0)
|
||||
//log.debug("txDetails.fees: ${it.fees}")
|
||||
assertTrue(it.fees!! > 0)
|
||||
//log.debug("txDetails.fees: ${it.height}")
|
||||
assertTrue(it.height!! >= -1)
|
||||
//log.debug("txDetails.fee: ${it.fee}")
|
||||
assertTrue(it.fee!! > 0)
|
||||
//log.debug("txDetails.is_confirmed: ${it.is_confirmed}")
|
||||
assertTrue(it.is_confirmed!!)
|
||||
assertNotNull(it.confirmation_time!!)
|
||||
//log.debug("txDetails.confirmation_time.timestamp: ${it.confirmation_time!!.timestamp}")
|
||||
assertTrue(it.confirmation_time!!.timestamp!! > 0)
|
||||
//log.debug("txDetails.confirmation_time.height: ${it.confirmation_time!!.height}")
|
||||
assertTrue(it.confirmation_time!!.height!! > 0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
162
build.sh
162
build.sh
@ -1,64 +1,114 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail -o xtrace
|
||||
set -eo pipefail
|
||||
|
||||
# rust
|
||||
cargo fmt
|
||||
cargo build
|
||||
cargo test --features c-headers -- generate_headers
|
||||
# functions
|
||||
|
||||
# cc
|
||||
export LD_LIBRARY_PATH=`pwd`/target/debug
|
||||
cc cc/bdk_ffi_test.c -o cc/bdk_ffi_test -L target/debug -l bdk_ffi -l pthread -l dl -l m
|
||||
## help
|
||||
help()
|
||||
{
|
||||
# Display Help
|
||||
echo "Build bdk-ffi and related libraries."
|
||||
echo
|
||||
echo "Syntax: build [-a|h|k]"
|
||||
echo "options:"
|
||||
echo "-a Android aar."
|
||||
echo "-h Print this Help."
|
||||
echo "-k JVM jar."
|
||||
echo
|
||||
}
|
||||
|
||||
## rust
|
||||
build_rust() {
|
||||
echo "Build Rust library and C headers"
|
||||
cargo fmt
|
||||
cargo build
|
||||
cargo test --features c-headers -- generate_headers
|
||||
}
|
||||
|
||||
## cc
|
||||
build_cc() {
|
||||
echo "Build C test library"
|
||||
export LD_LIBRARY_PATH=`pwd`/target/debug
|
||||
cc cc/bdk_ffi_test.c -o cc/bdk_ffi_test -L target/debug -l bdk_ffi -l pthread -l dl -l m
|
||||
}
|
||||
|
||||
## copy to bdk-kotlin
|
||||
copy_lib_kotlin() {
|
||||
echo -n "Copy "
|
||||
case $OS in
|
||||
"Darwin")
|
||||
echo -n "darwin "
|
||||
mkdir -p bdk-kotlin/jvm/src/main/resources/darwin-x86-64
|
||||
cp target/debug/libbdk_ffi.dylib bdk-kotlin/jvm/src/main/resources/darwin-x86-64
|
||||
;;
|
||||
"Linux")
|
||||
echo -n "linux "
|
||||
mkdir -p bdk-kotlin/jvm/src/main/resources/linux-x86-64
|
||||
cp target/debug/libbdk_ffi.so bdk-kotlin/jvm/src/main/resources/linux-x86-64
|
||||
;;
|
||||
esac
|
||||
echo "libs to kotlin sub-project"
|
||||
}
|
||||
|
||||
## bdk-kotlin jar
|
||||
build_kotlin() {
|
||||
(cd bdk-kotlin && ./gradlew :jvm:build && ./gradlew :jvm:publishToMavenLocal)
|
||||
}
|
||||
|
||||
## rust android
|
||||
build_android() {
|
||||
# If ANDROID_NDK_HOME is not set then set it to github actions default
|
||||
[ -z "$ANDROID_NDK_HOME" ] && export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
|
||||
|
||||
# Update this line accordingly if you are not building *from* darwin-x86_64 or linux-x86_64
|
||||
export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/`uname | tr '[:upper:]' '[:lower:]'`-x86_64/bin
|
||||
|
||||
# Required for 'ring' dependency to cross-compile to Android platform, must be at least 21
|
||||
export CFLAGS="-D__ANDROID_API__=21"
|
||||
|
||||
# IMPORTANT: make sure every target is not a substring of a different one. We check for them with grep later on
|
||||
BUILD_TARGETS="${BUILD_TARGETS:-aarch64,armv7,x86_64,i686}"
|
||||
|
||||
mkdir -p bdk-kotlin/android/src/main/jniLibs/ bdk-kotlin/android/src/main/jniLibs/arm64-v8a bdk-kotlin/android/src/main/jniLibs/x86_64 bdk-kotlin/android/src/main/jniLibs/armeabi-v7a bdk-kotlin/android/src/main/jniLibs/x86
|
||||
|
||||
if echo $BUILD_TARGETS | grep "aarch64"; then
|
||||
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android21-clang" CC="aarch64-linux-android21-clang" cargo build --target=aarch64-linux-android
|
||||
cp target/aarch64-linux-android/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/arm64-v8a
|
||||
fi
|
||||
if echo $BUILD_TARGETS | grep "x86_64"; then
|
||||
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android21-clang" CC="x86_64-linux-android21-clang" cargo build --target=x86_64-linux-android
|
||||
cp target/x86_64-linux-android/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/x86_64
|
||||
fi
|
||||
if echo $BUILD_TARGETS | grep "armv7"; then
|
||||
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="armv7a-linux-androideabi21-clang" CC="armv7a-linux-androideabi21-clang" cargo build --target=armv7-linux-androideabi
|
||||
cp target/armv7-linux-androideabi/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/armeabi-v7a
|
||||
fi
|
||||
if echo $BUILD_TARGETS | grep "i686"; then
|
||||
CARGO_TARGET_I686_LINUX_ANDROID_LINKER="i686-linux-android21-clang" CC="i686-linux-android21-clang" cargo build --target=i686-linux-android
|
||||
cp target/i686-linux-android/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/x86
|
||||
fi
|
||||
|
||||
# bdk-kotlin aar
|
||||
(cd bdk-kotlin && ./gradlew :android:build && ./gradlew :android:publishToMavenLocal)
|
||||
}
|
||||
|
||||
# bdk-kotlin jar
|
||||
OS=$(uname)
|
||||
case $OS in
|
||||
"Darwin")
|
||||
echo "Darwin build system"
|
||||
mkdir -p bdk-kotlin/jvm/src/main/resources/darwin-x86-64
|
||||
cp target/debug/libbdk_ffi.dylib bdk-kotlin/jvm/src/main/resources/darwin-x86-64
|
||||
;;
|
||||
"Linux")
|
||||
echo "Linux build system"
|
||||
mkdir -p bdk-kotlin/jvm/src/main/resources/linux-x86-64
|
||||
cp target/debug/libbdk_ffi.so bdk-kotlin/jvm/src/main/resources/linux-x86-64
|
||||
;;
|
||||
esac
|
||||
|
||||
(cd bdk-kotlin && gradle :jvm:build && gradle :jvm:publishToMavenLocal)
|
||||
if [ $1 = "-h" ]
|
||||
then
|
||||
help
|
||||
else
|
||||
build_rust
|
||||
build_cc
|
||||
copy_lib_kotlin
|
||||
|
||||
# rust android
|
||||
|
||||
# If ANDROID_NDK_HOME is not set then set it to github actions default
|
||||
[ -z "$ANDROID_NDK_HOME" ] && export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
|
||||
|
||||
# Update this line accordingly if you are not building *from* darwin-x86_64 or linux-x86_64
|
||||
export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/`uname | tr '[:upper:]' '[:lower:]'`-x86_64/bin
|
||||
|
||||
# Required for 'ring' dependency to cross-compile to Android platform, must be at least 21
|
||||
export CFLAGS="-D__ANDROID_API__=21"
|
||||
|
||||
# IMPORTANT: make sure every target is not a substring of a different one. We check for them with grep later on
|
||||
BUILD_TARGETS="${BUILD_TARGETS:-aarch64,armv7,x86_64,i686}"
|
||||
|
||||
mkdir -p bdk-kotlin/android/src/main/jniLibs/ bdk-kotlin/android/src/main/jniLibs/arm64-v8a bdk-kotlin/android/src/main/jniLibs/x86_64 bdk-kotlin/android/src/main/jniLibs/armeabi-v7a bdk-kotlin/android/src/main/jniLibs/x86
|
||||
|
||||
if echo $BUILD_TARGETS | grep "aarch64"; then
|
||||
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="aarch64-linux-android21-clang" CC="aarch64-linux-android21-clang" cargo build --target=aarch64-linux-android
|
||||
cp target/aarch64-linux-android/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/arm64-v8a
|
||||
while [ -n "$1" ]; do # while loop starts
|
||||
case "$1" in
|
||||
-k) build_kotlin ;;
|
||||
-a) build_android ;;
|
||||
-h) help ;;
|
||||
*) echo "Option $1 not recognized" ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
fi
|
||||
if echo $BUILD_TARGETS | grep "x86_64"; then
|
||||
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="x86_64-linux-android21-clang" CC="x86_64-linux-android21-clang" cargo build --target=x86_64-linux-android
|
||||
cp target/x86_64-linux-android/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/x86_64
|
||||
fi
|
||||
if echo $BUILD_TARGETS | grep "armv7"; then
|
||||
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="armv7a-linux-androideabi21-clang" CC="armv7a-linux-androideabi21-clang" cargo build --target=armv7-linux-androideabi
|
||||
cp target/armv7-linux-androideabi/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/armeabi-v7a
|
||||
fi
|
||||
if echo $BUILD_TARGETS | grep "i686"; then
|
||||
CARGO_TARGET_I686_LINUX_ANDROID_LINKER="i686-linux-android21-clang" CC="i686-linux-android21-clang" cargo build --target=i686-linux-android
|
||||
cp target/i686-linux-android/debug/libbdk_ffi.so bdk-kotlin/android/src/main/jniLibs/x86
|
||||
fi
|
||||
|
||||
# bdk-kotlin aar
|
||||
(cd bdk-kotlin && gradle :android:build && gradle :android:publishToMavenLocal)
|
||||
|
||||
35
cc/bdk_ffi.h
35
cc/bdk_ffi.h
@ -40,10 +40,6 @@ typedef uint16_t FfiError_t; enum
|
||||
/** . */
|
||||
FFI_ERROR_SCRIPT_DOESNT_HAVE_ADDRESS_FORM,
|
||||
/** . */
|
||||
FFI_ERROR_SINGLE_RECIPIENT_MULTIPLE_OUTPUTS,
|
||||
/** . */
|
||||
FFI_ERROR_SINGLE_RECIPIENT_NO_INPUTS,
|
||||
/** . */
|
||||
FFI_ERROR_NO_RECIPIENTS,
|
||||
/** . */
|
||||
FFI_ERROR_NO_UTXOS_SELECTED,
|
||||
@ -68,6 +64,8 @@ typedef uint16_t FfiError_t; enum
|
||||
/** . */
|
||||
FFI_ERROR_FEE_TOO_LOW,
|
||||
/** . */
|
||||
FFI_ERROR_FEE_RATE_UNAVAILABLE,
|
||||
/** . */
|
||||
FFI_ERROR_MISSING_KEY_ORIGIN,
|
||||
/** . */
|
||||
FFI_ERROR_KEY,
|
||||
@ -80,6 +78,8 @@ typedef uint16_t FfiError_t; enum
|
||||
/** . */
|
||||
FFI_ERROR_SIGNER,
|
||||
/** . */
|
||||
FFI_ERROR_INVALID_NETWORK,
|
||||
/** . */
|
||||
FFI_ERROR_INVALID_PROGRESS_VALUE,
|
||||
/** . */
|
||||
FFI_ERROR_PROGRESS_UPDATE_ERROR,
|
||||
@ -104,6 +104,8 @@ typedef uint16_t FfiError_t; enum
|
||||
/** . */
|
||||
FFI_ERROR_PSBT,
|
||||
/** . */
|
||||
FFI_ERROR_PSBT_PARSE,
|
||||
/** . */
|
||||
FFI_ERROR_ELECTRUM,
|
||||
/** . */
|
||||
FFI_ERROR_SLED,
|
||||
@ -124,6 +126,7 @@ typedef struct {
|
||||
FfiResult_OpaqueWallet_ptr_t new_wallet_result (
|
||||
char const * descriptor,
|
||||
char const * change_descriptor,
|
||||
char const * network,
|
||||
BlockchainConfig_t const * blockchain_config,
|
||||
DatabaseConfig_t const * database_config);
|
||||
|
||||
@ -214,19 +217,32 @@ typedef struct {
|
||||
FfiResult_uint64_t balance (
|
||||
OpaqueWallet_t const * opaque_wallet);
|
||||
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
typedef struct {
|
||||
|
||||
uint32_t height;
|
||||
|
||||
uint64_t timestamp;
|
||||
|
||||
} ConfirmationTime_t;
|
||||
|
||||
typedef struct {
|
||||
|
||||
char * txid;
|
||||
|
||||
uint64_t timestamp;
|
||||
|
||||
uint64_t received;
|
||||
|
||||
uint64_t sent;
|
||||
|
||||
uint64_t fees;
|
||||
int64_t fee;
|
||||
|
||||
int32_t height;
|
||||
bool is_confirmed;
|
||||
|
||||
ConfirmationTime_t confirmation_time;
|
||||
|
||||
bool verified;
|
||||
|
||||
} TransactionDetails_t;
|
||||
|
||||
@ -261,7 +277,8 @@ BlockchainConfig_t * new_electrum_config (
|
||||
char const * url,
|
||||
char const * socks5,
|
||||
int16_t retry,
|
||||
int16_t timeout);
|
||||
int16_t timeout,
|
||||
size_t stop_gap);
|
||||
|
||||
void free_blockchain_config (
|
||||
BlockchainConfig_t * blockchain_config);
|
||||
|
||||
@ -6,14 +6,21 @@
|
||||
|
||||
int main (int argc, char const * const argv[])
|
||||
{
|
||||
|
||||
// shared consts
|
||||
char const *desc = "wpkh([bf988dd3/84'/1'/0']tpubDD7bHVspyCSvvU8qEycydF664NAX6EAPjJ77j9E614GU2zVdXgnZZo6JJjKbDT6fUn8owMN6TCP9rZMznsNEhJbpkEwp6fAyyoSqy3DH2Qj/0/*)";
|
||||
char const *change = "wpkh([bf988dd3/84'/1'/0']tpubDD7bHVspyCSvvU8qEycydF664NAX6EAPjJ77j9E614GU2zVdXgnZZo6JJjKbDT6fUn8owMN6TCP9rZMznsNEhJbpkEwp6fAyyoSqy3DH2Qj/1/*)";
|
||||
char const *net = "testnet";
|
||||
char const *blocks = "ssl://electrum.blockstream.info:60002";
|
||||
|
||||
// test new wallet error
|
||||
{
|
||||
BlockchainConfig_t *bc_config = new_electrum_config("ssl://electrum.blockstream.info:60002", NULL, 5, 30);
|
||||
BlockchainConfig_t *bc_config = new_electrum_config(blocks, NULL, 5, 30, 100);
|
||||
//DatabaseConfig_t *db_config = new_sled_config("/home/steve/.bdk", "test_wallet");
|
||||
DatabaseConfig_t *db_config = new_memory_config();
|
||||
|
||||
// new wallet with bad descriptor
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result("bad","bad",bc_config,db_config);
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result("bad","bad",net,bc_config,db_config);
|
||||
assert(wallet_result.err == FFI_ERROR_DESCRIPTOR);
|
||||
assert(wallet_result.ok == NULL);
|
||||
|
||||
@ -25,14 +32,11 @@ int main (int argc, char const * const argv[])
|
||||
|
||||
// test new wallet
|
||||
{
|
||||
char const *desc = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)";
|
||||
char const *change = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)";
|
||||
|
||||
BlockchainConfig_t *bc_config = new_electrum_config("ssl://electrum.blockstream.info:60002", NULL, 5, 30);
|
||||
BlockchainConfig_t *bc_config = new_electrum_config(blocks, NULL, 5, 30, 100);
|
||||
DatabaseConfig_t *db_config = new_memory_config();
|
||||
|
||||
// new wallet
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,bc_config,db_config);
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,net,bc_config,db_config);
|
||||
// printf("wallet_result.err = %d\n", wallet_result.err));
|
||||
assert(wallet_result.err == FFI_ERROR_NONE);
|
||||
assert(wallet_result.ok != NULL);
|
||||
@ -51,15 +55,15 @@ int main (int argc, char const * const argv[])
|
||||
FfiResult_char_ptr_t address1_result = new_address(wallet);
|
||||
assert(address1_result.ok != NULL);
|
||||
assert(address1_result.err == FFI_ERROR_NONE);
|
||||
// printf("address1 = %s\n", *address1_result.ok);
|
||||
assert( 0 == strcmp(address1_result.ok,"tb1qgkhp034fyxeta00h0nne9tzfm0vsxq4prduzxp"));
|
||||
//printf("address1 = %s\n", address1_result.ok);
|
||||
assert( 0 == strcmp(address1_result.ok,"tb1qh4ajvhz9nd76tqddnl99l89hx4dat33hrjauzw"));
|
||||
free_string_result(address1_result);
|
||||
|
||||
FfiResult_char_ptr_t address2_result = new_address(wallet);
|
||||
assert(address2_result.ok != NULL);
|
||||
assert(address2_result.err == FFI_ERROR_NONE);
|
||||
// printf("address2 = %s\n", *address2_result.ok);
|
||||
assert( 0 == strcmp(address2_result.ok,"tb1qd6u9q327sru2ljvwzdtfrdg36sapax7udz97wf"));
|
||||
//printf("address2 = %s\n", address2_result.ok);
|
||||
assert( 0 == strcmp(address2_result.ok,"tb1qr7pu0pech43hcjrc4pzxcen0qkslj7xk7s5w3m"));
|
||||
free_string_result(address2_result);
|
||||
|
||||
// free_wallet
|
||||
@ -73,15 +77,12 @@ int main (int argc, char const * const argv[])
|
||||
}
|
||||
|
||||
// test get unspent utxos
|
||||
{
|
||||
char const *desc = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)";
|
||||
char const *change = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)";
|
||||
|
||||
BlockchainConfig_t *bc_config = new_electrum_config("ssl://electrum.blockstream.info:60002", NULL, 5, 30);
|
||||
{
|
||||
BlockchainConfig_t *bc_config = new_electrum_config(blocks, NULL, 5, 30, 100);
|
||||
DatabaseConfig_t *db_config = new_memory_config();
|
||||
|
||||
// new wallet
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,bc_config,db_config);
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,net,bc_config,db_config);
|
||||
assert(wallet_result.err == FFI_ERROR_NONE);
|
||||
assert(wallet_result.ok != NULL);
|
||||
|
||||
@ -97,7 +98,7 @@ int main (int argc, char const * const argv[])
|
||||
|
||||
// list unspent
|
||||
FfiResult_Vec_LocalUtxo_t unspent_result = list_unspent(wallet);
|
||||
assert(unspent_result.ok.len == 7);
|
||||
assert(unspent_result.ok.len == 1);
|
||||
assert(unspent_result.err == FFI_ERROR_NONE);
|
||||
|
||||
LocalUtxo_t * unspent_ptr = unspent_result.ok.ptr;
|
||||
@ -119,15 +120,12 @@ int main (int argc, char const * const argv[])
|
||||
}
|
||||
|
||||
// test balance
|
||||
{
|
||||
char const *desc = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)";
|
||||
char const *change = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)";
|
||||
|
||||
BlockchainConfig_t *bc_config = new_electrum_config("ssl://electrum.blockstream.info:60002", NULL, 5, 30);
|
||||
{
|
||||
BlockchainConfig_t *bc_config = new_electrum_config(blocks, NULL, 5, 30, 100);
|
||||
DatabaseConfig_t *db_config = new_memory_config();
|
||||
|
||||
// new wallet
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,bc_config,db_config);
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,net,bc_config,db_config);
|
||||
assert(wallet_result.err == FFI_ERROR_NONE);
|
||||
assert(wallet_result.ok != NULL);
|
||||
|
||||
@ -155,14 +153,11 @@ int main (int argc, char const * const argv[])
|
||||
|
||||
// test get transaction details
|
||||
{
|
||||
char const *desc = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)";
|
||||
char const *change = "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/1/*)";
|
||||
|
||||
BlockchainConfig_t *bc_config = new_electrum_config("ssl://electrum.blockstream.info:60002", NULL, 5, 30);
|
||||
BlockchainConfig_t *bc_config = new_electrum_config(blocks, NULL, 5, 30, 100);
|
||||
DatabaseConfig_t *db_config = new_memory_config();
|
||||
|
||||
// new wallet
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,bc_config,db_config);
|
||||
FfiResult_OpaqueWallet_ptr_t wallet_result = new_wallet_result(desc,change,net,bc_config,db_config);
|
||||
assert(wallet_result.err == FFI_ERROR_NONE);
|
||||
assert(wallet_result.ok != NULL);
|
||||
|
||||
@ -186,14 +181,14 @@ int main (int argc, char const * const argv[])
|
||||
//printf("%d: txid: %s\n", i, txdetails_ptr[i].txid);
|
||||
assert(txdetails_ptr[i].txid != NULL);
|
||||
//printf("%d: timestamp: %ld\n", i, txdetails_ptr[i].timestamp);
|
||||
assert(txdetails_ptr[i].timestamp > 0);
|
||||
assert(txdetails_ptr[i].is_confirmed);
|
||||
//printf("%d: received: %ld\n", i, txdetails_ptr[i].received);
|
||||
//printf("%d: sent: %ld\n", i, txdetails_ptr[i].sent);
|
||||
assert(txdetails_ptr[i].received > 0 || txdetails_ptr[i].sent > 0);
|
||||
//printf("%d: fees: %ld\n", i, txdetails_ptr[i].fees);
|
||||
assert(txdetails_ptr[i].fees > 0);
|
||||
assert(txdetails_ptr[i].fee > 0);
|
||||
//printf("%d: height: %d\n", i, txdetails_ptr[i].height);
|
||||
assert(txdetails_ptr[i].height >= -1);
|
||||
assert(txdetails_ptr[i].confirmation_time.height > 0);
|
||||
}
|
||||
|
||||
free_vectxdetails_result(txdetails_result);
|
||||
|
||||
11
src/error.rs
11
src/error.rs
@ -9,8 +9,6 @@ pub enum FfiError {
|
||||
InvalidU32Bytes,
|
||||
Generic,
|
||||
ScriptDoesntHaveAddressForm,
|
||||
SingleRecipientMultipleOutputs,
|
||||
SingleRecipientNoInputs,
|
||||
NoRecipients,
|
||||
NoUtxosSelected,
|
||||
OutputBelowDustLimit,
|
||||
@ -23,12 +21,14 @@ pub enum FfiError {
|
||||
IrreplaceableTransaction,
|
||||
FeeRateTooLow,
|
||||
FeeTooLow,
|
||||
FeeRateUnavailable,
|
||||
MissingKeyOrigin,
|
||||
Key,
|
||||
ChecksumMismatch,
|
||||
SpendingPolicyRequired,
|
||||
InvalidPolicyPathError,
|
||||
Signer,
|
||||
InvalidNetwork,
|
||||
InvalidProgressValue,
|
||||
ProgressUpdateError,
|
||||
InvalidOutpoint,
|
||||
@ -41,6 +41,7 @@ pub enum FfiError {
|
||||
Json,
|
||||
Hex,
|
||||
Psbt,
|
||||
PsbtParse,
|
||||
Electrum,
|
||||
// Esplora,
|
||||
// CompactFilters,
|
||||
@ -53,8 +54,6 @@ impl From<&bdk::Error> for FfiError {
|
||||
Error::InvalidU32Bytes(_) => FfiError::InvalidU32Bytes,
|
||||
Error::Generic(_) => FfiError::Generic,
|
||||
Error::ScriptDoesntHaveAddressForm => FfiError::ScriptDoesntHaveAddressForm,
|
||||
Error::SingleRecipientMultipleOutputs => FfiError::SingleRecipientMultipleOutputs,
|
||||
Error::SingleRecipientNoInputs => FfiError::SingleRecipientNoInputs,
|
||||
Error::NoRecipients => FfiError::NoRecipients,
|
||||
Error::NoUtxosSelected => FfiError::NoUtxosSelected,
|
||||
Error::OutputBelowDustLimit(_) => FfiError::OutputBelowDustLimit,
|
||||
@ -67,12 +66,14 @@ impl From<&bdk::Error> for FfiError {
|
||||
Error::IrreplaceableTransaction => FfiError::IrreplaceableTransaction,
|
||||
Error::FeeRateTooLow { .. } => FfiError::FeeRateTooLow,
|
||||
Error::FeeTooLow { .. } => FfiError::FeeTooLow,
|
||||
Error::FeeRateUnavailable => FfiError::FeeRateUnavailable,
|
||||
Error::MissingKeyOrigin(_) => FfiError::MissingKeyOrigin,
|
||||
Error::Key(_) => FfiError::Key,
|
||||
Error::ChecksumMismatch => FfiError::ChecksumMismatch,
|
||||
Error::SpendingPolicyRequired(_) => FfiError::SpendingPolicyRequired,
|
||||
Error::InvalidPolicyPathError(_) => FfiError::InvalidPolicyPathError,
|
||||
Error::Signer(_) => FfiError::Signer,
|
||||
Error::InvalidNetwork { .. } => FfiError::InvalidNetwork,
|
||||
Error::InvalidProgressValue(_) => FfiError::InvalidProgressValue,
|
||||
Error::ProgressUpdateError => FfiError::ProgressUpdateError,
|
||||
Error::InvalidOutpoint(_) => FfiError::InvalidOutpoint,
|
||||
@ -85,9 +86,11 @@ impl From<&bdk::Error> for FfiError {
|
||||
Error::Json(_) => FfiError::Json,
|
||||
Error::Hex(_) => FfiError::Hex,
|
||||
Error::Psbt(_) => FfiError::Psbt,
|
||||
Error::PsbtParse(_) => FfiError::PsbtParse,
|
||||
Error::Electrum(_) => FfiError::Electrum,
|
||||
// Error::Esplora(_) => JniError::Esplora,
|
||||
// Error::CompactFilters(_) => JniError::CompactFilters,
|
||||
// Error::Rpc(_) => JniError::Rpc,
|
||||
Error::Sled(_) => FfiError::Sled,
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@ fn new_electrum_config(
|
||||
socks5: Option<char_p_ref>,
|
||||
retry: i16,
|
||||
timeout: i16,
|
||||
stop_gap: usize,
|
||||
) -> Box<BlockchainConfig> {
|
||||
let url = url.to_string();
|
||||
let socks5 = socks5.map(|s| s.to_string());
|
||||
@ -27,6 +28,7 @@ fn new_electrum_config(
|
||||
socks5,
|
||||
retry,
|
||||
timeout,
|
||||
stop_gap,
|
||||
});
|
||||
Box::new(BlockchainConfig {
|
||||
raw: electrum_config,
|
||||
|
||||
@ -2,7 +2,6 @@ use std::convert::TryFrom;
|
||||
use std::ffi::CString;
|
||||
|
||||
use ::safer_ffi::prelude::*;
|
||||
use bdk::bitcoin::network::constants::Network::Testnet;
|
||||
use bdk::blockchain::{log_progress, AnyBlockchain, AnyBlockchainConfig, ConfigurableBlockchain};
|
||||
use bdk::database::{AnyDatabase, AnyDatabaseConfig, ConfigurableDatabase};
|
||||
use bdk::wallet::AddressIndex::New;
|
||||
@ -16,6 +15,8 @@ use database::DatabaseConfig;
|
||||
use crate::error::FfiError;
|
||||
use crate::types::{FfiResult, FfiResultVoid};
|
||||
use crate::wallet::transaction::{LocalUtxo, TransactionDetails};
|
||||
use bdk::bitcoin::Network;
|
||||
use std::str::FromStr;
|
||||
|
||||
mod blockchain;
|
||||
mod database;
|
||||
@ -33,14 +34,16 @@ pub struct OpaqueWallet {
|
||||
fn new_wallet_result(
|
||||
descriptor: char_p_ref,
|
||||
change_descriptor: Option<char_p_ref>,
|
||||
network: char_p_ref,
|
||||
blockchain_config: &BlockchainConfig,
|
||||
database_config: &DatabaseConfig,
|
||||
) -> FfiResult<Option<Box<OpaqueWallet>>> {
|
||||
let descriptor = descriptor.to_string();
|
||||
let change_descriptor = change_descriptor.map(|s| s.to_string());
|
||||
let net = Network::from_str(network.to_str()).expect("Network name");
|
||||
let bc_config = &blockchain_config.raw;
|
||||
let db_config = &database_config.raw;
|
||||
let wallet_result = new_wallet(descriptor, change_descriptor, bc_config, db_config);
|
||||
let wallet_result = new_wallet(descriptor, change_descriptor, net, bc_config, db_config);
|
||||
|
||||
match wallet_result {
|
||||
Ok(w) => FfiResult {
|
||||
@ -57,11 +60,10 @@ fn new_wallet_result(
|
||||
fn new_wallet(
|
||||
descriptor: String,
|
||||
change_descriptor: Option<String>,
|
||||
network: Network,
|
||||
blockchain_config: &AnyBlockchainConfig,
|
||||
database_config: &AnyDatabaseConfig,
|
||||
) -> Result<Wallet<AnyBlockchain, AnyDatabase>, Error> {
|
||||
let network = Testnet;
|
||||
|
||||
let client = AnyBlockchain::from_config(blockchain_config)?;
|
||||
let database = AnyDatabase::from_config(database_config)?;
|
||||
|
||||
|
||||
@ -13,27 +13,52 @@ pub struct TransactionDetails {
|
||||
// pub transaction: Option<Transaction>,
|
||||
/// Transaction id
|
||||
pub txid: char_p_boxed,
|
||||
/// Timestamp
|
||||
pub timestamp: u64,
|
||||
/// Received value (sats)
|
||||
pub received: u64,
|
||||
/// Sent value (sats)
|
||||
pub sent: u64,
|
||||
/// Fee value (sats)
|
||||
pub fees: u64,
|
||||
/// Confirmed in block height, `None` means unconfirmed
|
||||
pub height: i32,
|
||||
/// Fee value (sats) if known, -1 if unknown, based on backend
|
||||
pub fee: i64,
|
||||
/// true if confirmed
|
||||
pub is_confirmed: bool,
|
||||
/// Confirmed in block height
|
||||
pub confirmation_time: ConfirmationTime,
|
||||
/// Whether the tx has been verified against the consensus rules
|
||||
pub verified: bool,
|
||||
}
|
||||
|
||||
#[derive_ReprC]
|
||||
#[repr(C)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ConfirmationTime {
|
||||
/// confirmation block height, 0 if is_confirmed is false
|
||||
pub height: u32,
|
||||
/// confirmation block timestamp, 0 if is_confirmed is false
|
||||
pub timestamp: u64,
|
||||
}
|
||||
|
||||
impl From<&bdk::TransactionDetails> for TransactionDetails {
|
||||
fn from(op: &bdk::TransactionDetails) -> Self {
|
||||
let fee = op.fee.map(|f| i64::try_from(f).unwrap()).unwrap_or(-1);
|
||||
let confirmation_time = op
|
||||
.confirmation_time
|
||||
.as_ref()
|
||||
.map(|c| ConfirmationTime {
|
||||
height: c.height,
|
||||
timestamp: c.timestamp,
|
||||
})
|
||||
.unwrap_or(ConfirmationTime {
|
||||
height: 0,
|
||||
timestamp: 0,
|
||||
});
|
||||
TransactionDetails {
|
||||
txid: char_p_boxed::try_from(op.txid.to_string()).unwrap(),
|
||||
timestamp: op.timestamp,
|
||||
received: op.received,
|
||||
sent: op.sent,
|
||||
fees: op.fees,
|
||||
height: op.height.map(|h| h as i32).unwrap_or(-1),
|
||||
fee,
|
||||
is_confirmed: op.confirmation_time.is_some(),
|
||||
confirmation_time,
|
||||
verified: op.verified,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
64
test.sh
64
test.sh
@ -1,14 +1,62 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eo pipefail -o xtrace
|
||||
set -eo pipefail
|
||||
|
||||
# functions
|
||||
|
||||
## help
|
||||
help()
|
||||
{
|
||||
# Display Help
|
||||
echo "Test bdk-ffi and related libraries."
|
||||
echo
|
||||
echo "Syntax: build [-a|h|k|v]"
|
||||
echo "options:"
|
||||
echo "-a Android aar tests."
|
||||
echo "-h Print this Help."
|
||||
echo "-k JVM jar tests."
|
||||
echo "-v Valgrind tests."
|
||||
echo
|
||||
}
|
||||
|
||||
# rust
|
||||
cargo test --features c-headers -- generate_headers
|
||||
c_headers() {
|
||||
cargo test --features c-headers -- generate_headers
|
||||
}
|
||||
|
||||
# cc
|
||||
export LD_LIBRARY_PATH=`pwd`/target/debug
|
||||
#valgrind --leak-check=full --show-leak-kinds=all cc/bdk_ffi_test
|
||||
cc/bdk_ffi_test
|
||||
test_c() {
|
||||
export LD_LIBRARY_PATH=`pwd`/target/debug
|
||||
cc/bdk_ffi_test
|
||||
}
|
||||
|
||||
# bdk-kotlin
|
||||
(cd bdk-kotlin && gradle test)
|
||||
(cd bdk-kotlin && gradle :android:connectedDebugAndroidTest)
|
||||
test_valgrind() {
|
||||
valgrind --leak-check=full --show-leak-kinds=all cc/bdk_ffi_test
|
||||
}
|
||||
|
||||
test_kotlin() {
|
||||
(cd bdk-kotlin && ./gradlew test)
|
||||
}
|
||||
|
||||
test_android() {
|
||||
(cd bdk-kotlin && ./gradlew :android:connectedDebugAndroidTest)
|
||||
}
|
||||
|
||||
if [ $1 = "-h" ]
|
||||
then
|
||||
help
|
||||
else
|
||||
c_headers
|
||||
test_c
|
||||
|
||||
# optional tests
|
||||
while [ -n "$1" ]; do # while loop starts
|
||||
case "$1" in
|
||||
-a) test_android ;;
|
||||
-h) help ;;
|
||||
-k) test_kotlin ;;
|
||||
-v) test_valgrind ;;
|
||||
*) echo "Option $1 not recognized" ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user