From a2471ee9812730d6e09178deb15b347fee4a2a3c Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Mon, 22 Jan 2024 10:34:19 +0000 Subject: [PATCH 1/4] Fix release workflow --- .github/workflows/frontend-build.yml | 3 +++ .github/workflows/release.yml | 17 ++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml index ae8651a9..b3d689f7 100644 --- a/.github/workflows/frontend-build.yml +++ b/.github/workflows/frontend-build.yml @@ -7,6 +7,7 @@ on: semver: required: true type: string + default: '' push: branches: [ "main" ] paths: [ "frontend" ] @@ -85,6 +86,8 @@ jobs: # Invoke pre-release image build if this was not a tag push # Docker images tagged only with short commit hash + - name: Print semver + run: echo The semver is ${{ github.event.inputs.semver }} - name: 'Invoke Coodinator Image CI' if: inputs.semver == '' uses: benc-uk/workflow-dispatch@v121 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f0394d71..807591d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,34 +37,33 @@ jobs: echo "Versions do not match! You might have forgotten to update the version on a component."; exit $ERRCODE; fi - - integration-tests: - uses: RoboSats/robosats/.github/workflows/integration-tests.yml@main - needs: check-versions - frontend-build: uses: RoboSats/robosats/.github/workflows/frontend-build.yml@main needs: check-versions with: semver: ${{ needs.check-versions.outputs.semver }} + integration-tests: + uses: RoboSats/robosats/.github/workflows/integration-tests.yml@main + needs: [frontend-build, check-versions] + coordinator-image: uses: RoboSats/robosats/.github/workflows/coordinator-image.yml@main - needs: [frontend-build] # django-test, + needs: [frontend-build, integration-tests, check-versions] secrets: inherit with: semver: ${{ needs.check-versions.outputs.semver }} selfhosted-client-image: uses: RoboSats/robosats/.github/workflows/selfhosted-client-image.yml@main - needs: frontend-build + needs: [frontend-build, check-versions] secrets: inherit with: semver: ${{ needs.check-versions.outputs.semver }} web-client-image: uses: RoboSats/robosats/.github/workflows/web-client-image.yml@main - needs: frontend-build + needs: [frontend-build, check-versions] secrets: inherit with: semver: ${{ needs.check-versions.outputs.semver }} @@ -76,7 +75,7 @@ jobs: semver: ${{ needs.check-versions.outputs.semver }} release: - needs: [check-versions, coordinator-image, client-image, android-build] + needs: [check-versions, integration-tests, coordinator-image, selfhosted-client-image, web-client-image, android-build] runs-on: ubuntu-latest steps: - name: Checkout From bf505cace9146ce8e686fb2595340e67f01a7bbb Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Mon, 22 Jan 2024 11:12:20 +0000 Subject: [PATCH 2/4] Bump client to 0.5.4 --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 0ddb53e1..dd2243a1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "0.5.3", + "version": "0.5.4", "description": "", "main": "index.js", "scripts": { From e49c861c5eb503b8f1b75df19df9e8353ca72fa2 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Mon, 22 Jan 2024 11:21:27 +0000 Subject: [PATCH 3/4] Fix deprecated set-output usage --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 807591d2..52fc3eb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: if [ "$coordinatorV" = "$clientV" ] && [ "$coordinatorV" = "$tagV" ] && [ "$coordinatorV" = "$androidV" ]; then echo "Versions match!" - echo '::set-output name=semver::'$semver + echo "semver=$semver" >> $GITHUB_OUTPUT #echo '::set-output name=semver::'$semver else echo "Versions do not match! You might have forgotten to update the version on a component."; exit $ERRCODE; fi From 35b8f56527171a79b2ada4acaedefc597c7857a1 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Mon, 22 Jan 2024 17:08:28 +0000 Subject: [PATCH 4/4] Add public view of devfund donations script --- scripts/get_devfund_donations.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 scripts/get_devfund_donations.py diff --git a/scripts/get_devfund_donations.py b/scripts/get_devfund_donations.py new file mode 100644 index 00000000..c7466a14 --- /dev/null +++ b/scripts/get_devfund_donations.py @@ -0,0 +1,27 @@ +import os +import json +import requests +import base64 + +devfund_data_path = os.path.normpath(os.path.join("..", "devfund_pubkey.json")) + +with open(devfund_data_path, "r") as f: + devfund_data = json.load(f) + +macaroon = devfund_data["mainnet_invoices_readonly_macaroon_hex"] +url = f'https://{devfund_data["mainnet_rpcserver"]}:8080' +headers = {"Grpc-Metadata-macaroon": macaroon} +method = "/v1/invoices" + +r = requests.get(url + method, headers=headers) + +response_data = r.json() + +for invoice in response_data["invoices"]: + if invoice["is_keysend"] and invoice["htlcs"][0]["custom_records"]["34349334"]: + print(f"Index {invoice['add_index']}") + print( + f"{base64.b64decode(invoice['htlcs'][0]['custom_records']['34349334']).decode('utf-8')}" + ) + print(f"Amount {invoice['amt_paid_sat']} Sats") + print("----------------------")