From 99cffa9cbc7ab9b0114517cadcc9950aeb5430a2 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@maha.xyz>
Date: Sat, 10 Aug 2024 06:16:46 -0700
Subject: [PATCH 1/3] removed old maha token and lp from treasury

---
 projects/treasury/mahaxyz.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/treasury/mahaxyz.js b/projects/treasury/mahaxyz.js
index 4518730cbeeb..d3992442b982 100644
--- a/projects/treasury/mahaxyz.js
+++ b/projects/treasury/mahaxyz.js
@@ -1,4 +1,4 @@
-const { nullAddress, treasuryExports } = require("../helper/treasury");
+const { treasuryExports } = require("../helper/treasury");
 
 const treasury = "0x6357EDbfE5aDA570005ceB8FAd3139eF5A8863CC";
 
@@ -6,9 +6,7 @@ module.exports = treasuryExports({
   ethereum: {
     owners: [treasury],
     ownTokens: [
-        "0x745407c86DF8DB893011912d3aB28e68B62E49B0", // MAHA
-        "0xB4d930279552397bbA2ee473229f89Ec245bc365", // MAHA
-        "0x6b7127a638eDC7Db04bEde220c7c49930fdB4160" // MAHAETH
+      "0x745407c86DF8DB893011912d3aB28e68B62E49B0", // MAHA
     ]
   },
-})
\ No newline at end of file
+})

From 0977c514b228d7e81a02e092ec8e79c38bbafce8 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@maha.xyz>
Date: Sat, 10 Aug 2024 06:17:06 -0700
Subject: [PATCH 2/3] added zai curve lp pools into pool2 for mahaxyz

---
 projects/mahaxyz/index.js | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/projects/mahaxyz/index.js b/projects/mahaxyz/index.js
index de15cfbf7674..4f13a49125b7 100644
--- a/projects/mahaxyz/index.js
+++ b/projects/mahaxyz/index.js
@@ -1,6 +1,6 @@
-const ADDRESSES = require('../helper/coreAssets.json')
-const { sumTokens2 } = require("../helper/unwrapLPs.js");
-const { staking } = require("../helper/staking");
+const ADDRESSES = require('../helper/coreAssets.json');
+const { staking } = require('../helper/staking.js');
+const { sumTokensExport } = require('../helper/unwrapLPs.js');
 
 const eth = {
   // tokens
@@ -11,15 +11,12 @@ const eth = {
   weth: ADDRESSES.ethereum.WETH,
   zai: "0x69000405f9dce69bd4cbf4f2865b79144a69bfe0",
 
-  // pools
-  zaiFraxBPCurve: "0x057c658dfbbcbb96c361fb4e66b86cca081b6c6a",
-  mahaEthCurve: "0x6b7127a638edc7db04bede220c7c49930fdb4160",
-
-  // staking contracts
+  // peg stability modules
   psmUSDC: '0x69000052a82e218ccb61fe6e9d7e3f87b9c5916f',
-  stakedZai: '0x69000e468f7f6d6f4ed00cf46f368acdac252553',
-  zaiFraxBPStaked: "0x6900066d9f8df0bfaf1e25ef89c0453e8e12373d",
 
+  // pools
+  zaiUsdcCurve: "0x6ee1955afb64146b126162b4ff018db1eb8f08c3",
+  zaiMahaCurve: "0x0086ef314a313018c70a2cd92504c7d1038a25aa",
 };
 
 Object.keys(eth).forEach((k) => (eth[k] = eth[k].toLowerCase()));
@@ -29,13 +26,14 @@ const pegStabilityModules = [eth.psmUSDC]
 
 module.exports = {
   ethereum: {
-    // todo add pool2
-    // pool2: genericUnwrapCvxDeposit({
-    //   tokensAndOwners: [
-    //     [eth.zaiFraxBP, eth.zaiFraxBPStaked],
-    //   ]
-    // }),
-    // staking: staking(eth.stakedZai, eth.zai),  // we dont staking for CDP as tokens backing the minted token is already counted towards tvl
-    tvl: () => sumTokens2({ owners: pegStabilityModules, tokens: collaterals}),
+    pool2: sumTokensExport({
+      tokensAndOwners: [
+        [eth.usdc, eth.zaiUsdcCurve], // Curve USDZ/USDC
+        [eth.zai, eth.zaiUsdcCurve], // Curve USDZ/USDC
+        [eth.zai, eth.zaiMahaCurve], // Curve USDZ/MAHA
+        [eth.maha, eth.zaiMahaCurve], // Curve USDZ/MAHA
+      ]
+    }),
+    tvl: sumTokensExport({ owners: pegStabilityModules, tokens: collaterals}),
   }
 };

From 34c25b3f64acfb46f4494512649575b69baa1f42 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@maha.xyz>
Date: Mon, 12 Aug 2024 16:18:41 -0700
Subject: [PATCH 3/3] added staking contracts for Lp tokens

---
 projects/mahaxyz/index.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/projects/mahaxyz/index.js b/projects/mahaxyz/index.js
index 4f13a49125b7..7bb6e8ba04d5 100644
--- a/projects/mahaxyz/index.js
+++ b/projects/mahaxyz/index.js
@@ -1,5 +1,4 @@
 const ADDRESSES = require('../helper/coreAssets.json');
-const { staking } = require('../helper/staking.js');
 const { sumTokensExport } = require('../helper/unwrapLPs.js');
 
 const eth = {
@@ -17,6 +16,10 @@ const eth = {
   // pools
   zaiUsdcCurve: "0x6ee1955afb64146b126162b4ff018db1eb8f08c3",
   zaiMahaCurve: "0x0086ef314a313018c70a2cd92504c7d1038a25aa",
+
+  // pool staking contracts
+  zaiMahaCurveStaking: "0x237efe587f2cb44597063dc8403a4892a60a5a4f",
+  zaiUsdcCurveStaking: "0x154F52B347D8E48b8DbD8D8325Fe5bb45AAdCCDa",
 };
 
 Object.keys(eth).forEach((k) => (eth[k] = eth[k].toLowerCase()));
@@ -28,12 +31,10 @@ module.exports = {
   ethereum: {
     pool2: sumTokensExport({
       tokensAndOwners: [
-        [eth.usdc, eth.zaiUsdcCurve], // Curve USDZ/USDC
-        [eth.zai, eth.zaiUsdcCurve], // Curve USDZ/USDC
-        [eth.zai, eth.zaiMahaCurve], // Curve USDZ/MAHA
-        [eth.maha, eth.zaiMahaCurve], // Curve USDZ/MAHA
+        [eth.zaiMahaCurve, eth.zaiMahaCurveStaking],
+        [eth.zaiUsdcCurve, eth.zaiUsdcCurveStaking]
       ]
     }),
-    tvl: sumTokensExport({ owners: pegStabilityModules, tokens: collaterals}),
+    tvl: sumTokensExport({ owners: pegStabilityModules, tokens: collaterals }),
   }
 };