Rollback changes in veDelegation and veUtils. Added more prints for debug in tests.

src/mappings/utils/veUtils.ts

@@ -1,10 +1,4 @@
-import {
-  BigDecimal,
-  ethereum,
-  BigInt,
-  Address,
-  log
-} from '@graphprotocol/graph-ts'
+import { BigDecimal, ethereum, BigInt, Address } from '@graphprotocol/graph-ts'
 import {
   VeAllocateUser,
   VeAllocateId,
@@ -162,38 +156,23 @@ export function createDefaultVeDelegation(id: string): VeDelegation {
   return veDelegation
 }
 
-export function getDeposit(
-  provider: string,
-  transactionHash: string,
-  eventIndex: number
-): VeDeposit | null {
-  for (let i = eventIndex; i >= 0; i--) {
-    const id = `${provider}-${transactionHash}-${i}`
-    log.info('deposit id: {}', [id])
-    const deposit = VeDeposit.load(id)
-    if (deposit && deposit.provider == provider) {
-      log.info('deposit provider: {}', [deposit.provider])
-      return deposit
-    }
+export function getDeposit(id: string): VeDeposit {
+  let deposit = VeDeposit.load(id)
+  if (deposit === null) {
+    deposit = new VeDeposit(id)
+    deposit.provider = ''
+    deposit.sender = ''
+    deposit.value = BigDecimal.zero()
+    deposit.unlockTime = BigInt.zero()
+    deposit.type = BigInt.zero()
+    deposit.timestamp = BigInt.zero()
+    deposit.tx = ''
+    deposit.eventIndex = 0
+    deposit.block = 0
+    // do not save it
+    // deposit.save()
   }
-  // let deposit = VeDeposit.load(id)
-
-  // if (deposit === null) {
-  //   deposit = new VeDeposit(id)
-  //   deposit.provider = ''
-  //   deposit.sender = ''
-  //   deposit.value = BigDecimal.zero()
-  //   deposit.unlockTime = BigInt.zero()
-  //   deposit.type = BigInt.zero()
-  //   deposit.timestamp = BigInt.zero()
-  //   deposit.tx = ''
-  //   deposit.eventIndex = 0
-  //   deposit.block = 0
-  //   // do not save it
-  //   // deposit.save()
-  // }
-  // return deposit
-  return null
+  return deposit
 }
 
 export function handleOneAllocation(

src/mappings/veDelegation.ts

@@ -79,13 +79,12 @@ export function handleBurnBoost(event: BurnBoost): void {
   // delete
   const eventIndex: number = event.logIndex.toI32()
   const tx = event.transaction.hash.toHex()
-  const veDelegation = getveDelegation(tx, _tokenId.toHex(), eventIndex)
-  if (!veDelegation) return
-  // {
-  //   veDelegation = createDefaultVeDelegation(
-  //     `${tx}-${_tokenId.toHex()}-${eventIndex}`
-  //   )
-  // }
+  let veDelegation = getveDelegation(tx, _tokenId.toHex(), eventIndex)
+  if (!veDelegation) {
+    veDelegation = createDefaultVeDelegation(
+      `${tx}-${_tokenId.toHex()}-${eventIndex}`
+    )
+  }
   veDelegation.amount = BigInt.zero()
   veDelegation.eventIndex = event.logIndex.toI32()
   veDelegation.save()

src/mappings/veOCEAN.ts

@@ -6,7 +6,6 @@ import {
   getTotalOceanLocked,
   updateTotalOceanLocked
 } from './utils/globalUtils'
-import { VeDeposit } from '../@types/schema'
 
 export function handleDeposit(event: Deposit): void {
   const provider = event.params.provider
@@ -17,32 +16,27 @@ export function handleDeposit(event: Deposit): void {
   const totalOceanLocked = getTotalOceanLocked()
   const veOCEAN = getveOCEAN(provider.toHex())
   // Create new Deposit entity
-  const eventIndex: number = event.logIndex.toI32()
-  let deposit = getDeposit(
-    provider.toHex(),
-    event.transaction.hash.toHex(),
-    eventIndex
+  const deposit = getDeposit(
+    provider.toHex() +
+      '-' +
+      event.transaction.hash.toHex() +
+      '-' +
+      event.logIndex.toString()
   )
-  if (!deposit) {
-    deposit = new VeDeposit(
-      `${provider.toHex()}-${event.transaction.hash.toHex()}-${eventIndex}`
-    )
-    deposit.provider = provider.toHex()
-    deposit.value = weiToDecimal(value.toBigDecimal(), 18)
-    deposit.unlockTime = locktime
-    deposit.type = type
-    deposit.timestamp = ts
-    deposit.block = event.block.number.toI32()
-    deposit.tx = event.transaction.hash.toHex()
-    deposit.eventIndex = event.logIndex.toI32()
-    deposit.sender = event.transaction.from.toHex()
-    deposit.veOcean = veOCEAN.id
+  deposit.provider = provider.toHex()
+  deposit.value = weiToDecimal(value.toBigDecimal(), 18)
+  deposit.unlockTime = locktime
+  deposit.type = type
+  deposit.timestamp = ts
+  deposit.block = event.block.number.toI32()
+  deposit.tx = event.transaction.hash.toHex()
+  deposit.sender = event.transaction.from.toHex()
+  deposit.veOcean = veOCEAN.id
 
-    deposit.totalOceanLocked = totalOceanLocked.plus(deposit.value)
-    updateTotalOceanLocked(deposit.totalOceanLocked)
+  deposit.totalOceanLocked = totalOceanLocked.plus(deposit.value)
+  updateTotalOceanLocked(deposit.totalOceanLocked)
 
-    deposit.save()
-  }
+  deposit.save()
   // --------------------------------------------
 
   const lockedAmount = weiToDecimal(value.toBigDecimal(), 18)
@@ -60,11 +54,12 @@ export function handleWithdraw(event: Withdraw): void {
 
   const veOCEAN = getveOCEAN(provider.toHex())
   // Create new Deposit entity
-  const eventIndex: number = event.logIndex.toI32()
   const deposit = getDeposit(
-    provider.toHex(),
-    event.transaction.hash.toHex(),
-    eventIndex
+    provider.toHex() +
+      '-' +
+      event.transaction.hash.toHex() +
+      '-' +
+      event.logIndex.toString()
   )
   if (!deposit) return
   deposit.provider = provider.toHex()

test/integration/VeOcean.test.ts

@@ -593,6 +593,8 @@ describe('veOcean tests', async () => {
     await veOcean.withdraw(Alice)
     await sleep(2000)
     const totalOceanLockedAfter = await getTotalLockedOcean()
+    console.log('totalOceanLockedBefore: ', totalOceanLockedBefore)
+    console.log('totalOceanLockedAfter: ', totalOceanLockedAfter)
     assert(
       parseFloat(totalOceanLockedAfter) < parseFloat(totalOceanLockedBefore),
       'After (' +
@@ -653,7 +655,6 @@ describe('veOcean tests', async () => {
     assert(info[0].id === Alice.toLowerCase(), 'ID is incorrect')
     console.log('lockAmmount: ', info[0].lockedAmount)
     console.log('currentBalance: ', currentBalance)
-    console.log('currentLock: ', currentLock)
     assert(info[0].lockedAmount === currentBalance, 'LockedAmount is incorrect')
     assert(info[0].unlockTime === currentLock, 'Unlock time is not correct')
 

test/integration/ZEnding.test.ts

@@ -40,8 +40,6 @@ describe('Ending tests', () => {
     assert(result.data._meta.hasIndexingErrors == false)
   })
   it('Make sure that graph has synced to last block', async () => {
-    console.log('meta.block: ', result.data._meta.block.number)
-    console.log('lastblock: ', lastblock)
     assert(result.data._meta.block.number >= lastblock)
   })
 })