From 1e15d9e5f26dcdc6363b84659fbc3bcdd651df04 Mon Sep 17 00:00:00 2001
From: SiaCashCoin <39414933+SiaCashCoin@users.noreply.github.com>
Date: Fri, 26 Nov 2021 20:00:09 -0500
Subject: [PATCH 1/2] Add files via upload

---
 events/block-by-block.js | 1 +
 events/block-reader.js   | 7 ++-----
 events/blockchain.js     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/events/block-by-block.js b/events/block-by-block.js
index 25100d7..b5ca969 100644
--- a/events/block-by-block.js
+++ b/events/block-by-block.js
@@ -11,6 +11,7 @@ const range = (start, end) => {
 
 module.exports.tryBlockByBlock = async (contract, start, end, symbol) => {
   const blocks = range(start, end);
+  console.log('blocks: ', blocks)
 
   let counter = 0;
   for await (const i of blocks) {
diff --git a/events/block-reader.js b/events/block-reader.js
index 9be48a7..b4daaaa 100644
--- a/events/block-reader.js
+++ b/events/block-reader.js
@@ -16,17 +16,14 @@ const getMinimal = pastEvents => {
       transactionHash: tx.transactionHash,
       from: tx.returnValues["0"],
       to: tx.returnValues["1"],
-      value: tx.returnValues["2"]._hex
+      value: tx.returnValues["2"]
     };
   });
 };
 
 module.exports.getEvents = async symbol => {
   const directory = Parameters.eventsDownloadFolder.replace(/{token}/g, symbol);
-  var files = await readdirAsync(directory);
-  files.sort((a,b) => {
-    return parseInt(a.split(".")[0]) - parseInt(b.split(".")[0]);
-  });
+  const files = await readdirAsync(directory);
   let events = [];
 
   console.log("Parsing files.");
diff --git a/events/blockchain.js b/events/blockchain.js
index 3756939..c0ad4c4 100644
--- a/events/blockchain.js
+++ b/events/blockchain.js
@@ -61,7 +61,7 @@ module.exports.get = async () => {
   var fromBlock = parseInt(Config.fromBlock) || 0;
   const blocksPerBatch = parseInt(Config.blocksPerBatch) || 0;
   const delay = parseInt(Config.delay) || 0;
-  const toBlock = blockHeight;
+  const toBlock = parseInt(Config.toBlock) || blockHeight;
 
   const lastDownloadedBlock = await LastDownloadedBlock.get(symbol);
 

From 8802633313b445ee473d1aa5f829f8d30cbd6bd8 Mon Sep 17 00:00:00 2001
From: SiaCashCoin <39414933+SiaCashCoin@users.noreply.github.com>
Date: Fri, 26 Nov 2021 20:01:15 -0500
Subject: [PATCH 2/2] Add files via upload

---
 balances.js | 2 +-
 contract.js | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/balances.js b/balances.js
index e781348..91c20c2 100644
--- a/balances.js
+++ b/balances.js
@@ -44,7 +44,7 @@ module.exports.createBalances = async data => {
 
     closingBalances.push({
       wallet: key,
-      balance: balance.div(10 ** parseInt(data.decimals)).toFixed(data.decimals)
+      balance: balance.div(10 ** parseInt(data.decimals)).toFixed(18)
     });
   }
 
diff --git a/contract.js b/contract.js
index abea66b..bc792fe 100644
--- a/contract.js
+++ b/contract.js
@@ -1,14 +1,11 @@
 "use strict";
-
 const Web3 = require("web3");
-
 const Config = require("./config").getConfig();
 const Parameters = require("./parameters").get();
-
 const web3 = new Web3(new Web3.providers.HttpProvider((Config || {}).provider || "http://localhost:8545"));
 const contractAddress = (Config || {}).contractAddress;
 
 module.exports.getContract = () => {
-  const contract = web3.eth.Contract(Parameters.abi, contractAddress);
+  const contract = new web3.eth.Contract(Parameters.abi, contractAddress);
   return contract;
 };