Fix token setup

beefyfinance · Sep 5, 2024 · e474a14 · e474a14
1 parent e81c4c3
commit e474a14
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/src/common/entity/token.ts b/src/common/entity/token.ts
@@ -6,35 +6,36 @@ import { ZERO_BI } from "../utils/decimal"
 export function isNullToken(token: Token): boolean {
   return token.id.equals(ADDRESS_ZERO)
 }
-
-export function getNullToken(): Token {
-  let token = Token.load(ADDRESS_ZERO)
-  if (!token) {
-    token = new Token(ADDRESS_ZERO)
-    token.symbol = "NULL"
-    token.name = "NULL"
-    token.decimals = BigInt.fromI32(18)
-    token.save()
-  }
+function createNullTokenObject(): Token {
+  const token = new Token(ADDRESS_ZERO)
+  token.symbol = "NULL"
+  token.name = "NULL"
+  token.decimals = BigInt.fromI32(18)
   return token
 }
 
 export function getToken(tokenAddress: Bytes): Token {
-  if (tokenAddress == ADDRESS_ZERO) {
-    return getNullToken()
-  }
-  let token = Token.load(tokenAddress)
+  let token = getTokenIfExists(tokenAddress)
   if (!token) {
-    token = new Token(tokenAddress)
-    token.symbol = ""
-    token.name = ""
-    token.decimals = BigInt.fromI32(18)
+    token = createNullTokenObject()
   }
   return token
 }
 
-export function isNewToken(token: Token): boolean {
-  return token.symbol == "" && token.name == ""
+export function getTokenIfExists(tokenAddress: Bytes): Token | null {
+  return Token.load(tokenAddress)
+}
+
+export function createTokenObject(tokenAddress: Bytes): Token {
+  if (tokenAddress == ADDRESS_ZERO) {
+    return createNullTokenObject()
+  }
+
+  const token = new Token(tokenAddress)
+  token.symbol = ""
+  token.name = ""
+  token.decimals = BigInt.fromI32(18)
+  return token
 }
 
 export function getTokenStatistic(tokenAddress: Bytes): TokenStatistic {

diff --git a/src/common/utils/token.ts b/src/common/utils/token.ts
@@ -1,11 +1,11 @@
 import { IERC20 as IERC20Contract } from "../../../generated/templates/BeefyERC20Product/IERC20"
 import { Token } from "../../../generated/schema"
 import { Address, BigInt, Bytes } from "@graphprotocol/graph-ts"
-import { getToken, isNewToken } from "../entity/token"
+import { createTokenObject, getToken, getTokenIfExists } from "../entity/token"
 
 export function fetchAndSaveTokenData(tokenAddress: Bytes): Token {
-  const token = getToken(tokenAddress)
-  if (!isNewToken(token)) {
+  let token = getTokenIfExists(tokenAddress)
+  if (token) {
     return token
   }
 
@@ -22,6 +22,7 @@ export function fetchAndSaveTokenData(tokenAddress: Bytes): Token {
   const tokenName = tokenNameRes.reverted ? "Unknown" : tokenNameRes.value
   const tokenSymbol = tokenSymbolRes.reverted ? "UNKNOWN" : tokenSymbolRes.value
 
+  token = createTokenObject(tokenAddress)
   token.name = tokenName
   token.symbol = tokenSymbol
   token.decimals = BigInt.fromI32(tokenDecimals)