Fix typeorm bigint transformer and convert to checksum contract address

cerc-io · May 11, 2023 · 68ceea3 · 68ceea3
1 parent 03dad21
commit 68ceea3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/util/src/graph/state-utils.ts b/packages/util/src/graph/state-utils.ts
@@ -6,6 +6,7 @@ import assert from 'assert';
 import debug from 'debug';
 import _ from 'lodash';
 import { Between, ValueTransformer } from 'typeorm';
+import { ethers } from 'ethers';
 
 import { jsonBigIntStringReplacer } from '../misc';
 import { IndexerInterface, StateInterface } from '../types';
@@ -150,7 +151,7 @@ export const getContractEntitiesMap = (dataSources: any[]): Map<string, string[]
   // Populate contractEntitiesMap using data sources from subgraph
   dataSources.forEach((dataSource: any) => {
     const { source: { address: contractAddress }, mapping: { entities } } = dataSource;
-    contractEntitiesMap.set(contractAddress, entities as string[]);
+    contractEntitiesMap.set(ethers.utils.getAddress(contractAddress), entities as string[]);
   });
 
   return contractEntitiesMap;

diff --git a/packages/util/src/misc.ts b/packages/util/src/misc.ts
@@ -37,14 +37,14 @@ export const wait = async (time: number): Promise<void> => new Promise(resolve =
  */
 export const graphDecimalTransformer: ValueTransformer = {
   to: (value?: GraphDecimal) => {
-    if (value !== undefined) {
+    if (value !== undefined && value !== null) {
       return value.toFixed();
     }
 
     return value;
   },
   from: (value?: string) => {
-    if (value !== undefined) {
+    if (value !== undefined && value !== null) {
       return new GraphDecimal(value);
     }
 
@@ -57,14 +57,14 @@ export const graphDecimalTransformer: ValueTransformer = {
  */
 export const decimalTransformer: ValueTransformer = {
   to: (value?: Decimal) => {
-    if (value !== undefined) {
+    if (value !== undefined && value !== null) {
       return value.toString();
     }
 
     return value;
   },
   from: (value?: string) => {
-    if (value !== undefined) {
+    if (value !== undefined && value !== null) {
       return new Decimal(value);
     }
 
@@ -77,14 +77,14 @@ export const decimalTransformer: ValueTransformer = {
  */
 export const bigintTransformer: ValueTransformer = {
   to: (value?: bigint) => {
-    if (value !== undefined) {
+    if (value !== undefined && value !== null) {
       return value.toString();
     }
 
     return value;
   },
   from: (value?: string) => {
-    if (value !== undefined) {
+    if (value !== undefined && value !== null) {
       return BigInt(value);
     }