Fixed some issues found during deployment

src/mappings/position-manager.ts

@@ -103,8 +103,7 @@ export function handleMemorializePosition(
   const position = loadOrCreatePosition(memorialize.tokenId)
 
   // get lend entities for each index with extant lpb
-  const addressNotBytes = getPoolForToken(memorialize.tokenId)
-  const poolAddress = addressToBytes(addressNotBytes)
+  const poolAddress = memorialize.pool
   const accountId = memorialize.lender
 
   log.info("handleMemorializePosition for lender {} token {}" , [accountId.toHexString(), memorialize.tokenId.toString()])
@@ -115,7 +114,6 @@ export function handleMemorializePosition(
     const bucket = Bucket.load(bucketId)!
 
     // create PositionLend entity to track each lpb associated with the position
-    const positionLendId = getPositionLendId(memorialize.tokenId, BigInt.fromI32(index))
     const positionLend = loadOrCreatePositionLend(memorialize.tokenId, bucketId, index)
     const positionInfo = getPositionInfo(memorialize.tokenId, BigInt.fromI32(index))
     //track the lpb and depositTime associated with each lend that was memorialized via RPC call
@@ -240,14 +238,15 @@ export function handleRedeemPosition(event: RedeemPositionEvent): void {
   redeem.transactionHash = event.transaction.hash
 
   const position = loadOrCreatePosition(redeem.tokenId)
-  const poolAddress = addressToBytes(getPoolForToken(redeem.tokenId))
+  const poolAddress = redeem.pool
   const accountId = redeem.lender
 
   log.info("handleRedeemPosition for lender {} token {}" , [accountId.toHexString(), redeem.tokenId.toString()])
 
   // update positionLend entities for each index
   const positionIndexes = position.indexes;
-  for (let index = 0; index < redeem.indexes.length; index++) {
+  for (let i = 0; i < redeem.indexes.length; i++) {
+    const index = redeem.indexes[i];
     const bucketId = getBucketId(poolAddress, index)
     const positionLend = loadOrCreatePositionLend(redeem.tokenId, bucketId, index)
     positionLend.lpb = ZERO_BD

src/utils/position.ts

@@ -1,4 +1,4 @@
-import { Address, BigInt, Bytes, dataSource, store } from "@graphprotocol/graph-ts"
+import { Address, BigInt, Bytes, dataSource, log, store } from "@graphprotocol/graph-ts"
 
 import { Bucket, Position, PositionLend, Token } from "../../generated/schema"
 import { ONE_BI, ZERO_BD, ZERO_BI, positionManagerAddressTable } from "../utils/constants"
@@ -98,6 +98,7 @@ export function saveOrRemovePositionLend(positionLend: PositionLend): void {
       bucketPositionLends.splice(existingBucketIndex, 1)
     }
     bucket.positionLends = bucketPositionLends
+    bucket.save()
 
     // remove positionLend from account array
     const position = Position.load(bigIntToBytes(positionLend.tokenId))!

subgraph.yaml

@@ -256,6 +256,8 @@ templates:
       abis:
         - name: ERC20
           file: ./abis/ERC20.json
+        - name: ERC721
+          file: ./abis/ERC721.json
         - name: ERC20Pool
           file: ./abis/ERC20Pool.json
         - name: PoolInfoUtils