feat: added fees to storage task

mstable · Jul 2, 2021 · 9516051 · 9516051
1 parent aa78ca5
commit 9516051
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 15 deletions.
diff --git a/tasks/feeder.ts b/tasks/feeder.ts
@@ -5,7 +5,7 @@ import { Signer } from "ethers"
 
 import { FeederPool, FeederPool__factory, Masset } from "types/generated"
 import { BN } from "@utils/math"
-import { dumpConfigStorage, dumpFassetStorage, dumpFeederDataStorage, dumpTokenStorage } from "./utils/storage-utils"
+import { dumpConfigStorage, dumpFassetStorage, dumpTokenStorage } from "./utils/storage-utils"
 import {
     getMultiRedemptions,
     Balances,
@@ -92,7 +92,6 @@ task("feeder-storage", "Dumps feeder contract storage data")
         await dumpTokenStorage(pool, blockNumber)
         await dumpFassetStorage(pool, blockNumber)
         await dumpConfigStorage(pool, blockNumber)
-        await dumpFeederDataStorage(pool, blockNumber)
     })
 
 task("feeder-snap", "Gets feeder transactions over a period of time")

diff --git a/tasks/utils/storage-utils.ts b/tasks/utils/storage-utils.ts
@@ -1,5 +1,6 @@
 import { FeederPool, Masset } from "types/generated"
 import { MusdEth } from "types/generated/MusdEth"
+import { isFeederPool, isMusdEth } from "./snap-utils"
 
 // Get mAsset token storage variables
 export const dumpTokenStorage = async (token: Masset | MusdEth | FeederPool, toBlock: number): Promise<void> => {
@@ -62,20 +63,45 @@ export const dumpConfigStorage = async (mAsset: Masset | MusdEth | FeederPool, t
     console.log("A              : ", invariantConfig.a.toString())
     console.log("Min            : ", invariantConfig.limits.min.toString())
     console.log("Max            : ", invariantConfig.limits.max.toString())
-}
 
-// Get Masset storage variables
-export const dumpFeederDataStorage = async (pool: FeederPool, toBlock: number): Promise<void> => {
-    const override = {
-        blockTag: toBlock,
-    }
-
-    const feederData = await pool.data(override)
+    if (!isMusdEth(mAsset)) {
+        // Masset and FeederPool
+        const data = await (mAsset as FeederPool).data(override)
 
-    console.log("SwapFee        : ", feederData.swapFee.toString())
-    console.log("RedemptionFee  : ", feederData.redemptionFee.toString())
-    console.log("GovFee         : ", feederData.govFee.toString())
-    console.log("pendingFees    : ", feederData.pendingFees.toString())
+        console.log("\nCacheSize      : ", data.cacheSize.toString())
+        console.log("\nSwapFee        : ", data.swapFee.toString())
+        console.log("RedemptionFee  : ", data.redemptionFee.toString())
 
-    console.log("CacheSize      : ", feederData.cacheSize.toString())
+        if (isFeederPool(mAsset)) {
+            // Only FeederPools
+            console.log("GovFee         : ", data.govFee.toString())
+            console.log("pendingFees    : ", data.pendingFees.toString())
+        }
+    } else {
+        // mUSD or mBTC
+        console.log(
+            "\nSwapFee        : ",
+            (
+                await mAsset.swapFee({
+                    blockTag: toBlock,
+                })
+            ).toString(),
+        )
+        console.log(
+            "RedemptionFee  : ",
+            (
+                await mAsset.redemptionFee({
+                    blockTag: toBlock,
+                })
+            ).toString(),
+        )
+        console.log(
+            "Surplus        : ",
+            (
+                await mAsset.surplus({
+                    blockTag: toBlock,
+                })
+            ).toString(),
+        )
+    }
 }