schema update + other

Author: mihaisc

schema.graphql

@@ -7,7 +7,7 @@ import {
 } from '../@types/Dispenser/Dispenser'
 import { DispenserCreated } from '../@types/ERC721Factory/ERC721Factory'
 import { DispenserTransaction } from '../@types/schema'
-import { ZERO_BD } from './utils/constants'
+import { decimal } from './utils/constants'
 import { createDispenser, getDispenser } from './utils/dispenserUtils'
 import { getUser } from './utils/userUtils'
 
@@ -60,6 +60,6 @@ export function handleTokensDispensed(event: TokensDispensed): void {
 
 export function handleOwnerWinthdraw(event: OwnerWithdrawed): void {
   const dispenser = getDispenser(event.params.datatoken.toHex())
-  dispenser.balance = ZERO_BD
+  dispenser.balance = decimal.ZERO_BD
   dispenser.save()
 }

src/mappings/dispenser.ts

@@ -1,6 +1,6 @@
 import { NFTCreated, TokenCreated } from '../@types/ERC721Factory/ERC721Factory'
 import { Nft, Token } from '../@types/schema'
-import { ZERO_BD } from './utils/constants'
+import { decimal } from './utils/constants'
 import { getUser } from './utils/userUtils'
 
 export function handleNftCreated(event: NFTCreated): void {
@@ -28,6 +28,6 @@ export function handleNewToken(event: TokenCreated): void {
 
   token.name = event.params.tokenName.toString()
   token.decimals = 18
-  token.supply = ZERO_BD
+  token.supply = decimal.ZERO_BD
   token.save()
 }

src/mappings/erc721Factory.ts

@@ -13,8 +13,8 @@ import {
   FixedRateExchangeSwap,
   FixedRateExchangeUpdate
 } from '../@types/schema'
-import { tokenToDecimal } from '../helpers'
 import { getFixedRateExchange, getUpdateOrSwapId } from './utils/fixedRateUtils'
+import { tokenToDecimal } from './utils/generic'
 import { getToken } from './utils/tokenUtils'
 import { getUser } from './utils/userUtils'
 
@@ -146,8 +146,9 @@ export function handleSwap(event: Swapped): void {
 
   // reduce supply if the fixed rate is not minting tokens
   if (fixedRateExchange.isMinter || fixedRateExchange.withMint) {
-    fixedRateExchange.supply =
-      fixedRateExchange.supply - event.params.dataTokenSwappedAmount
+    fixedRateExchange.supply = fixedRateExchange.supply.minus(
+      event.params.dataTokenSwappedAmount
+    )
   }
 
   const swap = new FixedRateExchangeSwap(

src/mappings/fixedRateExchange.ts

@@ -1,6 +1,6 @@
 import { Pool, PoolTransaction } from '../@types/schema'
 import { LOG_JOIN } from '../@types/templates/BPool/BPool'
-import { integer, PoolTransactionType } from './utils/constants'
+import { integer } from './utils/constants'
 import { gweiToEth } from './utils/generic'
 import { getUser } from './utils/userUtils'
 
@@ -17,7 +17,6 @@ export function handleJoin(event: LOG_JOIN): void {
   const user = getUser(event.params.caller.toHex())
   poolTx.user = user.id
   poolTx.pool = pool.id
-  poolTx.type = PoolTransactionType.JOIN
 
   poolTx.timestamp = event.block.timestamp.toI32()
   poolTx.tx = event.transaction.hash

src/mappings/pool.ts

@@ -18,7 +18,7 @@ export function handleNewPool(event: BPoolCreated): void {
   pool.datatoken = datatoken.id
 
   pool.owner = event.params.registeredBy.toHex()
-  
+
   pool.createdTimestamp = event.block.timestamp.toI32()
   pool.tx = event.transaction.hash
   pool.block = event.block.number.toI32()

src/mappings/poolFactory.ts

@@ -2,13 +2,6 @@ import { BigDecimal, BigInt } from '@graphprotocol/graph-ts'
 
 export const ENABLE_DEBUG = true
 
-export const enum PoolTransactionType {
-  JOIN = 'join',
-  EXIT = 'exit',
-  SWAP = 'swap',
-  SETUP = 'setup'
-}
-
 export namespace integer {
   export const NEGATIVE_ONE = BigInt.fromI32(-1)
   export const ZERO = BigInt.fromI32(0)
@@ -17,7 +10,7 @@ export namespace integer {
   export const ONE_BASE_18 = BigInt.fromI32(10).pow(18 as u8)
 }
 
-export namespace deciaml {
+export namespace decimal {
   export const ZERO_BD = BigDecimal.fromString('0.0')
   export const MINUS_1_BD = BigDecimal.fromString('-1.0')
   export const ONE_BD = BigDecimal.fromString('1.0')