add latest rc9 updates; fix tests

ajna-finance · Dec 19, 2023 · fbfe005 · fbfe005
1 parent 646da38
commit fbfe005
Show file tree

Hide file tree

Showing 11 changed files with 102 additions and 103 deletions.
diff --git a/abis/ERC20Pool.json b/abis/ERC20Pool.json
@@ -141,7 +141,7 @@
         "internalType": "uint256"
       },
       {
-        "name": "thresholdPrice_",
+        "name": "debtToCollateral_",
         "type": "uint256",
         "internalType": "uint256"
       },
@@ -1103,6 +1103,11 @@
         "type": "uint256",
         "internalType": "uint256"
       },
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
       {
         "name": "",
         "type": "uint256",
@@ -2126,17 +2131,17 @@
   },
   {
     "type": "error",
-    "name": "AllowanceAlreadySet",
+    "name": "AlreadyInitialized",
     "inputs": []
   },
   {
     "type": "error",
-    "name": "AlreadyInitialized",
+    "name": "AmountLTMinDebt",
     "inputs": []
   },
   {
     "type": "error",
-    "name": "AmountLTMinDebt",
+    "name": "AuctionActive",
     "inputs": []
   },
   {
@@ -2254,11 +2259,6 @@
     "name": "LUPBelowHTP",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "LUPGreaterThanTP",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "LimitIndexExceeded",
@@ -2424,11 +2424,6 @@
       }
     ]
   },
-  {
-    "type": "error",
-    "name": "PoolUnderCollateralized",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "PriceBelowLUP",
@@ -2471,7 +2466,7 @@
   },
   {
     "type": "error",
-    "name": "ZeroThresholdPrice",
+    "name": "ZeroDebtToCollateral",
     "inputs": []
   }
 ]
diff --git a/abis/ERC20PoolFactory.json b/abis/ERC20PoolFactory.json
@@ -187,6 +187,12 @@
         "type": "address",
         "indexed": false,
         "internalType": "address"
+      },
+      {
+        "name": "subsetHash_",
+        "type": "bytes32",
+        "indexed": false,
+        "internalType": "bytes32"
       }
     ],
     "anonymous": false

diff --git a/abis/ERC721Pool.json b/abis/ERC721Pool.json
@@ -141,7 +141,7 @@
         "internalType": "uint256"
       },
       {
-        "name": "thresholdPrice_",
+        "name": "debtToCollateral_",
         "type": "uint256",
         "internalType": "uint256"
       },
@@ -619,6 +619,38 @@
     ],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "getBorrowerTokenIds",
+    "inputs": [
+      {
+        "name": "borrower_",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256[]",
+        "internalType": "uint256[]"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "getBucketTokenIds",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256[]",
+        "internalType": "uint256[]"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "increaseLPAllowance",
@@ -1166,6 +1198,11 @@
         "type": "uint256",
         "internalType": "uint256"
       },
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
       {
         "name": "",
         "type": "uint256",
@@ -1326,38 +1363,6 @@
     ],
     "stateMutability": "view"
   },
-  {
-    "type": "function",
-    "name": "totalBorrowerTokens",
-    "inputs": [
-      {
-        "name": "borrower_",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "totalBucketTokens",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "totalT0Debt",
@@ -2265,17 +2270,17 @@
   },
   {
     "type": "error",
-    "name": "AllowanceAlreadySet",
+    "name": "AlreadyInitialized",
     "inputs": []
   },
   {
     "type": "error",
-    "name": "AlreadyInitialized",
+    "name": "AmountLTMinDebt",
     "inputs": []
   },
   {
     "type": "error",
-    "name": "AmountLTMinDebt",
+    "name": "AuctionActive",
     "inputs": []
   },
   {
@@ -2393,11 +2398,6 @@
     "name": "LUPBelowHTP",
     "inputs": []
   },
-  {
-    "type": "error",
-    "name": "LUPGreaterThanTP",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "LimitIndexExceeded",
@@ -2514,11 +2514,6 @@
       }
     ]
   },
-  {
-    "type": "error",
-    "name": "PoolUnderCollateralized",
-    "inputs": []
-  },
   {
     "type": "error",
     "name": "PriceBelowLUP",
@@ -2561,7 +2556,7 @@
   },
   {
     "type": "error",
-    "name": "ZeroThresholdPrice",
+    "name": "ZeroDebtToCollateral",
     "inputs": []
   }
 ]
diff --git a/abis/ERC721PoolFactory.json b/abis/ERC721PoolFactory.json
@@ -240,6 +240,12 @@
         "type": "address",
         "indexed": false,
         "internalType": "address"
+      },
+      {
+        "name": "subsetHash_",
+        "type": "bytes32",
+        "indexed": false,
+        "internalType": "bytes32"
       }
     ],
     "anonymous": false

diff --git a/abis/PoolInfoUtils.json b/abis/PoolInfoUtils.json
@@ -46,7 +46,7 @@
         "internalType": "uint256"
       },
       {
-        "name": "thresholdPrice_",
+        "name": "debtToCollateral_",
         "type": "uint256",
         "internalType": "uint256"
       },
@@ -120,7 +120,7 @@
         "internalType": "uint256"
       },
       {
-        "name": "thresholdPrice_",
+        "name": "debtToCollateral_",
         "type": "uint256",
         "internalType": "uint256"
       },
@@ -200,6 +200,11 @@
         "name": "t0Np_",
         "type": "uint256",
         "internalType": "uint256"
+      },
+      {
+        "name": "thresholdPrice_",
+        "type": "uint256",
+        "internalType": "uint256"
       }
     ],
     "stateMutability": "view"

diff --git a/schema.graphql b/schema.graphql
@@ -193,12 +193,14 @@ type Loan @entity {
   liquidationAuction: LiquidationAuction
   # collateral tokens deposited in a pool by the borrower
   collateralPledged: BigDecimal!
-  # borrower's threshold price in t0 terms
-  t0ThresholdPrice: BigDecimal!
+  # borrower's threshold price
+  thresholdPrice: BigDecimal!
   # list of tokenIds pledged by the borrower
   tokenIdsPledged: [BigInt!]!
   # debt in T0 terms, useful when the caller knows the pending inflator
   t0debt: BigDecimal!
+  # borrowers t0 neutral price
+  t0Np: BigDecimal!
 }
 
 type Account @entity {

diff --git a/src/mappings/erc-20-pool.ts b/src/mappings/erc-20-pool.ts
@@ -98,7 +98,7 @@ export function handleDrawDebt(event: DrawDebtEvent): void {
     loan.collateralPledged = wadToDecimal(borrowerInfo.collateral)
     loan.t0debt            = wadToDecimal(borrowerInfo.t0debt)
     loan.t0Np              = wadToDecimal(borrowerInfo.t0Np)
-    loan.t0ThresholdPrice  = wadToDecimal(borrowerInfo.t0ThresholdPrice)
+    loan.thresholdPrice    = wadToDecimal(borrowerInfo.thresholdPrice)
 
     // update account's list of pools and loans if necessary
     updateAccountPools(account, pool)
@@ -152,7 +152,7 @@ export function handleRepayDebt(event: RepayDebtEvent): void {
     loan.collateralPledged = wadToDecimal(borrowerInfo.collateral)
     loan.t0debt            = wadToDecimal(borrowerInfo.t0debt)
     loan.t0Np              = wadToDecimal(borrowerInfo.t0Np)
-    loan.t0ThresholdPrice  = wadToDecimal(borrowerInfo.t0ThresholdPrice)
+    loan.thresholdPrice    = wadToDecimal(borrowerInfo.thresholdPrice)
 
     // update account loans if necessary
     updateAccountLoans(account, loan)
@@ -442,7 +442,7 @@ export function handleBucketTake(event: BucketTakeEvent): void {
   loan.collateralPledged = wadToDecimal(borrowerInfo.collateral)
   loan.t0debt            = wadToDecimal(borrowerInfo.t0debt)
   loan.t0Np              = wadToDecimal(borrowerInfo.t0Np)
-  loan.t0ThresholdPrice  = wadToDecimal(borrowerInfo.t0ThresholdPrice)
+  loan.thresholdPrice    = wadToDecimal(borrowerInfo.thresholdPrice)
 
   // retrieve auction information on the take's auction
   const auctionInfo   = getAuctionInfoERC20Pool(bucketTake.borrower, pool)
@@ -557,7 +557,7 @@ export function handleTake(event: TakeEvent): void {
   loan.collateralPledged = wadToDecimal(borrowerInfo.collateral)
   loan.t0debt            = wadToDecimal(borrowerInfo.t0debt)
   loan.t0Np              = wadToDecimal(borrowerInfo.t0Np)
-  loan.t0ThresholdPrice  = wadToDecimal(borrowerInfo.t0ThresholdPrice)
+  loan.thresholdPrice    = wadToDecimal(borrowerInfo.thresholdPrice)
 
   // update liquidation auction state
   const auctionId = loan.liquidationAuction!