Merge pull request #280 from OlympusDAO/base-pol

0xJem · web-flow · commit 41e112888690 · 2025-01-29T11:32:04.000+04:00
Improvements to Base Protocol-Owned Liquidity
diff --git a/subgraphs/base/CHANGELOG.md b/subgraphs/base/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Base Subgraph Changelog
 
+## 1.0.9 (2025-01-28)
+
+- Removes tracking of USDS, sUSDS and OHM-sUSDS LP
+- Adds tracking of USDC and OHM-USDC LP
+- Fixes issues with underlying token balances for Uniswap V3 positions
+
 ## 1.0.2 (2025-01-10)
 
 - Adds price handler for ERC4626 tokens
diff --git a/subgraphs/base/config.json b/subgraphs/base/config.json
@@ -1,6 +1,6 @@
 {
-  "id": "QmYgw9fWpiriYBj6NL8U8952Gsrxfvdfe3hxHE25UJm56A",
+  "id": "QmWj7CDe7VivLqX49g6nXjni8w3XFokY5Pwiau78xyox9p",
   "org": "olympusdao",
   "name": "protocol-metrics-base",
-  "version": "1.0.2"
+  "version": "1.0.9"
 }
diff --git a/subgraphs/base/src/contracts/Constants.ts b/subgraphs/base/src/contracts/Constants.ts
@@ -6,19 +6,16 @@ export const BLOCKCHAIN = "Base";
 
 export const ERC20_OHM = "0x060cb087a9730E13aa191f31A6d86bFF8DfcdCC0".toLowerCase();
 export const ERC20_WETH = "0x4200000000000000000000000000000000000006".toLowerCase();
-export const ERC20_USDS = "0x820C137fa70C8691f0e44Dc420a5e53c168921Dc".toLowerCase();
-
-export const ERC4626_SUSDS = "0x5875eEE11Cf8398102FdAd704C9E96607675467a".toLowerCase();
+export const ERC20_USDC = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913".toLowerCase();
 
 export const LP_UNISWAP_V2_OHM_WETH = "0x5ab4b9e96aeed4820e4be267f42411d722985482".toLowerCase();
-export const LP_UNISWAP_V3_OHM_SUSDS = "0x8cda2eae542a93ea7496f015c6b908e53adcb41a".toLowerCase();
+export const LP_UNISWAP_V3_OHM_USDC = "0x183ea22691c54806FE96555436dd312b6BeFAc2F".toLowerCase();
 
 export const ERC20_TOKENS_BASE = new Map<string, TokenDefinition>();
-ERC20_TOKENS_BASE.set(ERC20_USDS, new TokenDefinition(ERC20_USDS, TokenCategoryStable, true, false));
+ERC20_TOKENS_BASE.set(ERC20_USDC, new TokenDefinition(ERC20_USDC, TokenCategoryStable, true, false));
 ERC20_TOKENS_BASE.set(ERC20_WETH, new TokenDefinition(ERC20_WETH, TokenCategoryVolatile, true, true));
-ERC20_TOKENS_BASE.set(ERC4626_SUSDS, new TokenDefinition(ERC4626_SUSDS, TokenCategoryStable, true, false));
 ERC20_TOKENS_BASE.set(LP_UNISWAP_V2_OHM_WETH, new TokenDefinition(LP_UNISWAP_V2_OHM_WETH, TokenCategoryPOL, true, false));
-ERC20_TOKENS_BASE.set(LP_UNISWAP_V3_OHM_SUSDS, new TokenDefinition(LP_UNISWAP_V3_OHM_SUSDS, TokenCategoryPOL, true, false));
+ERC20_TOKENS_BASE.set(LP_UNISWAP_V3_OHM_USDC, new TokenDefinition(LP_UNISWAP_V3_OHM_USDC, TokenCategoryPOL, true, false));
 
 export const OHM_TOKENS = [ERC20_OHM];
 
@@ -73,14 +70,12 @@ export const getWalletAddressesForContract = (contractAddress: string): string[]
 export const CONTRACT_NAME_MAP = new Map<string, string>();
 CONTRACT_NAME_MAP.set(DAO_MULTISIG, "DAO MS (Base)");
 CONTRACT_NAME_MAP.set(ERC20_OHM, "OHM");
-CONTRACT_NAME_MAP.set(ERC20_USDS, "USDS");
+CONTRACT_NAME_MAP.set(ERC20_USDC, "USDC");
 CONTRACT_NAME_MAP.set(ERC20_WETH, "Wrapped Ether");
-CONTRACT_NAME_MAP.set(ERC4626_SUSDS, "Savings USDS");
 CONTRACT_NAME_MAP.set(LP_UNISWAP_V2_OHM_WETH, "Uniswap V2 OHM-wETH LP");
-CONTRACT_NAME_MAP.set(LP_UNISWAP_V3_OHM_SUSDS, "Uniswap V3 OHM-sUSDS LP");
+CONTRACT_NAME_MAP.set(LP_UNISWAP_V3_OHM_USDC, "Uniswap V3 OHM-USDC LP");
 
 export const CONTRACT_ABBREVIATION_MAP = new Map<string, string>();
 CONTRACT_ABBREVIATION_MAP.set(ERC20_OHM, "OHM");
-CONTRACT_ABBREVIATION_MAP.set(ERC20_USDS, "USDS");
+CONTRACT_ABBREVIATION_MAP.set(ERC20_USDC, "USDC");
 CONTRACT_ABBREVIATION_MAP.set(ERC20_WETH, "wETH");
-CONTRACT_ABBREVIATION_MAP.set(ERC4626_SUSDS, "sUSDS");
diff --git a/subgraphs/base/src/price/PriceChainlink.ts b/subgraphs/base/src/price/PriceChainlink.ts
@@ -1,13 +1,12 @@
 import { Address, BigDecimal } from "@graphprotocol/graph-ts";
 
-import { ERC20_USDS } from "../../../ethereum/src/utils/Constants";
 import { toDecimal } from "../../../shared/src/utils/Decimals";
 import { ChainlinkPriceFeed } from "../../generated/TokenRecords-base/ChainlinkPriceFeed";
-import { ERC20_WETH } from "../contracts/Constants";
+import { ERC20_USDC,ERC20_WETH } from "../contracts/Constants";
 
 const tokenPriceFeedMap: Map<string, string> = new Map<string, string>();
 tokenPriceFeedMap.set(ERC20_WETH, "0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70".toLowerCase());
-tokenPriceFeedMap.set(ERC20_USDS, "0x591e79239a7d679378eC8c847e5038150364C78F".toLowerCase()); // DAI feed, 1:1 interchangeable with USDS
+tokenPriceFeedMap.set(ERC20_USDC, "0x7e860098F58bBFC8648a4311b374B1D669a2bc6B".toLowerCase());
 
 export function getPriceFeedTokens(): string[] {
     return tokenPriceFeedMap.keys();
diff --git a/subgraphs/base/src/price/PriceLookup.ts b/subgraphs/base/src/price/PriceLookup.ts
@@ -1,26 +1,23 @@
 import { Address, BigDecimal, BigInt, log } from "@graphprotocol/graph-ts";
 
 import { PriceHandler, PriceLookupResult } from "../../../shared/src/price/PriceHandler";
-import { PriceHandlerERC4626 } from "../../../shared/src/price/PriceHandlerERC4626";
 import { PriceHandlerUniswapV2 } from "../../../shared/src/price/PriceHandlerUniswapV2";
 import { PriceHandlerUniswapV3 } from "../../../shared/src/price/PriceHandlerUniswapV3";
 import { getUSDRate } from "../../../shared/src/price/PriceRouter";
 import {
   ERC20_OHM,
-  ERC20_USDS,
+  ERC20_USDC,
   ERC20_WETH,
-  ERC4626_SUSDS,
   LP_UNISWAP_V2_OHM_WETH,
-  LP_UNISWAP_V3_OHM_SUSDS,
+  LP_UNISWAP_V3_OHM_USDC,
   UNISWAP_V3_POSITION_MANAGER
 } from "../contracts/Constants";
 import { getContractName } from "../contracts/Contracts";
 import { getBaseTokenRate, isBaseToken } from "./PriceBase";
 
 export const PRICE_HANDLERS: PriceHandler[] = [
   new PriceHandlerUniswapV2([ERC20_OHM, ERC20_WETH], LP_UNISWAP_V2_OHM_WETH, getContractName),
-  new PriceHandlerUniswapV3([ERC20_OHM, ERC4626_SUSDS], LP_UNISWAP_V3_OHM_SUSDS, UNISWAP_V3_POSITION_MANAGER, getContractName),
-  new PriceHandlerERC4626(ERC4626_SUSDS, ERC20_USDS, getContractName),
+  new PriceHandlerUniswapV3([ERC20_OHM, ERC20_USDC], LP_UNISWAP_V3_OHM_USDC, UNISWAP_V3_POSITION_MANAGER, getContractName),
 ];
 
 /**
@@ -70,10 +67,10 @@ export function getPrice(tokenAddress: string, block: BigInt): BigDecimal {
   const priceResult = getPriceRecursive(tokenAddress, block, null);
 
   if (priceResult === null) {
-    log.warning("Unable to determine price for token {} ({}) at block {}", [getContractName(tokenAddress), tokenAddress, block.toString()]);
+    log.warning("{}: Unable to determine price for token {} ({}) at block {}", [FUNC, getContractName(tokenAddress), tokenAddress, block.toString()]);
     return BigDecimal.zero();
   }
 
-  log.debug("Price for {} ({}) at block {} was: {}", [getContractName(tokenAddress), tokenAddress, block.toString(), priceResult.price.toString()]);
+  log.debug("{}: Price for {} ({}) at block {} was: {}", [FUNC, getContractName(tokenAddress), tokenAddress, block.toString(), priceResult.price.toString()]);
   return priceResult.price;
 }
diff --git a/subgraphs/base/subgraph.yaml b/subgraphs/base/subgraph.yaml
@@ -1,6 +1,11 @@
 specVersion: 0.0.8
 description: Olympus Protocol Metrics Subgraph - Base
 repository: https://github.com/OlympusDAO/olympus-protocol-metrics-subgraph
+features:
+  - grafting
+graft:
+  base: QmYgw9fWpiriYBj6NL8U8952Gsrxfvdfe3hxHE25UJm56A # 1.0.2
+  block: 25311259 # POL updates
 schema:
   file: ../../schema.graphql
 dataSources:
@@ -21,8 +26,6 @@ dataSources:
       abis:
         - name: ERC20
           file: ../shared/abis/ERC20.json
-        - name: ERC4626
-          file: ../shared/abis/ERC4626.json
         # Price Lookup
         - name: UniswapV2Pair
           file: ../shared/abis/UniswapV2Pair.json
diff --git a/subgraphs/shared/src/price/PriceHandlerERC4626.ts b/subgraphs/shared/src/price/PriceHandlerERC4626.ts
@@ -28,10 +28,11 @@ export class PriceHandlerERC4626 implements PriceHandler {
         const FUNCTION = `${CLASS}: getVault:`;
         const vault = ERC4626.bind(Address.fromString(this.vaultAddress));
 
-        if (vault === null || vault.try_asset().reverted) {
-            log.debug("{} contract ({}) reverted at block {}", [
+        if (vault === null || vault.try_decimals().reverted) {
+            log.debug("{} contract {} ({}) reverted at block {}", [
                 FUNCTION,
                 this.contractLookup(this.vaultAddress),
+                this.vaultAddress,
                 block.toString(),
             ]);
             return null;
diff --git a/subgraphs/shared/src/price/PriceHandlerUniswapV3.ts b/subgraphs/shared/src/price/PriceHandlerUniswapV3.ts
@@ -274,15 +274,17 @@ export class PriceHandlerUniswapV3 implements PriceHandler {
       return null;
     }
 
+    // The tick calculations are based on the following: https://ethereum.stackexchange.com/a/140264
+
     // Ticks
     const tickLower = position.getTickLower();
     log.debug("getPairBalances: positionId: {}, tickLower: {}", [positionId.toString(), tickLower.toString()]);
-    const sqrtRatioA: BigInt = this.getSqrtRatioAtTick(tickLower);
+    const sqrtRatioA: BigDecimal = BigDecimal.fromString(Math.sqrt(1.0001 ** tickLower).toString());
     log.debug("getPairBalances: positionId: {}, sqrtRatioA: {}", [positionId.toString(), sqrtRatioA.toString()]);
 
     const tickUpper = position.getTickUpper();
     log.debug("getPairBalances: positionId: {}, tickUpper: {}", [positionId.toString(), tickUpper.toString()]);
-    const sqrtRatioB: BigInt = this.getSqrtRatioAtTick(tickUpper);
+    const sqrtRatioB: BigDecimal = BigDecimal.fromString(Math.sqrt(1.0001 ** tickUpper).toString());
     log.debug("getPairBalances: positionId: {}, sqrtRatioB: {}", [positionId.toString(), sqrtRatioB.toString()]);
 
     // If a position has no liquidity, we don't want to record details
@@ -293,17 +295,28 @@ export class PriceHandlerUniswapV3 implements PriceHandler {
     }
     log.debug("getPairBalances: positionId: {}, liquidity: {}", [positionId.toString(), liquidity.toString()]);
 
-    const sqrtPrice: BigInt = sqrtPriceX96.div(Q96);
+    const sqrtPrice: BigDecimal = sqrtPriceX96.toBigDecimal().div(Q96.toBigDecimal());
     log.debug("getPairBalances: positionId: {}, sqrtPrice: {}", [positionId.toString(), sqrtPrice.toString()]);
 
-    const token0Amount: BigInt = this.getToken0Amount(liquidity, sqrtPrice, sqrtRatioA, sqrtRatioB);
-    const token1Amount: BigInt = this.getToken1Amount(liquidity, sqrtPrice, sqrtRatioA, sqrtRatioB);
+    let token0Amount: BigDecimal = BigDecimal.zero();
+    let token1Amount: BigDecimal = BigDecimal.zero();
+
+    if (currentTick <= tickLower) {
+      token0Amount = liquidity.toBigDecimal().times(((sqrtRatioB.minus(sqrtRatioA)).div(sqrtRatioA.times(sqrtRatioB))));
+    }
+    else if (currentTick >= tickUpper) {
+      token1Amount = liquidity.toBigDecimal().times((sqrtRatioB.minus(sqrtRatioA)));
+    }
+    else if (currentTick > tickLower && currentTick < tickUpper) {
+      token0Amount = liquidity.toBigDecimal().times(((sqrtRatioB.minus(sqrtPrice)).div(sqrtPrice.times(sqrtRatioB))));
+      token1Amount = liquidity.toBigDecimal().times(((sqrtPrice.minus(sqrtRatioA))));
+    }
 
-    const token0Decimals = getDecimals(token0.toHexString(), block);
-    const token1Decimals = getDecimals(token1.toHexString(), block);
+    const token0Decimals: i32 = i32(getDecimals(token0.toHexString(), block));
+    const token1Decimals: i32 = i32(getDecimals(token1.toHexString(), block));
 
-    const token0Balance = toDecimal(token0Amount, token0Decimals);
-    const token1Balance = toDecimal(token1Amount, token1Decimals);
+    const token0Balance = token0Amount.div(BigInt.fromI32(10).pow(u8(token0Decimals)).toBigDecimal());
+    const token1Balance = token1Amount.div(BigInt.fromI32(10).pow(u8(token1Decimals)).toBigDecimal());
     log.debug("getPairBalances: positionId: {}, token0Balance: {}, token1Balance: {}", [positionId.toString(), token0Balance.toString(), token1Balance.toString()]);
 
     return [token0Balance, token1Balance];
diff --git a/subgraphs/shared/tests/price/PriceHandlerUniswapV3.test.ts b/subgraphs/shared/tests/price/PriceHandlerUniswapV3.test.ts
@@ -81,6 +81,7 @@ const WALLET_ADDRESS = "0x18a390bD45bCc92652b9A91AD51Aed7f1c1358f5".toLowerCase(
 
 const ERC20_OHM = "0x64aa3364F17a4D01c6f1751Fd97C2BD3D7e7f1D5".toLowerCase();
 const ERC20_WETH = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2".toLowerCase();
+const ERC20_USDC = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913".toLowerCase();
 
 const OHM_WETH_POOL = "0x88051b0eea095007d3bef21ab287be961f3d8598".toLowerCase();
 const OHM_WETH_SQRTPRICEX96 = BigInt.fromString("198259033222864761237442349019430");
@@ -90,6 +91,14 @@ const OHM_WETH_POSITION_TICK_LOWER: i32 = -887220;
 const OHM_WETH_POSITION_TICK_UPPER: i32 = 887220;
 const OHM_WETH_POSITION_LIQUIDITY = BigInt.fromString("346355586036686019");
 
+const OHM_USDC_POOL = "0x183ea22691c54806FE96555436dd312b6BeFAc2F".toLowerCase();
+const OHM_USDC_SQRTPRICEX96 = BigInt.fromString("11823183971744406029263508776");
+const OHM_USDC_TICK: i32 = -38048;
+const OHM_USDC_POSITION_ID = BigInt.fromString("1872809");
+const OHM_USDC_POSITION_TICK_LOWER: i32 = -44200;
+const OHM_USDC_POSITION_TICK_UPPER: i32 = 887220;
+const OHM_USDC_POSITION_LIQUIDITY = BigInt.fromString("11264485942092");
+
 export const mockFpisFraxPair = (): void => {
   mockRateUniswapV3(
     LP_UNISWAP_V3_FPIS_FRAX,
@@ -118,6 +127,20 @@ export const mockOhmWethPair = (): void => {
   );
 };
 
+export const mockOhmUsdcPair = (): void => {
+  mockRateUniswapV3(
+    OHM_USDC_POOL,
+    OHM_USDC_SQRTPRICEX96,
+    OHM_USDC_TICK,
+    ERC20_OHM,
+    ERC20_USDC,
+    9,
+    6,
+    toBigInt(BigDecimal.fromString("75504.35396532")),
+    toBigInt(BigDecimal.fromString("445506.63314")),
+  );
+};
+
 export const mockOhmWethPosition = (): void => {
   // positionManager.balanceOf()
   createMockedFunction(
@@ -160,6 +183,48 @@ export const mockOhmWethPosition = (): void => {
     ]);
 };
 
+export const mockOhmUsdcPosition = (): void => {
+  // positionManager.balanceOf()
+  createMockedFunction(
+    Address.fromString(UNISWAP_V3_POSITION_MANAGER),
+    "balanceOf",
+    "balanceOf(address):(uint256)",
+  )
+    .withArgs([ethereum.Value.fromAddress(Address.fromString(WALLET_ADDRESS))])
+    .returns([ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(1))]);
+
+  // positionManager.tokenOfOwnerByIndex()
+  createMockedFunction(
+    Address.fromString(UNISWAP_V3_POSITION_MANAGER),
+    "tokenOfOwnerByIndex",
+    "tokenOfOwnerByIndex(address,uint256):(uint256)",
+  )
+    .withArgs([ethereum.Value.fromAddress(Address.fromString(WALLET_ADDRESS)), ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(0))])
+    .returns([ethereum.Value.fromUnsignedBigInt(OHM_USDC_POSITION_ID)]);
+
+  // positionManager.positions()
+  createMockedFunction(
+    Address.fromString(UNISWAP_V3_POSITION_MANAGER),
+    "positions",
+    "positions(uint256):(uint96,address,address,address,uint24,int24,int24,uint128,uint256,uint256,uint128,uint128)",
+  )
+    .withArgs([ethereum.Value.fromUnsignedBigInt(OHM_USDC_POSITION_ID)])
+    .returns([
+      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(0)), // nonce
+      ethereum.Value.fromAddress(Address.zero()), // operator
+      ethereum.Value.fromAddress(Address.fromString(ERC20_OHM)), // token0
+      ethereum.Value.fromAddress(Address.fromString(ERC20_USDC)), // token1
+      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(10000)), // fee
+      ethereum.Value.fromI32(OHM_USDC_POSITION_TICK_LOWER), // tickLower
+      ethereum.Value.fromI32(OHM_USDC_POSITION_TICK_UPPER), // tickUpper
+      ethereum.Value.fromUnsignedBigInt(OHM_USDC_POSITION_LIQUIDITY), // liquidity
+      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(0)), // feeGrowthInside0X128
+      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(0)), // feeGrowthInside1X128
+      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(0)), // tokensOwed0
+      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(0)), // tokensOwed1
+    ]);
+};
+
 const FPIS_RATE = BigDecimal.fromString("1.13357594386");
 
 describe("getPrice", () => {
@@ -348,7 +413,28 @@ describe("getUnderlyingTokenBalance", () => {
     const ohmBalance = handler.getUnderlyingTokenBalance(WALLET_ADDRESS, ERC20_OHM, BLOCK);
     const wethBalance = handler.getUnderlyingTokenBalance(WALLET_ADDRESS, ERC20_WETH, BLOCK);
 
-    assert.stringEquals("138431.489223295", ohmBalance.toString());
-    assert.stringEquals("866.581676263788419538", wethBalance.toString());
+    assert.stringEquals("138410.423", ohmBalance.truncate(4).toString());
+    assert.stringEquals("866.7135", wethBalance.truncate(4).toString());
+  });
+
+  test("OHM-USDC balances are correct", () => {
+    const contractLookup: ContractNameLookup = (tokenAddress: string): string => {
+      if (addressesEqual(tokenAddress, ERC20_USDC)) {
+        return "USDC";
+      }
+
+      return "OHM";
+    };
+
+    mockOhmUsdcPair();
+    mockOhmUsdcPosition();
+
+    const handler = new PriceHandlerUniswapV3([ERC20_OHM, ERC20_USDC], OHM_USDC_POOL, UNISWAP_V3_POSITION_MANAGER, contractLookup);
+
+    const ohmBalance = handler.getUnderlyingTokenBalance(WALLET_ADDRESS, ERC20_OHM, BLOCK);
+    const usdcBalance = handler.getUnderlyingTokenBalance(WALLET_ADDRESS, ERC20_USDC, BLOCK);
+
+    assert.stringEquals("75484.2794", ohmBalance.truncate(4).toString());
+    assert.stringEquals("445136.3419", usdcBalance.truncate(4).toString());
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "id": "QmYgw9fWpiriYBj6NL8U8952Gsrxfvdfe3hxHE25UJm56A",`
	`2`	`+ "id": "QmWj7CDe7VivLqX49g6nXjni8w3XFokY5Pwiau78xyox9p",`
`3`	`3`	`"org": "olympusdao",`
`4`	`4`	`"name": "protocol-metrics-base",`
`5`		`- "version": "1.0.2"`
	`5`	`+ "version": "1.0.9"`
`6`	`6`	`}`