diff --git a/MANIFEST.in b/MANIFEST.in index 9c7af8dd3..080d09738 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -17,5 +17,5 @@ include requirements.txt # ... which might make the above not necessary but the below very needed: exclude .gitattributes .gitignore pyinstaller .pre-commit.config.yaml prune pyinstaller/bitcoind -prune pyinstaller/torbrowser +prune pyinstaller/tor prune .github \ No newline at end of file diff --git a/pyinstaller/build-win-ci.bat b/pyinstaller/build-win-ci.bat index d411d98a8..d13ad0159 100755 --- a/pyinstaller/build-win-ci.bat +++ b/pyinstaller/build-win-ci.bat @@ -19,7 +19,8 @@ python .\utils\release-helper.py set_setup_py_version %1% echo " --> Building pypi package" -python setup.py sdist bdist_wheel +pip3 install build==0.10.0 +python -m build echo " --> Installing pypi package" python .\utils\release-helper.py install_wheel %1% @@ -36,8 +37,11 @@ rmdir /s /q .\dist\ rmdir /s /q .\build\ rmdir /s /q .\release\ rmdir /s /q .\electron\dist\ + +echo " --> Creating the pyinstaller binary" pyinstaller.exe specterd.spec mkdir release +echo " --> Creating the release-package" powershell Compress-Archive -Path dist\specterd.exe release\specterd-%1%-win64.zip diff --git a/pyinstaller/specterd.spec b/pyinstaller/specterd.spec index d3f834d1a..f23540c66 100644 --- a/pyinstaller/specterd.spec +++ b/pyinstaller/specterd.spec @@ -13,8 +13,7 @@ binaries = [] if platform.system() == 'Windows': binaries = [("./windll/libusb-1.0.dll", ".")] packaged_software_datas = [ - ('./torbrowser/tor-win64-0.4.5.7.zip', 'torbrowser'), - ('./bitcoind/bitcoin-0.21.1-win64.zip', 'bitcoind'), + ('./tor/tor-win64-0.4.8.0.tar.xz', 'tor'), ] elif platform.system() == 'Linux': if platform.processor() == 'aarch64': #ARM 64 bit @@ -32,16 +31,14 @@ elif platform.system() == 'Linux': binaries = [(p, ".")] break packaged_software_datas = [ - ('./torbrowser/tor-browser-linux64-10.0.15_en-US.tar.xz', 'torbrowser'), - ('./bitcoind/bitcoin-0.21.1' + ('-arm-linux-gnueabihf.tar.gz' if "armv" in platform.machine() else '-x86_64-linux-gnu.tar.gz'), 'bitcoind') + ('./tor/tor-linux64-0.4.8.0.tar.xz', 'tor'), ] elif platform.system() == 'Darwin': find_brew_libusb_proc = subprocess.Popen(['brew', '--prefix', 'libusb'], stdout=subprocess.PIPE) libusb_path = find_brew_libusb_proc.communicate()[0] binaries = [(libusb_path.rstrip().decode() + "/lib/libusb-1.0.dylib", ".")] packaged_software_datas = [ - ('./torbrowser/TorBrowser-10.0.15-osx64_en-US.dmg', 'torbrowser'), - ('./bitcoind/bitcoin-0.21.1-osx64.tar.gz', 'bitcoind'), + ('./tor/tor-osx64-0.4.8.0.tar.xz', 'tor'), ] a = Analysis(['specterd.py'], diff --git a/pyinstaller/tor/README.md b/pyinstaller/tor/README.md new file mode 100644 index 000000000..320ed85a5 --- /dev/null +++ b/pyinstaller/tor/README.md @@ -0,0 +1,4 @@ +The tor binaries in this directory has been built with the help of https://github.com/cretz/tor-static +commit: 89f64ecb518204458ada53dffecc876527a3d8ff + +All tor binary packaged files has been signed by https://keybase.io/k9ert \ No newline at end of file diff --git a/pyinstaller/tor/tor-linux64-0.4.8.0.tar.xz b/pyinstaller/tor/tor-linux64-0.4.8.0.tar.xz new file mode 100644 index 000000000..8523ec97d Binary files /dev/null and b/pyinstaller/tor/tor-linux64-0.4.8.0.tar.xz differ diff --git a/pyinstaller/tor/tor-linux64-0.4.8.0.tar.xz.asc b/pyinstaller/tor/tor-linux64-0.4.8.0.tar.xz.asc new file mode 100644 index 000000000..b0605f458 --- /dev/null +++ b/pyinstaller/tor/tor-linux64-0.4.8.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE7MC0q9dOcW9a3glSKLNYqIQ7AQkFAmP4cpAACgkQKLNYqIQ7 +AQlYJRAAjumOlHEyDW0uZxdkX2QSeFN5hHLVNvN+xOOHSvimVRbxKQk7lYVLCA+/ +9KvkMDZE1Yran11SaIf0eKZ6Z1b1nEGfrJOJiWev8jMI/qT9tNQulFifNpIZF83O +fHt95oz4seXKyFsGU59H4CNxKewoEOE9RumkGiwGixwPHF5xSp5TJdXUJC341UF7 +MrVyO0djKPtoFxq/8VPzCyF4ghnTa0BaFYwdWVdnwrDDgeNWeKTe4IcDU2VkKTbo +fy7jmmYT91ypLzj7p0YfZVX3WH8uoBqQvu7majvjnBUdh6oXUuK4WtQuy6Kr+ldL +WuWfnnTliZe07zieRvjTRdyT+ycTFWCROmmpxPoHljQTNFC9hH9H4xlmQZGeQBCb +UQzFfB7S7DPCxiTbsCQwV1EC+94SgvH5EsElO0pb8s27qt4Lii8Ifx1QDwA/7e8s +WZkJ7MVsWALCnUJXNMOTslCjkMJY8ZRHkTq0yZF2/wliLwLsFdv4uykyvivN6iNP +WXi2eszwrxXkFtWxTy5Gnp12fkWMzJlnaEMKk9Ybw5dHS3wIYr1yDHxn0ujFTLb8 +QI/6IhF1kc+vLsGz4l2FpAe6ide/b1L4NpPZT+rsHqCZ0Uoa3JSqPCLMEiHQx7vR +9mUJZMKLMAXNIgcV8CO9vBNzZx1rOrdzmWjpQT7h/5eWKDB0MeU= +=fqvO +-----END PGP SIGNATURE----- diff --git a/pyinstaller/tor/tor-osx64-0.4.8.0.tar.xz b/pyinstaller/tor/tor-osx64-0.4.8.0.tar.xz new file mode 100644 index 000000000..1edc099d2 Binary files /dev/null and b/pyinstaller/tor/tor-osx64-0.4.8.0.tar.xz differ diff --git a/pyinstaller/tor/tor-osx64-0.4.8.0.tar.xz.asc b/pyinstaller/tor/tor-osx64-0.4.8.0.tar.xz.asc new file mode 100644 index 000000000..585b72e7d --- /dev/null +++ b/pyinstaller/tor/tor-osx64-0.4.8.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE7MC0q9dOcW9a3glSKLNYqIQ7AQkFAmP4dd0ACgkQKLNYqIQ7 +AQmfvw//fBahwhKeitlFYz/p8FBuqxP4ufUg9RB/T+8WKaORDZm8smlourdJIMH0 +UWYVmKV0Vjbho9jzI4YYbQRI9jaJXIbN977kpPdDmM1CLxGUDfOfpIEHb8FgThgL +6BKJfxfBzbrSqBRpeq/mfXxz5Db3b6Kg7nhK7BBnx37bPlx+M3CGq5yAM8AYINN6 +JWfgbHF6Ao48JG+LnyJCCRJbgFgRKUmW0Oe2sWACoYu/sRda0j/Ja9WRBw4I1oZS +k5f2IlodIoWCwrLHQLJuc/lNv/I4BNS6YUJSnREUchMCZqpXTOUgoMhu77N60yYy +zBk/g10SJagtDue5GOdQL22WLGONqFCLk7R04OiADeozu3vREC5LoTGWnIzJI//J +F9GHC3X7005yIPh5XCH7UJKHswkaumkxk3XbCHub+uF5xZgbF1ukiZYvut2q0qnU +J8D900G5fAK5WnCFW7wzLVR6xZZaJyGWbdWm9eyah9l6h9WZbTY7hNEyRP32b/NA +whpEs1BAJwAZO/rENDk4hQYpJdWT0BDgVZKewAHa3G24j7rgtHnER8WZxhHFOx2x +krWhqa5bOh4tRCn3BlzjLVSS59eMZV0A78ajRNaAAa37HV/yESf5+ES4p+zAn6m8 +wB+cExwhXg/i6TOlGumYtrJanrmJOValygKW4H4UziY67kAbaOA= +=xn1P +-----END PGP SIGNATURE----- diff --git a/pyinstaller/tor/tor-win64-0.4.8.0.tar.xz b/pyinstaller/tor/tor-win64-0.4.8.0.tar.xz new file mode 100644 index 000000000..ff0d8815e Binary files /dev/null and b/pyinstaller/tor/tor-win64-0.4.8.0.tar.xz differ diff --git a/pyinstaller/tor/tor-win64-0.4.8.0.tar.xz.asc b/pyinstaller/tor/tor-win64-0.4.8.0.tar.xz.asc new file mode 100644 index 000000000..e9434f695 --- /dev/null +++ b/pyinstaller/tor/tor-win64-0.4.8.0.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE7MC0q9dOcW9a3glSKLNYqIQ7AQkFAmP4hk4ACgkQKLNYqIQ7 +AQl4dRAAsPsipzwYbR7jlk9BxmRq/iI+sZVQzeTS3mhEgFspCNWblQUe1hSHTwhA +u3S3Ynp0xxMLpI/ZAGxUUTtq4G6YH/GYqaXGbc77o0tYX2m+ZePeHIQr92XR1r1D +7ZSYdDSwCgq7mKDCrv0z7nKdyoJnsrCKLOLpBHQi6Mumt9IH97W6tXjBK8njo2pe +1+P3WkaE5Aui3s1y1ZGW+FSjFgU0CCmkTMLN+qWahbcL7YfGN3zYWAnINu+M3N11 +xmpI9728R55VtmDKhU7FNM/uFBWr9ucr/dnBqlCMQaX9+CrliWThdKrQLMY6oBVi +nSMGTJKtN6/PuPWGvTflidEgiCpTIdY8eXFGqwv7EdPVmr6sLPCgugI2u9BMji+W +4qaQKAVvlyOe2pHyJRBs5/FFzx6P4XRiSOVzbp7Q2mVYVtyUIRWc95REx++hNWG6 +Uz8KbRnhbhkFA88svH/dt/20Z/ZSwk30MI+2LRrzFQHd1pNtwG6MK4ORMH+a9NJT +A++vJyXd0IwN2escE/TXrrKEJJXLVkaCgITKxrSxB4yOXZg7Ngp63UUr6vIas7Ag +GSibOQE/91G618zho4c6wfpFaZE6fTQR/GujhrZbKbjmRc8VF8AvMG1NNrwYWMZf +ZpH3YsaaQ8N5cz4XyuKId/IFUyBPPi8M7kki+LY1WpJ1E7sDBwk= +=74Xl +-----END PGP SIGNATURE----- diff --git a/pyinstaller/torbrowser/TorBrowser-10.0.15-osx64_en-US.dmg.asc b/pyinstaller/torbrowser/TorBrowser-10.0.15-osx64_en-US.dmg.asc deleted file mode 100644 index 24217f517..000000000 --- a/pyinstaller/torbrowser/TorBrowser-10.0.15-osx64_en-US.dmg.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJgX1qwAAoJEOt3RJHZ/wbi4KIP/3/2RyZt19cdlNHLiO8LPLwa -nJIrbpyP50i8T6nmmsBpE0AZCt4bdktNIaMxJbnKf7kX9EJtF10CdF4wXiQnY9Vi -HYCy63kOqS6yASGlctK0pbrHCug3uoJvac1rjCsh9G1pcAkZHTzC+ZNQxd3AbSYR -ZIJkao7dFPQXXvscWmherCTWp8/LIVs7xBjhMfhRbSy86YJM6+vbubijanr+VrWz -Thfw54qLQQlyuZiv0ULnzdtanKb8BPRlPrp4iJEc6OBe8q4gTIG/4E4lg+XTqKKq -x3RUqLziue3GxIbKJdOVa19hgzo/ZsJVIWRK0k++N/BDUx1L/kXyBC8X0YQniCdo -nVVLlmBau9owh9YWZ5WJPckpvcR4lbcI+Q7l5ygTb1oaz6zDNjP7HgnhunWoA5qH -AKLpFoG1lokd/+HJfpzlDxuexd6DshH28b5cAPxjqgBPnJNbLlIbCTKCE8wxF5su -mR7AIQMrlfhqlC6uyX584fZ4LXiuZayCQDjFJcxw2fpmHRUb8awhGAoRFqv/DaSZ -qRwDuCZiWh/SgMXiL/xRI98BdQASJnW6hZDSuF0VRra1pLdWcsoWd5z2q+eDiI7f -iX+R8SjDrMg+YVlNK53bBP6ABHdg2KdPF0EQcPMeLM40i8vOYcbHzL2/697QOuYs -SqPpf7Pe+WVWLUFyTEFl -=scSU ------END PGP SIGNATURE----- diff --git a/pyinstaller/torbrowser/tor-browser-linux64-10.0.15_en-US.tar.xz b/pyinstaller/torbrowser/tor-browser-linux64-10.0.15_en-US.tar.xz deleted file mode 100644 index 237b90e27..000000000 Binary files a/pyinstaller/torbrowser/tor-browser-linux64-10.0.15_en-US.tar.xz and /dev/null differ diff --git a/pyinstaller/torbrowser/tor-browser-linux64-10.0.15_en-US.tar.xz.asc b/pyinstaller/torbrowser/tor-browser-linux64-10.0.15_en-US.tar.xz.asc deleted file mode 100644 index 7f8dd5264..000000000 --- a/pyinstaller/torbrowser/tor-browser-linux64-10.0.15_en-US.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJgX2g+AAoJEOt3RJHZ/wbi+BUQAKxqhLe62Lny2WQPU5gNEEeH -5mMo9OCaoYH1buWVLXoJ64EUTmDV5o5LDORhg4xC0Cddze1KQST3lhEL7LHf1VKt -FeL7AyH5NawE5EpPXqRYNBsiw0Jl76subMvC0UY9iEOrAizxmRxMlXo02aar2lSd -BeYiEUSi5FiM3VBGoetbNNoGfWC05czHb0x6OBTAfwo2CeGzUVTTIHB547YeMnHC -oKLhOH9eQGLb7T5gnIbqBRhRWM7Sqd/D6XLWu+0asUybKrSlsBPik5FA9jZv9iEl -mdRHvAyPZl2WkJAjFPun8shJ4izMpj0fdYiyIWNFWvz027gF8Qgh4MoDcL2aMlJP -nSJz16v7WWyRveOj8LrVJJaDXrBFfp5kd3br6LOCil+dBATvjufsz/2/zjenArwb -MAp26cg8+57WUoLKUBMudjTAIM2u6JO4+Mcy3w8/sxhwZGPkU9jFGw46TDd1UhQA -sg00MPN7uJFoFQFlSkvkfgcFqc2UEexQ8NxB51PaNvPxROh5FoLmeqo9apVMq0he -KD+vGL46/PdxRyy8GGrvk8qKXYvB+ZARYEDULR8gE6CPuXs4tN5kp4pWluMOX9SW -2DLsMUMECqVrj1AV+6p9Uuvx/2DnbrcJxS9VOKkV/CQa5yo3otxwzGVOs6DC6SdT -wW/E5ikD79Z5vSMap2cU -=n+4P ------END PGP SIGNATURE----- diff --git a/pyinstaller/torbrowser/tor-win64-0.4.5.7.zip b/pyinstaller/torbrowser/tor-win64-0.4.5.7.zip deleted file mode 100644 index 4752fa0b2..000000000 Binary files a/pyinstaller/torbrowser/tor-win64-0.4.5.7.zip and /dev/null differ diff --git a/pyinstaller/torbrowser/tor-win64-0.4.5.7.zip.asc b/pyinstaller/torbrowser/tor-win64-0.4.5.7.zip.asc deleted file mode 100644 index c1db643c5..000000000 --- a/pyinstaller/torbrowser/tor-win64-0.4.5.7.zip.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJgX2t4AAoJEOt3RJHZ/wbi5OkP/35io0fAqEpxgnKhBzI8zHl4 -49EHLQkds4Mxpf1jpPF1rcvfOtZFOAJcQENWqrR2jSqm0qemkxzy4o7cR4ckI7f6 -SZXW6W6aFhqvlg+O+PYmOPNpiYfjFmH/bA8ztsuZPhUgEBj/DeDTDa1pDIRqNCci -+Pv/RSsKjx993F7Nl9jQFpa03/Lpn2R6Z3o6m+Zu7S2nKuur6ohQMIqq8E/38z6W -qCokupSbuJYS4KcqW+Os8lvkPYOs7d18IQ09MxHIInynqDJSrhSBE/po4dahZi5K -OPuaEBvkRjbHMW75kW0JG7PG6ZR8Vn+Fyz0r2MfAhJuZtmOPn9yVP2Dzuvze8xZq -y7vJNqiMD/E+opNfXd5PFIiLXTx0vuZ07rMlYWAnGIFJ9Ba36wWLLiM80vnnmK0Y -XMl7HSE7bcseOi/tO0NgyuFCFsBRcpbYMx5I2Mstb+MslN7ptGEGPaR11M+lzgY3 -ddIkBCxQ+050CPQToYdN6vft4/34RH14rVq7dQ1SAu7CbC+2cDgOc4PuB6tK6v3W -fU2QrVgMjaGXMKfRxLVq2KLyYy1iI8N4STiruh5zMxSRWvyQvH7pM9tXdcrXvqEZ -AVXfmoG+kJZKJR84If1Agt0ncHvL+1+0xHO35UzpxUACoAte2Ey8ZwRzuP+lX/iW -kXUsSSSQSVc1Q0j2eQwY -=VMkJ ------END PGP SIGNATURE----- diff --git a/src/cryptoadvance/specter/specter.py b/src/cryptoadvance/specter/specter.py index c9b8da86a..e68e5392b 100644 --- a/src/cryptoadvance/specter/specter.py +++ b/src/cryptoadvance/specter/specter.py @@ -349,9 +349,7 @@ class Specter: self.setup_status[software_name]["stage_progress"] = -1 def get_setup_status(self, software_name): - if software_name == "bitcoind": - installed = os.path.isfile(self.bitcoind_path) - elif software_name == "torbrowser": + if software_name == "torbrowser": installed = os.path.isfile(self.torbrowser_path) else: installed = False diff --git a/src/cryptoadvance/specter/templates/settings/tor_settings.jinja b/src/cryptoadvance/specter/templates/settings/tor_settings.jinja index 0e2c2820a..02f5ad876 100644 --- a/src/cryptoadvance/specter/templates/settings/tor_settings.jinja +++ b/src/cryptoadvance/specter/templates/settings/tor_settings.jinja @@ -11,7 +11,14 @@

{{ _("Tor configurations") }}

-

{{ _("Enable Tor to anonymise your data connections.") }}

+