Fix indexing issues

README.md

@@ -17,46 +17,96 @@ Configure `ETH_RPC_URL` for your target network in `.env`.
 
 If you will change ABIs, please install `jq`.
 
+
+## Development and Deployment
+
+Commands for adding new data sources to the subgraph are listed in the [add-commands.txt](./add-commands.txt) file.
+
+Once data sources have been added, entites can be modified in the [schema.graphql](./schema.graphql) file. After any update, the following commands must be run to ensure the new types are available for the event handlers:
+```
+yarn codegen
+yarn build
+```
+
+After building, this subgraph can be run locally using provided docker container. To start, set the environment variable *ETH_RPC_URL* in your .env file. Then, run `docker-compose up`. Once the node is running, deploy the subgraph with:
+```
+yarn create-local
+yarn deploy-local
+```
+
+Instructions on creating your own deployment are available in the [Graph Protocols Documentation](https://thegraph.com/docs/en/cookbook/quick-start/).
+
+
 ## Querying
 
+The dockerized deployment offers a query UI at http://localhost:8000/subgraphs/name/ajna/graphql.
+
 Below are some examples of queries that can be made to the Ajna Subgraph.
 
+List pools showing their tokens and how many transactions have been performed on them:
 ```
 {
- pools {
- id
- createdAtBlockNumber
- createdAtTimestamp
- txCount
+ pools {
+ id
+ txCount
+ quoteToken {
+ id
+ symbol
  }
+ collateralToken {
+ id
+ symbol
+ }
+ }
 }
 ```
 
-## Development
-
-Commands for adding new data sources to the subgraph are listed in the [add-commands.txt](./add-commands.txt) file.
-
-Once data sources have been added, entites can be modified in the [schema.graphql](./schema.graphql) file. After any update, the following commands must be run to ensure the new types are available for the event handlers:
+List lender positions across all pools:
 ```
-npm run codegen
-npm run build
+{
+ accounts {
+ id
+ lends {
+ lpb
+ bucket {
+ bucketIndex
+ quoteTokens
+ collateral
+ }
+ pool {
+ id
+ actualUtilization
+ currentDebt
+ htp
+ hpb
+ lup
+ maxBorrower
+ poolSize
+ reserves
+ targetUtilization
+ totalAjnaBurned
+ totalInterestEarned
+ quoteToken {
+ symbol
+ }
+ collateralToken {
+ symbol
+ }
+ }
+ }
+ }
+}
 ```
 
-This subgraph can be run locally using provided docker containers. To start, set the environment variable *ETH_RPC_URL* in your .env file. Then, run `docker-compose up`. Once the node is running, deploy the subgraph with:
-```
-npm run create-local
-npm run deploy-local
-```
 
-Instructions on creating your own deployment are available in the [Graph Protocols Documentation](https://thegraph.com/docs/en/cookbook/quick-start/).
 
 ## Tests
 
 Tests are written using the [Matchstick unit testing framework](https://github.com/LimeChain/matchstick/blob/main/README.md).
 
 Run the Matchstick tests by executing: 
 ```
-npm run test
+yarn test
 ```
 
 ## Maintenance

src/erc-20-pool.ts

@@ -39,9 +39,6 @@ import {
  Kick,
  LiquidationAuction,
  LoanStamped,
- LPAllowance,
- LPAllowances,
- LPTransferors,
  MoveQuoteToken,
  Pool,
  RemoveCollateral,

src/utils/pool.ts

@@ -15,9 +15,13 @@ export function getPoolAddress(poolId: Bytes): Address {
 export function getMomp(poolId: Bytes): BigDecimal {
  const poolInfoUtilsAddress = poolInfoUtilsNetworkLookUpTable.get(dataSource.network())!
  const poolInfoUtilsContract = PoolInfoUtils.bind(poolInfoUtilsAddress)
- const momp = poolInfoUtilsContract.momp(Address.fromBytes(poolId))
-
- return wadToDecimal(momp)
+ const pool = Pool.load(poolId)
+ // HACK: work around bug https://github.com/ajna-finance/contracts/issues/702
+ if (pool == null || pool.loansCount == BigInt.zero()) {
+ return BigDecimal.zero() // TODO: should probably return MAX_PRICE
+ } else {
+ return wadToDecimal(poolInfoUtilsContract.momp(Address.fromBytes(poolId)))
+ }
 }
 
 export class LoansInfo {
@@ -81,12 +85,6 @@ export function getPoolPricesInfo(pool: Pool): PoolPricesInfo {
  return pricesInfo
 }
 
-export function getPoolMomp(pool: Pool): BigInt {
- const poolInfoUtilsAddress = poolInfoUtilsNetworkLookUpTable.get(dataSource.network())!
- const poolInfoUtilsContract = PoolInfoUtils.bind(poolInfoUtilsAddress)
- return poolInfoUtilsContract.momp(Address.fromBytes(pool.id));
-}
-
 export class ReservesInfo {
  reserves: BigInt
  claimableReserves: BigInt
@@ -160,7 +158,7 @@ export function updatePool(pool: Pool): void {
  pool.htpIndex = poolPricesInfo.htpIndex
  pool.lup = wadToDecimal(poolPricesInfo.lup)
  pool.lupIndex = poolPricesInfo.lupIndex
- pool.momp = wadToDecimal(getPoolMomp(pool))
+ pool.momp = getMomp(pool.id)
 
  // update reserve auction information
  const poolReservesInfo = getPoolReservesInfo(pool)

subgraph.yaml

@@ -8,6 +8,7 @@ dataSources:
  source:
  address: "0x31BcbE14Ad30B2f7E1E4A14caB2C16849B73Dac3"
  abi: PositionManager
+ startBlock: 8613513
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.7
@@ -48,6 +49,7 @@ dataSources:
  source:
  address: "0x9684b8eC942985b23d343cB82D2F30EdA8fD7179"
  abi: ERC20PoolFactory
+ startBlock: 8613513
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.7
@@ -57,7 +59,9 @@ dataSources:
  abis:
  - name: ERC20PoolFactory
  file: ./abis/ERC20PoolFactory.json
- # add token ABI to each respective factory type for querying token contracts
+ # add pool and token ABIs to each respective factory type for querying token contracts
+ - name: ERC20Pool
+ file: ./abis/ERC20Pool.json
  - name: ERC20
  file: ./abis/ERC20.json
  eventHandlers:
@@ -70,6 +74,7 @@ dataSources:
  source:
  address: "0xEd6890d748e62ddbb3f80e7256Deeb2fBb853476"
  abi: RewardsManager
+ startBlock: 8613513
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.7
@@ -101,6 +106,7 @@ dataSources:
  source:
  address: "0x7DB5ba7cB6dAD74b45AAB027A7E7388eF18656DF"
  abi: ERC721PoolFactory
+ startBlock: 8613513
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.7