Skip to content
Permalink
Browse files

ixc

  • Loading branch information...
ixcoin123 committed Oct 21, 2014
1 parent 49c0a3a commit 9c6f24288cff592b2c867cdef07f0a5cfcaa19e1
Showing with 447 additions and 739 deletions.
  1. +1 −1 .gitignore
  2. +2 −2 Info.plist
  3. +3 −3 MANIFEST.in
  4. +11 −5 README
  5. +4 −4 contrib/build-wine/deterministic.spec
  6. +15 −15 contrib/build-wine/electrum.nsi
  7. +10 −10 electrum → electrum-ixc
  8. +4 −4 electrum.conf.sample → electrum-ixc.conf.sample
  9. +17 −0 electrum-ixc.desktop
  10. BIN electrum-ixc.png
  11. +0 −17 electrum.desktop
  12. BIN electrum.png
  13. +9 −9 gui/android.py
  14. +12 −11 gui/gtk.py
  15. +11 −8 gui/qt/__init__.py
  16. +1 −1 gui/qt/console.py
  17. +1 −1 gui/qt/history_widget.py
  18. +12 −12 gui/qt/installwizard.py
  19. +25 −25 gui/qt/lite_window.py
  20. +62 −62 gui/qt/main_window.py
  21. +7 −7 gui/qt/network_dialog.py
  22. +1 −1 gui/qt/password_dialog.py
  23. +1 −1 gui/qt/paytoedit.py
  24. +3 −3 gui/qt/qrcodewidget.py
  25. +2 −2 gui/qt/qrtextedit.py
  26. +3 −3 gui/qt/qrwindow.py
  27. +1 −1 gui/qt/receiving_widget.py
  28. +3 −3 gui/qt/seed_dialog.py
  29. +4 −4 gui/qt/transaction_dialog.py
  30. +1 −1 gui/qt/util.py
  31. +3 −3 gui/qt/version_getter.py
  32. +7 −7 gui/stdio.py
  33. +5 −5 gui/text.py
  34. BIN icons/electrum-ixc.png
  35. +1 −1 lib/bitcoin.py
  36. +1 −1 lib/blockchain.py
  37. +11 −11 lib/commands.py
  38. +7 −1 lib/i18n.py
  39. +1 −14 lib/network.py
  40. +4 −4 lib/paymentrequest.py
  41. +30 −7 lib/plugins.py
  42. +5 −5 lib/simple_config.py
  43. +1 −0 lib/transaction.py
  44. +9 −9 lib/util.py
  45. +1 −1 lib/version.py
  46. +1 −1 lib/wallet.py
  47. +3 −3 make_packages
  48. +11 −11 plugins/btchipwallet.py
  49. +0 −321 plugins/coinbase_buyback.py
  50. +5 −5 plugins/cosigner_pool.py
  51. +8 −6 plugins/exchange_rate.py
  52. +7 −7 plugins/greenaddress_instant.py
  53. +5 −5 plugins/labels.py
  54. +11 −11 plugins/trezor.py
  55. +2 −2 plugins/virtualkeyboard.py
  56. +1 −1 scripts/block_headers
  57. +1 −1 scripts/get_history
  58. +1 −1 scripts/merchant/merchant.py
  59. +5 −5 scripts/merchant/merchant.readme
  60. +2 −2 scripts/servers
  61. +3 −3 scripts/util.py
  62. +2 −2 scripts/watch_address
  63. +2 −2 setup-release.py
  64. +65 −65 setup.py
@@ -8,7 +8,7 @@ dist/
*.egg/
/electrum.py
contrib/pyinstaller/
Electrum.egg-info/
Electrum_IXC.egg-info/
gui/qt/icons_rc.py
locale/
.devlocaltmp/
@@ -6,10 +6,10 @@
<array>
<dict>
<key>CFBundleURLName</key>
<string>bitcoin</string>
<string>ixcoin</string>
<key>CFBundleURLSchemes</key>
<array>
<string>bitcoin</string>
<string>ixcoin</string>
</array>
</dict>
</array>
@@ -1,8 +1,8 @@
include README LICENCE RELEASE-NOTES AUTHORS
include electrum.conf.sample
include electrum.desktop
include electrum-ixc.conf.sample
include electrum-ixc.desktop
include *.py
include electrum
include electrum-ixc
recursive-include lib *.py
recursive-include gui *.py
recursive-include plugins *.py
16 README
@@ -1,23 +1,29 @@
Electrum - lightweight Bitcoin client
uint256 hashGenesisBlock("0x0000000001534ef8893b025b9c1da67250285e35c9f76cae36a4904fdf72c591");//("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); // ixcoin
const int nTotalBlocksEstimate = 36500; // Conservative estimate of total nr of blocks on main chain //ixcoin
int64 nSubsidy = 96 * COIN; //ixcoin
chainid return 0x0003;
checksignature !key.SetPubKey(ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284"))) //8284 ixcoin

Electrum-IXC - lightweight Bitcoin client

Licence: GNU GPL v3
Author: Thomas Voegtlin
Language: Python
Homepage: https://electrum.org/
Homepage: https://ixco.in/electrum


1. GETTING STARTED
------------------

To run Electrum from this directory, just do:

./electrum
./electrum-ixc

If you install Electrum on your system, you can run it from any
directory:

sudo python setup.py install
electrum
electrum-ixc


To start Electrum from your web browser, see
@@ -40,6 +46,6 @@ On Mac OS X:
# On brew installs
ARCHFLAGS="-arch i386 -arch x86_64" sudo python setup-release.py py2app --includes sip

sudo hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-VERSION-macosx.dmg
sudo hdiutil create -fs HFS+ -volname "Electrum-IXC" -srcfolder dist/Electrum-IXC.app dist/electrum-ixc-VERSION-macosx.dmg


@@ -1,9 +1,9 @@
# -*- mode: python -*-

# 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(['electrum', 'gui/qt/main_window.py', 'gui/qt/lite_window.py', 'gui/text.py',
a = Analysis(['electrum-ixc', 'gui/qt/main_window.py', 'gui/qt/lite_window.py', 'gui/text.py',
'lib/util.py', 'lib/wallet.py', 'lib/simple_config.py',
'lib/bitcoin.py'
'lib/bitcoin.py', 'lib/blockchain.py'
],
hiddenimports=["lib","gui"],
pathex=['lib:gui:plugins'],
@@ -45,7 +45,7 @@ exe = EXE(pyz,
a.scripts,
a.binaries,
a.datas,
name=os.path.join('build\\pyi.win32\\electrum', 'electrum.exe'),
name=os.path.join('build\\pyi.win32\\electrum-ixc', 'electrum-ixc.exe'),
debug=False,
strip=None,
upx=False,
@@ -62,4 +62,4 @@ coll = COLLECT(exe,
debug=False,
icon='icons/electrum.ico',
console=False,
name=os.path.join('dist', 'electrum'))
name=os.path.join('dist', 'electrum-ixc'))
@@ -7,14 +7,14 @@
;General

;Name and file
Name "Electrum"
OutFile "dist/electrum-setup.exe"
Name "Electrum-IXC"
OutFile "dist/electrum-ixc-setup.exe"

;Default installation folder
InstallDir "$PROGRAMFILES\Electrum"
InstallDir "$PROGRAMFILES\Electrum-IXC"

;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\Electrum" ""
InstallDirRegKey HKCU "Software\Electrum-IXC" ""

;Request application privileges for Windows Vista
RequestExecutionLevel admin
@@ -36,7 +36,7 @@

;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Electrum"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Electrum-IXC"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"

;!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
@@ -59,21 +59,21 @@ Section
SetOutPath "$INSTDIR"

;ADD YOUR OWN FILES HERE...
file /r dist\electrum\*.*
file /r dist\electrum-ixc\*.*

;Store installation folder
WriteRegStr HKCU "Software\Electrum" "" $INSTDIR
WriteRegStr HKCU "Software\Electrum-IXC" "" $INSTDIR

;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"


CreateShortCut "$DESKTOP\Electrum.lnk" "$INSTDIR\electrum.exe" ""
CreateShortCut "$DESKTOP\Electrum-IXC.lnk" "$INSTDIR\electrum-ixc.exe" ""

;create start-menu items
CreateDirectory "$SMPROGRAMS\Electrum"
CreateShortCut "$SMPROGRAMS\Electrum\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\Electrum\Electrum.lnk" "$INSTDIR\electrum.exe" "" "$INSTDIR\electrum.exe" 0
CreateDirectory "$SMPROGRAMS\Electrum-IXC"
CreateShortCut "$SMPROGRAMS\Electrum-IXC\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\Electrum-IXC\Electrum-IXC.lnk" "$INSTDIR\electrum-ixc.exe" "" "$INSTDIR\electrum-ixc.exe" 0

SectionEnd

@@ -95,10 +95,10 @@ Section "Uninstall"

RMDir "$INSTDIR"

Delete "$DESKTOP\Electrum.lnk"
Delete "$SMPROGRAMS\Electrum\*.*"
RmDir "$SMPROGRAMS\Electrum"
Delete "$DESKTOP\Electrum-IXC.lnk"
Delete "$SMPROGRAMS\Electrum-IXC\*.*"
RmDir "$SMPROGRAMS\Electrum-IXC"

DeleteRegKey /ifempty HKCU "Software\Electrum"
DeleteRegKey /ifempty HKCU "Software\Electrum-IXC"

SectionEnd
@@ -39,15 +39,15 @@ __builtin__.use_local_modules = is_local or is_android
# load local module as electrum
if __builtin__.use_local_modules:
import imp
imp.load_module('electrum', *imp.find_module('lib'))
imp.load_module('electrum_gui', *imp.find_module('gui'))
imp.load_module('electrum_ixc', *imp.find_module('lib'))
imp.load_module('electrum_ixc_gui', *imp.find_module('gui'))


from electrum import util
from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server
from electrum.util import print_msg, print_stderr, print_json, set_verbosity
from electrum.daemon import get_daemon
from electrum.plugins import init_plugins
from electrum_ixc import util
from electrum_ixc import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server
from electrum_ixc.util import print_msg, print_stderr, print_json, set_verbosity
from electrum_ixc.daemon import get_daemon
from electrum_ixc.plugins import init_plugins



@@ -72,7 +72,7 @@ def arg_parser():
parser = optparse.OptionParser(usage=usage, add_help_option=False)
parser.add_option("-h", "--help", action="callback", callback=print_help_cb, help="show this help text")
parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk, text or stdio")
parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum-ixc.dat)")
parser.add_option("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
parser.add_option("-d", "--daemon", action="store_true", dest="daemon", default=False, help="use daemon")
parser.add_option("-C", "--concealed", action="store_true", dest="concealed", default=False, help="don't echo seed to console when restoring")
@@ -98,8 +98,8 @@ def arg_parser():

def print_help(parser):
parser.print_help()
print_msg("Type 'electrum help <command>' to see the help for a specific command")
print_msg("Type 'electrum --help' to see the list of options")
print_msg("Type 'electrum-ixc help <command>' to see the help for a specific command")
print_msg("Type 'electrum-ixc --help' to see the list of options")
run_command(known_commands['help'])


@@ -1,18 +1,18 @@
# Configuration file for the electrum client
# Settings defined here are shared across wallets
#
# copy this file to /etc/electrum.conf if you want read-only settings
# copy it into your ~/.electrum/ directory if you want global settings
# copy this file to /etc/electrum-ixc.conf if you want read-only settings
# copy it into your ~/.electrum-ixc/ directory if you want global settings
# that can be rewritten by the client

[client]
server = electrum.novit.ro:50001:t
server = electrum.ixco.in:50001:t
proxy = None
gap_limit = 5
# booleans use python syntax
use_change = True
gui = qt
num_zeros = 2
# default transaction fee is in Satoshis
fee = 10000
fee = 10000 #@todo ixcoin fee?
winpos-qt = [799, 226, 877, 435]
@@ -0,0 +1,17 @@
# If you want electrum to appear in a linux app launcher ("start menu"), install this by doing:
# sudo desktop-file-install electrum-ixc.desktop

[Desktop Entry]
Comment=Lightweight Ixcoin Client
Exec=electrum-ixc %u
GenericName[en_US]=Electrum-IXC
GenericName=Electrum-IXC
Icon=/usr/share/app-install/icons/electrum-ixc.png
Name[en_US]=Electrum Ixcoin Wallet
Name=Electrum Ixcoin Wallet
Categories=Network;
StartupNotify=false
Terminal=false
Type=Application
MimeType=x-scheme-handler/ixcoin

BIN +9.1 KB electrum-ixc.png
Binary file not shown.

This file was deleted.

BIN +9.1 KB electrum.png
Binary file not shown.
@@ -22,9 +22,9 @@
from __future__ import absolute_import
import android

from electrum import SimpleConfig, Wallet, WalletStorage, format_satoshis, mnemonic_encode, mnemonic_decode
from electrum.bitcoin import is_valid
from electrum import util
from electrum_ixc import SimpleConfig, Wallet, WalletStorage, format_satoshis, mnemonic_encode, mnemonic_decode
from electrum_ixc.bitcoin import is_valid
from electrum_ixc import util
from decimal import Decimal
import datetime, re

@@ -166,7 +166,7 @@ def make_layout(s, scrollable = False):
<TextView
android:id="@+id/textElectrum"
android:text="Electrum"
android:text="Electrum-IXC"
android:textSize="7pt"
android:textColor="#ff4444ff"
android:gravity="left"
@@ -453,7 +453,7 @@ def pay_to(recipient, amount, fee, label):
else:
password = None

droid.dialogCreateSpinnerProgress("Electrum", "signing transaction...")
droid.dialogCreateSpinnerProgress("Electrum-IXC", "signing transaction...")
droid.dialogShow()

try:
@@ -487,7 +487,7 @@ def make_new_contact():
if r:
data = r['extras']['SCAN_RESULT']
if data:
if re.match('^bitcoin:', data):
if re.match('^ixcoin:', data):
address, _, _, _, _ = util.parse_URI(data)
elif is_valid(data):
address = data
@@ -561,7 +561,7 @@ def main_loop():
if receive_addr:
amount = modal_input('Amount', 'Amount you want receive. ', '', "numberDecimal")
if amount:
receive_addr = 'bitcoin:%s?amount=%s'%(receive_addr, amount)
receive_addr = 'ixcoin:%s?amount=%s'%(receive_addr, amount)

if not receive_addr:
out = None
@@ -595,7 +595,7 @@ def payto_loop():
amount = droid.fullQueryDetail('amount').result.get('text')

if not is_valid(recipient):
modal_dialog('Error','Invalid Bitcoin address')
modal_dialog('Error','Invalid Ixcoin address')
continue

try:
@@ -1009,7 +1009,7 @@ def password_dialog(self):
def restore_wallet(self):

msg = "recovering wallet..."
droid.dialogCreateSpinnerProgress("Electrum", msg)
droid.dialogCreateSpinnerProgress("Electrum-IXC", msg)
droid.dialogShow()

wallet.restore(lambda x: None)

0 comments on commit 9c6f242

Please sign in to comment.
You can’t perform that action at this time.