From 120353bfc01d445794f24cc7a2be983f3c70c7ec Mon Sep 17 00:00:00 2001
From: Greg Taschuk <gregorytaschuk@gmail.com>
Date: Tue, 24 Aug 2021 10:29:34 -0700
Subject: [PATCH 1/2] optionally calculate hex proof in getMerkleRoots script

---
 js/src/getMerkleRoots.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/js/src/getMerkleRoots.ts b/js/src/getMerkleRoots.ts
index ea52e8779..acd74d895 100644
--- a/js/src/getMerkleRoots.ts
+++ b/js/src/getMerkleRoots.ts
@@ -1,4 +1,5 @@
 import { loadTree } from './merkle';
+import { toWei, soliditySha3 } from 'web3-utils';
 const fs = require('fs');
 const path = require('path');
 const glob = require('glob');
@@ -21,4 +22,11 @@ reports.forEach(([week, report]) => {
     const merkleTree = loadTree(report);
     console.log(`Week ${week}`);
     console.log(merkleTree.getHexRoot());
+
+    const address = process.env.ADDRESS;
+    if (address && address in report) {
+        const balance = toWei(report[address]);
+        const leaf = soliditySha3(address, balance);
+        console.log(`Proof ${merkleTree.getHexProof(leaf)}`);
+    }
 });

From 80d48e9a33fb6e65bf160397f4c0d38f3d558eb2 Mon Sep 17 00:00:00 2001
From: Greg Taschuk <gregorytaschuk@gmail.com>
Date: Tue, 31 Aug 2021 09:27:10 -0700
Subject: [PATCH 2/2] better reporting of roots and proofs

---
 js/src/getMerkleRoots.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/src/getMerkleRoots.ts b/js/src/getMerkleRoots.ts
index acd74d895..6b5a7ecff 100644
--- a/js/src/getMerkleRoots.ts
+++ b/js/src/getMerkleRoots.ts
@@ -20,13 +20,14 @@ console.log('Merkle roots');
 
 reports.forEach(([week, report]) => {
     const merkleTree = loadTree(report);
-    console.log(`Week ${week}`);
-    console.log(merkleTree.getHexRoot());
 
     const address = process.env.ADDRESS;
     if (address && address in report) {
         const balance = toWei(report[address]);
         const leaf = soliditySha3(address, balance);
-        console.log(`Proof ${merkleTree.getHexProof(leaf)}`);
+        console.log(`Week: ${week - 20}`);
+        console.log(`> Balance: ${balance}`);
+        console.log(`> Root: ${merkleTree.getHexRoot()}`);
+        console.log(`> Proof: ${merkleTree.getHexProof(leaf)}`);
     }
 });