Contracttest (#47)

* fix saving storage for mapping

* increase pg connection limit

* fix merge issue

* add fk to address table from contract_address_slots table to be able to derive mapping storage by address

* fill address table and all related from events. Match addresses with storage

* fix tests

* fix linter warnings

* fix issue with duplicated FK

* check data format correct

* fix db connection leak

docker-compose.yml

@@ -60,6 +60,7 @@ services:
       POSTGRES_USER: "vdbm"
       POSTGRES_DB: "vulcanize_public"
       POSTGRES_PASSWORD: "password"
+    command: ["postgres", "-c", "log_statement=all", "-N", "500"]
     volumes:
      - contract_watcher_js_db_data:/var/lib/postgresql/data
     ports:

ormconfig.js

@@ -9,6 +9,11 @@ module.exports = {
     'password': env.DATABASE_PASSWORD,
     'database': env.DATABASE_NAME,
     'logging': env.DATABASE_LOGGING,
+    extra: {
+        max: 100,
+        idleTimeoutMillis: 5000,
+        //log: console.log
+    },
     "entities": process.env.NODE_ENV === 'production' ?
       [__dirname + "/dist/models/*.js", __dirname + "/dist/models/**/*.js",] :
       ["src/models/*.ts", "src/models/**/*.ts"],

src/repositories/data/addressIdSlotIdRepository.ts

@@ -1,5 +1,6 @@
 import {EntityRepository, QueryRunner, Table} from 'typeorm';
 import { TableOptions } from 'typeorm/schema-builder/options/TableOptions';
+import {Structure} from "../../services/dataTypeParser";
 
 @EntityRepository()
 export default class AddressIdSlotIdRepository {
@@ -9,12 +10,16 @@ export default class AddressIdSlotIdRepository {
 		this.queryRunner = queryRunner;
     }
 
-	public async createTable(addressId, slotId): Promise<null> {
-		const tableName = `data.address_id_${addressId}_slot_id_${slotId}`;
+    private getTableName(contractId: number, slotId: number): string {
+		return `data.contract_id_${contractId}_address_slot_id_${slotId}`;
+	}
+
+	public async createTable(contractId: number, slotId: number): Promise<null> {
+		const tableName = this.getTableName(contractId, slotId);
 		const table = await this.queryRunner.getTable(tableName);
 
 		if (table) {
-			console.log(`Table ${tableName} already exists`);
+			// console.log(`Table ${tableName} already exists`);
 			return;
 		}
 
@@ -41,16 +46,16 @@ export default class AddressIdSlotIdRepository {
 		console.log('create new table', tableName);
 	}
 
-	public async add(cotractAddressId: number, addressId, slotId: number, hash: string): Promise<null> {
-		const tableName = `data.address_id_${cotractAddressId}_slot_id_${slotId}`;
+	public async add(contractId: number, addressId, slotId: number, hash: string): Promise<null> {
+		const tableName = this.getTableName(contractId, slotId);
 		const sql = `INSERT INTO ${tableName} (address_id, hash) VALUES (${addressId}, '${hash}');`;
 		console.log(sql);
 
 		return this.queryRunner.query(sql);
 	}
 
-	public async isExist(cotractAddressId: number, slotId: number, addressId: number): Promise<boolean> {
-		const tableName = `data.address_id_${cotractAddressId}_slot_id_${slotId}`;
+	public async isExist(contractId: number, slotId: number, addressId: number): Promise<boolean> {
+		const tableName = this.getTableName(contractId, slotId);
 		const sql = `SELECT * FROM ${tableName} WHERE address_id=${addressId};`;
 
 		const data = await this.queryRunner.query(sql);
@@ -61,8 +66,8 @@ export default class AddressIdSlotIdRepository {
 		return data[0]?.address_id ? true : false;
 	}
 
-	public async getAddressIdByHash(cotractAddressId: number, slotId: number, hash: string): Promise<number> {
-		const tableName = `data.address_id_${cotractAddressId}_slot_id_${slotId}`;
+	public async getAddressIdByHash(contractId: number, slotId: number, hash: string): Promise<number> {
+		const tableName = this.getTableName(contractId, slotId);
 		const sql = `SELECT * FROM ${tableName} WHERE hash='${hash}';`;
 
 		const data = await this.queryRunner.query(sql);
@@ -72,4 +77,15 @@ export default class AddressIdSlotIdRepository {
 
 		return data[0]?.address_id;
 	}
+
+	public async syncAddressSlotHashes(contractId: number, slotId: number, stateStructure: Structure): Promise<void> {
+		const sql = `UPDATE data.contract_id_${contractId}_state_id_${slotId} a
+					SET address_id=b.address_id
+					FROM data.contract_id_${contractId}_address_slot_id_${slotId} b
+					WHERE
+					  a.address_id IS NULL
+					  AND a.${stateStructure.name}=b.hash`;
+
+		return this.queryRunner.query(sql);
+	}
 }

src/repositories/data/addressRepository.ts

@@ -10,8 +10,16 @@ export default class AddressRepository extends Repository<Address> {
 
 	public async add(address: string, hash: string): Promise<Address> {
 		return this.save({
-			address,
-			hash,
+			address: address.toLowerCase(),
+			hash: hash.toLowerCase(),
+		});
+	}
+
+	public async get(address: string): Promise<Address> {
+		return await this.findOne({
+			where: {
+				address: address.toLowerCase()
+			}
 		});
 	}
 }

src/repositories/data/eventRepository.ts

@@ -1,4 +1,5 @@
 import {EntityRepository, QueryRunner} from 'typeorm';
+import {ABIInputData} from "../../types";
 
 @EntityRepository()
 export default class EventRepository {
@@ -8,7 +9,7 @@ export default class EventRepository {
 		this.queryRunner = queryRunner;
     }
 
-	public async add(tableName: string, data): Promise<number> {
+	public async add(tableName: string, data: Array<ABIInputData & {isStrict?}>): Promise<number> {
 		const sql = `INSERT INTO ${tableName}
 		(${data.map((line) => line.isStrict ? line.name : 'data_' + line.name.toLowerCase().trim()).join(',')})
 		VALUES

src/repositories/data/slotRepository.ts

@@ -8,6 +8,16 @@ export default class SlotRepository {
 		this.queryRunner = queryRunner;
     }
 
+    public async getByValue(table: string, name: string, value: string): Promise<number> {
+		const sql = `SELECT id FROM ${table} WHERE ${name}=$1`;
+		const res = await this.queryRunner.query(sql, [value]);
+		if (!res || !res.length) {
+			return null;
+		}
+
+		return res[0].id;
+	}
+
 	public async add(tableName: string, name: string[], value): Promise<number> {
 		const sql = `INSERT INTO ${tableName} (${name.join(',')}) VALUES ('${value.map((v) => v.toString().replace(/\0/g, '')).join('\',\'')}') RETURNING id;`;
 		console.log(sql);

src/run.ts

@@ -21,6 +21,12 @@ process.on('unhandledRejection', (reason, p) => {
 			dataService.processState(data.relatedNode)
 		},
 		processHeader: (data) => dataService.processHeader(data),
-		processEvent: (data) => dataService.processEvent(null, data.relatedNode, data.decoded, data.event),
+		processEvent: (data) => {
+			if (!data) {
+				return;
+			}
+
+			dataService.processEvent(null, data.relatedNode, data.decoded, data.event);
+		},
 	})
 })();

src/server.ts

@@ -26,7 +26,8 @@ const server = async function({
 	createConnection(connectionOptions).then(async () => {
 		const app = new App();
 
-		Store.init();
+		// @TODO autoUpdate=true breaks
+		Store.init(false);
 
 		const graphqlClient = new GraphqlClient(env.GRAPHQL_URI, ws);
 		const graphqlService = new GraphqlService(graphqlClient);