Merge pull request #248 from teller-protocol/subgraph/og-subgraph-liquidation-data

og subgraph liquidation data improvement

Author: ethereumdegen

packages/subgraph/README.md

@@ -70,7 +70,7 @@ graph codegen && graph build
 
 6. deploy ! 
 
- graph deploy   teller-v-2-base --version-label 0.4.21-22
+ graph deploy   teller-v-2-base --version-label 0.4.21-25
 
  graph deploy   tellerv2-arbitrum --version-label 0.4.21-22
 

packages/subgraph/config/base.json

@@ -1 +1 @@
-{"enabled":true,"name":"tellerv2-base","network":"base","export_network_name":"base","product":"studio","studio":{"owner":"0x1A2bAA2257343119FB03FD448622456a0c4f2190","network":"mainnet"},"grafting":{"enabled":false,"base":"QmRZxQwGcHmYoeXkPRwWLwkPLzXhhJHF9AyrHM9jhRPTm5","block":"11680298"},"block_handler":{"enabled":true,"block":"2935370"},"contracts":{"teller_v2":{"enabled":true,"address":"0x5cfD3aeD08a444Be32839bD911Ebecd688861164","block":"2935370"},"market_registry":{"enabled":true,"address":"0x2bD9697bF0AB44bE5cA698fB5787d8F13ca48Ffc","block":"2935397"},"lender_commitment":{"enabled":true,"address":"0x84B550EE6959FA3F3A44498836F2A9473734ba78","block":"2935403"},"lender_commitment_staging":{"enabled":true,"address":"0xf236d5Cc4d45eA0eF223Bfdf9583e655f51C12fB","block":"4442684"},"lender_commitment_alpha":{"enabled":true,"address":"0xfA87381128aAF95fB637BbA0B760bA2f9970c2b5","block":"11395281"},"collateral_manager":{"enabled":true,"address":"0x71B04a8569914bCb99D5F95644CF6b089c826024","block":"2935376"},"lender_manager":{"enabled":true,"address":"0x5594f9EE0DdF1e2D21ac8125dfeA66fc4c85Cd01","block":"2936927"},"market_liquidity_rewards":{"enabled":true,"address":"0x18A6BcAd5e52cbecc34b987697FC7bE15eDF9599","block":"2936948"}}}
+{"enabled":true,"name":"tellerv2-base","network":"base","export_network_name":"base","product":"studio","studio":{"owner":"0x1A2bAA2257343119FB03FD448622456a0c4f2190","network":"mainnet"},"grafting":{"enabled":false,"base":"QmRZxQwGcHmYoeXkPRwWLwkPLzXhhJHF9AyrHM9jhRPTm5","block":"11680298"},"block_handler":{"enabled":false,"block":"2935370"},"contracts":{"teller_v2":{"enabled":true,"address":"0x5cfD3aeD08a444Be32839bD911Ebecd688861164","block":"2935370"},"market_registry":{"enabled":true,"address":"0x2bD9697bF0AB44bE5cA698fB5787d8F13ca48Ffc","block":"2935397"},"lender_commitment":{"enabled":true,"address":"0x84B550EE6959FA3F3A44498836F2A9473734ba78","block":"2935403"},"lender_commitment_staging":{"enabled":true,"address":"0xf236d5Cc4d45eA0eF223Bfdf9583e655f51C12fB","block":"4442684"},"lender_commitment_alpha":{"enabled":true,"address":"0xfA87381128aAF95fB637BbA0B760bA2f9970c2b5","block":"11395281"},"collateral_manager":{"enabled":true,"address":"0x71B04a8569914bCb99D5F95644CF6b089c826024","block":"2935376"},"lender_manager":{"enabled":true,"address":"0x5594f9EE0DdF1e2D21ac8125dfeA66fc4c85Cd01","block":"2936927"},"market_liquidity_rewards":{"enabled":true,"address":"0x18A6BcAd5e52cbecc34b987697FC7bE15eDF9599","block":"2936948"}}}

packages/subgraph/package.json

@@ -3,7 +3,7 @@
   "license": "UNLICENSED",
   "version": "0.4.21-18",
   "scripts": {
-    "build": "graph build && graph codegen",
+    "build": "graph codegen && graph build && graph codegen",
     "deploy:prompt": "ts-node scripts/thegraph",
     "create-local": "graph create --node http://localhost:8020/ teller-v2",
     "remove-local": "graph remove --node http://localhost:8020/ teller-v2",

packages/subgraph/src/collateral-manager/mapping.ts

@@ -7,7 +7,7 @@ import {
   CollateralWithdrawn
 } from "../../generated/CollateralManager/CollateralManager";
 import { TellerV2 } from "../../generated/CollateralManager/TellerV2";
-import { Bid } from "../../generated/schema";
+import { Bid, CollateralDeposit, CollateralWithdrawal } from "../../generated/schema";
 import { updateCollateral } from "../collateral-manager/updaters";
 import { BidStatus, bidStatusToEnum, isBidDefaulted } from "../helpers/bid";
 import { loadBidById, loadCollateral } from "../helpers/loaders";
@@ -60,6 +60,18 @@ export function handleCollateralDeposited(event: CollateralDeposited): void {
   updateCollateral(collateral, event);
   collateral.status = "Deposited";
   collateral.save();
+
+  // Create CollateralDeposit entity
+  const depositId = event.transaction.hash.toHex() + "-" + event.logIndex.toString();
+  const deposit = new CollateralDeposit(depositId);
+  deposit.bid = event.params._bidId.toString();
+  deposit.collateralAddress = event.params._collateralAddress;
+  deposit.amount = event.params._amount;
+  deposit.tokenId = event.params._tokenId;
+  deposit.collateralType = collateralTypeToString(event.params._type);
+  deposit.timestamp = event.block.timestamp;
+  deposit.transactionHash = event.transaction.hash.toHex();
+  deposit.save();
 }
 
 export function handleCollateralDepositeds(
@@ -81,6 +93,19 @@ export function handleCollateralWithdrawn(event: CollateralWithdrawn): void {
   collateral.receiver = event.params._recipient;
   collateral.status = "Withdrawn";
   collateral.save();
+
+  // Create CollateralWithdrawal entity
+  const withdrawalId = event.transaction.hash.toHex() + "-" + event.logIndex.toString();
+  const withdrawal = new CollateralWithdrawal(withdrawalId);
+  withdrawal.bid = event.params._bidId.toString();
+  withdrawal.collateralAddress = event.params._collateralAddress;
+  withdrawal.amount = event.params._amount;
+  withdrawal.tokenId = event.params._tokenId;
+  withdrawal.collateralType = collateralTypeToString(event.params._type);
+  withdrawal.recipient = event.params._recipient;
+  withdrawal.timestamp = event.block.timestamp;
+  withdrawal.transactionHash = event.transaction.hash.toHex();
+  withdrawal.save();
 }
 
 /**
@@ -98,6 +123,17 @@ function collateralTypeToTokenType(type: i32): i32 {
   return i32.add(type, 1);
 }
 
+/**
+ * Converts the collateral type enum to a string representation.
+ * @param type
+ */
+function collateralTypeToString(type: i32): string {
+  if (type == 0) return "ERC20";
+  if (type == 1) return "ERC721";
+  if (type == 2) return "ERC1155";
+  return "UNKNOWN";
+}
+
 export function handleCollateralWithdrawns(
   events: CollateralWithdrawn[]
 ): void {
@@ -107,7 +143,7 @@ export function handleCollateralWithdrawns(
 }
 
 /**
- * Sets the bid status to `Liquidated` when the collateral is claimed from a defaulted loan.
+ * Sets the bid status to `Claimed` when the collateral is claimed from a defaulted loan.
  * @param event
  */
 export function handleCollateralClaimed(event: CollateralClaimed): void {
@@ -116,10 +152,10 @@ export function handleCollateralClaimed(event: CollateralClaimed): void {
   const collateralManager = CollateralManager.bind(event.address);
   const tellerV2 = TellerV2.bind(collateralManager.tellerV2());
 
-  // If the bid is not Repaid, then it means the lender has liquidated the loan
-  // without making a payment. In this case, we set the bid status to `Liquidated`.
+  // If the bid is not Repaid, then it means the lender has claimed collateral
+  // without making a payment. In this case, we set the bid status to `Claimed`.
   if (tellerV2.getBidState(bid.bidId) !== BidStatus.Repaid) {
-    updateBidStatus(bid, BidStatus.Liquidated);
+    updateBidStatus(bid, BidStatus.Claimed);
   }
 }
 

packages/subgraph/src/helpers/bid.ts

@@ -15,10 +15,11 @@ export enum BidStatus {
   Late,
   Defaulted,
 
-  Closed
+  Closed,
+  Claimed
 }
 
-export const BidStatusValues = new Array<string>(10);
+export const BidStatusValues = new Array<string>(12);
 BidStatusValues[BidStatus.None] = "";
 BidStatusValues[BidStatus.Submitted] = "Submitted";
 BidStatusValues[BidStatus.Cancelled] = "Cancelled";
@@ -31,6 +32,9 @@ BidStatusValues[BidStatus.DueSoon] = "Due Soon";
 BidStatusValues[BidStatus.Late] = "Late";
 BidStatusValues[BidStatus.Defaulted] = "Defaulted";
 
+BidStatusValues[BidStatus.Closed] = "Closed";
+BidStatusValues[BidStatus.Claimed] = "Claimed";
+
 export function bidStatusToEnum(status: string): BidStatus {
   return BidStatusValues.indexOf(status);
 }

packages/subgraph/src/helpers/loaders.ts

@@ -188,6 +188,12 @@ export function loadLoanStatusCount(
     loans.liquidated = [];
     loans.liquidatedCount = BigInt.zero();
 
+    loans.closed = [];
+    loans.closedCount = BigInt.zero();
+
+    loans.claimed = [];
+    loans.claimedCount = BigInt.zero();
+
     loans.save();
   }
 

packages/subgraph/src/helpers/updaters.ts

@@ -287,7 +287,7 @@ export function updateBidOnPayment(
 ): void {
   if (paymentEventType == PaymentEventType.Liquidated) {
     updateBidStatus(bid, BidStatus.Liquidated);
-  } else if (bidStatusToEnum(bid.status) != BidStatus.Liquidated) {
+  } else if (bidStatusToEnum(bid.status) != BidStatus.Liquidated && bidStatusToEnum(bid.status) != BidStatus.Claimed) {
     if (paymentEventType == PaymentEventType.Repayment) {
       updateBidStatus(bid, BidStatus.Accepted);
     } else if (paymentEventType == PaymentEventType.Repaid) {

packages/subgraph/src/mapping.ts

@@ -1,7 +1,7 @@
 import { Address, BigInt } from "@graphprotocol/graph-ts";
 
 import { Transfer } from "../generated/LenderManager/LenderManager";
-import { Bid, FundedTx, Lender } from "../generated/schema";
+import { Bid, FundedTx, Lender, Liquidation } from "../generated/schema";
 import {
   AcceptedBid,
   CancelledBid,
@@ -226,6 +226,15 @@ export function handleLoanLiquidated(event: LoanLiquidated): void {
   bid.save();
 
   updateBidOnPayment(bid, event, PaymentEventType.Liquidated);
+
+  // Create Liquidation entity
+  const liquidationId = event.transaction.hash.toHex() + "-" + event.logIndex.toString();
+  const liquidation = new Liquidation(liquidationId);
+  liquidation.bid = event.params.bidId.toString();
+  liquidation.liquidator = event.params.liquidator;
+  liquidation.timestamp = event.block.timestamp;
+  liquidation.transactionHash = event.transaction.hash.toHex();
+  liquidation.save();
 }
 
 export function handleLoanLiquidateds(events: LoanLiquidated[]): void {

packages/subgraph/src/schema.graphql

@@ -92,6 +92,9 @@ type Bid @entity(immutable: false) {
   commitmentId: String
 
   payments: [Payment!]! @derivedFrom(field: "bid")
+  collateralDeposits: [CollateralDeposit!]! @derivedFrom(field: "bid")
+  collateralWithdrawals: [CollateralWithdrawal!]! @derivedFrom(field: "bid")
+  liquidations: [Liquidation!]! @derivedFrom(field: "bid")
   totalRepaidPrincipal: BigInt!
   totalRepaidInterest: BigInt!
   _lastTotalRepaidAmount: BigInt!
@@ -139,6 +142,37 @@ type Payment @entity(immutable: false) {
   status: String!
 }
 
+type CollateralDeposit @entity(immutable: false) {
+  id: ID!
+  bid: Bid!
+  collateralAddress: Bytes!
+  amount: BigInt!
+  tokenId: BigInt!
+  collateralType: String!
+  timestamp: BigInt!
+  transactionHash: String!
+}
+
+type CollateralWithdrawal @entity(immutable: false) {
+  id: ID!
+  bid: Bid!
+  collateralAddress: Bytes!
+  amount: BigInt!
+  tokenId: BigInt!
+  collateralType: String!
+  recipient: Bytes!
+  timestamp: BigInt!
+  transactionHash: String!
+}
+
+type Liquidation @entity(immutable: false) {
+  id: ID!
+  bid: Bid!
+  liquidator: Bytes!
+  timestamp: BigInt!
+  transactionHash: String!
+}
+
 type User @entity(immutable: false) {
   id: ID!
   firstInteractionDate: BigInt!
@@ -227,6 +261,12 @@ interface ILoanStatusCount {
 
   liquidated: [Bid!]!
   liquidatedCount: BigInt!
+
+  closed: [Bid!]!
+  closedCount: BigInt!
+
+  claimed: [Bid!]!
+  claimedCount: BigInt!
 }
 
 type LoanStatusCount implements ILoanStatusCount @entity(immutable: false) {
@@ -262,6 +302,12 @@ type LoanStatusCount implements ILoanStatusCount @entity(immutable: false) {
   liquidated: [Bid!]!
   liquidatedCount: BigInt!
 
+  closed: [Bid!]!
+  closedCount: BigInt!
+
+  claimed: [Bid!]!
+  claimedCount: BigInt!
+
   ## Entity Relationships ##
   _protocol: Protocol
   _market: MarketPlace

packages/subgraph/src/subgraph.handlebars

@@ -9,8 +9,6 @@
           file: ../contracts/generated/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.json
 {{/inline}}
 specVersion: 1.2.0
-indexerHints:
-  prune: never
 schema:
   file: ./src/schema.graphql
 {{#if grafting.enabled}}