bug

.gitignore

@@ -7,6 +7,7 @@ dist/
 /electrum.py
 contrib/pyinstaller/
 Electrum.egg-info/
+Electrum_bci.egg-info/
 gui/qt/icons_rc.py
 locale/
 .devlocaltmp/
@@ -24,3 +25,5 @@ bin/
 /venv/**
 /.idea/**
 /example.log
+electrum-bci-env
+contrib/*/tmp/

AUTHORS

@@ -11,3 +11,5 @@ Julian Toash (Tuxavant) - Various fixes to the client.
 rdymac - Website and translations.
 kyuupichan - Miscellaneous.
 BitcoinGold Developers - Forked BTG Version
+fellu - Forked BCI Version
+

Info.plist

@@ -6,10 +6,10 @@
   <array>
     <dict>
       <key>CFBundleURLName</key>
-      <string>bitcoingold</string>
+      <string>bitcoininterest</string>
       <key>CFBundleURLSchemes</key>
       <array>
-        <string>bitcoingold</string>
+        <string>bitcoininterest</string>
       </array>
     </dict>
   </array>

MANIFEST.in

@@ -1,9 +1,9 @@
 include LICENCE RELEASE-NOTES AUTHORS
 include README.rst
-include electrumg.conf.sample
-include electrumg.desktop
+include electrum-bci.conf.sample
+include electrum-bci.desktop
 include *.py
-include electrumg
+include electrum-bci
 include contrib/requirements/requirements.txt
 include contrib/requirements/requirements-hw.txt
 recursive-include lib *.py

README.rst

@@ -36,7 +36,7 @@ Electrum from its root directory, without installing it on your
 system; all the python dependencies are included in the 'packages'
 directory. To run Electrum from its root directory, just do::
 
-    ./electrum
+    ./electrum-bci
 
 You can also install Electrum on your system, by running this command::
 
@@ -57,7 +57,7 @@ Development version
 
 Check out the code from Github::
 
-    git clone git://github.com/spesmilo/electrum.git
+    git clone git://github.com/BitcoinInterestOfficial/electrum.git
     cd electrum
 
 Run install (this should install dependencies)::

RELEASE-NOTES

@@ -1,6 +1,17 @@
+# Release 3.4
+
+ * Added / Fixed initial blockchain headers
+ * Fixed price getter
+
+
+# Release 3.3
+
+ ProgPow changes
+
+
 # Release 3.2
 
- First release containing changes for BitcoinGold
+ First release containing changes for BitcoinInterest
 
 
 

contrib/build-osx/make_osx

@@ -20,8 +20,8 @@ VERSION=`git describe --tags`
 # Paramterize
 PYTHON_VERSION=3.6.4
 BUILDDIR=/tmp/electrum-build
-PACKAGE=ElectrumG
-GIT_REPO=https://github.com/BTCGPU/electrum
+PACKAGE=Electrum-bci
+GIT_REPO=https://github.com/BitcoinInterestOfficial/electrum
 
 
 info "Installing Python $PYTHON_VERSION"
@@ -88,4 +88,4 @@ info "Building binary"
 pyinstaller --noconfirm --ascii --name $VERSION contrib/build-osx/osx.spec || fail "Could not build binary"
 
 info "Creating .DMG"
-hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrumg-$VERSION.dmg || fail "Could not create .DMG"
+hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrum-bci-$VERSION.dmg || fail "Could not create .DMG"

contrib/build-osx/osx.spec

@@ -5,10 +5,10 @@ from PyInstaller.utils.hooks import collect_data_files, collect_submodules, coll
 import sys
 import os
 
-PACKAGE='ElectrumG'
-PYPKG='electrumg'
-MAIN_SCRIPT='electrumg'
-ICONS_FILE='electrumg.icns'
+PACKAGE='Electrum-bci'
+PYPKG='electrum-bci'
+MAIN_SCRIPT='electrum-bci'
+ICONS_FILE='electrum-bci.icns'
 
 for i, x in enumerate(sys.argv):
     if x == '--name':

contrib/build-wine/build-electrum-git.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NAME_ROOT=electrumg
+NAME_ROOT=electrum-bci
 PYTHON_VERSION=3.5.4
 
 # These settings probably don't need any change
@@ -26,7 +26,7 @@ for repo in electrum electrum-locale electrum-icons; do
 	git checkout master
 	cd ..
     else
-	URL=https://github.com/BTCGPU/$repo.git
+	URL=https://github.com/BitcoinInterestOfficial/$repo.git
 	git clone -b master $URL $repo
     fi
 done
@@ -49,18 +49,18 @@ echo "Last commit: $VERSION"
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
-rm -rf $WINEPREFIX/drive_c/electrumg
-cp -r electrum $WINEPREFIX/drive_c/electrumg
+rm -rf $WINEPREFIX/drive_c/electrum-bci
+cp -r electrum $WINEPREFIX/drive_c/electrum-bci
 cp electrum/LICENCE .
-cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrumg/lib/
-cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrumg/gui/qt/
+cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrum-bci/lib/
+cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum-bci/gui/qt/
 
 # Install frozen dependencies
 $PYTHON -m pip install -r ../../deterministic-build/requirements.txt
 
 $PYTHON -m pip install -r ../../deterministic-build/requirements-hw.txt
 
-pushd $WINEPREFIX/drive_c/electrumg
+pushd $WINEPREFIX/drive_c/electrum-bci
 $PYTHON setup.py install
 popd
 
@@ -81,7 +81,7 @@ popd
 wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum.nsi
 
 cd dist
-mv electrumg-setup.exe $NAME_ROOT-$VERSION-setup.exe
+mv electrum-bci-setup.exe $NAME_ROOT-$VERSION-setup.exe
 cd ..
 
 echo "Done."

contrib/build-wine/deterministic.spec

@@ -11,7 +11,7 @@ else:
     raise BaseException('no name')
 
 
-home = 'C:\\electrumg\\'
+home = 'C:\\electrum-bci\\'
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
 hiddenimports = []
@@ -42,7 +42,7 @@ datas += collect_data_files('btchip')
 datas += collect_data_files('keepkeylib')
 
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
-a = Analysis([home+'electrumg',
+a = Analysis([home+'electrum-bci',
               home+'gui/qt/main_window.py',
               home+'gui/text.py',
               home+'lib/util.py',
@@ -84,11 +84,11 @@ exe_standalone = EXE(
     a.scripts,
     a.binaries,
     a.datas, 
-    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name + ".exe"),
+    name=os.path.join('build\\pyi.win32\\electrum-bci', cmdline_name + ".exe"),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrum-bci.ico',
     console=False)
     # console=True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used
 
@@ -97,11 +97,11 @@ exe_portable = EXE(
     a.scripts,
     a.binaries,
     a.datas + [ ('is_portable', 'README.md', 'DATA' ) ],
-    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name + "-portable.exe"),
+    name=os.path.join('build\\pyi.win32\\electrum-bci', cmdline_name + "-portable.exe"),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrum-bci.ico',
     console=False)
 
 #####
@@ -111,11 +111,11 @@ exe_dependent = EXE(
     pyz,
     a.scripts,
     exclude_binaries=True,
-    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name),
+    name=os.path.join('build\\pyi.win32\\electrum-bci', cmdline_name),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrum-bci.ico',
     console=False)
 
 coll = COLLECT(
@@ -126,6 +126,6 @@ coll = COLLECT(
     strip=None,
     upx=True,
     debug=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrum-bci.ico',
     console=False,
-    name=os.path.join('dist', 'electrumg'))
+    name=os.path.join('dist', 'electrum-bci'))

contrib/build-wine/electrum.nsi

@@ -6,17 +6,17 @@
 ;--------------------------------
 ;Variables
 
-  !define PRODUCT_NAME "ElectrumG"
-  !define PRODUCT_WEB_SITE "https://github.com/BTCGPU/electrum"
-  !define PRODUCT_PUBLISHER "BitcoinGold Organization"
+  !define PRODUCT_NAME "Electrum-bci"
+  !define PRODUCT_WEB_SITE "https://github.com/BitcoinInterestOfficial/electrum"
+  !define PRODUCT_PUBLISHER "BitcoinInterest Organization"
   !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 
 ;--------------------------------
 ;General
 
   ;Name and file
   Name "${PRODUCT_NAME}"
-  OutFile "dist/electrumg-setup.exe"
+  OutFile "dist/electrum-bci-setup.exe"
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
@@ -72,7 +72,7 @@
   !define MUI_ABORTWARNING
   !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
 
-  !define MUI_ICON "tmp\electrum\icons\electrumg.ico"
+  !define MUI_ICON "tmp\electrum\icons\electrum-bci.ico"
 
 ;--------------------------------
 ;Pages
@@ -125,7 +125,7 @@ Function .onInit
 FunctionEnd
 
 Function RunApplication
-  ExecShell "" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe"
+  ExecShell "" "$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe"
 FunctionEnd
 
 Section
@@ -138,8 +138,8 @@ Section
   Delete "$SMSTARTUP\${PRODUCT_NAME}.lnk"
 
   ;Files to pack into the installer
-  File /r "dist\electrumg\*.*"
-  File "..\..\icons\electrumg.ico"
+  File /r "dist\electrum-bci\*.*"
+  File "..\..\icons\electrum-bci.ico"
 
   ;Store installation folder
   WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR
@@ -150,36 +150,36 @@ Section
 
   ;Create desktop shortcut
   DetailPrint "Creating desktop shortcut..."
-  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" ""
+  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe" ""
 
   ;Create start-menu items
   DetailPrint "Creating start-menu items..."
   CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe" 0
 
-  ;Links bitcoingold: URI's to ElectrumG
-  WriteRegStr HKCU "Software\Classes\bitcoingold" "" "URL:bitcoingold Protocol"
-  WriteRegStr HKCU "Software\Classes\bitcoingold" "URL Protocol" ""
-  WriteRegStr HKCU "Software\Classes\bitcoingold" "DefaultIcon" "$\"$INSTDIR\electrumg.ico, 0$\""
-  WriteRegStr HKCU "Software\Classes\bitcoingold\shell\open\command" "" "$\"$INSTDIR\electrumg-${PRODUCT_VERSION}.exe$\" $\"%1$\""
+  ;Links bitcoininterest: URI's to Electrum-bci
+  WriteRegStr HKCU "Software\Classes\bitcoininterest" "" "URL:bitcoininterest Protocol"
+  WriteRegStr HKCU "Software\Classes\bitcoininterest" "URL Protocol" ""
+  WriteRegStr HKCU "Software\Classes\bitcoininterest" "DefaultIcon" "$\"$INSTDIR\electrum-bci.ico, 0$\""
+  WriteRegStr HKCU "Software\Classes\bitcoininterest\shell\open\command" "" "$\"$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe$\" $\"%1$\""
 
   ;Adds an uninstaller possibilty to Windows Uninstall or change a program section
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrumg.ico"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrum-bci.ico"
 
   ;Fixes Windows broken size estimates
   ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
   IntFmt $0 "0x%08X" $0
   WriteRegDWORD HKCU "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0"
 
   ${If} ${SectionIsSelected} ${SecStartup}
-    CreateShortCut "$SMSTARTUP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" ""
+    CreateShortCut "$SMSTARTUP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-bci-${PRODUCT_VERSION}.exe" ""
   ${EndIf}
 SectionEnd
 
@@ -199,7 +199,7 @@ Section "Uninstall"
   Delete "$SMSTARTUP\${PRODUCT_NAME}.lnk"
   RMDir  "$SMPROGRAMS\${PRODUCT_NAME}"
 
-  DeleteRegKey HKCU "Software\Classes\bitcoingold"
+  DeleteRegKey HKCU "Software\Classes\bitcoininterest"
   DeleteRegKey HKCU "Software\${PRODUCT_NAME}"
   DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
 SectionEnd

contrib/build-wine/prepare-wine.sh

@@ -106,14 +106,17 @@ for msifile in core dev exe lib pip tools; do
 done
 
 # upgrade pip
-$PYTHON -m pip install pip --upgrade
+# $PYTHON -m pip install pip --upgrade
 
 # Install pywin32-ctypes (needed by pyinstaller)
 $PYTHON -m pip install pywin32-ctypes==0.1.2
 
 # install PySocks
 $PYTHON -m pip install win_inet_pton==1.0.1
 
+# install pysha3
+$PYTHON -m pip install pysha3==1.0.2
+
 $PYTHON -m pip install -r $here/../deterministic-build/requirements-binaries.txt
 
 # Install PyInstaller

contrib/deterministic-build/requirements-hw.txt

@@ -17,3 +17,4 @@ rlp==0.6.0
 six==1.11.0
 trezor==0.9.1
 urllib3==1.22
+pysha3==1.0.2

contrib/deterministic-build/requirements.txt

@@ -13,3 +13,4 @@ qrcode==5.3
 requests==2.18.4
 six==1.11.0
 urllib3==1.22
+pysha3==1.0.2

contrib/freeze_packages.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Run this after a new release to update dependencies
 
-venv_dir=~/.electrumg-venv
+venv_dir=~/.electrum-bci-venv
 contrib=$(dirname "$0")
 
 which virtualenv > /dev/null 2>&1 || { echo "Please install virtualenv" && exit 1; }
@@ -16,7 +16,7 @@ for i in '' '-hw' '-binaries'; do
 
     python -m pip install -r $contrib/requirements/requirements${i}.txt --upgrade
 
-    pip freeze | sed '/^ElectrumG/ d' > $contrib/deterministic-build/requirements${i}.txt
+    pip freeze | sed '/^Electrum-bci/ d' > $contrib/deterministic-build/requirements${i}.txt
 done
 
 echo "Done. Updated requirements"