Merge pull request #279 from OlympusDAO/base-pol

Improvements to POL indexing

Author: 0xJem

package.json

@@ -14,7 +14,8 @@
     "remove-local": "graph remove --node http://localhost:8020/ olympus",
     "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 olympus",
     "ls-deadcode": "yarn ts-prune -p tsconfig.ts-prune.json | grep -v 'used in module'",
-    "subgraph": "yarn ts-node bin/subgraph/src/index.ts"
+    "subgraph": "yarn ts-node bin/subgraph/src/index.ts",
+    "lint": "eslint --fix ."
   },
   "dependencies": {
     "@apollo/client": "^3.8.4",

subgraphs/arbitrum/src/contracts/Contracts.ts

@@ -3,6 +3,7 @@ import { BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
 import { ERC20 } from "../../../shared/generated/Price/ERC20";
 import { TokenRecord } from "../../../shared/generated/schema";
 import { getERC20TokenRecordFromWallet } from "../../../shared/src/contracts/ERC20";
+import { getTokenRecordValue } from "../../../shared/src/utils/TokenRecordHelper";
 import { DAO_WALLET } from "../../../shared/src/Wallets";
 import {
   BLOCKCHAIN,
@@ -11,10 +12,9 @@ import {
   ERC20_JONES,
   ERC20_TOKENS_ARBITRUM,
   ERC20_WETH,
-  JONES_WRITE_OFF_BLOCK,
   getProtocolAddresses,
+  JONES_WRITE_OFF_BLOCK,
 } from "./Constants";
-import { getTokenRecordValue } from "../../../shared/src/utils/TokenRecordHelper";
 
 export function getContractName(
   contractAddress: string,

subgraphs/arbitrum/src/contracts/Sentiment.ts

@@ -1,10 +1,10 @@
 import { Address, BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
 
 import { TokenSupply } from "../../../shared/generated/schema";
-import { ERC20_OHM, SENTIMENT_LTOKEN } from "./Constants";
-import { ERC20 } from "../../generated/TokenRecords-arbitrum/ERC20";
 import { toDecimal } from "../../../shared/src/utils/Decimals";
-import { TYPE_LENDING, createTokenSupply } from "../../../shared/src/utils/TokenSupplyHelper";
+import { createTokenSupply,TYPE_LENDING } from "../../../shared/src/utils/TokenSupplyHelper";
+import { ERC20 } from "../../generated/TokenRecords-arbitrum/ERC20";
+import { ERC20_OHM, SENTIMENT_LTOKEN } from "./Constants";
 import { getContractName, getWalletAddressesForContract } from "./Contracts";
 
 export function getSentimentSupply(timestamp: BigInt, blockNumber: BigInt): TokenSupply[] {

subgraphs/arbitrum/src/contracts/Silo.ts

@@ -1,10 +1,10 @@
 import { Address, BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
 
 import { TokenSupply } from "../../../shared/generated/schema";
-import { ERC20_OHM } from "./Constants";
-import { ERC20 } from "../../generated/TokenRecords-arbitrum/ERC20";
 import { toDecimal } from "../../../shared/src/utils/Decimals";
-import { TYPE_LENDING, createTokenSupply } from "../../../shared/src/utils/TokenSupplyHelper";
+import { createTokenSupply,TYPE_LENDING } from "../../../shared/src/utils/TokenSupplyHelper";
+import { ERC20 } from "../../generated/TokenRecords-arbitrum/ERC20";
+import { ERC20_OHM } from "./Constants";
 import { getContractName, getWalletAddressesForContract } from "./Contracts";
 
 // Hard-coding this for now. If we wanted this to be generalisable, we would use the Silo Repository contract.

subgraphs/arbitrum/src/treasury/OhmCalculations.ts

@@ -10,9 +10,9 @@ import { ERC20 } from "../../generated/TokenRecords-arbitrum/ERC20";
 import { OlympusLender } from "../../generated/TokenRecords-arbitrum/OlympusLender";
 import { CIRCULATING_SUPPLY_WALLETS, ERC20_GOHM_SYNAPSE, ERC20_OHM, OLYMPUS_LENDER, SENTIMENT_DEPLOYMENTS, SENTIMENT_LTOKEN, SILO_ADDRESS, SILO_DEPLOYMENTS } from "../contracts/Constants";
 import { getContractName } from "../contracts/Contracts";
-import { PRICE_HANDLERS } from "../price/PriceLookup";
-import { getSiloSupply } from "../contracts/Silo";
 import { getSentimentSupply } from "../contracts/Sentiment";
+import { getSiloSupply } from "../contracts/Silo";
+import { PRICE_HANDLERS } from "../price/PriceLookup";
 
 /**
  * Block after which the Silo repository will be used, instead of manual deployments.

subgraphs/base/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Base Subgraph Changelog
 
+## 1.0.2 (2025-01-10)
+
+- Adds price handler for ERC4626 tokens
+- Adds price handler for Uniswap V3 (specifically, underlying token balances)
+- Adds tracking of USDS, sUSDS and OHM-sUSDS LP
+
 ## 0.0.1 (2024-06-04)
 
 - Adds POL in Uniswap V2

subgraphs/base/config.json

@@ -1,6 +1,6 @@
 {
-  "id": "QmdqJ1zoExrs8u2T93wXSRWSx5VSKqKWTV4gCE2vszGwgt",
+  "id": "QmYgw9fWpiriYBj6NL8U8952Gsrxfvdfe3hxHE25UJm56A",
   "org": "olympusdao",
   "name": "protocol-metrics-base",
-  "version": "0.0.2"
-}
+  "version": "1.0.2"
+}