diff --git a/.github/workflows/hashes.yaml b/.github/workflows/hashes.yaml index faace9e9ab..f87c0e6440 100644 --- a/.github/workflows/hashes.yaml +++ b/.github/workflows/hashes.yaml @@ -5,10 +5,12 @@ on: paths: - 'downloads/hashes.txt' - '_data/downloads.yml' + - '_data/contributing.yml' pull_request: paths: - 'downloads/hashes.txt' - '_data/downloads.yml' + - '_data/contributing.yml' jobs: validate-hashes: name: Validate Hashes @@ -19,11 +21,23 @@ jobs: run: | sudo apt-get install -y --no-install-recommends curl gpg jq python3-pip sudo pip3 install yq - - name: Verify hashes.txt signature + - name: Verify hashes.txt + contributing.yml signature run: | curl -sL https://raw.githubusercontent.com/monero-project/monero/master/utils/gpg_keys/binaryfate.asc | gpg --import gpg --verify downloads/hashes.txt + # signed by myself for testing purposes only + curl -sL https://raw.githubusercontent.com/plowsof/pgp/refs/heads/main/plowsofsmol.asc | gpg --import + gpg --verify _data/contributing.yml.asc + - name: Verify General Fund donation QR's + run: | + yaml="_data/contributing.yml" + for type in xmr btc; do + checksum=$(awk "/qr_${type}_checksum:/ {print \$2}" "$yaml") + file=$(awk "/qr_${type}_filename:/ {print \$2}" "$yaml") + echo "DEBUG: $checksum $file" + echo "$checksum $file" | sha256sum -c + done - name: Verify filenames run: | lines="$(grep -v ^# downloads/hashes.txt)" diff --git a/_data/contributing.yml b/_data/contributing.yml new file mode 100644 index 0000000000..2fe1aaa19a --- /dev/null +++ b/_data/contributing.yml @@ -0,0 +1,9 @@ +address_xmr: 888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H +address_btc: 1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H +address_openalias: donate.getmonero.org +view_address: 44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A +view_key: f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501 +qr_xmr_filename: img/donate-monero.png +qr_xmr_checksum: cf6cb49cf98726a40b860a6bb19df77df724a3e8e1ccb039adf8432de1509911 +qr_btc_filename: img/donate-bitcoin.png +qr_btc_checksum: ef2b0e59e401caad2393cb11f50dfc29b364e0af0fd5683012fe0abded608655 diff --git a/_data/contributing.yml.asc b/_data/contributing.yml.asc new file mode 100644 index 0000000000..e99381a4b1 --- /dev/null +++ b/_data/contributing.yml.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iI0EABMIADUWIQTci88MUIPyAweCgD5OipEtQO0FLAUCZw/b9xcccGxvd3NvZkBw +cm90b25tYWlsLmNvbQAKCRBOipEtQO0FLLGXAPoC2QGUbBPozZYqbzoJ/dsx+Kr+ +4JKe1roJvhgeUJdzMgD/VFJYuetujmhfWvfxjJMBHPMMBdOAmI/iTtMjsITVb5s= +=ptoN +-----END PGP SIGNATURE----- diff --git a/get-started/contributing/index.md b/get-started/contributing/index.md index 209d8a1b89..49903fad51 100644 --- a/get-started/contributing/index.md +++ b/get-started/contributing/index.md @@ -70,25 +70,25 @@ meta_descr: meta_descr.contributing

{% t contributing.genfund %}

{% t contributing.genfund_p %}

-

Monero:
888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H

+

Monero:
{{ site.data.contributing.address_xmr }}

{% t contributing.primary_address %}: - 44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A + {{ site.data.contributing.view_address }}
{% t moneropedia.entries.viewkey %}: - f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501 + {{ site.data.contributing.view_key }}
-

Bitcoin:
1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H

-

@openalias: donate.getmonero.org

+

Bitcoin:
{{ site.data.contributing.address_btc }}

+

@openalias: {{ site.data.contributing.address_openalias }}


- {% t contributing.altqrmonero %} + {% t contributing.altqrmonero %}
- {% t contributing.altqrbitcoin %} + {% t contributing.altqrbitcoin %}