From 3fc3c7f1dd78acf482c9db4ae88bad387ebc37d5 Mon Sep 17 00:00:00 2001
From: Mike D <admin@Admins-MacBook-Pro.local>
Date: Tue, 13 Aug 2024 23:05:42 -0400
Subject: [PATCH 1/3] added waxdao project

---
 projects/waxdao/index.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 projects/waxdao/index.js

diff --git a/projects/waxdao/index.js b/projects/waxdao/index.js
new file mode 100644
index 000000000000..fec0efcdfd2e
--- /dev/null
+++ b/projects/waxdao/index.js
@@ -0,0 +1,28 @@
+const { get_account_tvl } = require("../helper/chain/eos");
+
+// WaxDAO
+// https://waxdao.io
+async function wax() {
+  const accounts = ["waxdaofarmer", 
+                    "farms.waxdao", 
+                    "waxdaolocker", 
+                    "waxdaomarket", 
+                    "waxdaobacker",
+                    "dao.waxdao", 
+                    "tf.waxdao",
+                    "waxdaoescrow",
+                    "waxdaosynths"];
+  const tokens = [
+      ["eosio.token", "WAX", "wax"],
+      ["wuffi", "WUF", "wuffi"],
+      ["alien.worlds", "TLM", "alien-worlds"],
+  ];
+  return await get_account_tvl(accounts, tokens, "wax");
+}
+
+module.exports = {
+  methodology: `WaxDAO TVL is achieved by querying token balances from vesting, farming, market and DAO contracts`,
+  wax: {
+    tvl: wax
+  },
+}
\ No newline at end of file

From 45d43492f951502ef240d3dc00de31a5fe555103 Mon Sep 17 00:00:00 2001
From: Mike D <admin@Admins-MacBook-Pro.local>
Date: Wed, 14 Aug 2024 00:48:38 -0400
Subject: [PATCH 2/3] separate staking for waxdao

---
 projects/waxdao/index.js | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/projects/waxdao/index.js b/projects/waxdao/index.js
index fec0efcdfd2e..274c18a5d06c 100644
--- a/projects/waxdao/index.js
+++ b/projects/waxdao/index.js
@@ -1,28 +1,30 @@
 const { get_account_tvl } = require("../helper/chain/eos");
 
+const staking_accounts = ["waxdaofarmer", "farms.waxdao", "tf.waxdao"];
+
+const tokens = [
+    ["eosio.token", "WAX", "wax"],
+    ["wuffi", "WUF", "wuffi"],
+    ["alien.worlds", "TLM", "alien-worlds"],
+];
+
+
 // WaxDAO
 // https://waxdao.io
 async function wax() {
-  const accounts = ["waxdaofarmer", 
-                    "farms.waxdao", 
-                    "waxdaolocker", 
-                    "waxdaomarket", 
-                    "waxdaobacker",
-                    "dao.waxdao", 
-                    "tf.waxdao",
-                    "waxdaoescrow",
-                    "waxdaosynths"];
-  const tokens = [
-      ["eosio.token", "WAX", "wax"],
-      ["wuffi", "WUF", "wuffi"],
-      ["alien.worlds", "TLM", "alien-worlds"],
-  ];
+  const accounts = ["waxdaolocker", "waxdaomarket", "waxdaobacker", "dao.waxdao", "waxdaoescrow", "waxdaosynths"];
+
   return await get_account_tvl(accounts, tokens, "wax");
 }
 
+async function staking() {
+  return await get_account_tvl(staking_accounts, tokens, "wax");
+}
+
 module.exports = {
   methodology: `WaxDAO TVL is achieved by querying token balances from vesting, farming, market and DAO contracts`,
   wax: {
-    tvl: wax
+    tvl: wax,
+    staking
   },
 }
\ No newline at end of file

From 3d5dec7427bf047137bcdc1eacbf1fbe6e7660d4 Mon Sep 17 00:00:00 2001
From: Mike D <admin@Admins-MacBook-Pro.local>
Date: Fri, 16 Aug 2024 17:13:29 -0400
Subject: [PATCH 3/3] removed dao.waxdao contract

---
 projects/waxdao/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/waxdao/index.js b/projects/waxdao/index.js
index 274c18a5d06c..ed2f776ee96a 100644
--- a/projects/waxdao/index.js
+++ b/projects/waxdao/index.js
@@ -12,7 +12,7 @@ const tokens = [
 // WaxDAO
 // https://waxdao.io
 async function wax() {
-  const accounts = ["waxdaolocker", "waxdaomarket", "waxdaobacker", "dao.waxdao", "waxdaoescrow", "waxdaosynths"];
+  const accounts = ["waxdaolocker", "waxdaomarket", "waxdaobacker", "waxdaoescrow", "waxdaosynths"];
 
   return await get_account_tvl(accounts, tokens, "wax");
 }
@@ -22,7 +22,7 @@ async function staking() {
 }
 
 module.exports = {
-  methodology: `WaxDAO TVL is achieved by querying token balances from vesting, farming, market and DAO contracts`,
+  methodology: `WaxDAO TVL is achieved by querying token balances from vesting, farming, and market contract(s)`,
   wax: {
     tvl: wax,
     staking