oceanprotocol
/
ocean-subgraph
mirror of https://github.com/oceanprotocol/ocean-subgraph.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Print values from failing tests. Updated mappings.

This commit is contained in:
Maria Carmina 2023-04-26 15:27:21 +03:00
parent a187d2b577
commit be10f0571a
6 changed files with 83 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/mappings/utils/veUtils.ts
View File

@ -1,4 +1,10 @@
import { BigDecimal, ethereum, BigInt, Address } from '@graphprotocol/graph-ts'
import {
BigDecimal,
ethereum,
BigInt,
Address,
log
} from '@graphprotocol/graph-ts'
import {
VeAllocateUser,
VeAllocateId,
@ -156,24 +162,38 @@ export function createDefaultVeDelegation(id: string): VeDelegation {
return veDelegation
}
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()
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
}
}
return deposit
// 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
}
export function handleOneAllocation(

21
src/mappings/veDelegation.ts
View File

@ -49,12 +49,8 @@ export function handleExtendBoost(event: ExtendBoost): void {
const _expireTime = event.params._expire_time
const eventIndex: number = event.logIndex.toI32()
const tx = event.transaction.hash.toHex()
let veDelegation = getveDelegation(tx, _tokenId.toHex(), eventIndex)
if (!veDelegation) {
veDelegation = createDefaultVeDelegation(
`${tx}-${_tokenId.toHex()}-${eventIndex}`
)
}
const veDelegation = getveDelegation(tx, _tokenId.toHex(), eventIndex)
if (!veDelegation) return
veDelegation.delegator = _delegator
veDelegation.receiver = _receiver
@ -83,12 +79,13 @@ export function handleBurnBoost(event: BurnBoost): void {
// delete
const eventIndex: number = event.logIndex.toI32()
const tx = event.transaction.hash.toHex()
let veDelegation = getveDelegation(tx, _tokenId.toHex(), eventIndex)
if (!veDelegation) {
veDelegation = createDefaultVeDelegation(
`${tx}-${_tokenId.toHex()}-${eventIndex}`
)
}
const veDelegation = getveDelegation(tx, _tokenId.toHex(), eventIndex)
if (!veDelegation) return
// {
// veDelegation = createDefaultVeDelegation(
// `${tx}-${_tokenId.toHex()}-${eventIndex}`
// )
// }
veDelegation.amount = BigInt.zero()
veDelegation.eventIndex = event.logIndex.toI32()
veDelegation.save()

1
src/mappings/veFeeDistributor.ts
View File

@ -27,6 +27,7 @@ export function handleClaimed(event: Claimed): void {
claim.block = event.block.number.toI32()
claim.tx = event.transaction.hash.toHex()
claim.eventIndex = event.logIndex.toI32()
claim.timestamp = event.block.timestamp
claim.save()
}

53
src/mappings/veOCEAN.ts
View File

@ -6,6 +6,7 @@ import {
getTotalOceanLocked,
updateTotalOceanLocked
} from './utils/globalUtils'
import { VeDeposit } from '../@types/schema'
export function handleDeposit(event: Deposit): void {
const provider = event.params.provider
@ -16,28 +17,32 @@ export function handleDeposit(event: Deposit): void {
const totalOceanLocked = getTotalOceanLocked()
const veOCEAN = getveOCEAN(provider.toHex())
// Create new Deposit entity
const deposit = getDeposit(
provider.toHex() +
'-' +
event.transaction.hash.toHex() +
'-' +
event.logIndex.toString()
const eventIndex: number = event.logIndex.toI32()
let deposit = getDeposit(
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
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.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)
@ -55,13 +60,13 @@ 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() +
'-' +
event.logIndex.toString()
provider.toHex(),
event.transaction.hash.toHex(),
eventIndex
)
if (!deposit) return
deposit.provider = provider.toHex()
deposit.value = weiToDecimal(value.toBigDecimal(), 18).neg()
deposit.unlockTime = BigInt.zero()

3
test/integration/VeOcean.test.ts
View File

@ -651,6 +651,9 @@ describe('veOcean tests', async () => {
await sleep(2000)
const info = (await initialResponse.json()).data.veOCEANs
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')

4
test/integration/ZEnding.test.ts
View File

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