Fix generated watcher query with bigint arguments.

packages/codegen/src/entity.ts

@@ -96,6 +96,7 @@ export class Entity {
         assert(pgType);
 
         const columnOptions = [];
+
         if (param.type === 'address') {
           columnOptions.push(
             {
@@ -105,6 +106,16 @@ export class Entity {
           );
         }
 
+        // Use bigintTransformer for bigint types.
+        if (tsType === 'bigint') {
+          columnOptions.push(
+            {
+              option: 'transformer',
+              value: 'bigintTransformer'
+            }
+          );
+        }
+
         return {
           name,
           pgType,

packages/codegen/src/templates/database-template.handlebars

@@ -48,17 +48,13 @@ export class Database {
   {{~#each query.params}}, {{this.name~}} {{/each}} }: { blockHash: string, contractAddress: string
   {{~#each query.params}}, {{this.name~}}: {{this.type~}} {{/each}} }): Promise<{{capitalize query.name tillIndex=1}} | undefined> {
     return this._conn.getRepository({{capitalize query.name tillIndex=1}})
-      .createQueryBuilder('{{query.name}}')
-      .where(`${this._propColMaps['{{capitalize query.name tillIndex=1}}'].get('blockHash')} = :blockHash AND ${this._propColMaps['{{capitalize query.name tillIndex=1}}'].get('contractAddress')} = :contractAddress
-      {{~#each query.params}} AND ${this._propColMaps['{{capitalize query.name tillIndex=1}}'].get('{{this.name}}')} = :{{this.name~}} {{/each}}`, {
+      .findOne({
         blockHash,
-        contractAddress
-        {{~#each query.params}},
-        {{this.name}}
-        {{~/each}}
-
+        contractAddress{{#if query.params.length}},{{/if}}
+        {{#each query.params}}
+        {{this.name}}{{#unless @last}},{{/unless}}
+        {{/each}}
       })
-      .getOne();
   }
 
   {{/each}}

packages/codegen/src/templates/entity-template.handlebars

@@ -6,12 +6,14 @@
 import { {{~#each import.toImport}} {{this}} {{~#unless @last}}, {{~/unless}} {{~/each}} } from '{{import.from}}';
 {{/each}}
 
+import { bigintTransformer } from '@vulcanize/util';
+
 @Entity()
 {{#each indexOn as | index |}}
 {{#if index.columns}}
 @Index([
 {{~#each index.columns}}'{{this}}'
-{{~#unless @last}}, {{/unless}}  
+{{~#unless @last}}, {{/unless}}
 {{~/each}}]
 {{~#if index.unique}}, { unique: true }{{/if}})
 {{/if}}

packages/util/src/index.ts

@@ -12,7 +12,7 @@ import { ValueTransformer } from 'typeorm';
 export const wait = async (time: number): Promise<void> => new Promise(resolve => setTimeout(resolve, time));
 
 /**
- * Transformer used by typeorm entity for Decimal type fields
+ * Transformer used by typeorm entity for Decimal type fields.
  */
 export const decimalTransformer: ValueTransformer = {
   to: (value?: Decimal) => {
@@ -30,3 +30,23 @@ export const decimalTransformer: ValueTransformer = {
     return value;
   }
 };
+
+/**
+ * Transformer used by typeorm entity for bigint type fields.
+ */
+export const bigintTransformer: ValueTransformer = {
+  to: (value?: bigint) => {
+    if (value) {
+      return value.toString();
+    }
+
+    return value;
+  },
+  from: (value?: string) => {
+    if (value) {
+      return BigInt(value);
+    }
+
+    return value;
+  }
+};