From b7b135b27cedb0e0cdb76e94781036d0134677ce Mon Sep 17 00:00:00 2001 From: Mustafa Refaey Date: Tue, 28 May 2019 10:34:10 +0200 Subject: [PATCH] fix transactions issue --- .gitignore | 1 + .unibeautifyrc.json | 0 README.md | 0 assets/images/icon.png | Bin assets/images/logo.png | Bin assets/images/sort_asc.png | 0 assets/images/sort_asc_disabled.png | 0 assets/images/sort_both.png | 0 assets/images/sort_desc.png | 0 assets/images/sort_desc_disabled.png | 0 assets/scripts/Chart.js | 0 assets/scripts/all.min.js | 0 assets/scripts/datatables-absolute.js | 0 assets/scripts/datatables.min.js | 0 assets/scripts/datetime-moment.js | 0 assets/scripts/handlebars.js | 0 assets/scripts/iziModal.min.js | 0 assets/scripts/iziToast.min.js | 0 assets/scripts/jquery.floatThead.min.js | 0 assets/scripts/jquery.min.js | 0 assets/scripts/jquery.qrcode.min.js | 0 assets/scripts/materialize.min.js | 0 assets/scripts/moment.min.js | 0 assets/scripts/please-wait.js | 0 assets/scripts/progressbar.min.js | 0 assets/scripts/sprintf.min.js | 0 assets/scripts/tablesort.min.js | 0 assets/scripts/tablesort.number.min.js | 0 assets/scripts/tippy.min.js | 0 assets/styles/all.min.css | 0 assets/styles/buttons.css | 0 assets/styles/datatables.min.css | 0 assets/styles/forms.css | 0 assets/styles/indicators.css | 0 assets/styles/iziModal.min.css | 0 assets/styles/iziToast.min.css | 0 assets/styles/materialize.min.css | 0 assets/styles/please-wait.css | 0 assets/styles/spinner.css | 0 assets/styles/style.css | 0 assets/styles/tablesort.css | 0 assets/styles/transactions.css | 0 assets/templates/addressBook.html | 0 assets/templates/addresslist.html | 0 assets/templates/markets.html | 0 assets/templates/send.html | 0 assets/templates/settings.html | 0 assets/templates/transactions.html | 0 assets/templates/wallets.html | 0 bin/linux/geth | Bin bin/macos/geth | Bin bin/win/StopGeth.dll | Bin bin/win/WrapGeth.exe | Bin bin/win/geth.exe | Bin build/icon.icns | Bin build/icon.png | Bin build_win.bat | 0 index.html | 0 main.js | 0 modules/accounts.js | 0 modules/database.js | 0 modules/geth.js | 4 +++- modules/menu.js | 0 package-lock.json | 2 +- package.json | 16 ++++++++++++---- renderer/addressBook.js | 0 renderer/blockchain.js | 0 renderer/database.js | 0 renderer/maingui.js | 0 renderer/markets.js | 0 renderer/send.js | 0 renderer/settings.js | 0 renderer/syncing.js | 0 renderer/tableTransactions.js | 0 renderer/transactions.js | 0 renderer/utils.js | 0 renderer/wallets.js | 0 77 files changed, 17 insertions(+), 6 deletions(-) create mode 100755 .gitignore mode change 100644 => 100755 .unibeautifyrc.json mode change 100644 => 100755 README.md mode change 100644 => 100755 assets/images/icon.png mode change 100644 => 100755 assets/images/logo.png mode change 100644 => 100755 assets/images/sort_asc.png mode change 100644 => 100755 assets/images/sort_asc_disabled.png mode change 100644 => 100755 assets/images/sort_both.png mode change 100644 => 100755 assets/images/sort_desc.png mode change 100644 => 100755 assets/images/sort_desc_disabled.png mode change 100644 => 100755 assets/scripts/Chart.js mode change 100644 => 100755 assets/scripts/all.min.js mode change 100644 => 100755 assets/scripts/datatables-absolute.js mode change 100644 => 100755 assets/scripts/datatables.min.js mode change 100644 => 100755 assets/scripts/datetime-moment.js mode change 100644 => 100755 assets/scripts/handlebars.js mode change 100644 => 100755 assets/scripts/iziModal.min.js mode change 100644 => 100755 assets/scripts/iziToast.min.js mode change 100644 => 100755 assets/scripts/jquery.floatThead.min.js mode change 100644 => 100755 assets/scripts/jquery.min.js mode change 100644 => 100755 assets/scripts/jquery.qrcode.min.js mode change 100644 => 100755 assets/scripts/materialize.min.js mode change 100644 => 100755 assets/scripts/moment.min.js mode change 100644 => 100755 assets/scripts/please-wait.js mode change 100644 => 100755 assets/scripts/progressbar.min.js mode change 100644 => 100755 assets/scripts/sprintf.min.js mode change 100644 => 100755 assets/scripts/tablesort.min.js mode change 100644 => 100755 assets/scripts/tablesort.number.min.js mode change 100644 => 100755 assets/scripts/tippy.min.js mode change 100644 => 100755 assets/styles/all.min.css mode change 100644 => 100755 assets/styles/buttons.css mode change 100644 => 100755 assets/styles/datatables.min.css mode change 100644 => 100755 assets/styles/forms.css mode change 100644 => 100755 assets/styles/indicators.css mode change 100644 => 100755 assets/styles/iziModal.min.css mode change 100644 => 100755 assets/styles/iziToast.min.css mode change 100644 => 100755 assets/styles/materialize.min.css mode change 100644 => 100755 assets/styles/please-wait.css mode change 100644 => 100755 assets/styles/spinner.css mode change 100644 => 100755 assets/styles/style.css mode change 100644 => 100755 assets/styles/tablesort.css mode change 100644 => 100755 assets/styles/transactions.css mode change 100644 => 100755 assets/templates/addressBook.html mode change 100644 => 100755 assets/templates/addresslist.html mode change 100644 => 100755 assets/templates/markets.html mode change 100644 => 100755 assets/templates/send.html mode change 100644 => 100755 assets/templates/settings.html mode change 100644 => 100755 assets/templates/transactions.html mode change 100644 => 100755 assets/templates/wallets.html mode change 100644 => 100755 bin/linux/geth mode change 100644 => 100755 bin/macos/geth mode change 100644 => 100755 bin/win/StopGeth.dll mode change 100644 => 100755 bin/win/WrapGeth.exe mode change 100644 => 100755 bin/win/geth.exe mode change 100644 => 100755 build/icon.icns mode change 100644 => 100755 build/icon.png mode change 100644 => 100755 build_win.bat mode change 100644 => 100755 index.html mode change 100644 => 100755 main.js mode change 100644 => 100755 modules/accounts.js mode change 100644 => 100755 modules/database.js mode change 100644 => 100755 modules/geth.js mode change 100644 => 100755 modules/menu.js mode change 100644 => 100755 package-lock.json mode change 100644 => 100755 package.json mode change 100644 => 100755 renderer/addressBook.js mode change 100644 => 100755 renderer/blockchain.js mode change 100644 => 100755 renderer/database.js mode change 100644 => 100755 renderer/maingui.js mode change 100644 => 100755 renderer/markets.js mode change 100644 => 100755 renderer/send.js mode change 100644 => 100755 renderer/settings.js mode change 100644 => 100755 renderer/syncing.js mode change 100644 => 100755 renderer/tableTransactions.js mode change 100644 => 100755 renderer/transactions.js mode change 100644 => 100755 renderer/utils.js mode change 100644 => 100755 renderer/wallets.js diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..3c3629e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules diff --git a/.unibeautifyrc.json b/.unibeautifyrc.json old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/assets/images/icon.png b/assets/images/icon.png old mode 100644 new mode 100755 diff --git a/assets/images/logo.png b/assets/images/logo.png old mode 100644 new mode 100755 diff --git a/assets/images/sort_asc.png b/assets/images/sort_asc.png old mode 100644 new mode 100755 diff --git a/assets/images/sort_asc_disabled.png b/assets/images/sort_asc_disabled.png old mode 100644 new mode 100755 diff --git a/assets/images/sort_both.png b/assets/images/sort_both.png old mode 100644 new mode 100755 diff --git a/assets/images/sort_desc.png b/assets/images/sort_desc.png old mode 100644 new mode 100755 diff --git a/assets/images/sort_desc_disabled.png b/assets/images/sort_desc_disabled.png old mode 100644 new mode 100755 diff --git a/assets/scripts/Chart.js b/assets/scripts/Chart.js old mode 100644 new mode 100755 diff --git a/assets/scripts/all.min.js b/assets/scripts/all.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/datatables-absolute.js b/assets/scripts/datatables-absolute.js old mode 100644 new mode 100755 diff --git a/assets/scripts/datatables.min.js b/assets/scripts/datatables.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/datetime-moment.js b/assets/scripts/datetime-moment.js old mode 100644 new mode 100755 diff --git a/assets/scripts/handlebars.js b/assets/scripts/handlebars.js old mode 100644 new mode 100755 diff --git a/assets/scripts/iziModal.min.js b/assets/scripts/iziModal.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/iziToast.min.js b/assets/scripts/iziToast.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/jquery.floatThead.min.js b/assets/scripts/jquery.floatThead.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/jquery.min.js b/assets/scripts/jquery.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/jquery.qrcode.min.js b/assets/scripts/jquery.qrcode.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/materialize.min.js b/assets/scripts/materialize.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/moment.min.js b/assets/scripts/moment.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/please-wait.js b/assets/scripts/please-wait.js old mode 100644 new mode 100755 diff --git a/assets/scripts/progressbar.min.js b/assets/scripts/progressbar.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/sprintf.min.js b/assets/scripts/sprintf.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/tablesort.min.js b/assets/scripts/tablesort.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/tablesort.number.min.js b/assets/scripts/tablesort.number.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/tippy.min.js b/assets/scripts/tippy.min.js old mode 100644 new mode 100755 diff --git a/assets/styles/all.min.css b/assets/styles/all.min.css old mode 100644 new mode 100755 diff --git a/assets/styles/buttons.css b/assets/styles/buttons.css old mode 100644 new mode 100755 diff --git a/assets/styles/datatables.min.css b/assets/styles/datatables.min.css old mode 100644 new mode 100755 diff --git a/assets/styles/forms.css b/assets/styles/forms.css old mode 100644 new mode 100755 diff --git a/assets/styles/indicators.css b/assets/styles/indicators.css old mode 100644 new mode 100755 diff --git a/assets/styles/iziModal.min.css b/assets/styles/iziModal.min.css old mode 100644 new mode 100755 diff --git a/assets/styles/iziToast.min.css b/assets/styles/iziToast.min.css old mode 100644 new mode 100755 diff --git a/assets/styles/materialize.min.css b/assets/styles/materialize.min.css old mode 100644 new mode 100755 diff --git a/assets/styles/please-wait.css b/assets/styles/please-wait.css old mode 100644 new mode 100755 diff --git a/assets/styles/spinner.css b/assets/styles/spinner.css old mode 100644 new mode 100755 diff --git a/assets/styles/style.css b/assets/styles/style.css old mode 100644 new mode 100755 diff --git a/assets/styles/tablesort.css b/assets/styles/tablesort.css old mode 100644 new mode 100755 diff --git a/assets/styles/transactions.css b/assets/styles/transactions.css old mode 100644 new mode 100755 diff --git a/assets/templates/addressBook.html b/assets/templates/addressBook.html old mode 100644 new mode 100755 diff --git a/assets/templates/addresslist.html b/assets/templates/addresslist.html old mode 100644 new mode 100755 diff --git a/assets/templates/markets.html b/assets/templates/markets.html old mode 100644 new mode 100755 diff --git a/assets/templates/send.html b/assets/templates/send.html old mode 100644 new mode 100755 diff --git a/assets/templates/settings.html b/assets/templates/settings.html old mode 100644 new mode 100755 diff --git a/assets/templates/transactions.html b/assets/templates/transactions.html old mode 100644 new mode 100755 diff --git a/assets/templates/wallets.html b/assets/templates/wallets.html old mode 100644 new mode 100755 diff --git a/bin/linux/geth b/bin/linux/geth old mode 100644 new mode 100755 diff --git a/bin/macos/geth b/bin/macos/geth old mode 100644 new mode 100755 diff --git a/bin/win/StopGeth.dll b/bin/win/StopGeth.dll old mode 100644 new mode 100755 diff --git a/bin/win/WrapGeth.exe b/bin/win/WrapGeth.exe old mode 100644 new mode 100755 diff --git a/bin/win/geth.exe b/bin/win/geth.exe old mode 100644 new mode 100755 diff --git a/build/icon.icns b/build/icon.icns old mode 100644 new mode 100755 diff --git a/build/icon.png b/build/icon.png old mode 100644 new mode 100755 diff --git a/build_win.bat b/build_win.bat old mode 100644 new mode 100755 diff --git a/index.html b/index.html old mode 100644 new mode 100755 diff --git a/main.js b/main.js old mode 100644 new mode 100755 diff --git a/modules/accounts.js b/modules/accounts.js old mode 100644 new mode 100755 diff --git a/modules/database.js b/modules/database.js old mode 100644 new mode 100755 diff --git a/modules/geth.js b/modules/geth.js old mode 100644 new mode 100755 index 14353bf..952864a --- a/modules/geth.js +++ b/modules/geth.js @@ -60,7 +60,9 @@ class Geth { "--wsport", "8546", "--wsapi", - "admin,db,eth,net,miner,personal,web3" + "admin,db,eth,net,miner,personal,web3", + "--networkid", + "1313114" ]); if (!this.gethProcess) { diff --git a/modules/menu.js b/modules/menu.js old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 index 17f0f6b..5aaf450 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Ether1Wallet", - "version": "0.2.9", + "version": "0.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json old mode 100644 new mode 100755 index d38759a..10d60d2 --- a/package.json +++ b/package.json @@ -22,24 +22,32 @@ "target": "7z", "icon": "build/icon.png", "artifactName": "Windows-${productName}-${version}.${ext}", - "extraResources": ["bin/win/*"] + "extraResources": [ + "bin/win/*" + ] }, "linux": { "target": "tar.gz", "icon": "build/icon.icns", "artifactName": "Linux-${productName}-${version}.${ext}", - "extraResources": ["bin/linux/*"] + "extraResources": [ + "bin/linux/*" + ] }, "mac": { "target": "pkg", "icon": "build/icon.icns", "artifactName": "MacOS-${productName}-${version}.${ext}", - "extraResources": ["bin/macos/*"] + "extraResources": [ + "bin/macos/*" + ] } }, "repository": "https://github.com/taeguscromis/Ether1DesktopWallet", "keywords": [ - "Ether1", "Desktop", "Wallet" + "Ether1", + "Desktop", + "Wallet" ], "author": "Ether1", "license": "CC0-1.0", diff --git a/renderer/addressBook.js b/renderer/addressBook.js old mode 100644 new mode 100755 diff --git a/renderer/blockchain.js b/renderer/blockchain.js old mode 100644 new mode 100755 diff --git a/renderer/database.js b/renderer/database.js old mode 100644 new mode 100755 diff --git a/renderer/maingui.js b/renderer/maingui.js old mode 100644 new mode 100755 diff --git a/renderer/markets.js b/renderer/markets.js old mode 100644 new mode 100755 diff --git a/renderer/send.js b/renderer/send.js old mode 100644 new mode 100755 diff --git a/renderer/settings.js b/renderer/settings.js old mode 100644 new mode 100755 diff --git a/renderer/syncing.js b/renderer/syncing.js old mode 100644 new mode 100755 diff --git a/renderer/tableTransactions.js b/renderer/tableTransactions.js old mode 100644 new mode 100755 diff --git a/renderer/transactions.js b/renderer/transactions.js old mode 100644 new mode 100755 diff --git a/renderer/utils.js b/renderer/utils.js old mode 100644 new mode 100755 diff --git a/renderer/wallets.js b/renderer/wallets.js old mode 100644 new mode 100755