From b16e9b29019d10daf5a18a81fde16358e2c48854 Mon Sep 17 00:00:00 2001
From: Exlo <46317321+Exlo84@users.noreply.github.com>
Date: Tue, 21 Jun 2022 08:51:26 +0200
Subject: [PATCH] Fix for the transactions

Using explorer instead of richlist
---
 assets/templates/about.html |  2 +-
 renderer/transactions.js    | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/assets/templates/about.html b/assets/templates/about.html
index 9983d77..8fde5ed 100644
--- a/assets/templates/about.html
+++ b/assets/templates/about.html
@@ -106,7 +106,7 @@
       <button class="aboutbutton ui inverted blue button" type="button" onclick="require('electron').shell.openExternal('https://t.me/Ether_1')">Telegram</button>
     </div>
     <div class="column">
-      <button class="aboutbutton ui inverted blue button" type="button" onclick="require('electron').shell.openExternal('https://t.me/Ether1News')">News</button>
+      <button class="aboutbutton ui inverted blue button" type="button" onclick="require('electron').shell.openExternal('https://ethoprotocol.com/blog/')">News Blog</button>
     </div>
     <div class="column">
       <button class="aboutbutton ui inverted blue button" type="button" onclick="require('electron').shell.openExternal('mailto:admin@ethoprotocol.com')">Email</button>
diff --git a/renderer/transactions.js b/renderer/transactions.js
index 8c23de8..b88563c 100755
--- a/renderer/transactions.js
+++ b/renderer/transactions.js
@@ -1,4 +1,5 @@
 const {ipcRenderer} = require("electron");
+const moment = require("moment");
 
 class Transactions {
   constructor() {
@@ -46,19 +47,22 @@ class Transactions {
         lastBlock
       ]);
 
-      $.getJSON("https://richlist.ethoprotocol.com/transactions_list.php" + params, function (result) {
-        result.data.forEach(element => {
-          if (element.fromaddr && element.toaddr) {
-            ipcRenderer.send("storeTransaction", {
-              block: element.block.toString(),
-              txhash: element.txhash.toLowerCase(),
-              fromaddr: element.fromaddr.toLowerCase(),
-              timestamp: element.timestamp,
-              toaddr: element.toaddr.toLowerCase(),
-              value: element.value
+      $.getJSON("https://explorer1.ethoprotocol.com/api?module=account&action=txlist&address=" + addressList[counter].toLowerCase(), function (result) {
+
+          if (result.result) {
+            result.result.forEach(element => {
+              if (element.from && element.to && startBlock <= parseInt(element.blockNumber) && lastBlock >= parseInt(element.blockNumber)) {
+                ipcRenderer.send("storeTransaction", {
+                  block: element.blockNumber.toString(),
+                  txhash: element.hash.toLowerCase(),
+                  fromaddr: element.from.toLowerCase(),
+                  timestamp: moment.unix(parseInt(element.timeStamp)).format("YYYY-MM-DD HH:mm:ss"),
+                  toaddr: element.to.toLowerCase(),
+                  value: element.value
+                });
+              }
             });
           }
-        });
 
         // call the transaction sync for the next address
         EthoTransactions.syncTransactionsForSingleAddress(addressList, counters, lastBlock, counter + 1);