fix typescript

This commit is contained in:
Matthias Kretschmann 2020-12-10 16:28:01 +01:00
parent 0a68cb4b49
commit 523953a226
Signed by: m
GPG Key ID: 606EEEF3C479A91F
2 changed files with 74 additions and 92 deletions

View File

@ -6,7 +6,6 @@ import {
LOG_SWAP,
Transfer
} from '../types/templates/Pool/Pool'
import { log } from '@graphprotocol/graph-ts'
import {
PoolFactory,
@ -39,8 +38,8 @@ export function handleSetSwapFee(
event: LOG_CALL,
swapFeeStr: string = null
): void {
let poolId = event.address.toHex()
let pool = Pool.load(poolId)
const poolId = event.address.toHex()
const pool = Pool.load(poolId)
if (!swapFeeStr) {
swapFeeStr = event.params.data.toHexString().slice(-40)
}
@ -49,8 +48,8 @@ export function handleSetSwapFee(
}
export function handleSetController(event: LOG_CALL): void {
let poolId = event.address.toHex()
let pool = Pool.load(poolId)
const poolId = event.address.toHex()
const pool = Pool.load(poolId)
pool.controller = Address.fromString(
event.params.data.toHexString().slice(-40)
)
@ -58,29 +57,29 @@ export function handleSetController(event: LOG_CALL): void {
}
export function handleSetPublicSwap(event: LOG_CALL): void {
let poolId = event.address.toHex()
let pool = Pool.load(poolId)
const poolId = event.address.toHex()
const pool = Pool.load(poolId)
pool.publicSwap = event.params.data.toHexString().slice(-1) == '1'
pool.save()
}
export function handleFinalize(event: LOG_CALL): void {
let poolId = event.address.toHex()
let pool = Pool.load(poolId)
const poolId = event.address.toHex()
const pool = Pool.load(poolId)
pool.finalized = true
pool.symbol = 'BPT'
pool.publicSwap = true
pool.save()
let factory = PoolFactory.load('1')
const factory = PoolFactory.load('1')
factory.finalizedPoolCount = factory.finalizedPoolCount + 1
factory.save()
}
export function handleSetup(event: LOG_CALL): void {
let poolId = event.address.toHex()
const poolId = event.address.toHex()
debuglog('handleSetup: ', event, [])
let data = event.params.data.toHexString()
const data = event.params.data.toHexString()
// First 2 chars are 0x
// Next there is 8 chars
// Next starts the data each params occupies exactly 64 chars
@ -89,19 +88,19 @@ export function handleSetup(event: LOG_CALL): void {
// For numbers we donot need to remove the leading zeros because they have no effect being on the left of the number
// skip 8 then take the last 40 (2 + 8 + 24 = 34) to (2 + 8 + 64 = 74)
let dataTokenAddress = Address.fromString(data.slice(34, 74)).toHexString()
const dataTokenAddress = Address.fromString(data.slice(34, 74)).toHexString()
let dataTokenAmount = data.slice(74, 138) // 74+64
let dataTokenWeight = data.slice(138, 202) // (74+64,74+(2*64)
let baseTokenAddress = Address.fromString(
const dataTokenAmount = data.slice(74, 138) // 74+64
const dataTokenWeight = data.slice(138, 202) // (74+64,74+(2*64)
const baseTokenAddress = Address.fromString(
data.slice(202 + 24, 266)
).toHexString() // (74+(2*64)+24, 74+(3*64))
let baseTokenAmount = data.slice(266, 330) // (74+(3*64),74+(4*64))
let baseTokenWeight = data.slice(330, 394) // (74+(4*64),74+(5*64))
let swapFee = data.slice(394) // (74+(5*64), END)
const baseTokenAmount = data.slice(266, 330) // (74+(3*64),74+(4*64))
const baseTokenWeight = data.slice(330, 394) // (74+(4*64),74+(5*64))
const swapFee = data.slice(394) // (74+(5*64), END)
let poolTokenId = poolId.concat('-').concat(baseTokenAddress)
let poolToken = PoolToken.load(poolTokenId)
const poolTokenId = poolId.concat('-').concat(baseTokenAddress)
const poolToken = PoolToken.load(poolTokenId)
if (poolToken != null) return
_handleRebind(
@ -150,23 +149,23 @@ export function _handleRebind(
balanceStr: string,
denormWeightStr: string
): void {
let pool = Pool.load(poolId)
let decimals = BigInt.fromI32(18).toI32()
const pool = Pool.load(poolId)
const decimals = BigInt.fromI32(18).toI32()
if (tokenAddress != OCEAN) {
pool.datatokenAddress = tokenAddress
}
pool.tokenCount += BigInt.fromI32(1)
let address = Address.fromString(tokenAddress)
let denormWeight = hexToDecimal(denormWeightStr, decimals)
let poolTokenId = poolId.concat('-').concat(address.toHexString())
const address = Address.fromString(tokenAddress)
const denormWeight = hexToDecimal(denormWeightStr, decimals)
const poolTokenId = poolId.concat('-').concat(address.toHexString())
let poolToken = PoolToken.load(poolTokenId)
if (poolToken == null) {
createPoolTokenEntity(poolTokenId, poolId, address.toHexString())
poolToken = PoolToken.load(poolTokenId)
pool.totalWeight += denormWeight
} else {
let oldWeight = poolToken.denormWeight
const oldWeight = poolToken.denormWeight
if (denormWeight > oldWeight) {
pool.totalWeight = pool.totalWeight + (denormWeight - oldWeight)
} else {
@ -175,7 +174,7 @@ export function _handleRebind(
}
poolToken.denormWeight = denormWeight
let balance = hexToDecimal(balanceStr, decimals)
const balance = hexToDecimal(balanceStr, decimals)
updatePoolTokenBalance(poolToken as PoolToken, balance, '_handleRebind')
poolToken.save()
@ -187,7 +186,7 @@ export function _handleRebind(
}
export function handleRebind(event: LOG_CALL): void {
let poolId = event.address.toHex()
const poolId = event.address.toHex()
_handleRebind(
event,
poolId,
@ -202,17 +201,17 @@ export function handleRebind(event: LOG_CALL): void {
************************************/
export function handleJoinPool(event: LOG_JOIN): void {
let poolId = event.address.toHex()
const poolId = event.address.toHex()
let pool = Pool.load(poolId)
const pool = Pool.load(poolId)
if (pool.finalized == false) {
return
}
pool.joinCount = pool.joinCount.plus(BigInt.fromI32(1))
pool.save()
let ptx = event.transaction.hash.toHexString()
let poolTx = PoolTransaction.load(ptx)
const ptx = event.transaction.hash.toHexString()
const poolTx = PoolTransaction.load(ptx)
if (poolTx != null) {
debuglog(
'!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!! JOIN JOIN JOIN !!!!!!!!!!!! PoolTransaction EXISTS: ',
@ -222,9 +221,9 @@ export function handleJoinPool(event: LOG_JOIN): void {
return
}
let address = event.params.tokenIn.toHex()
let poolTokenId = poolId.concat('-').concat(address)
let poolToken = PoolToken.load(poolTokenId)
const address = event.params.tokenIn.toHex()
const poolTokenId = poolId.concat('-').concat(address)
const poolToken = PoolToken.load(poolTokenId)
if (poolToken == null) {
debuglog(
'!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!! JOIN JOIN JOIN !!!!!!!!!!!! NO PoolToken: ',
@ -237,9 +236,9 @@ export function handleJoinPool(event: LOG_JOIN): void {
let datatoken: Datatoken | null
datatoken =
poolToken.tokenId != null ? Datatoken.load(poolToken.tokenId) : null
let decimals =
const decimals =
datatoken == null ? BigInt.fromI32(18).toI32() : datatoken.decimals
let tokenAmountIn = tokenToDecimal(
const tokenAmountIn = tokenToDecimal(
event.params.tokenAmountIn.toBigDecimal(),
decimals
)
@ -266,11 +265,11 @@ export function handleJoinPool(event: LOG_JOIN): void {
}
export function handleExitPool(event: LOG_EXIT): void {
let poolId = event.address.toHex()
const poolId = event.address.toHex()
let address = event.params.tokenOut.toHex()
let poolTokenId = poolId.concat('-').concat(address.toString())
let poolToken = PoolToken.load(poolTokenId)
const address = event.params.tokenOut.toHex()
const poolTokenId = poolId.concat('-').concat(address.toString())
const poolToken = PoolToken.load(poolTokenId)
if (!poolToken) {
debuglog(
'!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!! EXIT EXIT EXIT !!!!!!!!!!!! NO PoolToken: ',
@ -283,13 +282,13 @@ export function handleExitPool(event: LOG_EXIT): void {
let datatoken: Datatoken | null
datatoken =
poolToken.tokenId != null ? Datatoken.load(poolToken.tokenId) : null
let decimals =
const decimals =
datatoken == null ? BigInt.fromI32(18).toI32() : datatoken.decimals
let tokenAmountOut = tokenToDecimal(
const tokenAmountOut = tokenToDecimal(
event.params.tokenAmountOut.toBigDecimal(),
decimals
)
let newAmount = poolToken.balance.minus(tokenAmountOut)
const newAmount = poolToken.balance.minus(tokenAmountOut)
updatePoolTokenBalance(poolToken as PoolToken, newAmount, 'handleExitPool')
poolToken.save()
debuglog(
@ -297,7 +296,7 @@ export function handleExitPool(event: LOG_EXIT): void {
event,
[address, tokenAmountOut.toString(), event.params.tokenAmountOut.toString()]
)
let pool = Pool.load(poolId)
const pool = Pool.load(poolId)
pool.exitCount = pool.exitCount.plus(BigInt.fromI32(1))
if (newAmount.equals(ZERO_BD)) {
decrPoolCount(pool.finalized)
@ -320,12 +319,12 @@ export function handleExitPool(event: LOG_EXIT): void {
************************************/
export function handleSwap(event: LOG_SWAP): void {
let poolId = event.address.toHex()
let ptx = event.transaction.hash.toHexString()
const poolId = event.address.toHex()
const ptx = event.transaction.hash.toHexString()
let tokenIn = event.params.tokenIn.toHex()
let poolTokenInId = poolId.concat('-').concat(tokenIn.toString())
let poolTokenIn = PoolToken.load(poolTokenInId)
const tokenIn = event.params.tokenIn.toHex()
const poolTokenInId = poolId.concat('-').concat(tokenIn.toString())
const poolTokenIn = PoolToken.load(poolTokenInId)
if (!poolTokenIn) {
debuglog(
'!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!! SWAP SWAP SWAP !!!!!!!!!!!! NO PoolToken: ',
@ -334,12 +333,12 @@ export function handleSwap(event: LOG_SWAP): void {
)
return
}
let dtIn = Datatoken.load(tokenIn)
let tokenAmountIn = tokenToDecimal(
const dtIn = Datatoken.load(tokenIn)
const tokenAmountIn = tokenToDecimal(
event.params.tokenAmountIn.toBigDecimal(),
dtIn == null ? 18 : dtIn.decimals
)
let newAmountIn = poolTokenIn.balance.plus(tokenAmountIn)
const newAmountIn = poolTokenIn.balance.plus(tokenAmountIn)
updatePoolTokenBalance(
poolTokenIn as PoolToken,
newAmountIn,
@ -347,15 +346,15 @@ export function handleSwap(event: LOG_SWAP): void {
)
poolTokenIn.save()
let tokenOut = event.params.tokenOut.toHex()
let poolTokenOutId = poolId.concat('-').concat(tokenOut.toString())
let poolTokenOut = PoolToken.load(poolTokenOutId)
let dtOut = Datatoken.load(tokenOut)
let tokenAmountOut = tokenToDecimal(
const tokenOut = event.params.tokenOut.toHex()
const poolTokenOutId = poolId.concat('-').concat(tokenOut.toString())
const poolTokenOut = PoolToken.load(poolTokenOutId)
const dtOut = Datatoken.load(tokenOut)
const tokenAmountOut = tokenToDecimal(
event.params.tokenAmountOut.toBigDecimal(),
dtOut == null ? 18 : dtOut.decimals
)
let newAmountOut = poolTokenOut.balance.minus(tokenAmountOut)
const newAmountOut = poolTokenOut.balance.minus(tokenAmountOut)
updatePoolTokenBalance(
poolTokenOut as PoolToken,
newAmountOut,
@ -374,7 +373,7 @@ export function handleSwap(event: LOG_SWAP): void {
event.params.tokenAmountOut.toString()
]
)
let pool = Pool.load(poolId)
const pool = Pool.load(poolId)
pool.swapCount = pool.swapCount.plus(BigInt.fromI32(1))
if (newAmountIn.equals(ZERO_BD) || newAmountOut.equals(ZERO_BD)) {
@ -405,25 +404,25 @@ export function handleSwap(event: LOG_SWAP): void {
************************************/
export function handleTransfer(event: Transfer): void {
let poolId = event.address.toHex()
const poolId = event.address.toHex()
let ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
let isMint = event.params.from.toHex() == ZERO_ADDRESS
let isBurn = event.params.to.toHex() == ZERO_ADDRESS
const isMint = event.params.from.toHex() == ZERO_ADDRESS
const isBurn = event.params.to.toHex() == ZERO_ADDRESS
let poolShareFromId = poolId.concat('-').concat(event.params.from.toHex())
const poolShareFromId = poolId.concat('-').concat(event.params.from.toHex())
let poolShareFrom = PoolShare.load(poolShareFromId)
let poolShareFromBalance =
const poolShareFromBalance =
poolShareFrom == null ? ZERO_BD : poolShareFrom.balance
let poolShareToId = poolId.concat('-').concat(event.params.to.toHex())
const poolShareToId = poolId.concat('-').concat(event.params.to.toHex())
let poolShareTo = PoolShare.load(poolShareToId)
let poolShareToBalance = poolShareTo == null ? ZERO_BD : poolShareTo.balance
const poolShareToBalance = poolShareTo == null ? ZERO_BD : poolShareTo.balance
let pool = Pool.load(poolId)
let poolTx = PoolTransaction.load(event.transaction.hash.toHexString())
let value = tokenToDecimal(event.params.value.toBigDecimal(), 18)
const pool = Pool.load(poolId)
const poolTx = PoolTransaction.load(event.transaction.hash.toHexString())
const value = tokenToDecimal(event.params.value.toBigDecimal(), 18)
if (isMint) {
if (poolShareTo == null) {

View File

@ -1,23 +1,6 @@
{
"extends": "./node_modules/@graphprotocol/graph-ts/tsconfig.json",
"extend": "./node_modules/@graphprotocol/graph-ts/tsconfig.json",
"compilerOptions": {
"types": ["@graphprotocol/graph-ts"],
"resolveJsonModule": true,
"moduleResolution": "node",
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"lib": ["es5", "dom"],
"declaration": true,
"module": "commonjs",
"target": "es5",
"removeComments": true,
"experimentalDecorators": true,
"preserveConstEnums": true,
"outDir": "./dist/node/",
"rootDir": "./src/",
"sourceMap": true,
"typeRoots": ["node_modules/@types"]
},
"include": ["src/**/*"],
"exclude": ["node_modules", "**/*.test.ts"]
"types": ["@graphprotocol/graph-ts"]
}
}