dao-treasury 0.0.34__cp312-cp312-musllinux_1_2_x86_64.whl → 0.0.35__cp312-cp312-musllinux_1_2_x86_64.whl

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

@@ -55,7 +55,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,
@@ -83,9 +192,9 @@
             "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",
@@ -111,6 +220,6 @@
   "timezone": "",
   "title": "LlamaPay",
   "uid": "aa4d62a2-9e52-4acc-8f38-a96c77810aca",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
-}
+}

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

@@ -130,7 +130,7 @@
                   {
                     "targetBlank": true,
                     "title": "View on Etherscan",
-                    "url": "https://etherscan.io/address/${__data.fields.from}"
+                    "url": "https://etherscan.io/address/${__data.fields.From}"
                   }
                 ]
               }
@@ -148,7 +148,7 @@
                   {
                     "targetBlank": true,
                     "title": "View on Etherscan",
-                    "url": "https://etherscan.io/address/${__data.fields.to}"
+                    "url": "https://etherscan.io/address/${__data.fields.To}"
                   }
                 ]
               }

dao_treasury/_wallet.py

@@ -149,16 +149,18 @@ def load_wallets_from_yaml(path: Path) -> List[TreasuryWallet]:
         elif not isinstance(cfg, dict):
             raise ValueError(f"Invalid config for wallet {address}, expected mapping")
 
-        # Extract optional networks list
-        networks = cfg.get("networks", [])
-        if not isinstance(networks, list) or not all(
-            isinstance(n, int) for n in networks
-        ):
-            raise ValueError(
-                f"'networks' for wallet {address} must be a list of integers, got {networks}"
-            )
+        kwargs = {"address": address}
 
-        kwargs = {"address": address, "networks": networks}
+        # Extract optional networks list
+        networks = cfg.get("networks")
+        if networks:
+            if not isinstance(networks, list) or not all(
+                isinstance(n, int) for n in networks
+            ):
+                raise ValueError(
+                    f"'networks' for wallet {address} must be a list of integers, got {networks}"
+                )
+            kwargs["networks"] = networks
 
         # Parse start: timestamp universal, block under chain key
         start_cfg = cfg.get("start", {})
@@ -241,6 +243,8 @@ def load_wallets_from_yaml(path: Path) -> List[TreasuryWallet]:
                     f"Invalid key: {key}. Valid options are 'block' or 'timestamp'."
                 )
 
-        wallets.append(TreasuryWallet(**kwargs))
+        wallet = TreasuryWallet(**kwargs)
+        print(f"initialized {wallet}")
+        wallets.append(wallet)
 
     return wallets

dao_treasury/db.py

@@ -863,27 +863,48 @@ class TreasuryTx(DbEntity):
                 },
             ) from e
         except InvalidOperation as e:
-            logger.error(e)
-            logger.error(
-                {
-                    "chain": Chain.get_dbid(CHAINID),
-                    "block": entry.block_number,
-                    "timestamp": ts,
-                    "hash": entry.hash.hex(),
-                    "log_index": log_index,
-                    "from_address": from_address,
-                    "to_address": to_address,
-                    "token": token,
-                    "amount": entry.value,
-                    "price": entry.price,
-                    "value_usd": entry.value_usd,
-                    # TODO: nuke db and add this column
-                    # gas = gas,
-                    "gas_used": gas_used,
-                    "gas_price": gas_price,
-                    "txgroup": txgroup_dbid,
-                }
-            )
+            with db_session:
+                from_address_entity = Address[from_address]
+                to_address_entity = Address[to_address]
+                token_entity = Token[token]
+                logger.error(e)
+                logger.error(
+                    {
+                        "chain": Chain.get_dbid(CHAINID),
+                        "block": entry.block_number,
+                        "timestamp": ts,
+                        "hash": entry.hash.hex(),
+                        "log_index": log_index,
+                        "from_address": {
+                            "dbid": from_address,
+                            "address": from_address_entity.address,
+                            "nickname": from_address_entity.nickname,
+                        },
+                        "to_address": {
+                            "dbid": to_address,
+                            "address": to_address_entity.address,
+                            "nickname": to_address_entity.nickname,
+                        },
+                        "token": {
+                            "dbid": token,
+                            "address": token_entity.address.address,
+                            "name": token_entity.name,
+                            "symbol": token_entity.symbol,
+                            "decimals": token_entity.decimals,
+                        },
+                        "amount": entry.value,
+                        "price": entry.price,
+                        "value_usd": entry.value_usd,
+                        # TODO: nuke db and add this column
+                        # gas = gas,
+                        "gas_used": gas_used,
+                        "gas_price": gas_price,
+                        "txgroup": {
+                            "dbid": txgroup_dbid,
+                            "fullname": TxGroup[txgroup_dbid].fullname,
+                        },
+                    }
+                )
             return None
         except TransactionIntegrityError as e:
             return _validate_integrity_error(entry, log_index)

dao_treasury/docker-compose.yaml

@@ -3,9 +3,6 @@ networks:
   docker_eth_portfolio:
     external: true
 
-volumes:
-  grafana_data: {}
-
 services:
   grafana:
     image: grafana/grafana:10.2.0
@@ -24,7 +21,6 @@ services:
       - GF_INSTALL_PLUGINS=volkovlabs-variable-panel,frser-sqlite-datasource
     volumes:
       - ~/.dao-treasury/:/app/dao-treasury-data
-      - grafana_data:/var/lib/grafana
       - ./.grafana/provisioning/:/etc/grafana/provisioning/
     networks:
       - dao_treasury

{dao_treasury-0.0.34.dist-info → dao_treasury-0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao_treasury
-Version: 0.0.34
+Version: 0.0.35
 Summary: Produce comprehensive financial reports for your on-chain org
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers

{dao_treasury-0.0.34.dist-info → dao_treasury-0.0.35.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bf2b4fe1f86ad2ea158b__mypyc.cpython-312-x86_64-linux-musl.so,sha256=o9--cWuMzVRQmRTKLbW4-hXKxA2IpQjpML64BSPvhPU,1557392
+bf2b4fe1f86ad2ea158b__mypyc.cpython-312-x86_64-linux-musl.so,sha256=lgqfkmC-P3l_u4b5i56IjIuXZg2FB_33kGlaLPOv8kA,1558592
 dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=yKvgOMUyU7-fF_-1zSMXML7ah7-r2f0oHrOV0p10LPc,195
 dao_treasury/__init__.py,sha256=ZQ0ZROQzSyJdYuQS1Z_VD0c7CiV8BWZcLTX66wO4slc,1004
 dao_treasury/_docker.cpython-312-x86_64-linux-musl.so,sha256=mYyhF79--IqY25gNVcsnlj29fVHOByCKwTSLPuAm7m8,17752
@@ -6,20 +6,20 @@ dao_treasury/_docker.py,sha256=7MnPA5xhRCM8Kqiogk87ltUVn8i_hpkNgO_hFC-7sPw,5430
 dao_treasury/_nicknames.cpython-312-x86_64-linux-musl.so,sha256=f6IPfgH2-yVbz_t0IOo820JCkLbdaadsi-b4364kiZ4,17768
 dao_treasury/_nicknames.py,sha256=deSpcDMtC_78C07tW0fZ_NzHIfHXsoHBVXfb_Dvlzsw,480
 dao_treasury/_wallet.cpython-312-x86_64-linux-musl.so,sha256=kqwRvoaGPO3HNbAzOeU6jo99nkbrGHh0F_BA46z_LXo,17752
-dao_treasury/_wallet.py,sha256=sIeUsyu9Y8MmOm-9bfwIEYjJ9Owgv1GXdTLZpcXMnCg,10338
+dao_treasury/_wallet.py,sha256=epV8LVuwHlOzc9UkA66js7HfEiZBOSAGJMtWbDTzmjU,10462
 dao_treasury/constants.cpython-312-x86_64-linux-musl.so,sha256=wsN5MKS92Pe3Zo909vGHKs3DcdR1gPDRoUYkUqF57rM,17760
 dao_treasury/constants.py,sha256=IFg_CyVnfPhPjKyFX1Ix4QaB8ghbOI5QZGSy2TNsUSA,507
-dao_treasury/db.py,sha256=F-ZZQ21KCTCNusOgQADIMXl1mpuuI7g26nCV2Y7U8Yk,46136
-dao_treasury/docker-compose.yaml,sha256=Q6NPNT9iKkKOehDcKtxltvQjbxZuXmb51Tjwb1M21_I,1376
+dao_treasury/db.py,sha256=7d1OIz82DStylR3kpRz2U2wVB5c3bdGVc0lp_4mEaxg,47259
+dao_treasury/docker-compose.yaml,sha256=E6KE-IjWDisAM19PPDi4ApR6Eu7jmMTM6J9DhtgJvR4,1309
 dao_treasury/main.py,sha256=31EA10Fpaj9y-cRJPnNnvCBI38UM0848xlzn7A0BzC4,8047
 dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_treasury/treasury.py,sha256=7xLVQPqnDd3cexbYuF1opTjCiHgkPqHFOanRom8wiLE,6506
 dao_treasury/types.cpython-312-x86_64-linux-musl.so,sha256=JyfC1keXoWVEiIdHWkT9laX_QirI1jEJEMaOBuyfs0U,17744
 dao_treasury/types.py,sha256=dJDx0hYfDDL3slcUzRnCgrzFFsgCzoqg8uaTtLaT4kk,3685
 dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=tr6FBJeAAPX76db8E3qBBVWnq2-yrWDXDGuclMDg6dw,1277
-dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json,sha256=7bDAboObB2LsY6EicAL-DAC0HKIaSRVW6AbGzmy_xUI,3403
+dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json,sha256=9OzlVtq0wRBDw3MhoaYLrT_hd7w_V3c_B7bYNmX4TJo,7023
 dao_treasury/.grafana/provisioning/dashboards/summary/Monthly.json,sha256=O6ghjzBf333baPjuMuUNguxF2v6rvPCiOu39sm1zxxY,6533
-dao_treasury/.grafana/provisioning/dashboards/transactions/Treasury Transactions.json,sha256=H6qng6k0RHholMaP9l3FODULAvQYpQUIf2ldNzYwq6w,13230
+dao_treasury/.grafana/provisioning/dashboards/transactions/Treasury Transactions.json,sha256=gCWQTzawn5w9LVsxCi4SbobcVXK8IxXrZdk2syH4Ubg,13230
 dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow (Including Unsorted).json,sha256=4TpUdEmo40EneKldjeNxaiNLW2-IsIBRiy5jz-nqFdY,25664
 dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json,sha256=DOpO3leNVyUUQD5ou5FkdGCGc1xJmCRQjuzSUCvBnGU,18139
 dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json,sha256=tKtUeBp9p-g21MOaFMPItUoXF_coHMM000yNipNB_RU,14352
@@ -45,7 +45,7 @@ dao_treasury/streams/__init__.cpython-312-x86_64-linux-musl.so,sha256=hdcFojfA4M
 dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_treasury/streams/llamapay.cpython-312-x86_64-linux-musl.so,sha256=vfWsqB5_KbA4AsgEkSW55gvKqXZaXIkaGDwhf_6CblQ,17776
 dao_treasury/streams/llamapay.py,sha256=xc2sgmTV4EnQFFemea87QoUdIeGtO9OJQCwJG9c-SJQ,12774
-dao_treasury-0.0.34.dist-info/METADATA,sha256=C6oXk_ibHqhGAXDo7DxXsTyw_SrXFhmzezf-0KAVN8M,7030
-dao_treasury-0.0.34.dist-info/WHEEL,sha256=AwHYJA1Do1jwgPIoLQR4DiHSeYY_vU6Ht9Vljq5Yt_M,112
-dao_treasury-0.0.34.dist-info/top_level.txt,sha256=Gw-ri_26lZA_3hwhnOX48mffUbmBGr8NhtoQ0XoMeF8,41
-dao_treasury-0.0.34.dist-info/RECORD,,
+dao_treasury-0.0.35.dist-info/METADATA,sha256=k_oTH84gRKdDT9hmU3hSe0Asw72MRkou5gbPJem-kqw,7030
+dao_treasury-0.0.35.dist-info/WHEEL,sha256=AwHYJA1Do1jwgPIoLQR4DiHSeYY_vU6Ht9Vljq5Yt_M,112
+dao_treasury-0.0.35.dist-info/top_level.txt,sha256=Gw-ri_26lZA_3hwhnOX48mffUbmBGr8NhtoQ0XoMeF8,41
+dao_treasury-0.0.35.dist-info/RECORD,,