diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0061673..6be7e1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ concurrency: env: BIN_DIR: /tmp/cached_bin - TEST_RELOAD_PATH: /tmp/test_basicswap1 + TEST_RELOAD_PATH: /tmp/test_basicswap jobs: ci: @@ -46,8 +46,8 @@ jobs: cache-name: cache-cores CACHE_KEY: $(printf $(python bin/basicswap-prepare.py --version --withcoins=bitcoin) | sha256sum | head -c 64) with: - path: "$BIN_DIR" - key: "$CACHE_KEY" + path: $BIN_DIR + key: $CACHE_KEY - if: ${{ steps.cache-yarn.outputs.cache-hit != 'true' }} name: Running basicswap-prepare @@ -57,6 +57,6 @@ jobs: run: | export PYTHONPATH=$(pwd) export TEST_PATH=${TEST_RELOAD_PATH} - mkdir -p ${TEST_RELOAD_PATH}/bin - cp -r $BIN_DIR/* ${TEST_RELOAD_PATH}/bin/ + mkdir -p ${TEST_PATH}/bin + cp -r $BIN_DIR/* ${TEST_PATH}/bin/ pytest tests/basicswap/extended/test_encrypted_xmr_reload.py diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py index d327513..bbfb414 100644 --- a/basicswap/basicswap.py +++ b/basicswap/basicswap.py @@ -10285,6 +10285,9 @@ class BasicSwap(BaseApp): "locked": walletinfo["locked"], } + if "wallet_blocks" in walletinfo: + rv["wallet_blocks"] = walletinfo["wallet_blocks"] + if "immature_balance" in walletinfo: rv["immature"] = ci.format_amount( walletinfo["immature_balance"], conv_int=True diff --git a/basicswap/interface/xmr.py b/basicswap/interface/xmr.py index 1b0dfc5..bf5c21f 100644 --- a/basicswap/interface/xmr.py +++ b/basicswap/interface/xmr.py @@ -292,6 +292,7 @@ class XMRInterface(CoinInterface): rv = {} balance_info = self.rpc_wallet("get_balance") + rv["wallet_blocks"] = self.rpc_wallet("get_height")["height"] rv["balance"] = self.format_amount(balance_info["unlocked_balance"]) rv["unconfirmed_balance"] = self.format_amount( balance_info["balance"] - balance_info["unlocked_balance"] diff --git a/basicswap/templates/wallet.html b/basicswap/templates/wallet.html index aca5281..05943fc 100644 --- a/basicswap/templates/wallet.html +++ b/basicswap/templates/wallet.html @@ -163,6 +163,12 @@ {% endif %} + {% if w.wallet_blocks %} +