Merge branch 'master' into feature/kredits-formatter

scripts/list-contributions.js

@@ -40,8 +40,8 @@ module.exports = async function(callback) {
 
     console.log(table.toString());
 
-    let totalContributionBalances = await kredits.Contribution.functions.totalCount(true);
-    console.log(`Total confirmed balance: ${totalContributionBalances}`);
+    let totalKreditsEarned = await kredits.Contribution.functions.totalKreditsEarned(true);
+    console.log(`Total confirmed kredits: ${totalKreditsEarned}`);
   } catch (err) {
     console.log(err);
   }

scripts/list-contributors.js

@@ -21,26 +21,25 @@ module.exports = async function(callback) {
 
   try {
     const contributors = await kredits.Contributor.all()
+
+    contributors.forEach((c) => {
+      table.push([
+        c.id.toString(),
+        c.account,
+        `${c.name}`,
+        c.isCore,
+        c.balanceInt.toString(),
+        c.totalKreditsEarned.toString(),
+        c.contributionsCount.toString(),
+        c.ipfsHash
+      ])
+    })
+
+    console.log(table.toString())
   } catch(e) {
     callback(e);
     return;
   }
 
-  contributors.forEach((c) => {
-    table.push([
-      c.id.toString(),
-      c.account,
-      `${c.name}`,
-      c.isCore,
-      c.balanceInt.toString(),
-      c.totalKreditsEarned.toString(),
-      c.contributionsCount.toString(),
-      c.ipfsHash
-    ])
-  })
-
-  console.log(table.toString())
-
   callback()
 }
-