diff --git a/contrib/android/build.sh b/contrib/android/build.sh index a156838eb..f34b7948c 100755 --- a/contrib/android/build.sh +++ b/contrib/android/build.sh @@ -44,14 +44,14 @@ fi info "building docker image." docker build \ $DOCKER_BUILD_FLAGS \ - -t electrum-android-builder-img \ + -t pallectrum-android-builder-img \ --file "$CONTRIB_ANDROID/Dockerfile" \ "$PROJECT_ROOT" # maybe do fresh clone if [ ! -z "$ELECBUILD_COMMIT" ] ; then info "ELECBUILD_COMMIT=$ELECBUILD_COMMIT. doing fresh clone and git checkout." - FRESH_CLONE=${FRESH_CLONE:-"/tmp/electrum_build/android/fresh_clone/electrum"} + FRESH_CLONE=${FRESH_CLONE:-"/tmp/pallectrum_build/android/fresh_clone/pallectrum"} rm -rf "$FRESH_CLONE" 2>/dev/null || ( info "we need sudo to rm prev FRESH_CLONE." && sudo rm -rf "$FRESH_CLONE" ) umask 0022 git clone "$PROJECT_ROOT" "$FRESH_CLONE" @@ -82,12 +82,12 @@ if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) fi fi docker run --rm \ - --name electrum-android-builder-cont \ - -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/home/user/wspace/electrum \ + --name pallectrum-android-builder-cont \ + -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/home/user/wspace/pallectrum \ -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT"/.buildozer/.gradle:/home/user/.gradle \ $DOCKER_RUN_FLAGS \ - --workdir /home/user/wspace/electrum \ - electrum-android-builder-img \ + --workdir /home/user/wspace/pallectrum \ + pallectrum-android-builder-img \ ./contrib/android/make_apk.sh "$@" # make sure resulting binary location is independent of fresh_clone diff --git a/contrib/android/buildozer_qml.spec b/contrib/android/buildozer_qml.spec index e19bcac5a..264a08add 100644 --- a/contrib/android/buildozer_qml.spec +++ b/contrib/android/buildozer_qml.spec @@ -1,13 +1,13 @@ [app] # (str) Title of your application -title = Electrum +title = Pallectrum # (str) Package name -package.name = Electrum +package.name = Pallectrum # (str) Package domain (needed for android/ios packaging) -package.domain = org.electrum +package.domain = org.palladium # (str) Source code where the main.py live source.dir = . @@ -153,7 +153,7 @@ android.accept_sdk_license = True #android.add_jars = foo.jar,bar.jar,path/to/more/*.jar #android.add_jars = lib/android/zbar.jar -android.add_jars = .buildozer/android/platform/*/build/libs_collections/Electrum/jar/*.jar +android.add_jars = .buildozer/android/platform/*/build/libs_collections/Pallectrum/jar/*.jar android.add_aars = @@ -171,7 +171,7 @@ android.gradle_dependencies = com.android.support:support-compat:28.0.0, org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -android.add_activities = org.electrum.qr.SimpleScannerActivity +android.add_activities = org.palladium.qr.SimpleScannerActivity # (list) Put these files or directories in the apk res directory. # The option may be used in three ways, the value may contain one or zero ':' diff --git a/contrib/android/make_apk.sh b/contrib/android/make_apk.sh index 2b6ee7360..e4e6be091 100755 --- a/contrib/android/make_apk.sh +++ b/contrib/android/make_apk.sh @@ -52,7 +52,7 @@ if [[ "$3" == "release" ]] ; then export P4A_RELEASE_KEYSTORE_PASSWD="$4" export P4A_RELEASE_KEYALIAS_PASSWD="$4" export P4A_RELEASE_KEYSTORE=~/.keystore - export P4A_RELEASE_KEYALIAS=electrum + export P4A_RELEASE_KEYALIAS=pallectrum if [ -z "$P4A_RELEASE_KEYSTORE_PASSWD" ] || [ -z "$P4A_RELEASE_KEYALIAS_PASSWD" ]; then echo "p4a password not defined" exit 1 @@ -66,7 +66,7 @@ elif [[ "$3" == "debug" ]] ; then export P4A_DEBUG_KEYSTORE="$CONTRIB_ANDROID"/android_debug.keystore export P4A_DEBUG_KEYSTORE_PASSWD=unsafepassword export P4A_DEBUG_KEYALIAS_PASSWD=unsafepassword - export P4A_DEBUG_KEYALIAS=electrum + export P4A_DEBUG_KEYALIAS=pallectrum # create keystore if needed if [ ! -f "$P4A_DEBUG_KEYSTORE" ]; then keytool -genkey -v -keystore "$CONTRIB_ANDROID"/android_debug.keystore \ diff --git a/contrib/build-linux/appimage/build.sh b/contrib/build-linux/appimage/build.sh index 8f66d5359..d687a1928 100755 --- a/contrib/build-linux/appimage/build.sh +++ b/contrib/build-linux/appimage/build.sh @@ -29,13 +29,13 @@ fi info "building docker image." docker build \ $DOCKER_BUILD_FLAGS \ - -t electrum-appimage-builder-img \ + -t pallectrum-appimage-builder-img \ "$CONTRIB_APPIMAGE" # maybe do fresh clone if [ ! -z "$ELECBUILD_COMMIT" ] ; then info "ELECBUILD_COMMIT=$ELECBUILD_COMMIT. doing fresh clone and git checkout." - FRESH_CLONE="/tmp/electrum_build/appimage/fresh_clone/electrum" + FRESH_CLONE="/tmp/pallectrum_build/appimage/fresh_clone/pallectrum" rm -rf "$FRESH_CLONE" 2>/dev/null || ( info "we need sudo to rm prev FRESH_CLONE." && sudo rm -rf "$FRESH_CLONE" ) umask 0022 git clone "$PROJECT_ROOT" "$FRESH_CLONE" @@ -65,11 +65,11 @@ if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) fi fi docker run $DOCKER_RUN_FLAGS \ - --name electrum-appimage-builder-cont \ - -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/electrum \ + --name pallectrum-appimage-builder-cont \ + -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/pallectrum \ --rm \ - --workdir /opt/electrum/contrib/build-linux/appimage \ - electrum-appimage-builder-img \ + --workdir /opt/pallectrum/contrib/build-linux/appimage \ + pallectrum-appimage-builder-img \ ./make_appimage.sh # make sure resulting binary location is independent of fresh_clone diff --git a/contrib/build-linux/appimage/make_appimage.sh b/contrib/build-linux/appimage/make_appimage.sh index 061a12a28..9c3713332 100755 --- a/contrib/build-linux/appimage/make_appimage.sh +++ b/contrib/build-linux/appimage/make_appimage.sh @@ -7,7 +7,7 @@ CONTRIB="$PROJECT_ROOT/contrib" CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage" DISTDIR="$PROJECT_ROOT/dist" BUILDDIR="$CONTRIB_APPIMAGE/build/appimage" -APPDIR="$BUILDDIR/electrum.AppDir" +APPDIR="$BUILDDIR/pallectrum.AppDir" CACHEDIR="$CONTRIB_APPIMAGE/.cache/appimage" TYPE2_RUNTIME_REPO_DIR="$CACHEDIR/type2-runtime" export DLL_TARGET_DIR="$CACHEDIR/dlls" @@ -25,7 +25,7 @@ PY_VER_MAJOR="3.12" # as it appears in fs paths PKG2APPIMAGE_COMMIT="a9c85b7e61a3a883f4a35c41c5decb5af88b6b5d" VERSION=$(git describe --tags --dirty --always) -APPIMAGE="$DISTDIR/electrum-$VERSION-x86_64.AppImage" +APPIMAGE="$DISTDIR/pallectrum-$VERSION-x86_64.AppImage" rm -rf "$BUILDDIR" mkdir -p "$APPDIR" "$CACHEDIR" "$PIP_CACHE_DIR" "$DISTDIR" "$DLL_TARGET_DIR" diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile index 4a7022bce..fcf9bcb4b 100644 --- a/contrib/build-wine/Dockerfile +++ b/contrib/build-wine/Dockerfile @@ -69,4 +69,4 @@ RUN chown --recursive ${UID} ${WORK_DIR} RUN chown ${UID} /opt USER ${UID} -RUN mkdir --parents "/opt/wine64/drive_c/electrum" +RUN mkdir --parents "/opt/wine64/drive_c/pallectrum" diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 10c1ac1c6..bbde43964 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -1,7 +1,7 @@ #!/bin/bash -NAME_ROOT=electrum -PROJECT_ROOT="$WINEPREFIX/drive_c/electrum" +NAME_ROOT=pallectrum +PROJECT_ROOT="$WINEPREFIX/drive_c/pallectrum" export PYTHONDONTWRITEBYTECODE=1 # don't create __pycache__/ folders with .pyc files diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh index c10e8751a..5880bf96d 100755 --- a/contrib/build-wine/build.sh +++ b/contrib/build-wine/build.sh @@ -31,13 +31,13 @@ fi info "building docker image." docker build \ $DOCKER_BUILD_FLAGS \ - -t electrum-wine-builder-img \ + -t pallectrum-wine-builder-img \ "$CONTRIB_WINE" # maybe do fresh clone if [ ! -z "$ELECBUILD_COMMIT" ] ; then info "ELECBUILD_COMMIT=$ELECBUILD_COMMIT. doing fresh clone and git checkout." - FRESH_CLONE="/tmp/electrum_build/windows/fresh_clone/electrum" + FRESH_CLONE="/tmp/pallectrum_build/windows/fresh_clone/pallectrum" rm -rf "$FRESH_CLONE" 2>/dev/null || ( info "we need sudo to rm prev FRESH_CLONE." && sudo rm -rf "$FRESH_CLONE" ) umask 0022 git clone "$PROJECT_ROOT" "$FRESH_CLONE" @@ -63,11 +63,11 @@ if [ ! -z "$ELECBUILD_COMMIT" ] ; then # fresh clone (reproducible build) fi fi docker run $DOCKER_RUN_FLAGS \ - --name electrum-wine-builder-cont \ - -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/wine64/drive_c/electrum \ + --name pallectrum-wine-builder-cont \ + -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/wine64/drive_c/pallectrum \ --rm \ - --workdir /opt/wine64/drive_c/electrum/contrib/build-wine \ - electrum-wine-builder-img \ + --workdir /opt/wine64/drive_c/pallectrum/contrib/build-wine \ + pallectrum-wine-builder-img \ ./make_win.sh # make sure resulting binary location is independent of fresh_clone diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi index 6aa4ce22b..660a6fa4a 100644 --- a/contrib/build-wine/electrum.nsi +++ b/contrib/build-wine/electrum.nsi @@ -6,9 +6,9 @@ ;-------------------------------- ;Variables - !define PRODUCT_NAME "Electrum" - !define PRODUCT_WEB_SITE "https://github.com/spesmilo/electrum" - !define PRODUCT_PUBLISHER "Electrum Technologies GmbH" + !define PRODUCT_NAME "Pallectrum" + !define PRODUCT_WEB_SITE "https://github.com/palladium-coin/pallectrum" + !define PRODUCT_PUBLISHER "Pallectrum Project" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" ;-------------------------------- @@ -16,7 +16,7 @@ ;Name and file Name "${PRODUCT_NAME}" - OutFile "dist/electrum-setup.exe" + OutFile "dist/pallectrum-setup.exe" ;Default installation folder InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}" @@ -189,11 +189,11 @@ Section CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" 0 - ;Links bitcoin: and lightning: URIs to Electrum - WriteRegStr HKCU "Software\Classes\bitcoin" "" "URL:bitcoin Protocol" - WriteRegStr HKCU "Software\Classes\bitcoin" "URL Protocol" "" - WriteRegStr HKCU "Software\Classes\bitcoin" "DefaultIcon" "$\"$INSTDIR\electrum.ico, 0$\"" - WriteRegStr HKCU "Software\Classes\bitcoin\shell\open\command" "" "$\"$INSTDIR\electrum-${PRODUCT_VERSION}.exe$\" $\"%1$\"" + ;Links palladium: and lightning: URIs to Pallectrum + WriteRegStr HKCU "Software\Classes\palladium" "" "URL:palladium Protocol" + WriteRegStr HKCU "Software\Classes\palladium" "URL Protocol" "" + WriteRegStr HKCU "Software\Classes\palladium" "DefaultIcon" "$\"$INSTDIR\electrum.ico, 0$\"" + WriteRegStr HKCU "Software\Classes\palladium\shell\open\command" "" "$\"$INSTDIR\electrum-${PRODUCT_VERSION}.exe$\" $\"%1$\"" WriteRegStr HKCU "Software\Classes\lightning" "" "URL:lightning Protocol" WriteRegStr HKCU "Software\Classes\lightning" "URL Protocol" "" WriteRegStr HKCU "Software\Classes\lightning" "DefaultIcon" "$\"$INSTDIR\electrum.ico, 0$\"" diff --git a/contrib/build-wine/make_win.sh b/contrib/build-wine/make_win.sh index 13ee21d90..e3fb5f7c2 100755 --- a/contrib/build-wine/make_win.sh +++ b/contrib/build-wine/make_win.sh @@ -25,7 +25,7 @@ export CONTRIB="$here/.." export PROJECT_ROOT="$CONTRIB/.." export CACHEDIR="$here/.cache/$WIN_ARCH/build" export PIP_CACHE_DIR="$here/.cache/$WIN_ARCH/wine_pip_cache" -export WINE_PIP_CACHE_DIR="c:/electrum/contrib/build-wine/.cache/$WIN_ARCH/wine_pip_cache" +export WINE_PIP_CACHE_DIR="c:/pallectrum/contrib/build-wine/.cache/$WIN_ARCH/wine_pip_cache" export DLL_TARGET_DIR="$CACHEDIR/dlls" export WINEPREFIX="/opt/wine64" diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index f9553f7e5..3fddfbaa4 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -53,9 +53,9 @@ $WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-binary : # copy already built DLLs -cp "$DLL_TARGET_DIR"/libsecp256k1-*.dll $WINEPREFIX/drive_c/electrum/electrum/ || fail "Could not copy libsecp to its destination" -cp "$DLL_TARGET_DIR/libzbar-0.dll" $WINEPREFIX/drive_c/electrum/electrum/ || fail "Could not copy libzbar to its destination" -cp "$DLL_TARGET_DIR/libusb-1.0.dll" $WINEPREFIX/drive_c/electrum/electrum/ || fail "Could not copy libusb to its destination" +cp "$DLL_TARGET_DIR"/libsecp256k1-*.dll $WINEPREFIX/drive_c/pallectrum/electrum/ || fail "Could not copy libsecp to its destination" +cp "$DLL_TARGET_DIR/libzbar-0.dll" $WINEPREFIX/drive_c/pallectrum/electrum/ || fail "Could not copy libzbar to its destination" +cp "$DLL_TARGET_DIR/libusb-1.0.dll" $WINEPREFIX/drive_c/pallectrum/electrum/ || fail "Could not copy libusb to its destination" info "Building PyInstaller." @@ -73,7 +73,7 @@ info "Building PyInstaller." info "pyinstaller already built, skipping" exit 0 fi - cd "$WINEPREFIX/drive_c/electrum" + cd "$WINEPREFIX/drive_c/pallectrum" ELECTRUM_COMMIT_HASH=$(git rev-parse HEAD) cd "$CACHEDIR" rm -rf pyinstaller diff --git a/contrib/build-wine/pyinstaller.spec b/contrib/build-wine/pyinstaller.spec index 09f1655fd..0556a020e 100644 --- a/contrib/build-wine/pyinstaller.spec +++ b/contrib/build-wine/pyinstaller.spec @@ -11,7 +11,7 @@ if TYPE_CHECKING: PYPKG="electrum" MAIN_SCRIPT="run_electrum" -PROJECT_ROOT = "C:/electrum" +PROJECT_ROOT = "C:/pallectrum" ICONS_FILE=f"{PROJECT_ROOT}/{PYPKG}/gui/icons/electrum.ico" cmdline_name = os.environ.get("ELECTRUM_CMDLINE_NAME") diff --git a/contrib/build-wine/sign.sh b/contrib/build-wine/sign.sh index ecdd30575..1f959adde 100755 --- a/contrib/build-wine/sign.sh +++ b/contrib/build-wine/sign.sh @@ -35,8 +35,8 @@ for f in $(ls *.exe); do -h sha256 \ -certs "$CERT_FILE" \ -key "$KEY_FILE" \ - -n "Electrum" \ - -i "https://electrum.org/" \ + -n "Pallectrum" \ + -i "https://github.com/palladium-coin/pallectrum" \ -t "http://timestamp.digicert.com/" \ -in "$f" \ -out "../signed/$f" diff --git a/electrum.desktop b/electrum.desktop index 7434829a5..f4407b3d6 100644 --- a/electrum.desktop +++ b/electrum.desktop @@ -1,23 +1,23 @@ -# If you want Electrum to appear in a Linux app launcher ("start menu"), install this by doing: +# If you want Pallectrum to appear in a Linux app launcher ("start menu"), install this by doing: # sudo desktop-file-install electrum.desktop # Note: This assumes $HOME/.local/bin is in your $PATH [Desktop Entry] -Comment=Lightweight Bitcoin Client +Comment=Lightweight Palladium Client Exec=electrum %u -GenericName[en_US]=Bitcoin Wallet -GenericName=Bitcoin Wallet +GenericName[en_US]=Palladium Wallet +GenericName=Palladium Wallet Icon=electrum -Name[en_US]=Electrum Bitcoin Wallet -Name=Electrum Bitcoin Wallet +Name[en_US]=Pallectrum Wallet +Name=Pallectrum Wallet Categories=Finance;Network; StartupNotify=true StartupWMClass=electrum Terminal=false Type=Application -MimeType=x-scheme-handler/bitcoin;x-scheme-handler/lightning; +MimeType=x-scheme-handler/palladium;x-scheme-handler/lightning; Actions=Testnet; -Keywords=crypto;currency;BTC +Keywords=crypto;currency;PLM;palladium [Desktop Action Testnet] Exec=electrum --testnet %u diff --git a/electrum/util.py b/electrum/util.py index f647ea0c3..8a53e41d5 100644 --- a/electrum/util.py +++ b/electrum/util.py @@ -705,11 +705,11 @@ def user_dir(): elif 'ANDROID_DATA' in os.environ: return android_data_dir() elif os.name == 'posix': - return os.path.join(os.environ["HOME"], ".electrum") + return os.path.join(os.environ["HOME"], ".pallectrum") elif "APPDATA" in os.environ: - return os.path.join(os.environ["APPDATA"], "Electrum") + return os.path.join(os.environ["APPDATA"], "Pallectrum") elif "LOCALAPPDATA" in os.environ: - return os.path.join(os.environ["LOCALAPPDATA"], "Electrum") + return os.path.join(os.environ["LOCALAPPDATA"], "Pallectrum") else: #raise Exception("No home directory found in environment variables.") return diff --git a/setup.py b/setup.py index ba15de1ba..0674ce38d 100755 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ extras_require['fast'] = extras_require['crypto'] setup( - name="Electrum", + name="Pallectrum", version=version.ELECTRUM_VERSION, python_requires='>={}'.format(MIN_PYTHON_VERSION), install_requires=requirements, @@ -73,10 +73,10 @@ setup( include_package_data=True, scripts=['electrum/electrum'], data_files=data_files, - description="Lightweight Bitcoin Wallet", - author="Thomas Voegtlin", - author_email="thomasv@electrum.org", + description="Lightweight Palladium Wallet", + author="Pallectrum Project", + author_email="", license="MIT Licence", - url="https://electrum.org", - long_description="""Lightweight Bitcoin Wallet""", + url="https://github.com/palladium-coin/pallectrum", + long_description="""Lightweight Palladium Wallet""", )