Skip to content

Commit

Permalink
Merge branch 'main' into the-federation-layer-v0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Reckless-Satoshi authored Jan 23, 2024
2 parents 9d96326 + 35b8f56 commit 30f7c04
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
semver:
required: true
type: string
default: ''
push:
branches: [ "main" ]
paths: [ "frontend" ]
Expand Down Expand Up @@ -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
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,38 @@ 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
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 }}
Expand All @@ -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
Expand Down
27 changes: 27 additions & 0 deletions scripts/get_devfund_donations.py
Original file line number Diff line number Diff line change
@@ -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("----------------------")

0 comments on commit 30f7c04

Please sign in to comment.