wip

Author: harsh9200

subgraphs/fx-protocol/abis/ERC20.json

@@ -27,16 +27,14 @@ dataSources:
           file: ./abis/TreasuryV2.json
         - name: PoolManager
           file: ./abis/PoolManager.json
-        - name: ERC20
-          file: ./abis/ERC20.json
         - name: Pool
           file: ./abis/Pool.json
 
         ###########################################
         ############## Price Oracle ###############
         ###########################################
         # ERC20
-        - name: _ERC20
+        - name: ERC20
           file: ./abis/Prices/ERC20.json
         # Curve Contracts
         - name: CurvePool
@@ -67,8 +65,6 @@ dataSources:
       eventHandlers:
         - event: Harvest(indexed address,indexed address,uint256,uint256,uint256,uint256)
           handler: handleHarvest
-        - event: RegisterPool(indexed address)
-          handler: handleRegisterPool
       file: ./src/mappings/poolManagerMappings.ts
 
 {{#treasuryContracts}}
@@ -90,16 +86,14 @@ dataSources:
           file: ./abis/TreasuryV2.json
         - name: PoolManager
           file: ./abis/PoolManager.json
-        - name: ERC20
-          file: ./abis/ERC20.json
         - name: Pool
           file: ./abis/Pool.json
 
         ###########################################
         ############## Price Oracle ###############
         ###########################################
         # ERC20
-        - name: _ERC20
+        - name: ERC20
           file: ./abis/Prices/ERC20.json
         # Curve Contracts
         - name: CurvePool
@@ -132,61 +126,3 @@ dataSources:
           handler: handleHarvest
       file: ./src/mappings/treasuryTokenMappings.ts
 {{/treasuryContracts}}
-
-templates:
-  - kind: ethereum/contract
-    name: Pool
-    network: {{ network }}
-    source:
-      abi: Pool
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      entities: []
-      abis:
-        - name: Pool
-          file: ./abis/Pool.json
-        - name: TreasuryV2
-          file: ./abis/TreasuryV2.json
-        - name: PoolManager
-          file: ./abis/PoolManager.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-
-        ###########################################
-        ############## Price Oracle ###############
-        ###########################################
-        # ERC20
-        - name: _ERC20
-          file: ./abis/Prices/ERC20.json
-        # Curve Contracts
-        - name: CurvePool
-          file: ./abis/Prices/Curve/Pool.json
-        - name: CurveRegistry
-          file: ./abis/Prices/Curve/Registry.json
-        - name: CalculationsCurve
-          file: ./abis/Prices/Calculations/Curve.json
-        # YearnLens Contracts
-        - name: YearnLensContract
-          file: ./abis/Prices/YearnLens.json
-        # Aave Oracle Contract
-        - name: AaveOracleContract
-          file: ./abis/Prices/AaveOracle.json
-        # SushiSwap Contracts
-        - name: CalculationsSushiSwap
-          file: ./abis/Prices/Calculations/SushiSwap.json
-        # ChainLink Contracts
-        - name: ChainLinkContract
-          file: ./abis/Prices/ChainLink.json
-        # Uniswap Contracts
-        - name: UniswapRouter
-          file: ./abis/Prices/Uniswap/Router.json
-        - name: UniswapFactory
-          file: ./abis/Prices/Uniswap/Factory.json
-        - name: UniswapPair
-          file: ./abis/Prices/Uniswap/Pair.json
-      eventHandlers:
-        - event: PositionSnapshot(uint256,int16,uint256,uint256,uint256)
-          handler: handlePositionSnapshot
-      file: ./src/mappings/poolMappings.ts

subgraphs/fx-protocol/protocols/fx-protocol/config/templates/fx.protocol.template.yaml

@@ -23,6 +23,8 @@ export const ETH_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 export const WETH_ADDRESS = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
 export const POOL_MANAGER_ADDRESS =
   "0x250893CA4Ba5d05626C785e8da758026928FCD24";
+export const POOL_ADDRESS = "0x6ecfa38fee8a5277b91efda204c235814f0122e8";
+export const FX_USD_ADDRESS = "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0";
 
 ////////////////////////
 ///// Type Helpers /////

subgraphs/fx-protocol/src/common/constants.ts

@@ -85,7 +85,12 @@ export function updatePoolTVLV1(pool: Pool): void {
     constants.BIGINT_ZERO,
   );
 
-  pool.setInputTokenBalances([baseTokenTotalSupply], true);
+  const baseTokenTotalSupplyWrapped = readValue<BigInt>(
+    contract.try_getWrapppedValue(baseTokenTotalSupply),
+    constants.BIGINT_ZERO,
+  );
+
+  pool.setInputTokenBalances([baseTokenTotalSupplyWrapped], true);
 }
 
 export function updatePoolOutputTokenSupplyV1(pool: Pool): void {
@@ -103,14 +108,7 @@ export function getOrCreatePoolV2(poolAddress: Address, sdk: SDK): Pool {
   const pool = sdk.Pools.loadPool(poolAddress);
 
   if (!pool.isInitialized) {
-    const poolManagerContract = PoolContract.bind(
-      Address.fromString(constants.POOL_MANAGER_ADDRESS),
-    );
-    const inputToken = readValue<Address>(
-      poolManagerContract.try_collateralToken(),
-      constants.NULL.TYPE_ADDRESS,
-    );
-
+    const inputToken = Address.fromString(constants.FX_USD_ADDRESS);
     const outputToken = sdk.Tokens.getOrCreateToken(poolAddress);
 
     pool.initialize(

subgraphs/fx-protocol/src/common/initializers.ts

@@ -1,14 +1,22 @@
-import { initializeSDKFromEvent } from "../common/initializers";
-import { Pool as PoolTemplate } from "../../generated/templates";
-import { RegisterPool, Harvest } from "../../generated/PoolManager/PoolManager";
+import {
+  getOrCreatePoolV2,
+  initializeSDKFromEvent,
+  updatePoolTVLV2,
+} from "../common/initializers";
+import * as constants from "../common/constants";
+import { Address } from "@graphprotocol/graph-ts";
+import { Harvest } from "../../generated/PoolManager/PoolManager";
 
 export function handleHarvest(event: Harvest): void {
   const sdk = initializeSDKFromEvent(event);
 
+  const pool = getOrCreatePoolV2(
+    Address.fromString(constants.POOL_ADDRESS),
+    sdk,
+  );
+
+  updatePoolTVLV2(pool);
+
   const account = sdk.Accounts.loadAccount(event.transaction.from);
   account.trackActivity();
 }
-
-export function handleRegisterPool(event: RegisterPool): void {
-  PoolTemplate.create(event.params.pool);
-}