From 1c4414d311531805f2cc94a0b9bb293c0527c6b8 Mon Sep 17 00:00:00 2001 From: calle <93376500+callebtc@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:14:52 +0100 Subject: [PATCH 1/3] await ledeger verify (#1411) --- lnbits/extensions/cashu/views_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnbits/extensions/cashu/views_api.py b/lnbits/extensions/cashu/views_api.py index 2017df00..ed762ed3 100644 --- a/lnbits/extensions/cashu/views_api.py +++ b/lnbits/extensions/cashu/views_api.py @@ -302,7 +302,7 @@ async def melt_coins( await ledger._set_proofs_pending(proofs) try: - ledger._verify_proofs(proofs) + await ledger._verify_proofs(proofs) total_provided = sum([p["amount"] for p in proofs]) invoice_obj = bolt11.decode(invoice) From 45a0657828f2dc2bd772c57a20af4df5670c4ee6 Mon Sep 17 00:00:00 2001 From: calle <93376500+callebtc@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:24:36 +0100 Subject: [PATCH 2/3] do not reference these object (#1412) --- lnbits/extensions/cashu/views_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lnbits/extensions/cashu/views_api.py b/lnbits/extensions/cashu/views_api.py index ed762ed3..dfd20cef 100644 --- a/lnbits/extensions/cashu/views_api.py +++ b/lnbits/extensions/cashu/views_api.py @@ -343,13 +343,13 @@ async def melt_coins( else: logger.debug(f"Cashu: Payment failed for {invoice_obj.payment_hash}") except Exception as e: - logger.debug(f"Cashu: Exception for {invoice_obj.payment_hash}: {str(e)}") + logger.debug(f"Cashu: Exception: {str(e)}") raise HTTPException( status_code=HTTPStatus.BAD_REQUEST, detail=f"Cashu: {str(e)}", ) finally: - logger.debug(f"Cashu: Unset pending for {invoice_obj.payment_hash}") + logger.debug(f"Cashu: Unset pending") # delete proofs from pending list await ledger._unset_proofs_pending(proofs) From 36c881c4ceb8a05084ea769ea94e0ff7efbf8fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Wed, 25 Jan 2023 15:07:41 +0100 Subject: [PATCH 3/3] add eclair fundingsource workflow / test (#1406) --- .github/workflows/regtest.yml | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.github/workflows/regtest.yml b/.github/workflows/regtest.yml index ecba4090..57b7e1f4 100644 --- a/.github/workflows/regtest.yml +++ b/.github/workflows/regtest.yml @@ -134,3 +134,46 @@ jobs: uses: codecov/codecov-action@v3 with: file: ./coverage.xml + EclairWallet: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.9"] + poetry-version: ["1.3.1"] + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Set up Poetry ${{ matrix.poetry-version }} + uses: abatilo/actions-poetry@v2 + with: + poetry-version: ${{ matrix.poetry-version }} + - name: Setup Regtest + run: | + docker build -t lnbitsdocker/lnbits-legend . + git clone https://github.com/lnbits/legend-regtest-enviroment.git docker + cd docker + chmod +x ./tests + ./tests + sudo chmod -R a+rwx . + - name: Install dependencies + run: | + poetry config virtualenvs.create false + poetry install + - name: Run tests + env: + PYTHONUNBUFFERED: 1 + PORT: 5123 + LNBITS_DATA_FOLDER: ./data + LNBITS_BACKEND_WALLET_CLASS: EclairWallet + ECLAIR_URL: http://127.0.0.1:8082 + ECLAIR_PASS: lnbits + run: | + sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data + make test-real-wallet + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 + with: + file: ./coverage.xml