+ new versions of geth
! check if transactions are already loading * catch and report error on syncing
This commit is contained in:
BIN
bin/linux/geth
BIN
bin/linux/geth
Binary file not shown.
BIN
bin/macos/geth
BIN
bin/macos/geth
Binary file not shown.
BIN
bin/win/geth.exe
BIN
bin/win/geth.exe
Binary file not shown.
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Ether1Wallet",
|
"name": "Ether1Wallet",
|
||||||
"version": "0.2.3",
|
"version": "0.2.4",
|
||||||
"description": "Desktop wallet for Ether1 currency",
|
"description": "Desktop wallet for Ether1 currency",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -75,10 +75,14 @@ function StartSyncProcess() {
|
|||||||
$(document).trigger("onSyncComplete");
|
$(document).trigger("onSyncComplete");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
EthoMainGUI.showGeneralError(error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}, 10000);
|
}, 10000);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
EthoMainGUI.showGeneralError(error);
|
||||||
}
|
}
|
||||||
}).on("data", function(sync){
|
}).on("data", function(sync){
|
||||||
if ((sync) && (sync.HighestBlock > 0)) {
|
if ((sync) && (sync.HighestBlock > 0)) {
|
||||||
@@ -93,6 +97,8 @@ function StartSyncProcess() {
|
|||||||
if ((!error) && (sync)) {
|
if ((!error) && (sync)) {
|
||||||
SyncProgress.animate(sync.currentBlock / sync.highestBlock);
|
SyncProgress.animate(sync.currentBlock / sync.highestBlock);
|
||||||
SyncProgress.setText(vsprintf('%d/%d (%d%%)', [sync.currentBlock, sync.highestBlock, Math.floor(sync.currentBlock / sync.highestBlock * 100)]));
|
SyncProgress.setText(vsprintf('%d/%d (%d%%)', [sync.currentBlock, sync.highestBlock, Math.floor(sync.currentBlock / sync.highestBlock * 100)]));
|
||||||
|
} else if (error) {
|
||||||
|
EthoMainGUI.showGeneralError(error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}, 2000);
|
}, 2000);
|
||||||
@@ -118,6 +124,6 @@ var InitWeb3 = setInterval(function()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
catch(err) {
|
catch(err) {
|
||||||
console.log(err);
|
EthoMainGUI.showGeneralError(err);
|
||||||
}
|
}
|
||||||
}, 2000);
|
}, 2000);
|
||||||
@@ -4,6 +4,7 @@ class Transactions {
|
|||||||
constructor() {
|
constructor() {
|
||||||
this.filter = "";
|
this.filter = "";
|
||||||
this.isSyncing = false;
|
this.isSyncing = false;
|
||||||
|
this.isLoading = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
setIsSyncing(value) {
|
setIsSyncing(value) {
|
||||||
@@ -14,6 +15,14 @@ class Transactions {
|
|||||||
return this.isSyncing;
|
return this.isSyncing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setIsLoading(value) {
|
||||||
|
this.isLoading = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
getIsLoading() {
|
||||||
|
return this.isLoading;
|
||||||
|
}
|
||||||
|
|
||||||
setFilter(text) {
|
setFilter(text) {
|
||||||
this.filter = text;
|
this.filter = text;
|
||||||
}
|
}
|
||||||
@@ -74,8 +83,10 @@ class Transactions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
renderTransactions() {
|
renderTransactions() {
|
||||||
|
if (!EthoTransactions.getIsLoading()) {
|
||||||
EthoMainGUI.renderTemplate("transactions.html", {});
|
EthoMainGUI.renderTemplate("transactions.html", {});
|
||||||
$(document).trigger("render_transactions");
|
$(document).trigger("render_transactions");
|
||||||
|
EthoTransactions.setIsLoading(true);
|
||||||
|
|
||||||
// show the loading overlay for transactions
|
// show the loading overlay for transactions
|
||||||
$("#loadingTransactionsOverlay").css("display", "block");
|
$("#loadingTransactionsOverlay").css("display", "block");
|
||||||
@@ -98,8 +109,10 @@ class Transactions {
|
|||||||
});
|
});
|
||||||
|
|
||||||
EthoTableTransactions.initialize('#tableTransactionsForAll', dataTransactions);
|
EthoTableTransactions.initialize('#tableTransactionsForAll', dataTransactions);
|
||||||
|
EthoTransactions.setIsLoading(false);
|
||||||
}, 200);
|
}, 200);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
enableKeepInSync() {
|
enableKeepInSync() {
|
||||||
EthoBlockchain.subsribeNewBlockHeaders(
|
EthoBlockchain.subsribeNewBlockHeaders(
|
||||||
|
|||||||
Reference in New Issue
Block a user