Merge branch 'main' into 902-traefik-image-upgrade

Author: aquarat

pages/treasury.tsx

@@ -12,7 +12,8 @@ import { fetchWebconfig } from "../services/webconfig";
 export async function getServerSideProps() {
   const webconfig = fetchWebconfig();
   const results = await Promise.all([
-    Treasuries.fetchList(),
+    // V1 no longer used
+    Treasuries.fetchList().then(list => list.filter(type => type !== 'V1')),
     Blocks.fetchLast(),
   ]);
   const names = results[0];

services/treasuries.ts

@@ -67,9 +67,15 @@ export const Treasuries = {
           ? null
           : new ethers.Contract(token.address, abiERC20, jsonRpc);
       for (const [contractAddress, contractType] of mapAddresses.entries()) {
-        const tokenBalance = tokenContract
-          ? await tokenContract.balanceOf(contractAddress)
-          : await jsonRpc.getBalance(contractAddress);
+        let tokenBalance;
+        // The V1 treasury no longer holds any tokens
+        if (contractType === TreasuryType.V1) {
+          tokenBalance = 0;
+        } else {
+          tokenBalance = tokenContract
+            ? await tokenContract.balanceOf(contractAddress)
+            : await jsonRpc.getBalance(contractAddress);
+        }
 
         const value = withDecimals(tokenBalance.toString(), token.decimals);
         console.log(contractType, tokenSymbol, value);