fix: prevent ownership update when the to address is diamond

Author: BromeRST

schema.graphql

@@ -652,10 +652,3 @@ type ItemTypeOwnership @entity {
   balance: BigInt!
   lastUpdated: BigInt!
 }
-
-type PendingEquip @entity {
-  id: ID! # `${txHash}-${logIdx}`  (or just txHash if one equip/tx)
-  sender: Bytes! # original wallet
-  itemId: BigInt!
-  amount: BigInt!
-}

src/mappings/diamond.ts

@@ -117,11 +117,7 @@ import {
 } from "../utils/constants";
 import { Address, BigInt, log, Bytes, store } from "@graphprotocol/graph-ts";
 
-import {
-  /*Parcel,*/ Parcel,
-  PendingEquip,
-  TokenCommitment,
-} from "../../generated/schema";
+import { /*Parcel,*/ Parcel, TokenCommitment } from "../../generated/schema";
 // import {
 //   RealmDiamond,
 //   MintParcel,
@@ -137,7 +133,7 @@ import {
   RealmDiamond,
   ResyncParcel,
 } from "../../generated/AavegotchiDiamond/RealmDiamond";
-import { updateOwnership } from "./helpers";
+import { AAVEGOTCHI_ADDRESS, updateOwnership } from "./helpers";
 
 export function handleBuyPortals(event: BuyPortals): void {
   let contract = AavegotchiDiamond.bind(event.address);
@@ -1995,7 +1991,9 @@ export function handleTransferSingle(e: TransferSingle): void {
   const from = e.params._from;
   const to = e.params._to;
 
-  // 1) Normal balance book-keeping
+  // prevent updating balances when equipping/unequipping and delegating?
+  if (to.equals(AAVEGOTCHI_ADDRESS)) return;
+
   if (from.notEqual(Address.zero()))
     updateOwnership(
       e.params._id.toString(),
@@ -2011,17 +2009,6 @@ export function handleTransferSingle(e: TransferSingle): void {
       e.params._value,
       e.block.timestamp
     );
-
-  // 2) If it went _into_ the diamond it MIGHT be an equip leg,
-  //    so remember who sent it.
-  if (to.equals(e.address)) {
-    const key = `${e.transaction.hash.toHex()}-${e.logIndex.toString()}`;
-    let p = new PendingEquip(key);
-    p.sender = from; // wallet that paid the item
-    p.itemId = e.params._id;
-    p.amount = e.params._value;
-    p.save();
-  }
 }
 
 export function handleTransferBatch(event: TransferBatch): void {
@@ -2044,36 +2031,3 @@ export function handleTransferBatch(event: TransferBatch): void {
     }
   }
 }
-
-export function handleTransferToParent(e: TransferToParent): void {
-  const itemId = e.params._tokenTypeId.toString(); // 👈 field names from ABI
-  const amt = e.params._value;
-  const ts = e.block.timestamp;
-  const pendId = `${e.transaction.hash.toHex()}-${(
-    e.logIndex.toI32() - 1
-  ).toString()}`;
-
-  let p = PendingEquip.load(pendId);
-
-  if (p) {
-    // 1) undo diamond’s +amt
-    updateOwnership(itemId, e.params._toContract, amt.neg(), ts);
-
-    // 2) give item back to original wallet
-    updateOwnership(itemId, Address.fromBytes(p.sender), amt, ts);
-
-    store.remove("PendingEquip", pendId);
-  } else {
-    // diamond really owned it already
-    updateOwnership(itemId, e.params._toContract, amt.neg(), ts);
-  }
-}
-
-export function handleTransferFromParent(e: TransferFromParent): void {
-  const itemId = e.params._tokenTypeId.toString();
-  const amt = e.params._value;
-  const ts = e.block.timestamp;
-
-  // 1) diamond temporarily regains it
-  updateOwnership(itemId, e.params._fromContract, amt, ts);
-}

src/mappings/helpers.ts

@@ -2,7 +2,7 @@ import { BigInt, Address, ethereum, store } from "@graphprotocol/graph-ts";
 import { ItemTypeOwnership } from "../../generated/schema";
 
 const MIGRATION_BLOCK = BigInt.fromI32(35999793);
-const AAVEGOTCHI_ADDRESS = Address.fromString(
+export const AAVEGOTCHI_ADDRESS = Address.fromString(
   "0x86935F11C86623deC8a25696E1C19a8659CbF95d"
 );
 

src/mappings/itemTransfers.ts

@@ -1,17 +1,18 @@
 import { Address } from "@graphprotocol/graph-ts";
 
-import { updateOwnership } from "./helpers";
+import { AAVEGOTCHI_ADDRESS, updateOwnership } from "./helpers";
 import {
   TransferBatch,
   TransferSingle,
 } from "../../generated/AavegotchiDiamond/AavegotchiDiamond";
-import { PendingEquip } from "../../generated/schema";
 
 export function handleTransferSingle(e: TransferSingle): void {
   const from = e.params._from;
   const to = e.params._to;
 
-  // 1) Normal balance book-keeping
+  // prevent updating balances when equipping/unequipping and delegating?
+  if (to.equals(AAVEGOTCHI_ADDRESS)) return;
+
   if (from.notEqual(Address.zero()))
     updateOwnership(
       e.params._id.toString(),
@@ -27,17 +28,6 @@ export function handleTransferSingle(e: TransferSingle): void {
       e.params._value,
       e.block.timestamp
     );
-
-  // 2) If it went _into_ the diamond it MIGHT be an equip leg,
-  //    so remember who sent it.
-  if (to.equals(e.address)) {
-    const key = `${e.transaction.hash.toHex()}-${e.logIndex.toString()}`;
-    let p = new PendingEquip(key);
-    p.sender = from; // wallet that paid the item
-    p.itemId = e.params._id;
-    p.amount = e.params._value;
-    p.save();
-  }
 }
 
 export function handleTransferBatch(event: TransferBatch): void {

subgraph.template.yaml

@@ -177,10 +177,6 @@ dataSources:
           handler: handleWearablesConfigCreated
         - event: WearablesConfigUpdated(indexed address,indexed uint256,indexed uint16,uint16[16])
           handler: handleWearablesConfigUpdated
-        - event: TransferToParent(indexed address,indexed uint256,indexed uint256,uint256)
-          handler: handleTransferToParent
-        - event: TransferFromParent(indexed address,indexed uint256,indexed uint256,uint256)
-          handler: handleTransferFromParent
 
   - kind: ethereum/contract
     name: RealmDiamond

subgraph.yaml

@@ -177,10 +177,6 @@ dataSources:
           handler: handleWearablesConfigCreated
         - event: WearablesConfigUpdated(indexed address,indexed uint256,indexed uint16,uint16[16])
           handler: handleWearablesConfigUpdated
-        - event: TransferToParent(indexed address,indexed uint256,indexed uint256,uint256)
-          handler: handleTransferToParent
-        - event: TransferFromParent(indexed address,indexed uint256,indexed uint256,uint256)
-          handler: handleTransferFromParent
 
   - kind: ethereum/contract
     name: RealmDiamond