Set GQL query param to optional string for avoiding validation error (#12)

Part of [Regenerate ajna watcher with updated subgraph config](https://www.notion.so/Regenerate-ajna-watcher-with-updated-subgraph-config-c9bbecb033024c13a7515c7f1efc3363)

Reviewed-on: #12
Co-authored-by: Nabarun <nabarun@deepstacksoft.com>
Co-committed-by: Nabarun <nabarun@deepstacksoft.com>

README.md

@@ -1,5 +1,9 @@
 # ajna-watcher-ts
 
+## Source
+
+* Subgraph: [ajna-subgraph v0.1.1](https://github.com/cerc-io/ajna-subgraph/releases/tag/v0.1.1)
+
 ## Setup
 
 * Run the following command to install required packages:

codegen-config.yml

@@ -0,0 +1,35 @@
+# Contracts to watch (required).
+# Can pass empty array ([]) when using subgraphPath.
+contracts: []
+
+# Output folder path (logs output using `stdout` if not provided).
+outputFolder: /home/user/cerc-io/ajna-watcher-ts
+
+# Code generation mode [eth_call | storage | all | none] (default: none).
+mode: none
+
+# Kind of watcher [lazy | active] (default: active).
+kind: active
+
+# Watcher server port (default: 3008).
+port: 3008
+
+# Flatten the input contract file(s) [true | false] (default: true).
+flatten: true
+
+# Config for subgraph
+subgraph:
+  # Path to subgraph repo directory containing package.json
+  directory: /home/user/cerc-io/ajna-subgraph
+
+  # Package manager that is used in subgraph repo for dependencies
+  packageManager: yarn
+
+  # Path to subgraph manifest/config file
+  configFile: /home/user/cerc-io/ajna-subgraph/subgraph.yaml
+
+  # Networks config file path used when building subgraph (optional)
+  networkFilePath: /home/user/cerc-io/ajna-subgraph/networks.json
+
+  # Network configuration to use from the networks config file (optional)
+  network: filecoin

environments/local.toml

@@ -12,7 +12,7 @@
 
   # Enable state creation
   # CAUTION: Disable only if state creation is not desired or can be filled subsequently
-  enableState = true
+  enableState = false
 
   subgraphPath = "./subgraph-build"
 
@@ -58,14 +58,15 @@
 
 [upstream]
   [upstream.ethServer]
-    # gqlApiEndpoint = "http://127.0.0.1:8082/graphql"
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
     rpcClient = true
 
     # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint
-    isFEVM = false
+    isFEVM = true
 
     # Boolean flag to filter event logs by contracts
     filterLogsByAddresses = true
@@ -96,3 +97,6 @@
   # Max block range of historical processing after which it waits for completion of events processing
   # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
   historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/ajna-watcher-ts",
-  "version": "0.1.0",
+  "version": "0.1.9",
   "description": "ajna-watcher-ts",
   "private": true,
   "main": "dist/index.js",
@@ -39,11 +39,11 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.82",
-    "@cerc-io/ipld-eth-client": "^0.2.82",
-    "@cerc-io/solidity-mapper": "^0.2.82",
-    "@cerc-io/util": "^0.2.82",
-    "@cerc-io/graph-node": "^0.2.82",
+    "@cerc-io/cli": "^0.2.90",
+    "@cerc-io/ipld-eth-client": "^0.2.90",
+    "@cerc-io/solidity-mapper": "^0.2.90",
+    "@cerc-io/util": "^0.2.90",
+    "@cerc-io/graph-node": "^0.2.90",
     "@ethersproject/providers": "^5.4.4",
     "debug": "^4.3.1",
     "decimal.js": "^10.3.1",

src/indexer.ts

@@ -6,7 +6,7 @@ import assert from 'assert';
 import { DeepPartial, FindConditions, FindManyOptions, ObjectLiteral } from 'typeorm';
 import debug from 'debug';
 import { ethers, constants } from 'ethers';
-import { SelectionNode } from 'graphql';
+import { GraphQLResolveInfo } from 'graphql';
 
 import { JsonFragment } from '@ethersproject/abi';
 import { BaseProvider } from '@ethersproject/providers';
@@ -326,6 +326,13 @@ export class Indexer implements IndexerInterface {
     await this._baseIndexer.fetchStateStatus();
   }
 
+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+    this._graphWatcher.switchClients({ ethClient, ethProvider });
+  }
+
   async getMetaData (block: BlockHeight): Promise<ResultMeta | null> {
     return this._baseIndexer.getMetaData(block);
   }
@@ -457,9 +464,9 @@ export class Indexer implements IndexerInterface {
     entity: new () => Entity,
     id: string,
     block: BlockHeight,
-    selections: ReadonlyArray<SelectionNode> = []
+    queryInfo: GraphQLResolveInfo
   ): Promise<any> {
-    const data = await this._graphWatcher.getEntity(entity, id, this._relationsMap, block, selections);
+    const data = await this._graphWatcher.getEntity(entity, id, this._relationsMap, block, queryInfo);
 
     return data;
   }
@@ -469,9 +476,9 @@ export class Indexer implements IndexerInterface {
     block: BlockHeight,
     where: { [key: string]: any } = {},
     queryOptions: QueryOptions = {},
-    selections: ReadonlyArray<SelectionNode> = []
+    queryInfo: GraphQLResolveInfo
   ): Promise<any[]> {
-    return this._graphWatcher.getEntities(entity, this._relationsMap, block, where, queryOptions, selections);
+    return this._graphWatcher.getEntities(entity, this._relationsMap, block, where, queryOptions, queryInfo);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -513,20 +520,34 @@ export class Indexer implements IndexerInterface {
     console.timeEnd('time:indexer#processBlockAfterEvents-dump_subgraph_state');
   }
 
-  parseEventNameAndArgs (kind: string, logObj: any): any {
+  parseEventNameAndArgs (kind: string, logObj: any): { eventParsed: boolean, eventDetails: any } {
     const { topics, data } = logObj;
 
     const contract = this._contractMap.get(kind);
     assert(contract);
 
-    const logDescription = contract.parseLog({ data, topics });
+    let logDescription: ethers.utils.LogDescription;
+    try {
+      logDescription = contract.parseLog({ data, topics });
+    } catch (err) {
+      // Return if no matching event found
+      if ((err as Error).message.includes('no matching event')) {
+        log(`WARNING: Skipping event for contract ${kind} as no matching event found in the ABI`);
+        return { eventParsed: false, eventDetails: {} };
+      }
+
+      throw err;
+    }
 
     const { eventName, eventInfo, eventSignature } = this._baseIndexer.parseEvent(logDescription);
 
     return {
-      eventName,
-      eventInfo,
-      eventSignature
+      eventParsed: true,
+      eventDetails: {
+        eventName,
+        eventInfo,
+        eventSignature
+      }
     };
   }
 

src/schema.gql

@@ -9933,139 +9933,139 @@ type SyncStatus {
 type Query {
   events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
   eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
-  token(id: ID!, block: Block_height): Token
+  token(id: String, block: Block_height): Token
   tokens(block: Block_height, where: Token_filter, orderBy: Token_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Token!]!
-  poolFactory(id: ID!, block: Block_height): PoolFactory
+  poolFactory(id: String, block: Block_height): PoolFactory
   poolFactories(block: Block_height, where: PoolFactory_filter, orderBy: PoolFactory_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [PoolFactory!]!
-  pool(id: ID!, block: Block_height): Pool
+  pool(id: String, block: Block_height): Pool
   pools(block: Block_height, where: Pool_filter, orderBy: Pool_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Pool!]!
-  bucket(id: ID!, block: Block_height): Bucket
+  bucket(id: String, block: Block_height): Bucket
   buckets(block: Block_height, where: Bucket_filter, orderBy: Bucket_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Bucket!]!
-  lend(id: ID!, block: Block_height): Lend
+  lend(id: String, block: Block_height): Lend
   lends(block: Block_height, where: Lend_filter, orderBy: Lend_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Lend!]!
-  loan(id: ID!, block: Block_height): Loan
+  loan(id: String, block: Block_height): Loan
   loans(block: Block_height, where: Loan_filter, orderBy: Loan_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Loan!]!
-  account(id: ID!, block: Block_height): Account
+  account(id: String, block: Block_height): Account
   accounts(block: Block_height, where: Account_filter, orderBy: Account_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Account!]!
-  liquidationAuction(id: ID!, block: Block_height): LiquidationAuction
+  liquidationAuction(id: String, block: Block_height): LiquidationAuction
   liquidationAuctions(block: Block_height, where: LiquidationAuction_filter, orderBy: LiquidationAuction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [LiquidationAuction!]!
-  reserveAuction(id: ID!, block: Block_height): ReserveAuction
+  reserveAuction(id: String, block: Block_height): ReserveAuction
   reserveAuctions(block: Block_height, where: ReserveAuction_filter, orderBy: ReserveAuction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ReserveAuction!]!
-  lptransferorList(id: ID!, block: Block_height): LPTransferorList
+  lptransferorList(id: String, block: Block_height): LPTransferorList
   lptransferorLists(block: Block_height, where: LPTransferorList_filter, orderBy: LPTransferorList_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [LPTransferorList!]!
-  lpallowance(id: ID!, block: Block_height): LPAllowance
+  lpallowance(id: String, block: Block_height): LPAllowance
   lpallowances(block: Block_height, where: LPAllowance_filter, orderBy: LPAllowance_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [LPAllowance!]!
-  lpallowanceList(id: ID!, block: Block_height): LPAllowanceList
+  lpallowanceList(id: String, block: Block_height): LPAllowanceList
   lpallowanceLists(block: Block_height, where: LPAllowanceList_filter, orderBy: LPAllowanceList_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [LPAllowanceList!]!
-  addCollateral(id: ID!, block: Block_height): AddCollateral
+  addCollateral(id: String, block: Block_height): AddCollateral
   addCollaterals(block: Block_height, where: AddCollateral_filter, orderBy: AddCollateral_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [AddCollateral!]!
-  addQuoteToken(id: ID!, block: Block_height): AddQuoteToken
+  addQuoteToken(id: String, block: Block_height): AddQuoteToken
   addQuoteTokens(block: Block_height, where: AddQuoteToken_filter, orderBy: AddQuoteToken_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [AddQuoteToken!]!
-  auctionSettle(id: ID!, block: Block_height): AuctionSettle
+  auctionSettle(id: String, block: Block_height): AuctionSettle
   auctionSettles(block: Block_height, where: AuctionSettle_filter, orderBy: AuctionSettle_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [AuctionSettle!]!
-  bondWithdrawn(id: ID!, block: Block_height): BondWithdrawn
+  bondWithdrawn(id: String, block: Block_height): BondWithdrawn
   bondWithdrawns(block: Block_height, where: BondWithdrawn_filter, orderBy: BondWithdrawn_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [BondWithdrawn!]!
-  bucketBankruptcy(id: ID!, block: Block_height): BucketBankruptcy
+  bucketBankruptcy(id: String, block: Block_height): BucketBankruptcy
   bucketBankruptcies(block: Block_height, where: BucketBankruptcy_filter, orderBy: BucketBankruptcy_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [BucketBankruptcy!]!
-  bucketTake(id: ID!, block: Block_height): BucketTake
+  bucketTake(id: String, block: Block_height): BucketTake
   bucketTakes(block: Block_height, where: BucketTake_filter, orderBy: BucketTake_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [BucketTake!]!
-  bucketTakeLPAwarded(id: ID!, block: Block_height): BucketTakeLPAwarded
+  bucketTakeLPAwarded(id: String, block: Block_height): BucketTakeLPAwarded
   bucketTakeLPAwardeds(block: Block_height, where: BucketTakeLPAwarded_filter, orderBy: BucketTakeLPAwarded_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [BucketTakeLPAwarded!]!
-  drawDebt(id: ID!, block: Block_height): DrawDebt
+  drawDebt(id: String, block: Block_height): DrawDebt
   drawDebts(block: Block_height, where: DrawDebt_filter, orderBy: DrawDebt_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DrawDebt!]!
-  flashloan(id: ID!, block: Block_height): Flashloan
+  flashloan(id: String, block: Block_height): Flashloan
   flashloans(block: Block_height, where: Flashloan_filter, orderBy: Flashloan_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Flashloan!]!
-  kick(id: ID!, block: Block_height): Kick
+  kick(id: String, block: Block_height): Kick
   kicks(block: Block_height, where: Kick_filter, orderBy: Kick_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Kick!]!
-  loanStamped(id: ID!, block: Block_height): LoanStamped
+  loanStamped(id: String, block: Block_height): LoanStamped
   loanStampeds(block: Block_height, where: LoanStamped_filter, orderBy: LoanStamped_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [LoanStamped!]!
-  moveQuoteToken(id: ID!, block: Block_height): MoveQuoteToken
+  moveQuoteToken(id: String, block: Block_height): MoveQuoteToken
   moveQuoteTokens(block: Block_height, where: MoveQuoteToken_filter, orderBy: MoveQuoteToken_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [MoveQuoteToken!]!
-  removeCollateral(id: ID!, block: Block_height): RemoveCollateral
+  removeCollateral(id: String, block: Block_height): RemoveCollateral
   removeCollaterals(block: Block_height, where: RemoveCollateral_filter, orderBy: RemoveCollateral_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [RemoveCollateral!]!
-  removeQuoteToken(id: ID!, block: Block_height): RemoveQuoteToken
+  removeQuoteToken(id: String, block: Block_height): RemoveQuoteToken
   removeQuoteTokens(block: Block_height, where: RemoveQuoteToken_filter, orderBy: RemoveQuoteToken_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [RemoveQuoteToken!]!
-  repayDebt(id: ID!, block: Block_height): RepayDebt
+  repayDebt(id: String, block: Block_height): RepayDebt
   repayDebts(block: Block_height, where: RepayDebt_filter, orderBy: RepayDebt_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [RepayDebt!]!
-  reserveAuctionKick(id: ID!, block: Block_height): ReserveAuctionKick
+  reserveAuctionKick(id: String, block: Block_height): ReserveAuctionKick
   reserveAuctionKicks(block: Block_height, where: ReserveAuctionKick_filter, orderBy: ReserveAuctionKick_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ReserveAuctionKick!]!
-  reserveAuctionTake(id: ID!, block: Block_height): ReserveAuctionTake
+  reserveAuctionTake(id: String, block: Block_height): ReserveAuctionTake
   reserveAuctionTakes(block: Block_height, where: ReserveAuctionTake_filter, orderBy: ReserveAuctionTake_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ReserveAuctionTake!]!
-  resetInterestRate(id: ID!, block: Block_height): ResetInterestRate
+  resetInterestRate(id: String, block: Block_height): ResetInterestRate
   resetInterestRates(block: Block_height, where: ResetInterestRate_filter, orderBy: ResetInterestRate_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ResetInterestRate!]!
-  settle(id: ID!, block: Block_height): Settle
+  settle(id: String, block: Block_height): Settle
   settles(block: Block_height, where: Settle_filter, orderBy: Settle_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Settle!]!
-  take(id: ID!, block: Block_height): Take
+  take(id: String, block: Block_height): Take
   takes(block: Block_height, where: Take_filter, orderBy: Take_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Take!]!
-  transferLP(id: ID!, block: Block_height): TransferLP
+  transferLP(id: String, block: Block_height): TransferLP
   transferLPS(block: Block_height, where: TransferLP_filter, orderBy: TransferLP_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [TransferLP!]!
-  updateInterestRate(id: ID!, block: Block_height): UpdateInterestRate
+  updateInterestRate(id: String, block: Block_height): UpdateInterestRate
   updateInterestRates(block: Block_height, where: UpdateInterestRate_filter, orderBy: UpdateInterestRate_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [UpdateInterestRate!]!
-  approval(id: ID!, block: Block_height): Approval
+  approval(id: String, block: Block_height): Approval
   approvals(block: Block_height, where: Approval_filter, orderBy: Approval_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Approval!]!
-  approvalForAll(id: ID!, block: Block_height): ApprovalForAll
+  approvalForAll(id: String, block: Block_height): ApprovalForAll
   approvalForAlls(block: Block_height, where: ApprovalForAll_filter, orderBy: ApprovalForAll_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ApprovalForAll!]!
-  moveLiquidity(id: ID!, block: Block_height): MoveLiquidity
+  moveLiquidity(id: String, block: Block_height): MoveLiquidity
   moveLiquidities(block: Block_height, where: MoveLiquidity_filter, orderBy: MoveLiquidity_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [MoveLiquidity!]!
-  transfer(id: ID!, block: Block_height): Transfer
+  transfer(id: String, block: Block_height): Transfer
   transfers(block: Block_height, where: Transfer_filter, orderBy: Transfer_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transfer!]!
-  poolCreated(id: ID!, block: Block_height): PoolCreated
+  poolCreated(id: String, block: Block_height): PoolCreated
   poolCreateds(block: Block_height, where: PoolCreated_filter, orderBy: PoolCreated_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [PoolCreated!]!
-  addCollateralNFT(id: ID!, block: Block_height): AddCollateralNFT
+  addCollateralNFT(id: String, block: Block_height): AddCollateralNFT
   addCollateralNFTS(block: Block_height, where: AddCollateralNFT_filter, orderBy: AddCollateralNFT_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [AddCollateralNFT!]!
-  auctionNFTSettle(id: ID!, block: Block_height): AuctionNFTSettle
+  auctionNFTSettle(id: String, block: Block_height): AuctionNFTSettle
   auctionNFTSettles(block: Block_height, where: AuctionNFTSettle_filter, orderBy: AuctionNFTSettle_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [AuctionNFTSettle!]!
-  drawDebtNFT(id: ID!, block: Block_height): DrawDebtNFT
+  drawDebtNFT(id: String, block: Block_height): DrawDebtNFT
   drawDebtNFTS(block: Block_height, where: DrawDebtNFT_filter, orderBy: DrawDebtNFT_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DrawDebtNFT!]!
-  mergeOrRemoveCollateralNFT(id: ID!, block: Block_height): MergeOrRemoveCollateralNFT
+  mergeOrRemoveCollateralNFT(id: String, block: Block_height): MergeOrRemoveCollateralNFT
   mergeOrRemoveCollateralNFTS(block: Block_height, where: MergeOrRemoveCollateralNFT_filter, orderBy: MergeOrRemoveCollateralNFT_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [MergeOrRemoveCollateralNFT!]!
-  position(id: ID!, block: Block_height): Position
+  position(id: String, block: Block_height): Position
   positions(block: Block_height, where: Position_filter, orderBy: Position_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Position!]!
-  positionLend(id: ID!, block: Block_height): PositionLend
+  positionLend(id: String, block: Block_height): PositionLend
   positionLends(block: Block_height, where: PositionLend_filter, orderBy: PositionLend_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [PositionLend!]!
-  burn(id: ID!, block: Block_height): Burn
+  burn(id: String, block: Block_height): Burn
   burns(block: Block_height, where: Burn_filter, orderBy: Burn_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Burn!]!
-  memorializePosition(id: ID!, block: Block_height): MemorializePosition
+  memorializePosition(id: String, block: Block_height): MemorializePosition
   memorializePositions(block: Block_height, where: MemorializePosition_filter, orderBy: MemorializePosition_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [MemorializePosition!]!
-  mint(id: ID!, block: Block_height): Mint
+  mint(id: String, block: Block_height): Mint
   mints(block: Block_height, where: Mint_filter, orderBy: Mint_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Mint!]!
-  redeemPosition(id: ID!, block: Block_height): RedeemPosition
+  redeemPosition(id: String, block: Block_height): RedeemPosition
   redeemPositions(block: Block_height, where: RedeemPosition_filter, orderBy: RedeemPosition_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [RedeemPosition!]!
-  grantFund(id: ID!, block: Block_height): GrantFund
+  grantFund(id: String, block: Block_height): GrantFund
   grantFunds(block: Block_height, where: GrantFund_filter, orderBy: GrantFund_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [GrantFund!]!
-  distributionPeriod(id: ID!, block: Block_height): DistributionPeriod
+  distributionPeriod(id: String, block: Block_height): DistributionPeriod
   distributionPeriods(block: Block_height, where: DistributionPeriod_filter, orderBy: DistributionPeriod_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DistributionPeriod!]!
-  proposal(id: ID!, block: Block_height): Proposal
+  proposal(id: String, block: Block_height): Proposal
   proposals(block: Block_height, where: Proposal_filter, orderBy: Proposal_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Proposal!]!
-  proposalParams(id: ID!, block: Block_height): ProposalParams
+  proposalParams(id: String, block: Block_height): ProposalParams
   proposalParamss(block: Block_height, where: ProposalParams_filter, orderBy: ProposalParams_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ProposalParams!]!
-  distributionPeriodVote(id: ID!, block: Block_height): DistributionPeriodVote
+  distributionPeriodVote(id: String, block: Block_height): DistributionPeriodVote
   distributionPeriodVotes(block: Block_height, where: DistributionPeriodVote_filter, orderBy: DistributionPeriodVote_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DistributionPeriodVote!]!
-  screeningVote(id: ID!, block: Block_height): ScreeningVote
+  screeningVote(id: String, block: Block_height): ScreeningVote
   screeningVotes(block: Block_height, where: ScreeningVote_filter, orderBy: ScreeningVote_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ScreeningVote!]!
-  fundingVote(id: ID!, block: Block_height): FundingVote
+  fundingVote(id: String, block: Block_height): FundingVote
   fundingVotes(block: Block_height, where: FundingVote_filter, orderBy: FundingVote_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [FundingVote!]!
-  fundedSlate(id: ID!, block: Block_height): FundedSlate
+  fundedSlate(id: String, block: Block_height): FundedSlate
   fundedSlates(block: Block_height, where: FundedSlate_filter, orderBy: FundedSlate_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [FundedSlate!]!
-  delegateRewardClaimed(id: ID!, block: Block_height): DelegateRewardClaimed
+  delegateRewardClaimed(id: String, block: Block_height): DelegateRewardClaimed
   delegateRewardClaimeds(block: Block_height, where: DelegateRewardClaimed_filter, orderBy: DelegateRewardClaimed_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DelegateRewardClaimed!]!
-  fundTreasury(id: ID!, block: Block_height): FundTreasury
+  fundTreasury(id: String, block: Block_height): FundTreasury
   fundTreasuries(block: Block_height, where: FundTreasury_filter, orderBy: FundTreasury_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [FundTreasury!]!
-  fundedSlateUpdated(id: ID!, block: Block_height): FundedSlateUpdated
+  fundedSlateUpdated(id: String, block: Block_height): FundedSlateUpdated
   fundedSlateUpdateds(block: Block_height, where: FundedSlateUpdated_filter, orderBy: FundedSlateUpdated_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [FundedSlateUpdated!]!
-  proposalCreated(id: ID!, block: Block_height): ProposalCreated
+  proposalCreated(id: String, block: Block_height): ProposalCreated
   proposalCreateds(block: Block_height, where: ProposalCreated_filter, orderBy: ProposalCreated_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ProposalCreated!]!
-  proposalExecuted(id: ID!, block: Block_height): ProposalExecuted
+  proposalExecuted(id: String, block: Block_height): ProposalExecuted
   proposalExecuteds(block: Block_height, where: ProposalExecuted_filter, orderBy: ProposalExecuted_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [ProposalExecuted!]!
-  distributionPeriodStarted(id: ID!, block: Block_height): DistributionPeriodStarted
+  distributionPeriodStarted(id: String, block: Block_height): DistributionPeriodStarted
   distributionPeriodStarteds(block: Block_height, where: DistributionPeriodStarted_filter, orderBy: DistributionPeriodStarted_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DistributionPeriodStarted!]!
-  voteCast(id: ID!, block: Block_height): VoteCast
+  voteCast(id: String, block: Block_height): VoteCast
   voteCasts(block: Block_height, where: VoteCast_filter, orderBy: VoteCast_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [VoteCast!]!
-  delegateChanged(id: ID!, block: Block_height): DelegateChanged
+  delegateChanged(id: String, block: Block_height): DelegateChanged
   delegateChangeds(block: Block_height, where: DelegateChanged_filter, orderBy: DelegateChanged_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DelegateChanged!]!
-  delegateVotesChanged(id: ID!, block: Block_height): DelegateVotesChanged
+  delegateVotesChanged(id: String, block: Block_height): DelegateVotesChanged
   delegateVotesChangeds(block: Block_height, where: DelegateVotesChanged_filter, orderBy: DelegateVotesChanged_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DelegateVotesChanged!]!
-  burnWrap(id: ID!, block: Block_height): BurnWrap
+  burnWrap(id: String, block: Block_height): BurnWrap
   burnWraps(block: Block_height, where: BurnWrap_filter, orderBy: BurnWrap_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [BurnWrap!]!
   _meta(block: Block_height): _Meta_
   getStateByCID(cid: String!): ResultState

subgraph-build/ERC20PoolFactory/abis/DSToken.json

@@ -0,0 +1,566 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "stop",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "owner_",
+        "type": "address"
+      }
+    ],
+    "name": "setOwner",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "mint",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "burn",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "name_",
+        "type": "bytes32"
+      }
+    ],
+    "name": "setName",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "src",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "stopped",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "authority_",
+        "type": "address"
+      }
+    ],
+    "name": "setAuthority",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "burn",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "mint",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "transfer",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "push",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "move",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "start",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "authority",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "guy",
+        "type": "address"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "name": "guy",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "pull",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "name": "symbol_",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "Mint",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "Burn",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "authority",
+        "type": "address"
+      }
+    ],
+    "name": "LogSetAuthority",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "owner",
+        "type": "address"
+      }
+    ],
+    "name": "LogSetOwner",
+    "type": "event"
+  },
+  {
+    "anonymous": true,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "sig",
+        "type": "bytes4"
+      },
+      {
+        "indexed": true,
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "foo",
+        "type": "bytes32"
+      },
+      {
+        "indexed": true,
+        "name": "bar",
+        "type": "bytes32"
+      },
+      {
+        "indexed": false,
+        "name": "wad",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "fax",
+        "type": "bytes"
+      }
+    ],
+    "name": "LogNote",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  }
+]

subgraph-build/subgraph.yaml

@@ -6,8 +6,8 @@ dataSources:
     name: PositionManager
     source:
       abi: PositionManager
-      address: "0x87B0F458d8F1ACD28A83A748bFFbE24bD6B701B1"
-      startBlock: 18938158
+      address: "0x0cEfA3be6496B8Ab0A66B01aABEf05A5aE38221b"
+      startBlock: 3751042
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -46,13 +46,13 @@ dataSources:
         - event: Transfer(indexed address,indexed address,indexed uint256)
           handler: handleTransfer
       file: PositionManager/PositionManager.wasm
-    network: mainnet
+    network: filecoin
   - kind: ethereum
     name: ERC20PoolFactory
     source:
       abi: ERC20PoolFactory
-      address: "0x6146DD43C5622bB6D12A5240ab9CF4de14eDC625"
-      startBlock: 18938158
+      address: "0x0E4a2276Ac259CF226eEC6536f2b447Fc26F2D8a"
+      startBlock: 3750988
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -68,17 +68,19 @@ dataSources:
           file: ERC20PoolFactory/abis/ERC20.json
         - name: PoolInfoUtils
           file: ERC20PoolFactory/abis/PoolInfoUtils.json
+        - name: DSToken
+          file: ERC20PoolFactory/abis/DSToken.json
       eventHandlers:
         - event: PoolCreated(address,bytes32)
           handler: handlePoolCreated
       file: ERC20PoolFactory/ERC20PoolFactory.wasm
-    network: mainnet
+    network: filecoin
   - kind: ethereum
     name: ERC721PoolFactory
     source:
       abi: ERC721PoolFactory
-      address: "0x27461199d3b7381De66a85D685828E967E35AF4c"
-      startBlock: 18938158
+      address: "0x07Eb44ca94cddA4016cECCe7FB9C7Ae73DBD4306"
+      startBlock: 3750996
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -100,13 +102,13 @@ dataSources:
         - event: PoolCreated(address,bytes32)
           handler: handlePoolCreated
       file: ERC721PoolFactory/ERC721PoolFactory.wasm
-    network: mainnet
+    network: filecoin
   - kind: ethereum
     name: GrantFund
     source:
       abi: GrantFund
-      address: "0x74d5b005ca64a5C9EE3611Bdc6F6C02D93C84b2f"
-      startBlock: 18964103
+      address: "0x0000000000000000000000000000000000000000"
+      startBlock: 3750988
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -138,14 +140,14 @@ dataSources:
         - event: VoteCast(indexed address,uint256,uint8,uint256,string)
           handler: handleVoteCast
       file: GrantFund/GrantFund.wasm
-    network: mainnet
+    network: filecoin
   - kind: ethereum
     name: AjnaToken
-    network: mainnet
+    network: filecoin
     source:
       abi: AjnaToken
-      address: "0x9a96ec9B57Fb64FbC60B423d1f4da7691Bd35079"
-      startBlock: 15478977
+      address: "0xe9DfbF0d7371638dc2662672435E1A3E75D0CeF4"
+      startBlock: 3749104
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -164,11 +166,11 @@ dataSources:
       file: AjnaToken/AjnaToken.wasm
   - kind: ethereum
     name: BurnWrappedAjna
-    network: mainnet
+    network: filecoin
     source:
       abi: BurnWrappedAjna
-      address: "0x936Ab482d6bd111910a42849D3A51Ff80BB0A711"
-      startBlock: 17913208
+      address: "0x0000000000000000000000000000000000000000"
+      startBlock: 3750988
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -286,7 +288,7 @@ templates:
         - event: UpdateInterestRate(uint256,uint256)
           handler: handleUpdateInterestRate
       file: templates/ERC20Pool/ERC20Pool.wasm
-    network: mainnet
+    network: filecoin
   - kind: ethereum
     name: ERC721Pool
     source:
@@ -395,4 +397,4 @@ templates:
         - event: UpdateInterestRate(uint256,uint256)
           handler: handleUpdateInterestRate
       file: templates/ERC721Pool/ERC721Pool.wasm
-    network: mainnet
+    network: filecoin

yarn.lock

@@ -176,10 +176,10 @@
     binaryen "101.0.0-nightly.20210723"
     long "^4.0.0"
 
-"@cerc-io/cache@^0.2.82":
-  version "0.2.82"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.82/cache-0.2.82.tgz#b3ccc72047e9fd59f8cfe1e6d55a7139e0b61b7b"
-  integrity sha512-auQhFYShmn6KaV27WcLqhPhsMjr8s/adThLpg2MYqlR880YNPx9WSXK0gku3xBej4XIXBurZy/QkMq4A3IF2vw==
+"@cerc-io/cache@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.90/cache-0.2.90.tgz#95791f16443cc3c48658df8cdf24941c85a5c456"
+  integrity sha512-vezwldh6P97bKCDe820EbjVmweL1azsuWxZJM8KdmvTdjQNN56PP3JctvCt8agW5rrzfHIo64UBPptT9wheH0A==
   dependencies:
     canonical-json "^0.0.4"
     debug "^4.3.1"
@@ -187,19 +187,19 @@
     fs-extra "^10.0.0"
     level "^7.0.0"
 
-"@cerc-io/cli@^0.2.82":
-  version "0.2.82"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.82/cli-0.2.82.tgz#783782cfb60fe302d6ca2fa151d49f9fec53302e"
-  integrity sha512-d86uMh2mXo+ZPT9Jr9qMdQZ2q7ZeGv1xyGpJD/42XK+jf5t59ZjAzK2MxNgzEe/vYghiRdsg3+sJPA8wKmR6Bg==
+"@cerc-io/cli@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.90/cli-0.2.90.tgz#16de193b744f683479cfd5fd293f495ca7433bd2"
+  integrity sha512-DK4HK7+gGiwkzu/Iphe7E4MeVFABAflkAbMU+h8qHrp5T5rVh8rbLCsEF1sY64MZ2jwtUyq8jOYN0X5399uBmg==
   dependencies:
     "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.82"
-    "@cerc-io/ipld-eth-client" "^0.2.82"
+    "@cerc-io/cache" "^0.2.90"
+    "@cerc-io/ipld-eth-client" "^0.2.90"
     "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
     "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.82"
-    "@cerc-io/rpc-eth-client" "^0.2.82"
-    "@cerc-io/util" "^0.2.82"
+    "@cerc-io/peer" "^0.2.90"
+    "@cerc-io/rpc-eth-client" "^0.2.90"
+    "@cerc-io/util" "^0.2.90"
     "@ethersproject/providers" "^5.4.4"
     "@graphql-tools/utils" "^9.1.1"
     "@ipld/dag-cbor" "^8.0.0"
@@ -220,16 +220,16 @@
     typeorm "0.2.37"
     yargs "^17.0.1"
 
-"@cerc-io/graph-node@^0.2.82":
-  version "0.2.82"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.82/graph-node-0.2.82.tgz#9e62dd7bf5497f014fc253d97cb6fee7c862a9ba"
-  integrity sha512-2b1/0CR0BBDWB/KIIxtM9vg2iHxPCNFN/XnEyumzmLXDgSwlNZkYLcPHWANK/X8nH3x8eqEA4BBfl0hDT9tnww==
+"@cerc-io/graph-node@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.90/graph-node-0.2.90.tgz#4e5451a0f384801524d9c78f65be9705a820cca9"
+  integrity sha512-tMfPQBup+swhUjW+3S5/Kihy6dQ25VLynCwAo5ylE0vV1pm6U8suu8i2lcIu/Nu6Zkm/WzQ7FYl57phI4YdGuw==
   dependencies:
     "@apollo/client" "^3.3.19"
     "@cerc-io/assemblyscript" "0.19.10-watcher-ts-0.1.2"
-    "@cerc-io/cache" "^0.2.82"
-    "@cerc-io/ipld-eth-client" "^0.2.82"
-    "@cerc-io/util" "^0.2.82"
+    "@cerc-io/cache" "^0.2.90"
+    "@cerc-io/ipld-eth-client" "^0.2.90"
+    "@cerc-io/util" "^0.2.90"
     "@types/json-diff" "^0.5.2"
     "@types/yargs" "^17.0.0"
     bn.js "^4.11.9"
@@ -246,14 +246,14 @@
     typeorm-naming-strategies "^2.0.0"
     yargs "^17.0.1"
 
-"@cerc-io/ipld-eth-client@^0.2.82":
-  version "0.2.82"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.82/ipld-eth-client-0.2.82.tgz#2d682ab8cdfc99d6b37cc2af6ee168f002b4639e"
-  integrity sha512-dbZ7n1TxVdwQ56T+KcE/Ac2bFWZXFkTCcs5fH5hlpUc4HyZI86MZ5IuaaNco4BBHYXUABntESWtvlx4cepeZCg==
+"@cerc-io/ipld-eth-client@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.90/ipld-eth-client-0.2.90.tgz#2dd907177d0f1bda45af1631f20a3c39f934c243"
+  integrity sha512-lQkDdawmMQhA9uYxrzvwURwuHr2hcbwaTArYy+p1Xyo/8DicJyxpwg+iHvDceKg971Iq/mDYjQa+HFvbTb+pxg==
   dependencies:
     "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.82"
-    "@cerc-io/util" "^0.2.82"
+    "@cerc-io/cache" "^0.2.90"
+    "@cerc-io/util" "^0.2.90"
     cross-fetch "^3.1.4"
     debug "^4.3.1"
     ethers "^5.4.4"
@@ -376,7 +376,7 @@
     lodash "^4.17.21"
     uint8arrays "^4.0.3"
 
-"@cerc-io/peer@^0.2.65", "@cerc-io/peer@^0.2.82":
+"@cerc-io/peer@^0.2.65":
   version "0.2.82"
   resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.82/peer-0.2.82.tgz#e27a1cafd06c25f9c4e02d49d4615f45a76ce22b"
   integrity sha512-wKkBXO7hxuN13Av60otDj+2O7nyoogYp+n8uTKNU9cv6J87OLRUZZAuGb5FggUONgDqxS3cyaXD6vqLpkhbbIA==
@@ -406,6 +406,36 @@
     unique-names-generator "^4.7.1"
     yargs "^17.0.1"
 
+"@cerc-io/peer@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.90/peer-0.2.90.tgz#4507ab3d793b7c4e35af26f26470e2770aac6319"
+  integrity sha512-jrmbjJBXwrSYOqNkXaaAh2J30gVKV+4vXnZAiPYbpl6Tlo72iJOwWAzJLXJej48NNCkJkdpXkuxcsQZtsW90mQ==
+  dependencies:
+    "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
+    "@cerc-io/prometheus-metrics" "1.1.4"
+    "@chainsafe/libp2p-gossipsub" "^6.0.0"
+    "@chainsafe/libp2p-noise" "^11.0.0"
+    "@chainsafe/libp2p-yamux" "3.0.7"
+    "@libp2p/floodsub" "^6.0.0"
+    "@libp2p/mplex" "^7.1.1"
+    "@libp2p/peer-id-factory" "^2.0.0"
+    "@libp2p/pubsub-peer-discovery" "^8.0.0"
+    "@libp2p/websockets" "^5.0.5"
+    "@multiformats/multiaddr" "^11.1.4"
+    assert "^2.0.0"
+    buffer "^6.0.3"
+    chai "^4.3.4"
+    debug "^4.3.1"
+    it-length-prefixed "^8.0.4"
+    it-map "^2.0.0"
+    it-pipe "^2.0.5"
+    it-pushable "^3.1.2"
+    mocha "^8.4.0"
+    p-event "^5.0.1"
+    uint8arrays "^4.0.3"
+    unique-names-generator "^4.7.1"
+    yargs "^17.0.1"
+
 "@cerc-io/prometheus-metrics@1.1.4":
   version "1.1.4"
   resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fprometheus-metrics/-/1.1.4/prometheus-metrics-1.1.4.tgz#51006b0b5bf6168394390c78072a1c0bb2b02f28"
@@ -418,23 +448,23 @@
     it-stream-types "^1.0.4"
     promjs "^0.4.2"
 
-"@cerc-io/rpc-eth-client@^0.2.82":
-  version "0.2.82"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.82/rpc-eth-client-0.2.82.tgz#44d58f22f8375adf4bf167a314691368cfa74b06"
-  integrity sha512-ndMkbOORQ6qs8zi+yIOU3btTXC1aVjzg+pCtNR62ieVZDJYTCXCD6kmZB4vx340PHnH2f5+51N9n/icY6CU0pQ==
+"@cerc-io/rpc-eth-client@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.90/rpc-eth-client-0.2.90.tgz#e1c814571822cc790163df9f533ea562ed5f1d23"
+  integrity sha512-+MJ2kNGnZnJvS2KPHGy2iu8UFj6tNHz1Clz3ZbICXiQHGQv9ROs0yvugt/HgFXFin3zIjpPyPJcdQ0VkskJlsA==
   dependencies:
-    "@cerc-io/cache" "^0.2.82"
-    "@cerc-io/ipld-eth-client" "^0.2.82"
-    "@cerc-io/util" "^0.2.82"
+    "@cerc-io/cache" "^0.2.90"
+    "@cerc-io/ipld-eth-client" "^0.2.90"
+    "@cerc-io/util" "^0.2.90"
     chai "^4.3.4"
     ethers "^5.4.4"
     left-pad "^1.3.0"
     mocha "^8.4.0"
 
-"@cerc-io/solidity-mapper@^0.2.82":
-  version "0.2.82"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.82/solidity-mapper-0.2.82.tgz#1ba9d41ac28c1963748d198bf400bae98e156342"
-  integrity sha512-braGSAB+iuIwwnpBWuSUtw0bhSEFMKKE6cYMr0O6Aj3NVLowmjrENKqCYDG6XwRpUKZheAgUUd8GJ5Dush412Q==
+"@cerc-io/solidity-mapper@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.90/solidity-mapper-0.2.90.tgz#6b0da45b2030ed818d25a1212cf7485b80142fa4"
+  integrity sha512-0Ydbjb/WwRmbEYzBDzIBM4I58YpRl2tsdjp4mrdI68rBVonzFOFxNryrCutqkB2mWOUkayznKiUmPESZA3Yj9A==
   dependencies:
     dotenv "^10.0.0"
 
@@ -443,15 +473,15 @@
   resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fts-channel/-/1.0.3-ts-nitro-0.1.1/ts-channel-1.0.3-ts-nitro-0.1.1.tgz#0768781313a167295c0bf21307f47e02dc17e936"
   integrity sha512-2jFICUSyffuZ+8+qRhXuLSJq4GJ6Y02wxiXoubH0Kzv2lIKkJtWICY1ZQQhtXAvP0ncAQB85WJHqtqwH8l7J3Q==
 
-"@cerc-io/util@^0.2.82":
-  version "0.2.82"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.82/util-0.2.82.tgz#aa0646bd4276ac5afa6789459eb78b88a4f170a5"
-  integrity sha512-rqcc5k7KEb261vxuNRD/+agYvp1CJjhWFohNGroxpQcP6be21PRh/Evm2wdqYq75GgN9suQooCdmsXsdXlMgXA==
+"@cerc-io/util@^0.2.90":
+  version "0.2.90"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.90/util-0.2.90.tgz#bd220c2ccf4cb118c078651078d59f3af92bd85c"
+  integrity sha512-LrbeZA0vLCxJTEj3bFQaCANwhF3VnBhmVipg34aw4An0pryqNc6OWOoz+aMK16wahrGLoMfNfd2iOUfmXalpAA==
   dependencies:
     "@apollo/utils.keyvaluecache" "^1.0.1"
     "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.82"
-    "@cerc-io/solidity-mapper" "^0.2.82"
+    "@cerc-io/peer" "^0.2.90"
+    "@cerc-io/solidity-mapper" "^0.2.90"
     "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
     "@ethersproject/properties" "^5.7.0"
     "@ethersproject/providers" "^5.4.4"