Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2024-12-22 11:39:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui: Add wallet_blocks to XMR wallet page.

Browse source
This commit is contained in:
tecnovert 2024-11-29 12:30:36 +02:00
parent 0dc55fc449
commit 037851a002
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
5 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View file

@ -8,7 +8,7 @@ concurrency:
env: env:
BIN_DIR: /tmp/cached_bin BIN_DIR: /tmp/cached_bin
TEST_RELOAD_PATH: /tmp/test_basicswap1 TEST_RELOAD_PATH: /tmp/test_basicswap
jobs: jobs:
ci: ci:
@ -46,8 +46,8 @@ jobs:
cache-name: cache-cores cache-name: cache-cores
CACHE_KEY: $(printf $(python bin/basicswap-prepare.py --version --withcoins=bitcoin) | sha256sum | head -c 64) CACHE_KEY: $(printf $(python bin/basicswap-prepare.py --version --withcoins=bitcoin) | sha256sum | head -c 64)
with: with:
path: "$BIN_DIR" path: $BIN_DIR
key: "$CACHE_KEY" key: $CACHE_KEY
- if: ${{ steps.cache-yarn.outputs.cache-hit != 'true' }} - if: ${{ steps.cache-yarn.outputs.cache-hit != 'true' }}
name: Running basicswap-prepare name: Running basicswap-prepare
@ -57,6 +57,6 @@ jobs:
run: | run: |
export PYTHONPATH=$(pwd) export PYTHONPATH=$(pwd)
export TEST_PATH=${TEST_RELOAD_PATH} export TEST_PATH=${TEST_RELOAD_PATH}
mkdir -p ${TEST_RELOAD_PATH}/bin mkdir -p ${TEST_PATH}/bin
cp -r $BIN_DIR/* ${TEST_RELOAD_PATH}/bin/ cp -r $BIN_DIR/* ${TEST_PATH}/bin/
pytest tests/basicswap/extended/test_encrypted_xmr_reload.py pytest tests/basicswap/extended/test_encrypted_xmr_reload.py

3
basicswap/basicswap.py
View file

@ -10285,6 +10285,9 @@ class BasicSwap(BaseApp):
"locked": walletinfo["locked"], "locked": walletinfo["locked"],
} }
if "wallet_blocks" in walletinfo:
rv["wallet_blocks"] = walletinfo["wallet_blocks"]
if "immature_balance" in walletinfo: if "immature_balance" in walletinfo:
rv["immature"] = ci.format_amount( rv["immature"] = ci.format_amount(
walletinfo["immature_balance"], conv_int=True walletinfo["immature_balance"], conv_int=True

1
basicswap/interface/xmr.py
View file

@ -292,6 +292,7 @@ class XMRInterface(CoinInterface):
rv = {} rv = {}
balance_info = self.rpc_wallet("get_balance") 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["balance"] = self.format_amount(balance_info["unlocked_balance"])
rv["unconfirmed_balance"] = self.format_amount( rv["unconfirmed_balance"] = self.format_amount(
balance_info["balance"] - balance_info["unlocked_balance"] balance_info["balance"] - balance_info["unlocked_balance"]

6
basicswap/templates/wallet.html
View file

@ -163,6 +163,12 @@
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{% if w.wallet_blocks %}
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
<td class="py-3 px-6 bold">Wallet Blocks:</td>
<td class="py-3 px-6">{{ w.wallet_blocks }}{% if w.known_block_count %} / {{ w.known_block_count }}{% endif %}</td>
</tr>
{% endif %}
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
<td class="py-3 px-6 bold">Synced:</td> <td class="py-3 px-6 bold">Synced:</td>
<td class="py-3 px-6">{{ w.synced }}</td> <td class="py-3 px-6">{{ w.synced }}</td>

3
basicswap/ui/page_wallet.py
View file

@ -38,6 +38,9 @@ def format_wallet_data(swap_client, ci, w):
"havedata": True, "havedata": True,
} }
if "wallet_blocks" in w:
wf["wallet_blocks"] = w["wallet_blocks"]
if w.get("bootstrapping", False) is True: if w.get("bootstrapping", False) is True:
wf["bootstrapping"] = True wf["bootstrapping"] = True
if "known_block_count" in w: if "known_block_count" in w: