dao-treasury 0.0.30__cp312-cp312-win32.whl → 0.0.32__cp312-cp312-win32.whl

dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml

@@ -24,3 +24,11 @@ providers:
   editable: false
   options:
     path: /etc/grafana/provisioning/dashboards/transactions
+
+- name: 'LlamaPay Streams'
+  folder: 'streams'
+  type: file
+  disableDeletion: true
+  editable: false
+  options:
+    path: /etc/grafana/provisioning/dashboards/streams

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

@@ -0,0 +1,116 @@
+{
+  "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": 7,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "frser-sqlite-datasource",
+        "uid": "P2D2EEF3E092AF52B"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "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": "10.2.0",
+      "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",
+          "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",
+          "refId": "A",
+          "timeColumns": [
+            "time",
+            "ts"
+          ]
+        }
+      ],
+      "title": "LlamaPay Streams",
+      "type": "table"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 38,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "LlamaPay",
+  "uid": "aa4d62a2-9e52-4acc-8f38-a96c77810aca",
+  "version": 1,
+  "weekStart": ""
+}

dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json

@@ -71,9 +71,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -133,9 +133,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -195,9 +195,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Cost of Revenue'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -257,9 +257,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Income'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -319,9 +319,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Other Expenses'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -382,9 +382,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -498,9 +498,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses')  THEN t.value_usd ELSE 0 END) AS \"Net\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "refId": "A",
           "timeColumns": [
             "timestamp"
@@ -643,9 +643,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Inbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -706,9 +706,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\n    SELECT txgroup_id, name AS top_category, parent_txgroup\n    FROM txgroups\n    WHERE parent_txgroup IS NULL\n\n    UNION ALL\n\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    SUM(t.value_usd) AS total_revenue\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE gh.top_category = 'Sort Me (Outbound)'\n  AND t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\n",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -769,9 +769,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM treasury_txs t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    (\n        -- Revenue\n        SUM(CASE WHEN gh.top_category = 'Revenue'         THEN t.value_usd ELSE 0 END)\n        -- Cost of Revenue\n      - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN t.value_usd ELSE 0 END)\n        -- Expenses\n      - SUM(CASE WHEN gh.top_category = 'Expenses'        THEN t.value_usd ELSE 0 END)\n        -- Other Income\n      + SUM(CASE WHEN gh.top_category = 'Other Income'    THEN t.value_usd ELSE 0 END)\n        -- Other Expenses\n      - SUM(CASE WHEN gh.top_category = 'Other Expenses'  THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Inbound)\n      + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)'    THEN t.value_usd ELSE 0 END)\n        -- Sort Me (Outbound)\n      - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)'    THEN t.value_usd ELSE 0 END)\n    ) AS total_net\nFROM general_ledger t\nJOIN group_hierarchy gh USING (txgroup_id)\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": [
             "time",
@@ -885,9 +885,9 @@
       "targets": [
         {
           "datasource": "SQLite",
-          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "queryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "queryType": "table",
-          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM treasury_txs AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "rawQueryText": "WITH RECURSIVE group_hierarchy (txgroup_id, top_category, parent_txgroup) AS (\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    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    t.timestamp,\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)')         THEN t.value_usd ELSE 0 END) AS \"Total Revenue (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) * -1 AS \"Total Expenses (incl. Unsorted)\",\n    SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN t.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)')  THEN t.value_usd ELSE 0 END) AS \"Net (incl. Unsorted)\"\nFROM general_ledger AS t\nJOIN group_hierarchy gh\n    ON t.txgroup_id = gh.txgroup_id\nWHERE t.timestamp >= $__from/1000\n  AND t.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "refId": "A",
           "timeColumns": [
             "timestamp"

dao_treasury/db.py

@@ -8,6 +8,7 @@ This module defines Pony ORM entities for:
 - ERC-20 tokens and native coin placeholder (:class:`Token`)
 - Hierarchical transaction grouping (:class:`TxGroup`)
 - Treasury transaction records (:class:`TreasuryTx`)
+- Streams and StreamedFunds for streaming payments
 
 It also provides helper functions for inserting ledger entries,
 resolving integrity conflicts, caching transaction receipts,
@@ -21,15 +22,16 @@ from functools import lru_cache
 from logging import getLogger
 from os import path
 from pathlib import Path
-from typing import TYPE_CHECKING, Dict, Final, Union, final
+from typing import TYPE_CHECKING, Dict, Final, Tuple, Union, final
+from datetime import date, datetime, time, timezone
 
-from a_sync import AsyncThreadPoolExecutor, a_sync
+from a_sync import AsyncThreadPoolExecutor
 from brownie import chain
 from brownie.convert.datatypes import HexString
 from brownie.exceptions import EventLookupError
 from brownie.network.event import EventDict, _EventItem
 from brownie.network.transaction import TransactionReceipt
-from eth_typing import ChecksumAddress, HexAddress
+from eth_typing import ChecksumAddress, HexAddress, HexStr
 from eth_portfolio.structs import (
     InternalTransfer,
     LedgerEntry,
@@ -68,6 +70,7 @@ _INSERT_THREAD = AsyncThreadPoolExecutor(1)
 _SORT_THREAD = AsyncThreadPoolExecutor(1)
 _SORT_SEMAPHORE = Semaphore(50)
 
+_UTC = timezone.utc
 
 db = Database()
 
@@ -210,9 +213,10 @@ class Address(DbEntity):
 
     treasury_tx_to = Set("TreasuryTx", reverse="to_address")
     """Inverse relation for transactions sent to this address."""
-    # streams_from = Set("Stream", reverse="from_address")
-    # streams_to = Set("Stream", reverse="to_address")
-    # streams = Set("Stream", reverse="contract")
+
+    streams_from = Set("Stream", reverse="from_address")
+    streams_to = Set("Stream", reverse="to_address")
+    streams = Set("Stream", reverse="contract")
     # vesting_escrows = Set("VestingEscrow", reverse="address")
     # vests_received = Set("VestingEscrow", reverse="recipient")
     # vests_funded = Set("VestingEscrow", reverse="funder")
@@ -226,6 +230,10 @@ class Address(DbEntity):
 
     __hash__ = DbEntity.__hash__
 
+    @property
+    def contract(self) -> Contract:
+        return Contract(self.address)
+
     @staticmethod
     @lru_cache(maxsize=None)
     def get_dbid(address: HexAddress) -> int:
@@ -380,7 +388,8 @@ class Token(DbEntity):
 
     address = Required(Address, column="address_id")
     """Foreign key to the address record for this token contract."""
-    # streams = Set('Stream', reverse="token")
+
+    streams = Set("Stream", reverse="token")
     # vesting_escrows = Set("VestingEscrow", reverse="token")
 
     def __eq__(self, other: Union["Token", Address, ChecksumAddress]) -> bool:  # type: ignore [override]
@@ -534,8 +543,10 @@ class TxGroup(DbEntity):
 
     child_txgroups = Set("TxGroup", reverse="parent_txgroup")
     """Set of nested child groups."""
-    # TODO: implement these
-    # streams = Set("Stream", reverse="txgroup")
+
+    streams = Set("Stream", reverse="txgroup")
+
+    # TODO: implement this
     # vesting_escrows = Set("VestingEscrow", reverse="txgroup")
 
     @property
@@ -896,6 +907,151 @@ class TreasuryTx(DbEntity):
             TreasuryTx[treasury_tx_dbid].txgroup = txgroup_dbid
 
 
+_stream_metadata_cache: Final[Dict[HexStr, Tuple[ChecksumAddress, date]]] = {}
+
+
+class Stream(DbEntity):
+    _table_ = "streams"
+    stream_id = PrimaryKey(str)
+
+    contract = Required("Address", reverse="streams")
+    start_block = Required(int)
+    end_block = Optional(int)
+    token = Required("Token", reverse="streams", index=True)
+    from_address = Required("Address", reverse="streams_from")
+    to_address = Required("Address", reverse="streams_to")
+    reason = Optional(str)
+    amount_per_second = Required(Decimal, 38, 1)
+    status = Required(str, default="Active")
+    txgroup = Optional("TxGroup", reverse="streams")
+
+    streamed_funds = Set("StreamedFunds")
+
+    scale = int(1e20)
+
+    @property
+    def is_alive(self) -> bool:
+        if self.end_block is None:
+            assert self.status in ["Active", "Paused"]
+            return self.status == "Active"
+        assert self.status == "Stopped"
+        return False
+
+    @property
+    def amount_per_minute(self) -> int:
+        return self.amount_per_second * 60
+
+    @property
+    def amount_per_hour(self) -> int:
+        return self.amount_per_minute * 60
+
+    @property
+    def amount_per_day(self) -> int:
+        return self.amount_per_hour * 24
+
+    @staticmethod
+    def check_closed(stream_id: HexStr) -> bool:
+        with db_session:
+            return any(sf.is_last_day for sf in Stream[stream_id].streamed_funds)
+
+    @staticmethod
+    def _get_start_and_end(stream_dbid: HexStr) -> Tuple[datetime, datetime]:
+        with db_session:
+            stream = Stream[stream_dbid]
+            start_date, end = stream.start_date, datetime.now(_UTC)
+            # convert start to datetime
+            start = datetime.combine(start_date, time(tzinfo=_UTC), tzinfo=_UTC)
+            if stream.end_block:
+                end = datetime.fromtimestamp(chain[stream.end_block].timestamp, tz=_UTC)
+            return start, end
+
+    def stop_stream(self, block: int) -> None:
+        self.end_block = block
+        self.status = "Stopped"
+
+    def pause(self) -> None:
+        self.status = "Paused"
+
+    @staticmethod
+    def _get_token_and_start_date(stream_id: HexStr) -> Tuple[ChecksumAddress, date]:
+        try:
+            return _stream_metadata_cache[stream_id]
+        except KeyError:
+            with db_session:
+                stream = Stream[stream_id]
+                token = stream.token.address.address
+                start_date = stream.start_date
+            _stream_metadata_cache[stream_id] = token, start_date
+            return token, start_date
+
+    @property
+    def stream_contract(self) -> Contract:
+        return Contract(self.contract.address)
+
+    @property
+    def start_date(self) -> date:
+        return datetime.fromtimestamp(chain[self.start_block].timestamp).date()
+
+    async def amount_withdrawable(self, block: int) -> int:
+        return await self.stream_contract.withdrawable.coroutine(
+            self.from_address.address,
+            self.to_address.address,
+            int(self.amount_per_second),
+            block_identifier=block,
+        )
+
+    def print(self) -> None:
+        symbol = self.token.symbol
+        print(f"{symbol} per second: {self.amount_per_second / self.scale}")
+        print(f"{symbol} per day: {self.amount_per_day / self.scale}")
+
+
+class StreamedFunds(DbEntity):
+    """Each object represents one calendar day of tokens streamed for a particular stream."""
+
+    _table_ = "streamed_funds"
+
+    date = Required(date)
+    stream = Required(Stream, reverse="streamed_funds")
+    PrimaryKey(stream, date)
+
+    amount = Required(Decimal, 38, 18)
+    price = Required(Decimal, 38, 18)
+    value_usd = Required(Decimal, 38, 18)
+    seconds_active = Required(int)
+    is_last_day = Required(bool)
+
+    @db_session
+    def get_entity(stream_id: str, date: datetime) -> "StreamedFunds":
+        stream = Stream[stream_id]
+        return StreamedFunds.get(date=date, stream=stream)
+
+    @classmethod
+    @db_session
+    def create_entity(
+        cls,
+        stream_id: str,
+        date: datetime,
+        price: Decimal,
+        seconds_active: int,
+        is_last_day: bool,
+    ) -> "StreamedFunds":
+        stream = Stream[stream_id]
+        amount_streamed_today = round(
+            stream.amount_per_second * seconds_active / stream.scale, 18
+        )
+        entity = StreamedFunds(
+            date=date,
+            stream=stream,
+            amount=amount_streamed_today,
+            price=round(price, 18),
+            value_usd=round(amount_streamed_today * price, 18),
+            seconds_active=seconds_active,
+            is_last_day=is_last_day,
+        )
+        return entity
+
+
 db.bind(
     provider="sqlite",  # TODO: let user choose postgres with server connection params
     filename=str(SQLITE_DIR / "dao-treasury.sqlite"),
@@ -921,12 +1077,12 @@ def create_stream_ledger_view() -> None:
     Examples:
         >>> create_stream_ledger_view()
     """
+    db.execute("""DROP VIEW IF EXISTS stream_ledger;""")
     db.execute(
         """
-        DROP VIEW IF EXISTS stream_ledger;
         create view stream_ledger as
         SELECT  'Mainnet' as chain_name,
-                cast(DATE AS timestamp) as timestamp,
+                cast(strftime('%s', date || ' 00:00:00') as INTEGER) as timestamp,
                 NULL as block, 
                 NULL as hash, 
                 NULL as log_index, 
@@ -1007,7 +1163,7 @@ def create_general_ledger_view() -> None:
         create VIEW general_ledger as
         select *
         from (
-            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
+            SELECT treasury_tx_id, b.chain_name, a.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
             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
@@ -1015,9 +1171,9 @@ def create_general_ledger_view() -> None:
                 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
-            --UNION
-            --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
-            --FROM stream_ledger
+            UNION
+            SELECT -1, chain_name, timestamp, block, hash, log_index, token, "from", from_nickname, "to", to_nickname, amount, price, value_usd, txgroup, parent_txgroup, txgroup_id
+            FROM stream_ledger
             --UNION
             --SELECT -1, *
             --FROM vesting_ledger
@@ -1093,7 +1249,7 @@ def create_monthly_pnl_view() -> None:
 
 
 with db_session:
-    # create_stream_ledger_view()
+    create_stream_ledger_view()
     # create_vesting_ledger_view()
     create_general_ledger_view()
     create_unsorted_txs_view()

dao_treasury/sorting/__init__.py

@@ -35,6 +35,7 @@ from dao_treasury.sorting.rule import (
     OtherIncomeSortRule,
     RevenueSortRule,
 )
+from dao_treasury.sorting.rules import *
 from dao_treasury.types import TxGroupDbid
 
 

dao_treasury/sorting/rules/__init__.py

@@ -0,0 +1 @@
+from dao_treasury.sorting.rules.ignore import *

dao_treasury/sorting/rules/ignore/__init__.py

@@ -0,0 +1 @@
+from dao_treasury.sorting.rules.ignore.llamapay import *

dao_treasury/sorting/rules/ignore/llamapay.py

@@ -0,0 +1,20 @@
+from dao_treasury import TreasuryTx
+from dao_treasury.sorting.factory import ignore
+from dao_treasury.streams import llamapay
+
+
+@ignore("LlamaPay")
+def is_llamapay_stream_replenishment(tx: TreasuryTx) -> bool:
+    if tx.to_address.address in llamapay.factories:  # type: ignore [operator]
+        # We amortize these streams daily in the `llamapay` module, you'll sort each stream appropriately.
+        return True
+
+    # NOTE: not sure if we want this yet
+    # Puling unused funds back from vesting escrow / llamapay
+    # elif tx.from_address == "Contract: LlamaPay" and "StreamCancelled" in tx.events:
+    #    if tx.amount > 0:
+    #        tx.amount *= -1
+    #    if tx.value_usd > 0:
+    #        tx.value_usd *= -1
+    #    return True
+    return False

dao_treasury/streams/llamapay.py

@@ -0,0 +1,376 @@
+import asyncio
+import datetime as dt
+import decimal
+from logging import getLogger
+from typing import (
+    Awaitable,
+    Callable,
+    Dict,
+    Final,
+    Iterator,
+    List,
+    Optional,
+    Set,
+    final,
+)
+
+import dank_mids
+import pony.orm
+from a_sync import AsyncThreadPoolExecutor, igather
+from brownie.network.event import _EventItem
+from eth_typing import BlockNumber, ChecksumAddress, HexAddress, HexStr
+from tqdm.asyncio import tqdm_asyncio
+
+import y
+from y.time import UnixTimestamp
+from y.utils.events import decode_logs, get_logs_asap
+
+from dao_treasury import constants
+from dao_treasury.db import (
+    Stream,
+    StreamedFunds,
+    Address,
+    Token,
+    must_sort_outbound_txgroup_dbid,
+)
+from dao_treasury._wallet import TreasuryWallet
+
+
+logger: Final = getLogger(__name__)
+
+_UTC: Final = dt.timezone.utc
+
+_ONE_DAY: Final = 60 * 60 * 24
+
+_STREAMS_THREAD: Final = AsyncThreadPoolExecutor(1)
+
+create_task: Final = asyncio.create_task
+sleep: Final = asyncio.sleep
+
+datetime: Final = dt.datetime
+timedelta: Final = dt.timedelta
+fromtimestamp: Final = datetime.fromtimestamp
+now: Final = datetime.now
+
+Decimal: Final = decimal.Decimal
+
+ObjectNotFound: Final = pony.orm.ObjectNotFound
+commit: Final = pony.orm.commit
+db_session: Final = pony.orm.db_session
+
+Contract: Final = y.Contract
+Network: Final = y.Network
+get_block_at_timestamp: Final = y.get_block_at_timestamp
+get_price: Final = y.get_price
+
+
+networks: Final = [Network.Mainnet]
+
+factories: List[HexAddress] = []
+
+if dai_stream_factory := {
+    Network.Mainnet: "0x60c7B0c5B3a4Dc8C690b074727a17fF7aA287Ff2",
+}.get(constants.CHAINID):
+    factories.append(dai_stream_factory)
+
+if yfi_stream_factory := {
+    Network.Mainnet: "0xf3764eC89B1ad20A31ed633b1466363FAc1741c4",
+}.get(constants.CHAINID):
+    factories.append(yfi_stream_factory)
+
+
+def _generate_dates(
+    start: dt.datetime, end: dt.datetime, stop_at_today: bool = True
+) -> Iterator[dt.datetime]:
+    current = start
+    while current < end:
+        yield current
+        current += timedelta(days=1)
+        if stop_at_today and current.date() > now(_UTC).date():
+            break
+
+
+_StreamToStart = Callable[[HexStr, Optional[BlockNumber]], Awaitable[int]]
+
+_streamToStart_cache: Final[Dict[HexStr, _StreamToStart]] = {}
+
+
+def _get_streamToStart(stream_id: HexStr) -> _StreamToStart:
+    if streamToStart := _streamToStart_cache.get(stream_id):
+        return streamToStart
+    with db_session:
+        contract: y.Contract = Stream[stream_id].contract.contract  # type: ignore [misc]
+    streamToStart = contract.streamToStart.coroutine
+    _streamToStart_cache[stream_id] = streamToStart
+    return streamToStart
+
+
+async def _get_start_timestamp(
+    stream_id: HexStr, block: Optional[BlockNumber] = None
+) -> int:
+    streamToStart = _streamToStart_cache.get(stream_id)
+    if streamToStart is None:
+        streamToStart = await _STREAMS_THREAD.run(_get_streamToStart, stream_id)
+    # try:
+    return int(await streamToStart(f"0x{stream_id}", block_identifier=block))  # type: ignore [call-arg]
+    # except Exception:
+    #    return 0
+
+
+def _pause_stream(stream_id: HexStr) -> None:
+    with db_session:
+        Stream[stream_id].pause()  # type: ignore [misc]
+
+
+def _stop_stream(stream_id: str, block: BlockNumber) -> None:
+    with db_session:
+        Stream[stream_id].stop_stream(block)  # type: ignore [misc]
+
+
+_block_timestamps: Final[Dict[BlockNumber, UnixTimestamp]] = {}
+
+
+async def _get_block_timestamp(block: BlockNumber) -> UnixTimestamp:
+    if timestamp := _block_timestamps.get(block):
+        return timestamp
+    timestamp = await dank_mids.eth.get_block_timestamp(block)
+    _block_timestamps[block] = timestamp
+    return timestamp
+
+
+"""
+class _StreamProcessor(ABC):
+    @abstractmethod
+    async def _load_streams(self) -> None:
+        ...
+"""
+
+
+@final
+class LlamaPayProcessor:
+    """
+    Generalized async processor for DAO stream contracts.
+    Args are passed in at construction time.
+    Supports time-bounded admin periods for filtering.
+    """
+
+    handled_events: Final = (
+        "StreamCreated",
+        "StreamCreatedWithReason",
+        "StreamModified",
+        "StreamPaused",
+        "StreamCancelled",
+    )
+    skipped_events: Final = (
+        "PayerDeposit",
+        "PayerWithdraw",
+        "Withdraw",
+    )
+
+    def __init__(self) -> None:
+        self.stream_contracts: Final = {Contract(addr) for addr in factories}
+
+    async def _get_streams(self) -> None:
+        await igather(
+            self._load_contract_events(stream_contract)
+            for stream_contract in self.stream_contracts
+        )
+
+    async def _load_contract_events(self, stream_contract: y.Contract) -> None:
+        events = decode_logs(
+            await get_logs_asap(stream_contract.address, None, sync=False)
+        )
+        keys: Set[str] = set(events.keys())
+        for k in keys:
+            if k not in self.handled_events and k not in self.skipped_events:
+                raise NotImplementedError(f"Need to handle event: {k}")
+
+        if "StreamCreated" in keys:
+            for event in events["StreamCreated"]:
+                from_address, *_ = event.values()
+                from_address = Address.get_or_insert(from_address).address
+                if not TreasuryWallet.check_membership(
+                    from_address, event.block_number
+                ):
+                    continue
+                await _STREAMS_THREAD.run(self._get_stream, event)
+
+        if "StreamCreatedWithReason" in keys:
+            for event in events["StreamCreatedWithReason"]:
+                from_address, *_ = event.values()
+                from_address = Address.get_or_insert(from_address).address
+                if not TreasuryWallet.check_membership(
+                    from_address, event.block_number
+                ):
+                    continue
+                await _STREAMS_THREAD.run(self._get_stream, event)
+
+        if "StreamModified" in keys:
+            for event in events["StreamModified"]:
+                from_address, _, _, old_stream_id, *_ = event.values()
+                if not TreasuryWallet.check_membership(
+                    from_address, event.block_number
+                ):
+                    continue
+                await _STREAMS_THREAD.run(
+                    _stop_stream, old_stream_id.hex(), event.block_number
+                )
+                await _STREAMS_THREAD.run(self._get_stream, event)
+
+        if "StreamPaused" in keys:
+            for event in events["StreamPaused"]:
+                from_address, *_, stream_id = event.values()
+                if not TreasuryWallet.check_membership(
+                    from_address, event.block_number
+                ):
+                    continue
+                await _STREAMS_THREAD.run(_pause_stream, stream_id.hex())
+
+        if "StreamCancelled" in keys:
+            for event in events["StreamCancelled"]:
+                from_address, *_, stream_id = event.values()
+                if not TreasuryWallet.check_membership(
+                    from_address, event.block_number
+                ):
+                    continue
+                await _STREAMS_THREAD.run(
+                    _stop_stream, stream_id.hex(), event.block_number
+                )
+
+    def _get_stream(self, log: _EventItem) -> Stream:
+        with db_session:
+            if log.name == "StreamCreated":
+                from_address, to_address, amount_per_second, stream_id = log.values()
+                reason = None
+            elif log.name == "StreamCreatedWithReason":
+                from_address, to_address, amount_per_second, stream_id, reason = (
+                    log.values()
+                )
+            elif log.name == "StreamModified":
+                (
+                    from_address,
+                    _,
+                    _,
+                    old_stream_id,
+                    to_address,
+                    amount_per_second,
+                    stream_id,
+                ) = log.values()
+                reason = Stream[old_stream_id.hex()].reason  # type: ignore [misc]
+            else:
+                raise NotImplementedError("This is not an appropriate event log.")
+
+            stream_id_hex = stream_id.hex()
+            try:
+                return Stream[stream_id_hex]  # type: ignore [misc]
+            except ObjectNotFound:
+                entity = Stream(
+                    stream_id=stream_id_hex,
+                    contract=Address.get_dbid(log.address),
+                    start_block=log.block_number,
+                    token=Token.get_dbid(Contract(log.address).token()),
+                    from_address=Address.get_dbid(from_address),
+                    to_address=Address.get_dbid(to_address),
+                    amount_per_second=amount_per_second,
+                    txgroup=must_sort_outbound_txgroup_dbid,
+                )
+                if reason is not None:
+                    entity.reason = reason
+                commit()
+                return entity
+
+    def streams_for_recipient(
+        self, recipient: ChecksumAddress, at_block: Optional[BlockNumber] = None
+    ) -> List[Stream]:
+        with db_session:
+            streams = Stream.select(lambda s: s.to_address.address == recipient)
+            if at_block is None:
+                return list(streams)
+            return [
+                s for s in streams if (s.end_block is None or at_block <= s.end_block)
+            ]
+
+    def streams_for_token(
+        self, token: ChecksumAddress, include_inactive: bool = False
+    ) -> List[Stream]:
+        with db_session:
+            streams = Stream.select(lambda s: s.token.address.address == token)
+            return (
+                list(streams)
+                if include_inactive
+                else [s for s in streams if s.is_alive]
+            )
+
+    async def process_streams(self, run_forever: bool = False) -> None:
+        logger.info("Processing stream events and streamed funds...")
+        # Always sync events before processing
+        await self._get_streams()
+        with db_session:
+            streams = [s.stream_id for s in Stream.select()]
+        await tqdm_asyncio.gather(
+            *(
+                self.process_stream(stream_id, run_forever=run_forever)
+                for stream_id in streams
+            ),
+            desc="LlamaPay Streams",
+        )
+
+    async def process_stream(
+        self, stream_id: HexStr, run_forever: bool = False
+    ) -> None:
+        start, end = await _STREAMS_THREAD.run(Stream._get_start_and_end, stream_id)
+        for date_obj in _generate_dates(start, end, stop_at_today=not run_forever):
+            if await self.process_stream_for_date(stream_id, date_obj) is None:
+                return
+
+    async def process_stream_for_date(
+        self, stream_id: HexStr, date_obj: dt.datetime
+    ) -> Optional[StreamedFunds]:
+        entity = await _STREAMS_THREAD.run(
+            StreamedFunds.get_entity, stream_id, date_obj
+        )
+        if entity:
+            return entity
+
+        stream_token, start_date = await _STREAMS_THREAD.run(
+            Stream._get_token_and_start_date, stream_id
+        )
+        check_at = date_obj + timedelta(days=1) - timedelta(seconds=1)
+        if check_at > now(tz=_UTC):
+            await sleep((check_at - now(tz=_UTC)).total_seconds())
+        block = await get_block_at_timestamp(check_at, sync=False)
+        price_fut = create_task(get_price(stream_token, block, sync=False))
+        start_timestamp = await _get_start_timestamp(stream_id, block)
+        if start_timestamp == 0:
+            if await _STREAMS_THREAD.run(Stream.check_closed, stream_id):
+                price_fut.cancel()
+                return None
+
+            while start_timestamp == 0:
+                block -= 1
+                start_timestamp = await _get_start_timestamp(stream_id, block)
+
+            block_datetime = fromtimestamp(await _get_block_timestamp(block), tz=_UTC)
+            assert block_datetime.date() == date_obj.date()
+            seconds_active = (check_at - block_datetime).seconds
+            is_last_day = True
+        else:
+            seconds_active = int(check_at.timestamp()) - start_timestamp
+            is_last_day = False
+
+        seconds_active_today = min(seconds_active, _ONE_DAY)
+        if seconds_active_today < _ONE_DAY and not is_last_day:
+            if date_obj.date() != start_date:
+                seconds_active_today = _ONE_DAY
+
+        with db_session:
+            price = Decimal(await price_fut)
+            entity = await _STREAMS_THREAD.run(
+                StreamedFunds.create_entity,
+                stream_id,
+                date_obj,
+                price,
+                seconds_active_today,
+                is_last_day,
+            )
+            return entity

dao_treasury/treasury.py

@@ -1,4 +1,4 @@
-from asyncio import create_task
+from asyncio import create_task, gather
 from logging import getLogger
 from pathlib import Path
 from typing import Final, Iterable, List, Optional, Union
@@ -16,6 +16,7 @@ from dao_treasury._wallet import TreasuryWallet
 from dao_treasury.constants import CHAINID
 from dao_treasury.db import TreasuryTx
 from dao_treasury.sorting._rules import Rules
+from dao_treasury.streams import llamapay
 
 
 Wallet = Union[TreasuryWallet, str]
@@ -108,6 +109,10 @@ class Treasury(a_sync.ASyncGenericBase):  # type: ignore [misc]
         )
         """An eth_portfolio.Portfolio object used for exporting tx and balance history"""
 
+        self._llamapay: Final = (
+            llamapay.LlamaPayProcessor() if CHAINID in llamapay.networks else None
+        )
+
         self.asynchronous: Final = asynchronous
         """A boolean flag indicating whether the API for this `Treasury` object is sync or async by default"""
 
@@ -120,7 +125,7 @@ class Treasury(a_sync.ASyncGenericBase):  # type: ignore [misc]
     def txs(self) -> a_sync.ASyncIterator[LedgerEntry]:
         return self.portfolio.ledger.all_entries
 
-    async def populate_db(
+    async def _insert_txs(
         self, start_block: BlockNumber, end_block: BlockNumber
     ) -> None:
         """Populate the database with treasury transactions in a block range.
@@ -136,7 +141,7 @@ class Treasury(a_sync.ASyncGenericBase):  # type: ignore [misc]
 
         Examples:
             >>> # Insert transactions from block 0 to 10000
-            >>> await treasury.populate_db(0, 10000)
+            >>> await treasury._insert_txs(0, 10000)
         """
         with db_session:
             futs = []
@@ -146,9 +151,22 @@ class Treasury(a_sync.ASyncGenericBase):  # type: ignore [misc]
                     logger.debug("zero value transfer, skipping %s", entry)
                     continue
                 futs.append(create_task(TreasuryTx.insert(entry)))
-
             if futs:
                 await tqdm_asyncio.gather(*futs, desc="Insert Txs to Postgres")
                 logger.info(f"{len(futs)} transfers exported")
 
+    async def _process_streams(self) -> None:
+        if self._llamapay is not None:
+            await self._llamapay.process_streams(run_forever=True)
+
+    async def populate_db(
+        self, start_block: BlockNumber, end_block: BlockNumber
+    ) -> None:
+        """
+        Populate the database with treasury transactions and streams in parallel.
+        """
+        tasks = [self._insert_txs(start_block, end_block)]
+        if self._llamapay:
+            tasks.append(self._process_streams())
+        await gather(*tasks)
         logger.info("db connection closed")

{dao_treasury-0.0.30.dist-info → dao_treasury-0.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao_treasury
-Version: 0.0.30
+Version: 0.0.32
 Summary: Produce comprehensive financial reports for your on-chain org
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10,<3.13
 Description-Content-Type: text/markdown
-Requires-Dist: eth-portfolio-temp<0.1,>=0.0.23.dev0
+Requires-Dist: eth-portfolio-temp<0.1,>=0.0.29.dev0
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type

dao_treasury-0.0.32.dist-info/RECORD

@@ -0,0 +1,49 @@
+bf2b4fe1f86ad2ea158b__mypyc.cp312-win32.pyd,sha256=t574Jt4sYrAKhwJ6lgyZzMjs7nBuZA-9feRJ0lQUfZA,455168
+dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=ci7djcsXc9uRi6_vBQv-avGQrrIacyftXmcwKuitWWU,203
+dao_treasury/__init__.py,sha256=U8BsakN_w15wVE_7MjVbHD9LBal48LfJ6a1Icf5oHdY,1052
+dao_treasury/_docker.cp312-win32.pyd,sha256=OUmqhK5WrJOeq2scAcFxN5clwKiaJNKg7NFSt522HQI,9216
+dao_treasury/_docker.py,sha256=wY26wCrQ8p-L0KfMJftyzI_YAszHjnBWLw94eh0LxxY,5607
+dao_treasury/_nicknames.cp312-win32.pyd,sha256=d-bapuwig4qKreohzWQwy7kQjSMXgAPsGmEDMn1tLXM,9216
+dao_treasury/_nicknames.py,sha256=NpbQ4NtmZF_A_vqTGSal2KzKzkH5t7_wbI8EtMBqEr4,497
+dao_treasury/_wallet.cp312-win32.pyd,sha256=Xh2jb3dCAxkvj84CeJkCIaSz_QXyw0gAGJIwsSgkaGI,9216
+dao_treasury/_wallet.py,sha256=q-H3YrRLWHIjOplVEcY2zqYnv6J--nxXtcx_-a1jcQw,10584
+dao_treasury/constants.cp312-win32.pyd,sha256=G-7yShiKHnVIskFcFNP-HuohVYh3Nu4rheAZlclQFf0,9216
+dao_treasury/constants.py,sha256=VNzlrwC8HB8LdKNmoIfncUACKHfXZxp2GtBBrH_lZKE,522
+dao_treasury/db.py,sha256=naWIASCJCGROMijxdkS-A0g8_HEFrCqCP0FsAjaDRm8,46167
+dao_treasury/docker-compose.yaml,sha256=trksBUUwNGJGcrsgX0k0xVEsl-SjWzYE_4tpO1DjuJg,1421
+dao_treasury/main.py,sha256=yVQGwDgO4XKcxV6tQQPxEcLcZPSEEK1yJS8Djfq3Esc,8294
+dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dao_treasury/treasury.py,sha256=64_z0lsjOngGFASCVQNUM-QfbC5YqhKMgOdtLh758co,6678
+dao_treasury/types.cp312-win32.pyd,sha256=ymuPAouv42cb-AHRj6gEOQTKJUnz0b9DwLFEDzq1Jcc,9216
+dao_treasury/types.py,sha256=KFz4WKPp4t_RBwIT6YGwOcgbzw8tdHIOcXTFsUA0pJA,3818
+dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=DzPkgm6Sz2hB5nNpKyTWTEfRplsYVQ9KUgQZ-yQOu6c,747
+dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json,sha256=zKisR5WewEdpPMMSVLe3w-K8YBg30CYEuzrYjW_LZTQ,3518
+dao_treasury/.grafana/provisioning/dashboards/summary/Monthly.json,sha256=pEHnKgiFgL_oscujk2SVEmkwe-PZiuGjlKf7bcLm2uc,8022
+dao_treasury/.grafana/provisioning/dashboards/transactions/Treasury Transactions.json,sha256=kXaEYWwbwVbkYmj2iWYpHzHVeeBidFpGQoLm5rxUUGU,16361
+dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json,sha256=Q544KS0P30LnBWAjMFr9jHOW83-Eoj76AQEWjNDS93o,43367
+dao_treasury/.grafana/provisioning/dashboards/treasury/Treasury.json,sha256=6y7Fp-2g1iRanRBtWKKN13sXjaKxBvqld7416ZJu4YI,72196
+dao_treasury/.grafana/provisioning/datasources/datasources.yaml,sha256=gLmJsOkEXNzWRDibShfHFySWeuExW-dSB_U0OSfH868,344
+dao_treasury/sorting/__init__.cp312-win32.pyd,sha256=YiRsCPjCk-sK5AlbDBTmRwIddWQXxu2VAUif1-lNw6g,9216
+dao_treasury/sorting/__init__.py,sha256=hHH9LLX11m2YR5NFKiTSVtdLBNGdAyJsvgDNzG3BTBI,5977
+dao_treasury/sorting/_matchers.cp312-win32.pyd,sha256=oghFJ0utsQwzvkXVz-ICR1rsJlYGDIRdEl3dBFQtu-A,9216
+dao_treasury/sorting/_matchers.py,sha256=ACi6aXZCKW5OTiztsID7CXCGJounj5c6ivhOCg2436M,14392
+dao_treasury/sorting/_rules.cp312-win32.pyd,sha256=w3EFJrawtJfg0Fauh0QB-eU6ql4MElKpCq7lIQH_k1Q,9216
+dao_treasury/sorting/_rules.py,sha256=DxhdUgpS0q0LWeLl9W1Bjn5LZz9z4OLA03vQllPMH9k,9229
+dao_treasury/sorting/factory.cp312-win32.pyd,sha256=UtYPiUDnQMK5Er682773zjRqLRiyxLJJxO7rItnlFUs,9216
+dao_treasury/sorting/factory.py,sha256=zlJ18xlMTxv8ACV6_MimCVIDsw3K5AZcyvKaNYY7R14,10484
+dao_treasury/sorting/rule.cp312-win32.pyd,sha256=rQxxFVoMjjx3enIyy3qMLmfyWdhi2UbZ8ZQFkTBYzYw,9216
+dao_treasury/sorting/rule.py,sha256=TsSlaU4UlYr4QWJBdUY7EOAfC_SK6_VA3wEFOFNUUrU,11837
+dao_treasury/sorting/rules/__init__.cp312-win32.pyd,sha256=pyAk9P1cU62sy7QMNDnSqbobAVP7tkvJl4mzt7z1r6s,9216
+dao_treasury/sorting/rules/__init__.py,sha256=hcLfejOEwD8RaM2RE-38Ej6_WkvL9BVGvIIGY848E6E,49
+dao_treasury/sorting/rules/ignore/__init__.cp312-win32.pyd,sha256=6bXC7ydbsHE-cAzb__-6DWTe0JppzdE8VdWkUxJbgtM,9216
+dao_treasury/sorting/rules/ignore/__init__.py,sha256=16THKoGdj6qfkkytuCFVG_R1M6KSErMI4AVE1p0ukS4,58
+dao_treasury/sorting/rules/ignore/llamapay.cp312-win32.pyd,sha256=yKCCiJx0GHvxl5EwwQmo7QYlQqUluJNh0aYAj8MZL6k,9216
+dao_treasury/sorting/rules/ignore/llamapay.py,sha256=aYyAJRlmv419IeaqkcV5o3ffx0UVfteU0lTl80j0BGo,783
+dao_treasury/streams/__init__.cp312-win32.pyd,sha256=ABmRQ7gQdeEL-inkA8yp90T54azAL1tlXIuewpvlOz8,9216
+dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dao_treasury/streams/llamapay.cp312-win32.pyd,sha256=z3wWBUrMu07tA7B8V9XsDd6QvV1-ensZ_YcsyARkLjM,9216
+dao_treasury/streams/llamapay.py,sha256=HXG3Qg8R5l1FTVgmSnpOBRoDt2VchjOI-dU9rrC_mjQ,13150
+dao_treasury-0.0.32.dist-info/METADATA,sha256=-MJV9I0Bm8uwE9NjFwVOizFUgmh1GHA4toUB8wNF3Xg,7149
+dao_treasury-0.0.32.dist-info/WHEEL,sha256=LwxTQZ0gyDP_uaeNCLm-ZIktY9hv6x0e22Q-hgFd-po,97
+dao_treasury-0.0.32.dist-info/top_level.txt,sha256=Gw-ri_26lZA_3hwhnOX48mffUbmBGr8NhtoQ0XoMeF8,41
+dao_treasury-0.0.32.dist-info/RECORD,,

dao_treasury-0.0.32.dist-info/top_level.txt

@@ -0,0 +1,2 @@
+bf2b4fe1f86ad2ea158b__mypyc
+dao_treasury

dao_treasury-0.0.30.dist-info/RECORD

@@ -1,38 +0,0 @@
-3619d39567c7fe330ece__mypyc.cp312-win32.pyd,sha256=tKHQdhWGJ6LL1tzVXFACbtIFhkJMmZm3Z9uYKMBy2G0,263680
-dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=ci7djcsXc9uRi6_vBQv-avGQrrIacyftXmcwKuitWWU,203
-dao_treasury/__init__.py,sha256=U8BsakN_w15wVE_7MjVbHD9LBal48LfJ6a1Icf5oHdY,1052
-dao_treasury/_docker.cp312-win32.pyd,sha256=21X0gPjErgImTz4Z3CQPplr--kIAkkv86KxBOZclyV4,9216
-dao_treasury/_docker.py,sha256=wY26wCrQ8p-L0KfMJftyzI_YAszHjnBWLw94eh0LxxY,5607
-dao_treasury/_nicknames.cp312-win32.pyd,sha256=frDnXp7HZvDkP2bZXhIdtwKnGC7iPoXmXXQXYPwvNCI,9216
-dao_treasury/_nicknames.py,sha256=NpbQ4NtmZF_A_vqTGSal2KzKzkH5t7_wbI8EtMBqEr4,497
-dao_treasury/_wallet.cp312-win32.pyd,sha256=odpyXjRvOgKDH-nqiE69vvj5ZMWq2dkc2hRLCuJjFhg,9216
-dao_treasury/_wallet.py,sha256=q-H3YrRLWHIjOplVEcY2zqYnv6J--nxXtcx_-a1jcQw,10584
-dao_treasury/constants.cp312-win32.pyd,sha256=6-_HlMg-Ft41SAvWkY6WvMhXjR0ocR-YHDJLGdKxwlk,9216
-dao_treasury/constants.py,sha256=VNzlrwC8HB8LdKNmoIfncUACKHfXZxp2GtBBrH_lZKE,522
-dao_treasury/db.py,sha256=HMFp3X8rRn3TE0FbqnqgzbMm-WFF6GaGq6UmYYViHgY,41205
-dao_treasury/docker-compose.yaml,sha256=trksBUUwNGJGcrsgX0k0xVEsl-SjWzYE_4tpO1DjuJg,1421
-dao_treasury/main.py,sha256=yVQGwDgO4XKcxV6tQQPxEcLcZPSEEK1yJS8Djfq3Esc,8294
-dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dao_treasury/treasury.py,sha256=ZkkxaH49CXOgszOayu_IZ5wmqznOp7t1S3lz_M77Ct8,5954
-dao_treasury/types.cp312-win32.pyd,sha256=lkeWUubo1wMq8lBMSoaFsQGhRA0sYR_RAmLMMAKcoqk,9216
-dao_treasury/types.py,sha256=KFz4WKPp4t_RBwIT6YGwOcgbzw8tdHIOcXTFsUA0pJA,3818
-dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=43Lof370qTV5TPnVRpWxXIzjRpPX_u9khgee41lAyYQ,570
-dao_treasury/.grafana/provisioning/dashboards/summary/Monthly.json,sha256=pEHnKgiFgL_oscujk2SVEmkwe-PZiuGjlKf7bcLm2uc,8022
-dao_treasury/.grafana/provisioning/dashboards/transactions/Treasury Transactions.json,sha256=kXaEYWwbwVbkYmj2iWYpHzHVeeBidFpGQoLm5rxUUGU,16361
-dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json,sha256=xrUS1csp0hsfHcxhxFekxwzZ3ul-03aDwNw1EurBG9U,43323
-dao_treasury/.grafana/provisioning/dashboards/treasury/Treasury.json,sha256=6y7Fp-2g1iRanRBtWKKN13sXjaKxBvqld7416ZJu4YI,72196
-dao_treasury/.grafana/provisioning/datasources/datasources.yaml,sha256=gLmJsOkEXNzWRDibShfHFySWeuExW-dSB_U0OSfH868,344
-dao_treasury/sorting/__init__.cp312-win32.pyd,sha256=nfvJKGLw26xQeJyQkNUrXTYPr7IoAzFtTaMDuTP70Ng,9216
-dao_treasury/sorting/__init__.py,sha256=8scT00tm4LtZrKTnpv6MGdJWqC9L0ksDt_V7lrK7c98,5935
-dao_treasury/sorting/_matchers.cp312-win32.pyd,sha256=V3zhA7BVPHNk1L2k4QNgqG1YgrXUE1Zjzm-E8leGTFc,9216
-dao_treasury/sorting/_matchers.py,sha256=ACi6aXZCKW5OTiztsID7CXCGJounj5c6ivhOCg2436M,14392
-dao_treasury/sorting/_rules.cp312-win32.pyd,sha256=N9mWvQgFuti_M2LKMN-E_l8i_YXk9iDMSJNO2f4HO-4,9216
-dao_treasury/sorting/_rules.py,sha256=DxhdUgpS0q0LWeLl9W1Bjn5LZz9z4OLA03vQllPMH9k,9229
-dao_treasury/sorting/factory.cp312-win32.pyd,sha256=8bDAj8UvFrIGEMFMhANPu4eFA_NmRh2ULtzFMnSnTpY,9216
-dao_treasury/sorting/factory.py,sha256=zlJ18xlMTxv8ACV6_MimCVIDsw3K5AZcyvKaNYY7R14,10484
-dao_treasury/sorting/rule.cp312-win32.pyd,sha256=gWnR5zGuv8xWS0j3KiNu6zDd5A4PPEgNG9Di1BQuvWU,9216
-dao_treasury/sorting/rule.py,sha256=TsSlaU4UlYr4QWJBdUY7EOAfC_SK6_VA3wEFOFNUUrU,11837
-dao_treasury-0.0.30.dist-info/METADATA,sha256=vGTp6PwV3CsZbe3zO5cg0m5UJMEb1ED_hsnUDJ33jGc,7149
-dao_treasury-0.0.30.dist-info/WHEEL,sha256=LwxTQZ0gyDP_uaeNCLm-ZIktY9hv6x0e22Q-hgFd-po,97
-dao_treasury-0.0.30.dist-info/top_level.txt,sha256=NRjzFf9H2cBekP0cVk8IWoVYf0fTSSKfqvVPvaMhoNs,41
-dao_treasury-0.0.30.dist-info/RECORD,,

dao_treasury-0.0.30.dist-info/top_level.txt

@@ -1,2 +0,0 @@
-3619d39567c7fe330ece__mypyc
-dao_treasury