dao-treasury 0.0.34__cp312-cp312-win32.whl → 0.0.72__cp312-cp312-win32.whl

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

@@ -18,16 +18,15 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 7,
+  "id": 11,
   "links": [],
-  "liveNow": false,
   "panels": [
     {
       "datasource": {
         "type": "frser-sqlite-datasource",
         "uid": "P2D2EEF3E092AF52B"
       },
-      "description": "",
+      "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": {
@@ -46,7 +45,7 @@
             "steps": [
               {
                 "color": "green",
-                "value": null
+                "value": 0
               },
               {
                 "color": "red",
@@ -55,7 +54,116 @@
             ]
           }
         },
-        "overrides": []
+        "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,
@@ -69,37 +177,33 @@
         "footer": {
           "countRows": false,
           "fields": "",
-          "reducer": [
-            "sum"
-          ],
+          "reducer": ["sum"],
           "show": false
         },
         "showHeader": true
       },
-      "pluginVersion": "10.2.0",
+      "pluginVersion": "12.1.1",
       "targets": [
         {
           "datasource": {
             "type": "frser-sqlite-datasource",
             "uid": "P2D2EEF3E092AF52B"
           },
-          "queryText": "select stream_id as \"Stream ID\", b.address as \"Factory\", start_block as \"Start Block\", end_block as \"End Block\", c.symbol as \"Token\", d.address as \"From\", e.address as \"To\", reason as \"Reason\", amount_per_second as \"Amount Per Second\", status as \"Status\", txgroup as \"TxGroup\"\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",
+          "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 stream_id as \"Stream ID\", b.address as \"Factory\", start_block as \"Start Block\", end_block as \"End Block\", c.symbol as \"Token\", d.address as \"From\", e.address as \"To\", reason as \"Reason\", amount_per_second as \"Amount Per Second\", status as \"Status\", txgroup as \"TxGroup\"\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",
+          "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"
-          ]
+          "timeColumns": ["time", "ts"]
         }
       ],
       "title": "LlamaPay Streams",
       "type": "table"
     }
   ],
+  "preload": false,
   "refresh": "",
-  "schemaVersion": 38,
-  "tags": [],
+  "schemaVersion": 41,
+  "tags": ["streams", "llamapay", "payments"],
   "templating": {
     "list": []
   },
@@ -110,7 +214,7 @@
   "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": 1,
-  "weekStart": ""
-}
+  "version": 3
+}

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

@@ -12,46 +12,314 @@
       }
     ]
   },
+  "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.",
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
   "id": 2,
   "links": [],
-  "liveNow": false,
   "panels": [
     {
       "datasource": "SQLite",
+      "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.\n\nClick on any underlined cell value to see all transactions for that transaction group and time period.\n\nYou can download this table as a CSV. Click on the three dots in the upper right corner, navigate \"Inspect\" -> \"Data\", select your desired options and click \"Download CSV\".",
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "mode": "continuous-RdYlGr"
           },
           "custom": {
             "align": "auto",
             "cellOptions": {
               "type": "auto"
             },
-            "inspect": false
+            "footer": {
+              "reducers": ["sum", "max", "mean", "median"]
+            },
+            "inspect": true
           },
+          "fieldMinMax": true,
+          "links": [
+            {
+              "targetBlank": true,
+              "title": "View ${__field.name} transactions for this period",
+              "url": "/d/b21f1092-66a4-4fb0-90ef-ed77d2becaa4/treasury-transactions?var-Top=${__field.name}&from=${__data.fields.month_start}&to=${__data.fields.month_end}"
+            }
+          ],
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
                 "color": "green",
-                "value": null
+                "value": 0
               },
               {
                 "color": "red",
                 "value": 80
               }
             ]
-          }
+          },
+          "unit": "currencyUSD"
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Sorted Net"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Net"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Unsorted Income"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Unsorted Expenses"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Other Income"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Other Expenses"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Operating Net"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "continuous-RdYlGr"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "month_start"
+            },
+            "properties": [
+              {
+                "id": "unit"
+              },
+              {
+                "id": "custom.hideFrom.viz",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "month_end"
+            },
+            "properties": [
+              {
+                "id": "unit"
+              },
+              {
+                "id": "custom.hideFrom.viz",
+                "value": true
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Revenue"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#ffffff",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Expenses"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#ffffff",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Cost of Revenue"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#ffffff",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Month"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "#ffffff",
+                  "mode": "fixed"
+                }
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "links"
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
-        "h": 9,
+        "h": 20,
         "w": 24,
         "x": 0,
         "y": 0
@@ -59,14 +327,6 @@
       "id": 1,
       "options": {
         "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
         "showHeader": true,
         "sortBy": [
           {
@@ -75,33 +335,35 @@
           }
         ]
       },
-      "pluginVersion": "10.2.0",
+      "pluginVersion": "12.2.1",
       "targets": [
         {
           "datasource": "SQLite",
-          "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 >= strftime('%s', '2025-01-01') 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    (\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    ) AS \"Operating Net\",\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 Expenses\",\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 Expenses\",\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\",\n    -- Month Start as UNIX timestamp (midnight on the first day)\n    CAST(strftime('%s', month || '-01') * 1000 AS TEXT) AS \"month_start\",\n    -- Month End as UNIX timestamp (one millisecond before the next month starts)\n    CAST(strftime('%s', date(month || '-01', '+1 month')) * 1000 - 1 AS TEXT) AS \"month_end\"\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;",
           "queryType": "table",
-          "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;"
+          "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    (\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    ) AS \"Operating Net\",\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 Expenses\",\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 Expenses\",\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\",\n    -- Month Start as UNIX timestamp (midnight on the first day)\n    CAST(strftime('%s', month || '-01') * 1000 AS TEXT) AS \"month_start\",\n    -- Month End as UNIX timestamp (one millisecond before the next month starts)\n    CAST(strftime('%s', date(month || '-01', '+1 month')) * 1000 - 1 AS TEXT) AS \"month_end\"\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",
+          "timeColumns": ["time", "ts"]
         }
       ],
       "title": "Monthly Profit & Loss",
       "type": "table"
     }
   ],
+  "preload": false,
   "refresh": "",
-  "schemaVersion": 38,
+  "schemaVersion": 42,
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-6h",
+    "from": "now/y",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Monthly P&L",
   "uid": "a63fa9a7-d4f3-4092-9bde-194add8bcbeb",
-  "version": 1,
-  "weekStart": ""
+  "version": 6
 }