dao-treasury 0.0.22__cp310-cp310-macosx_11_0_arm64.whl → 0.0.69__cp310-cp310-macosx_11_0_arm64.whl

dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json

@@ -0,0 +1,220 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 11,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "type": "frser-sqlite-datasource",
+        "uid": "P2D2EEF3E092AF52B"
+      },
+      "description": "Displays all LlamaPay payment streams managed by the DAO, including stream ID, factory, start/end block, token, sender, recipient, reason, budget request, amount per second, status, and transaction group.\n\nData Links: Click on addresses or blocks to view them on Etherscan. Click on a budget request to view the related Github issue.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": 0
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Factory"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View on Etherscan",
+                    "url": "https://etherscan.io/address/${__value.raw}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "From"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View on Etherscan",
+                    "url": "https://etherscan.io/address/${__value.raw}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "To"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View on Etherscan",
+                    "url": "https://etherscan.io/address/${__value.raw}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Start Block"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View on Etherscan",
+                    "url": "https://etherscan.io/block/${__value.raw}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "End Block"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View on Etherscan",
+                    "url": "https://etherscan.io/block/${__value.raw}"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Budget Request"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "targetBlank": true,
+                    "title": "View Budget Request on Github",
+                    "url": "https://github.com/yearn/budget/issues/${__value.raw}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 19,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": ["sum"],
+          "show": false
+        },
+        "showHeader": true
+      },
+      "pluginVersion": "12.1.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "frser-sqlite-datasource",
+            "uid": "P2D2EEF3E092AF52B"
+          },
+          "queryText": "SELECT\n  stream_id as \"Stream ID\",\n  b.address as \"Factory\",\n  start_block as \"Start Block\",\n  end_block as \"End Block\",\n  c.symbol as \"Token\",\n  d.address as \"From\",\n  e.address as \"To\",\n  reason as \"Reason\",\n  CASE\n    WHEN reason LIKE 'gh-%' AND\n         -- ensures all after \"gh-\" is digits\n         REPLACE(SUBSTR(reason, 4), '0', '') >= '' AND\n         CAST(SUBSTR(reason, 4) AS INTEGER) || '' = SUBSTR(reason, 4)\n    THEN CAST(SUBSTR(reason, 4) AS INTEGER)\n    ELSE NULL\n  END AS \"Budget Request\",\n  amount_per_second as \"Amount Per Second\",\n  status as \"Status\",\n  txgroup as \"TxGroup\"\n\nFROM streams a\nLEFT JOIN addresses b ON a.contract = b.address_id\nLEFT JOIN tokens c ON a.token = c.token_id\nLEFT JOIN addresses d ON a.from_address = d.address_id\nLEFT JOIN addresses e ON a.to_address = e.address_id",
+          "queryType": "table",
+          "rawQueryText": "SELECT\n  stream_id as \"Stream ID\",\n  b.address as \"Factory\",\n  start_block as \"Start Block\",\n  end_block as \"End Block\",\n  c.symbol as \"Token\",\n  d.address as \"From\",\n  e.address as \"To\",\n  reason as \"Reason\",\n  CASE\n    WHEN reason LIKE 'gh-%' AND\n         -- ensures all after \"gh-\" is digits\n         REPLACE(SUBSTR(reason, 4), '0', '') >= '' AND\n         CAST(SUBSTR(reason, 4) AS INTEGER) || '' = SUBSTR(reason, 4)\n    THEN CAST(SUBSTR(reason, 4) AS INTEGER)\n    ELSE NULL\n  END AS \"Budget Request\",\n  amount_per_second as \"Amount Per Second\",\n  status as \"Status\",\n  txgroup as \"TxGroup\"\n\nFROM streams a\nLEFT JOIN addresses b ON a.contract = b.address_id\nLEFT JOIN tokens c ON a.token = c.token_id\nLEFT JOIN addresses d ON a.from_address = d.address_id\nLEFT JOIN addresses e ON a.to_address = e.address_id",
+          "refId": "A",
+          "timeColumns": ["time", "ts"]
+        }
+      ],
+      "title": "LlamaPay Streams",
+      "type": "table"
+    }
+  ],
+  "preload": false,
+  "refresh": "",
+  "schemaVersion": 41,
+  "tags": ["streams", "llamapay", "payments"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "LlamaPay",
+  "description": "A simple dashboard with a comprehensive view of all LlamaPay payment streams managed by the DAO, including stream status, participants, configuration, and transaction group.",
+  "uid": "aa4d62a2-9e52-4acc-8f38-a96c77810aca",
+  "version": 3
+}

dao_treasury/.grafana/provisioning/dashboards/summary/Monthly.json

@@ -17,7 +17,6 @@
   "graphTooltip": 0,
   "id": 2,
   "links": [],
-  "liveNow": false,
   "panels": [
     {
       "datasource": "SQLite",
@@ -39,7 +38,7 @@
             "steps": [
               {
                 "color": "green",
-                "value": null
+                "value": 0
               },
               {
                 "color": "red",
@@ -51,7 +50,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 9,
+        "h": 20,
         "w": 24,
         "x": 0,
         "y": 0
@@ -62,51 +61,47 @@
         "footer": {
           "countRows": false,
           "fields": "",
-          "reducer": [
-            "sum"
-          ],
+          "reducer": ["sum"],
           "show": false
         },
         "showHeader": true,
         "sortBy": [
           {
             "desc": true,
-            "displayName": "month"
+            "displayName": "Month"
           }
         ]
       },
-      "pluginVersion": "10.2.0",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    -- Anchor: pick all groups whose parent is NULL (i.e. top-level groups)\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    -- Recursive case: attach child groups to their parent's top_category\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    month,\n    SUM(CASE WHEN top_category = 'Revenue'            THEN value_usd ELSE 0 END) AS revenue,\n    SUM(CASE WHEN top_category = 'Cost of Revenue'    THEN value_usd ELSE 0 END) AS \"cost of revenue\",\n    SUM(CASE WHEN top_category = 'Expenses'           THEN value_usd ELSE 0 END) AS expenses,\n    SUM(CASE WHEN top_category = 'Other Income'       THEN value_usd ELSE 0 END) AS \"other income\",\n    SUM(CASE WHEN top_category = 'Other Expenses'     THEN value_usd ELSE 0 END) AS \"other expense\",\n    (\n        SUM(CASE WHEN top_category = 'Revenue'         THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Expenses'        THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN top_category = 'Other Income'    THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Other Expenses'  THEN value_usd ELSE 0 END)\n    ) AS \"sorted net\",\n    SUM(CASE WHEN top_category = 'Sort Me (Inbound)'  THEN value_usd ELSE 0 END) AS \"unsorted income\",\n    SUM(CASE WHEN top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END) AS \"unsorted expense\",\n    (\n        SUM(CASE WHEN top_category = 'Revenue'         THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Expenses'        THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN top_category = 'Other Income'    THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Other Expenses'  THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN top_category = 'Sort Me (Inbound)'  THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END)\n    ) AS net\nFROM (\n    SELECT\n        strftime('%Y-%m', datetime(t.timestamp, 'unixepoch')) AS month,\n        gh.top_category,\n        COALESCE(t.value_usd, 0) AS value_usd\n    FROM treasury_txs AS t\n    JOIN txgroups       AS tg ON t.txgroup_id = tg.txgroup_id\n    JOIN group_hierarchy gh   ON tg.txgroup_id = gh.txgroup_id\n    WHERE \n        t.timestamp >= strftime('%s', '2025-01-01')\n        AND tg.name <> 'Ignore'\n) AS s\nGROUP BY month;",
+          "queryText": "SELECT\n    month AS \"Month\",\n    SUM(CASE WHEN s.top_category = 'Revenue' THEN value_usd ELSE 0 END) AS \"Revenue\",\n    SUM(CASE WHEN s.top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END) AS \"Cost of Revenue\",\n    SUM(CASE WHEN s.top_category = 'Expenses' THEN value_usd ELSE 0 END) AS \"Expenses\",\n    SUM(CASE WHEN s.top_category = 'Other Income' THEN value_usd ELSE 0 END) AS \"Other Income\",\n    SUM(CASE WHEN s.top_category = 'Other Expenses' THEN value_usd ELSE 0 END) AS \"Other Expense\",\n    (\n        SUM(CASE WHEN s.top_category = 'Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Expenses' THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN s.top_category = 'Other Income' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Other Expenses' THEN value_usd ELSE 0 END)\n    ) AS \"Sorted Net\",\n    SUM(CASE WHEN s.top_category = 'Sort Me (Inbound)' THEN value_usd ELSE 0 END) AS \"Unsorted Income\",\n    SUM(CASE WHEN s.top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END) AS \"Unsorted Expense\",\n    (\n        SUM(CASE WHEN s.top_category = 'Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Expenses' THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN s.top_category = 'Other Income' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Other Expenses' THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN s.top_category = 'Sort Me (Inbound)' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END)\n    ) AS \"Net\"\nFROM (\n    SELECT\n        strftime('%Y-%m', datetime(t.timestamp, 'unixepoch')) AS month,\n        gh.top_category,\n        COALESCE(t.value_usd, 0) AS value_usd\n    FROM treasury_txs AS t\n    JOIN txgroups AS tg ON t.txgroup_id = tg.txgroup_id\n    JOIN txgroup_hierarchy AS gh ON tg.txgroup_id = gh.txgroup_id\n    WHERE t.timestamp >= $__from / 1000 AND tg.name <> 'Ignore'\n) AS s\nGROUP BY month;",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    -- Anchor: pick all groups whose parent is NULL (i.e. top-level groups)\n    SELECT\n        txgroup_id,\n        name AS top_category,\n        parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\n    -- Recursive case: attach child groups to their parent's top_category\n    SELECT\n        child.txgroup_id,\n        parent.top_category,\n        child.parent_txgroup\n    FROM txgroups AS child\n    JOIN group_hierarchy AS parent\n        ON child.parent_txgroup = parent.txgroup_id\n)\nSELECT\n    month,\n    SUM(CASE WHEN top_category = 'Revenue'            THEN value_usd ELSE 0 END) AS revenue,\n    SUM(CASE WHEN top_category = 'Cost of Revenue'    THEN value_usd ELSE 0 END) AS \"cost of revenue\",\n    SUM(CASE WHEN top_category = 'Expenses'           THEN value_usd ELSE 0 END) AS expenses,\n    SUM(CASE WHEN top_category = 'Other Income'       THEN value_usd ELSE 0 END) AS \"other income\",\n    SUM(CASE WHEN top_category = 'Other Expenses'     THEN value_usd ELSE 0 END) AS \"other expense\",\n    (\n        SUM(CASE WHEN top_category = 'Revenue'         THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Expenses'        THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN top_category = 'Other Income'    THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Other Expenses'  THEN value_usd ELSE 0 END)\n    ) AS \"sorted net\",\n    SUM(CASE WHEN top_category = 'Sort Me (Inbound)'  THEN value_usd ELSE 0 END) AS \"unsorted income\",\n    SUM(CASE WHEN top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END) AS \"unsorted expense\",\n    (\n        SUM(CASE WHEN top_category = 'Revenue'         THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Expenses'        THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN top_category = 'Other Income'    THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Other Expenses'  THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN top_category = 'Sort Me (Inbound)'  THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END)\n    ) AS net\nFROM (\n    SELECT\n        strftime('%Y-%m', datetime(t.timestamp, 'unixepoch')) AS month,\n        gh.top_category,\n        COALESCE(t.value_usd, 0) AS value_usd\n    FROM treasury_txs AS t\n    JOIN txgroups       AS tg ON t.txgroup_id = tg.txgroup_id\n    JOIN group_hierarchy gh   ON tg.txgroup_id = gh.txgroup_id\n    WHERE \n        t.timestamp >= strftime('%s', '2025-01-01')\n        AND tg.name <> 'Ignore'\n) AS s\nGROUP BY month;",
-          "refId": "A",
-          "timeColumns": [
-            "time",
-            "ts"
-          ]
+          "rawQueryText": "SELECT\n    month AS \"Month\",\n    SUM(CASE WHEN s.top_category = 'Revenue' THEN value_usd ELSE 0 END) AS \"Revenue\",\n    SUM(CASE WHEN s.top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END) AS \"Cost of Revenue\",\n    SUM(CASE WHEN s.top_category = 'Expenses' THEN value_usd ELSE 0 END) AS \"Expenses\",\n    SUM(CASE WHEN s.top_category = 'Other Income' THEN value_usd ELSE 0 END) AS \"Other Income\",\n    SUM(CASE WHEN s.top_category = 'Other Expenses' THEN value_usd ELSE 0 END) AS \"Other Expense\",\n    (\n        SUM(CASE WHEN s.top_category = 'Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Expenses' THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN s.top_category = 'Other Income' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Other Expenses' THEN value_usd ELSE 0 END)\n    ) AS \"Sorted Net\",\n    SUM(CASE WHEN s.top_category = 'Sort Me (Inbound)' THEN value_usd ELSE 0 END) AS \"Unsorted Income\",\n    SUM(CASE WHEN s.top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END) AS \"Unsorted Expense\",\n    (\n        SUM(CASE WHEN s.top_category = 'Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Expenses' THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN s.top_category = 'Other Income' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Other Expenses' THEN value_usd ELSE 0 END)\n      + SUM(CASE WHEN s.top_category = 'Sort Me (Inbound)' THEN value_usd ELSE 0 END)\n      - SUM(CASE WHEN s.top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END)\n    ) AS \"Net\"\nFROM (\n    SELECT\n        strftime('%Y-%m', datetime(t.timestamp, 'unixepoch')) AS month,\n        gh.top_category,\n        COALESCE(t.value_usd, 0) AS value_usd\n    FROM treasury_txs AS t\n    JOIN txgroups AS tg ON t.txgroup_id = tg.txgroup_id\n    JOIN txgroup_hierarchy AS gh ON tg.txgroup_id = gh.txgroup_id\n    WHERE t.timestamp >= strftime('%s', '2025-01-01') AND tg.name <> 'Ignore'\n) AS s\nGROUP BY month;",
+          "refId": "A"
         }
       ],
-      "title": "Panel Title",
-      "type": "table"
+      "title": "Monthly Profit & Loss",
+      "type": "table",
+      "description": "Displays a table of monthly profit and loss for the DAO, including Revenue, Cost of Revenue, Expenses, Other Income, Other Expense, Sorted Net, Unsorted Income, Unsorted Expense.\n\nUseful for high-level financial reporting and tracking the progress of transaction categorization."
     }
   ],
+  "preload": false,
   "refresh": "",
-  "schemaVersion": 38,
-  "tags": [],
+  "schemaVersion": 41,
+  "tags": ["pnl", "monthly"],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-6h",
+    "from": "now/y",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Monthly P&L",
+  "description": "Summarizes the DAO's monthly profit and loss, providing a breakdown of sorted and unsorted financial activity for each month. Supports financial reporting and tracking the progress of transaction categorization.",
   "uid": "a63fa9a7-d4f3-4092-9bde-194add8bcbeb",
-  "version": 1,
-  "weekStart": ""
-}
+  "version": 5
+}

dao_treasury/.grafana/provisioning/dashboards/transactions/Treasury Transactions.json

@@ -15,9 +15,8 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 1,
+  "id": 9,
   "links": [],
-  "liveNow": false,
   "panels": [
     {
       "datasource": "SQLite",
@@ -30,13 +29,14 @@
             },
             "inspect": false
           },
+          "decimals": 8,
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
                 "color": "green",
-                "value": null
+                "value": 0
               },
               {
                 "color": "red",
@@ -49,7 +49,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "hash"
+              "options": "Hash"
             },
             "properties": [
               {
@@ -67,7 +67,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "block"
+              "options": "Block"
             },
             "properties": [
               {
@@ -85,7 +85,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "to"
+              "options": "To"
             },
             "properties": [
               {
@@ -103,7 +103,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "from"
+              "options": "From"
             },
             "properties": [
               {
@@ -121,7 +121,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "from nickname"
+              "options": "From Nickname"
             },
             "properties": [
               {
@@ -130,7 +130,7 @@
                   {
                     "targetBlank": true,
                     "title": "View on Etherscan",
-                    "url": "https://etherscan.io/address/${__data.fields.from}"
+                    "url": "https://etherscan.io/address/${__data.fields.From}"
                   }
                 ]
               }
@@ -139,7 +139,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "to nickname"
+              "options": "To Nickname"
             },
             "properties": [
               {
@@ -148,11 +148,33 @@
                   {
                     "targetBlank": true,
                     "title": "View on Etherscan",
-                    "url": "https://etherscan.io/address/${__data.fields.to}"
+                    "url": "https://etherscan.io/address/${__data.fields.To}"
                   }
                 ]
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Block"
+            },
+            "properties": [
+              {
+                "id": "decimals"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Log Index"
+            },
+            "properties": [
+              {
+                "id": "decimals"
+              }
+            ]
           }
         ]
       },
@@ -168,36 +190,166 @@
         "footer": {
           "countRows": false,
           "fields": "",
-          "reducer": [
-            "sum"
-          ],
+          "reducer": ["sum"],
           "show": false
         },
-        "showHeader": true
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Timestamp"
+          }
+        ]
       },
-      "pluginVersion": "10.2.0",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "select chain_name as chain, timestamp, block, hash, token, \"from\", from_nickname as \"from nickname\", \"to\", to_nickname as \"to nickname\", amount, price, value_usd as \"value usd\", txgroup, parent_txgroup\nfrom (\n  SELECT treasury_tx_id, b.chain_name, datetime(a.timestamp, 'unixepoch') AS timestamp, a.block, a.hash, a.log_index, c.symbol AS token, d.address AS \"from\", d.nickname as from_nickname, e.address AS \"to\", e.nickname as to_nickname, a.amount, a.price, a.value_usd, f.name AS txgroup, g.name AS parent_txgroup, f.txgroup_id\n  FROM treasury_txs a\n      LEFT JOIN chains b ON a.chain = b.chain_dbid\n      LEFT JOIN tokens c ON a.token_id = c.token_id\n      LEFT JOIN addresses d ON a.\"from\" = d.address_id\n      LEFT JOIN addresses e ON a.\"to\" = e.address_id\n      LEFT JOIN txgroups f ON a.txgroup_id = f.txgroup_id\n      LEFT JOIN txgroups g ON f.parent_txgroup = g.txgroup_id\n  WHERE a.timestamp >= $__from / 1000 and a.timestamp < $__to / 1000\n  --UNION\n  --SELECT -1, chain_name, TIMESTAMP, cast(block AS integer) block, hash, CAST(log_index AS integer) as log_index, token, \"from\", from_nickname, \"to\", to_nickname, amount, price, value_usd, txgroup, parent_txgroup, txgroup_id\n  --FROM stream_ledger\n  --UNION\n  --SELECT -1, *\n  --FROM vesting_ledger  \n) a\nORDER BY timestamp",
+          "queryText": "select timestamp as \"Timestamp\", block as \"Block\", hash as \"Hash\", token as \"Token\", \"from\" as \"From\", from_nickname as \"From Nickname\", \"to\" as \"To\", to_nickname as \"To Nickname\", amount as \"Amount\", price as \"Price\", value_usd as \"Value USD\", txgroup as \"TxGroup\", a.parent_txgroup as \"Parent TxGroup\", log_index as \"Log Index\" from ( SELECT datetime(a.timestamp, 'unixepoch') AS timestamp, a.block, a.hash, c.symbol AS token, d.address AS \"from\", d.nickname as from_nickname, e.address AS \"to\", e.nickname as to_nickname, a.amount, a.price, a.value_usd, f.name AS txgroup, g.name AS parent_txgroup, f.txgroup_id, a.log_index FROM treasury_txs a LEFT JOIN chains b ON a.chain = b.chain_dbid LEFT JOIN tokens c ON a.token_id = c.token_id LEFT JOIN addresses d ON a.\"from\" = d.address_id LEFT JOIN addresses e ON a.\"to\" = e.address_id LEFT JOIN txgroups f ON a.txgroup_id = f.txgroup_id LEFT JOIN txgroups g ON f.parent_txgroup = g.txgroup_id WHERE a.timestamp >= $__from / 1000 and a.timestamp < $__to / 1000 and b.chain_name IN (${Chain:sqlstring}) and c.symbol IN (${Token:sqlstring}) and d.address IN (${From:sqlstring}) and e.address IN (${To:sqlstring}) and d.nickname IN (${FromNickname:sqlstring}) and e.nickname IN (${ToNickname:sqlstring}) ) a left join txgroup_hierarchy b on a.txgroup_id = b.txgroup_id WHERE b.top_category IN (${Top:sqlstring}) ORDER BY timestamp",
           "queryType": "table",
-          "rawQueryText": "select chain_name as chain, timestamp, block, hash, token, \"from\", from_nickname as \"from nickname\", \"to\", to_nickname as \"to nickname\", amount, price, value_usd as \"value usd\", txgroup, parent_txgroup\nfrom (\n  SELECT treasury_tx_id, b.chain_name, datetime(a.timestamp, 'unixepoch') AS timestamp, a.block, a.hash, a.log_index, c.symbol AS token, d.address AS \"from\", d.nickname as from_nickname, e.address AS \"to\", e.nickname as to_nickname, a.amount, a.price, a.value_usd, f.name AS txgroup, g.name AS parent_txgroup, f.txgroup_id\n  FROM treasury_txs a\n      LEFT JOIN chains b ON a.chain = b.chain_dbid\n      LEFT JOIN tokens c ON a.token_id = c.token_id\n      LEFT JOIN addresses d ON a.\"from\" = d.address_id\n      LEFT JOIN addresses e ON a.\"to\" = e.address_id\n      LEFT JOIN txgroups f ON a.txgroup_id = f.txgroup_id\n      LEFT JOIN txgroups g ON f.parent_txgroup = g.txgroup_id\n  WHERE a.timestamp >= $__from / 1000 and a.timestamp < $__to / 1000\n  --UNION\n  --SELECT -1, chain_name, TIMESTAMP, cast(block AS integer) block, hash, CAST(log_index AS integer) as log_index, token, \"from\", from_nickname, \"to\", to_nickname, amount, price, value_usd, txgroup, parent_txgroup, txgroup_id\n  --FROM stream_ledger\n  --UNION\n  --SELECT -1, *\n  --FROM vesting_ledger  \n) a\nORDER BY timestamp",
+          "rawQueryText": "select timestamp as \"Timestamp\", block as \"Block\", hash as \"Hash\", token as \"Token\", \"from\" as \"From\", from_nickname as \"From Nickname\", \"to\" as \"To\", to_nickname as \"To Nickname\", amount as \"Amount\", price as \"Price\", value_usd as \"Value USD\", txgroup as \"TxGroup\", a.parent_txgroup as \"Parent TxGroup\", log_index as \"Log Index\" from ( SELECT datetime(a.timestamp, 'unixepoch') AS timestamp, a.block, a.hash, c.symbol AS token, d.address AS \"from\", d.nickname as from_nickname, e.address AS \"to\", e.nickname as to_nickname, a.amount, a.price, a.value_usd, f.name AS txgroup, g.name AS parent_txgroup, f.txgroup_id, a.log_index FROM treasury_txs a LEFT JOIN chains b ON a.chain = b.chain_dbid LEFT JOIN tokens c ON a.token_id = c.token_id LEFT JOIN addresses d ON a.\"from\" = d.address_id LEFT JOIN addresses e ON a.\"to\" = e.address_id LEFT JOIN txgroups f ON a.txgroup_id = f.txgroup_id LEFT JOIN txgroups g ON f.parent_txgroup = g.txgroup_id WHERE a.timestamp >= $__from / 1000 and a.timestamp < $__to / 1000 and b.chain_name IN (${Chain:sqlstring}) and c.symbol IN (${Token:sqlstring}) and d.address IN (${From:sqlstring}) and e.address IN (${To:sqlstring}) and d.nickname IN (${FromNickname:sqlstring}) and e.nickname IN (${ToNickname:sqlstring}) ) a left join txgroup_hierarchy b on a.txgroup_id = b.txgroup_id WHERE b.top_category IN (${Top:sqlstring}) ORDER BY timestamp",
           "refId": "A",
-          "timeColumns": [
-            "time",
-            "ts"
-          ]
+          "timeColumns": ["time", "ts"]
         }
       ],
       "title": "Transactions",
-      "type": "table"
+      "type": "table",
+      "description": "Displays all of the DAO's treasury transactions with full details, including timestamp, block, hash, token, sender/recipient address and nickname, amount, price, value in USD, and transaction group.\n\nIncludes direct links to Etherscan for transaction, block, and address fields."
     }
   ],
+  "preload": false,
   "refresh": "",
-  "schemaVersion": 38,
-  "tags": [],
+  "schemaVersion": 41,
+  "tags": ["transactions", "detailed"],
   "templating": {
-    "list": []
+    "list": [
+      {
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "SQLite",
+        "definition": "SELECT DISTINCT gh.top_category FROM treasury_txs a INNER JOIN txgroup_hierarchy gh ON a.txgroup_id = gh.txgroup_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000;",
+        "includeAll": true,
+        "label": "Top Level",
+        "name": "Top",
+        "options": [],
+        "query": "SELECT DISTINCT gh.top_category FROM treasury_txs a INNER JOIN txgroup_hierarchy gh ON a.txgroup_id = gh.txgroup_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000;",
+        "refresh": 2,
+        "regex": "",
+        "sort": 5,
+        "type": "query",
+        "description": "Filter transactions by top-level category (e.g., Revenue, Cost of Revenue, Expenses, Other Income, Other Expenses, Unsorted Income, Unsorted Expense).\n\nSelecting 'All' includes all categories."
+      },
+      {
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "SQLite",
+        "definition": "select distinct chain_name from treasury_txs a left join chains b on a.chain = b.chain_dbid WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "description": "Filter transactions by blockchain network.\n\nSelecting 'All' includes all supported chains.",
+        "includeAll": true,
+        "label": "Chain",
+        "name": "Chain",
+        "options": [],
+        "query": "select distinct chain_name from treasury_txs a left join chains b on a.chain = b.chain_dbid WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "refresh": 2,
+        "regex": "",
+        "sort": 5,
+        "type": "query"
+      },
+      {
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "SQLite",
+        "definition": "select distinct symbol from treasury_txs a left join tokens b on a.token_id = b.token_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "description": "Filter transactions by token symbol.\n\nSelecting 'All' includes all tokens.",
+        "includeAll": true,
+        "label": "Token",
+        "name": "Token",
+        "options": [],
+        "query": "select distinct symbol from treasury_txs a left join tokens b on a.token_id = b.token_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "refresh": 2,
+        "regex": "",
+        "sort": 5,
+        "type": "query"
+      },
+      {
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "SQLite",
+        "definition": "select distinct address from treasury_txs a left join addresses b on a.\"from\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "description": "Filter transactions by sender address.\n\nSelecting 'All' includes all sender addresses.",
+        "includeAll": true,
+        "label": "From Address",
+        "name": "From",
+        "options": [],
+        "query": "select distinct address from treasury_txs a left join addresses b on a.\"from\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "refresh": 2,
+        "regex": "",
+        "sort": 5,
+        "type": "query"
+      },
+      {
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "SQLite",
+        "definition": "select distinct nickname from treasury_txs a inner join addresses b on a.\"from\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "description": "Filter transactions by sender nickname.\n\nSelecting 'All' includes all senders.",
+        "includeAll": true,
+        "label": "From Nickname",
+        "name": "FromNickname",
+        "options": [],
+        "query": "select distinct nickname from treasury_txs a inner join addresses b on a.\"from\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "refresh": 2,
+        "regex": "",
+        "sort": 5,
+        "type": "query"
+      },
+      {
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "SQLite",
+        "definition": "select distinct address from treasury_txs a left join addresses b on a.\"to\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "description": "Filter transactions by recipient address.\n\nSelecting 'All' includes all recipient addresses.",
+        "includeAll": true,
+        "label": "To Address",
+        "name": "To",
+        "options": [],
+        "query": "select distinct address from treasury_txs a left join addresses b on a.\"to\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "refresh": 2,
+        "regex": "",
+        "sort": 5,
+        "type": "query"
+      },
+      {
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "SQLite",
+        "definition": "select distinct nickname from treasury_txs a inner join addresses b on a.\"to\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "description": "Filter transactions by recipient nickname.\n\nSelecting 'All' includes all recipients.",
+        "includeAll": true,
+        "label": "To Nickname",
+        "name": "ToNickname",
+        "options": [],
+        "query": "select distinct nickname from treasury_txs a inner join addresses b on a.\"to\" = b.address_id WHERE a.timestamp >= $__from/1000 AND a.timestamp <= $__to/1000",
+        "refresh": 2,
+        "regex": "",
+        "sort": 5,
+        "type": "query"
+      }
+    ]
   },
   "time": {
     "from": "now-7d",
@@ -206,7 +358,7 @@
   "timepicker": {},
   "timezone": "",
   "title": "Treasury Transactions",
+  "description": "Provides a real-time, filterable table of all transactions in the DAO treasury database, including timestamp, block, hash, token, addresses, nicknames, amount, price, and value in USD. Enables detailed analysis and monitoring of all value transfers.",
   "uid": "b21f1092-66a4-4fb0-90ef-ed77d2becaa4",
-  "version": 5,
-  "weekStart": ""
-}
+  "version": 6
+}