Remove reused donation addresses

README.md

@@ -114,5 +114,3 @@ Donate to help make JoinMarket even better: [Obtain a bitcoin address here](http
 
 JoinMarket is an open source project which does not have a funding model, fortunately the project itself has very low running costs as it is almost-fully decentralized and available to everyone for free. Developers contribute only as volunteers and donations are divided amongst them. Many developers have also been important in advocating for privacy and educating the wider bitcoin user base. Be part of the effort to improve bitcoin privacy and fungibility. Every donated coin helps us spend more time on JoinMarket instead of doing other stuff.
 
-Old donation addresses: `bc1q5x02zqj5nshw0yhx2s4tj75z6vkvuvww26jak5` or `1AZgQZWYRteh6UyF87hwuvyWj73NvWKpL`. Signatures can be found [here](docs/signed-donation-address.txt).
-Ideally use the above https link to obtain a brand new address.

docs/signed-donation-address.txt

@@ -1,33 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-Bitcoin addresses used for accepting donations to the joinmarket project
-
-(bech32) bc1q5x02zqj5nshw0yhx2s4tj75z6vkvuvww26jak5
-(legacy) 1AZgQZWYRteh6UyF87hwuvyWj73NvWKpL
-
-Always check signatures of addresses to avoid man-in-the-middle attacks
-
-The GPG public key and fingerprint can be found at:
-* The joinmarket github repository in /pubkeys/belcher.asc
-* https://www.reddit.com/r/publickeyexchange/comments/3ti8vp/ubelcher_s_public_key/
-* https://twitter.com/chris_belcher_/status/559879313622061056
-* https://bitcointalk.org/index.php?action=profile;u=321816
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAEBCgAGBQJcHPgfAAoJEO9zTqZ38xEpZmoP/RbanNv0buDBs2UX+B5tvzqN
-czRVK4lh/5COyN3t4HZVVI0TJ0n6joQKswOJOtCuoPdISMXbw74Kh+kO9QIjD4+e
-ykIHF4Hcn1dvTGoJkxryTq6FFopQ0SA7EVctZ8yJcci4tYhkHnoGVWGfJh8GGMBy
-pZnNTf4q3lxqjFlT4bdmXiuPk22ZSNyzgFStb2zxsCz8bwf/O8mLkQQBA58mt6Qm
-v5qOc04FdKjg+NVfnYIX6dr436gusgGI6vzADrrkQ1491Qlc3sb5/FWdKYsstzrY
-bGbsWODBzAQT7p7jypSjlpHVU7zkO1EIIAkR2xkVXe5zERp1Jy0DY/ylgRqPT0pY
-BgM+FSpAIPLVwUz5wZQ3GThceljKr33p8nregF8lxc6Kw/GYwV2ob99pNmMMk38O
-HIa7Rz4W7XgTBUbuk/nIoQNyl5y2eN6EQKj1nP6Vg8klTDdFwuiVcBJYb0+zWm5J
-5ARvcisxzZjCjztiUk6LbjFEbwnfdnUwKAy4TpAHssrSCJlP91nSHLfoZc8KomVu
-Wb2AR9+6ZXa6KXKP2h9bPm+1YNZKvo7+OVdlxdVR/AU9qoxpom7A28w6hI7qjZoy
-3EOECEVZTgpREFNWr52Z1qOFW2Y+x3gUjZ2zlPAHC38o4SOZrbaMRm5KKkJ+zm4k
-HzevCRfeUUHMS77JUFuR
-=ljKH
------END PGP SIGNATURE-----

scripts/joinmarket-qt.py

@@ -50,9 +50,6 @@ if 'twisted.internet.reactor' in sys.modules:
 import qt5reactor
 qt5reactor.install()
 
-#General Joinmarket donation address; TODO
-donation_address = "1AZgQZWYRteh6UyF87hwuvyWj73NvWKpL"
-donation_address_sw = "bc1q5x02zqj5nshw0yhx2s4tj75z6vkvuvww26jak5"
 donation_address_url = "https://bitcoinprivacy.me/joinmarket-donations"
 
 #Version of this Qt script specifically
@@ -1615,23 +1612,14 @@ class JMMainWindow(QMainWindow):
                   + "coin helps us spend more time on JoinMarket instead of doing other stuff."]))
         about_text_label.setWordWrap(True)
         donation_url_label = QLabel(donation_address_url)
-        donation_addr_label = QLabel(donation_address)
-        donation_addr_sw_label = QLabel(donation_address_sw)
-        for l in [about_text_label, donation_url_label, donation_addr_label, donation_addr_sw_label]:
+        for l in [about_text_label, donation_url_label]:
             l.setTextFormat(QtCore.Qt.RichText)
             l.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
             l.setOpenExternalLinks(True)
         donation_url_label.setText("<a href='" + donation_address_url + "'>" +
             donation_address_url + "</a>")
-        donation_addr_label.setText("<a href='bitcoin:" + donation_address + "'>" +
-            donation_address + "</a>")
-        donation_addr_sw_label.setText("<a href='bitcoin:" + donation_address_sw + "'>" +
-            donation_address_sw + "</a>")
         lyt.addWidget(about_text_label)
         lyt.addWidget(donation_url_label)
-        lyt.addWidget(QLabel("Old donation addresses below. Ideally use the above URL."))
-        lyt.addWidget(donation_addr_label)
-        lyt.addWidget(donation_addr_sw_label)
         btnbox = QDialogButtonBox(msgbox)
         btnbox.setStandardButtons(QDialogButtonBox.Ok)
         btnbox.accepted.connect(msgbox.accept)