OS X - Apple Silicon Build v2.0.0-beta3.2. Change M1/M2 specific kivy…

… res. Improve connection time to v2ray nodes. Remove unused scripts. Reduce password prompt down to 1 instead of 2 entries. Update codesign.sh. Update routes.sh for optimal settings. Build Dev signed.

.gitignore

@@ -160,7 +160,10 @@ cython_debug/
 #.idea/
 
 # Custom
-scrtsxx.py
-scrtxxs.py
+#scrtsxx.py
+#scrtxxs.py
 
 src/meile_gui.egg-info/
+
+# OS X
+.DS_Store

codesign.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+
+if [[ $# -lt 1 ]]; then
+	echo "CodeSign v1.2 by freQniK"
+	echo ""
+	echo "Usage: $0 <version>"
+	echo ""
+	echo "where version is in the format of v1.x.x"
+	exit
+fi
+
+VERSION="$1"
+
+
+echo "Hard signing Meile.app..."
+codesign --force --options runtime --timestamp --sign "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app
+
+sleep 2
+echo "Signing v2ray..."
+codesign --force --options runtime --timestamp --sign "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app/Contents/Resources/bin/v2ray
+
+sleep 2
+echo "Signing wireguard-go.."
+codesign --force --options runtime --timestamp --sign "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app/Contents/Resources/bin/wireguard-go
+
+sleep 2
+echo "Signing tun2socks..."
+codesign --force --options runtime --timestamp --sign "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app/Contents/Resources/bin/tun2socks
+
+sleep 2
+echo "Signing wg..."
+codesign --force --options runtime --timestamp --sign "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app/Contents/Resources/bin/wg
+
+#sleep 2
+#echo "Signing sentinelcli..."
+#codesign --force --options runtime --timestamp --sign "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app/Contents/Resources/bin/sentinelcli
+
+sleep 2
+echo "Signing meile-gui..."
+codesign --force --options runtime --timestamp --sign "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app/Contents/MacOS/meile-gui
+
+sleep 2
+echo "Displaying hardsigning verification..."
+sleep 2
+codesign --display --verbose /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile/Meile.app
+sleep 7
+
+echo "Creating disk image..."
+#hdiutil create -volname Meile -srcfolder /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile.app -ov -format UDBZ /Users/freqnik/eclipse-workspace/Meile2.0/dist/Meile.dmg
+create-dmg \
+  --volname "Meile" \
+  --volicon "icon.icns" \
+  --background "meile.app.png" \
+  --window-pos 200 120 \
+  --window-size 800 400 \
+  --icon-size 100 \
+  --icon "dist/Meile/Meile.app" 200 190 \
+  --app-drop-link 600 185 \
+  "Meile-"$VERSION"_arm64.dmg" \
+  "dist/Meile/"
+sleep 2
+
+echo "Signing disk image..."
+codesign -s "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" --timestamp /Users/freqnik/eclipse-workspace/Meile2.0/"Meile-"$VERSION"_arm64.dmg"
+sleep 2
+
+
+meile_date=`date +%m%d%y`
+echo "Submitting App for notarization..."
+#deprecated
+#xcrun altool --notarize-app --primary-bundle-id "M1-$meile_date" -u "freqnik@mathnodes.com" -p "@keychain:Meile-M1" -t osx -f /Users/freqnik/eclipse-workspace/Meile2.0/"Meile-"$VERSION".dmg"
+xcrun notarytool submit --keychain-profile "MN-M1" /Users/freqnik/eclipse-workspace/Meile2.0/"Meile-"$VERSION"_arm64.dmg" --wait
+
+echo "Press enter once notarization was approved...."
+read answer
+
+sleep 2
+echo "Stapling the notarization receipt..."
+xcrun stapler staple /Users/freqnik/eclipse-workspace/Meile2.0/"Meile-"$VERSION"_arm64.dmg"
+sleep 3
+
+echo "Verification...."
+spctl -a -vv -t install /Users/freqnik/eclipse-workspace/Meile2.0/"Meile-"$VERSION"_arm64.dmg"

create-meile-dmg.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+create-dmg \
+  --volname "Meile" \
+  --volicon "icon.icns" \
+  --background "meile.app.png" \
+  --window-pos 200 120 \
+  --window-size 800 400 \
+  --icon-size 100 \
+  --icon "dist/Meile/Meile.app" 200 190 \
+  --app-drop-link 600 185 \
+  "Meile-v1.5.1_M1.dmg" \
+  "dist/Meile/"

pyinstaller.cmd

@@ -1,12 +1,16 @@
-#!/bin/bash
+#!/opt/homebrew/bin/bash
 
 if [[ $# -lt 1 ]]; then
 	echo "Usage: $0 <version>"
 	exit
 fi
 
 new_version="$1"
-sed -i "s/VERSION = \".*\"/VERSION = \"$new_version\"/" src/typedef/konstants.py
+build_version=`date +%s%3`
 
-# Linux 
-pyinstaller --onefile --collect-all bip_utils --collect-all mospy_wallet --collect-all sentinel_protobuf --collect-all sentinel_sdk --collect-all stripe --collect-all kivy_garden  --add-data src/fonts:../fonts --add-data src/awoc/datum/:datum --add-data src/utils/fonts/:../utils/fonts --add-data src/utils/coinimg/:../utils/coinimg --add-data src/imgs/:../imgs --add-data src/kv/:../kv --add-data src/conf/config/:config  --add-data src/bin/:../bin src/main/meile_gui.py
+sed -i '' "s/VERSION = \".*\"/VERSION = \"$new_version\"/" src/typedef/konstants.py
+sed -i '' "s/BUILD = \".*\"/BUILD = \"$build_version\"/" src/typedef/konstants.py
+
+rm -rf build dist
+
+pyinstaller --windowed --icon icon.icns --onedir --osx-bundle-identifier 'com.mathnodes.meile' --codesign-identity "Developer ID Application: Pool Stats LLC (VQYLU43P5V)" --collect-all bip_utils --collect-all mospy_wallet --collect-all sentinel_protobuf --collect-all sentinel_sdk --collect-all stripe --collect-all kivy_garden --add-data src/fonts:fonts --add-data src/awoc/data/:data --add-data src/utils/fonts/:utils/fonts --add-data src/utils/coinimg/:utils/coinimg --add-data src/imgs/:imgs --add-data src/kv/:kv --add-data src/conf/config/:config --add-data src/bin/:bin src/main/meile-gui.py