From daf4bb485dc37d05e52dfe5aa595de6e90c8a2dd Mon Sep 17 00:00:00 2001 From: Dmitry Tyshchenko Date: Fri, 19 Jun 2020 04:38:51 +0300 Subject: [PATCH] chore(core-database): upgrade typeorm and pg packages (#3812) --- packages/core-database/package.json | 4 +- .../src/repositories/round-repository.ts | 2 +- .../repositories/transaction-repository.ts | 7 +-- yarn.lock | 51 ++++++++++--------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/packages/core-database/package.json b/packages/core-database/package.json index dea81b8d29..2febdbd14b 100644 --- a/packages/core-database/package.json +++ b/packages/core-database/package.json @@ -25,9 +25,9 @@ "@arkecosystem/core-kernel": "^3.0.0-next.0", "@arkecosystem/crypto": "^3.0.0-next.0", "dayjs": "^1.8.17", - "pg": "^8.0.0", + "pg": "^8.2.1", "reflect-metadata": "^0.1.13", - "typeorm": "^0.2.21" + "typeorm": "^0.2.25" }, "engines": { "node": ">=10.x" diff --git a/packages/core-database/src/repositories/round-repository.ts b/packages/core-database/src/repositories/round-repository.ts index 49e24e5343..4a26b6878b 100644 --- a/packages/core-database/src/repositories/round-repository.ts +++ b/packages/core-database/src/repositories/round-repository.ts @@ -8,7 +8,7 @@ export class RoundRepository extends Repository { public async findById(id: string): Promise { return this.find({ where: { - id, + round: id, }, }); } diff --git a/packages/core-database/src/repositories/transaction-repository.ts b/packages/core-database/src/repositories/transaction-repository.ts index 223f20eab9..c991d6bae5 100644 --- a/packages/core-database/src/repositories/transaction-repository.ts +++ b/packages/core-database/src/repositories/transaction-repository.ts @@ -1,9 +1,10 @@ import { Utils } from "@arkecosystem/core-kernel"; -import { Blocks, Crypto, Enums } from "@arkecosystem/crypto"; +import { Crypto, Enums } from "@arkecosystem/crypto"; import dayjs from "dayjs"; import { Brackets, EntityRepository, In } from "typeorm"; -import { Transaction } from "../models"; +import { Block } from "../models/block"; +import { Transaction } from "../models/transaction"; import { AbstractRepository } from "./abstract-repository"; @EntityRepository(Transaction) @@ -116,7 +117,7 @@ export class TransactionRepository extends AbstractRepository { .addSelect('blocks.height as "blockHeight"') .addSelect('blocks.generatorPublicKey as "blockGeneratorPublicKey"') .addSelect('blocks.reward as "reward"') - .addFrom(Blocks.Block, "blocks") + .addFrom(Block, "blocks") .where("block_id = blocks.id") .andWhere("type = :type", { type }) .andWhere("type_group = :typeGroup", { typeGroup }) diff --git a/yarn.lock b/yarn.lock index 43bed07367..67a3ffef63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11366,10 +11366,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pg-connection-string@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" - integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc= +pg-connection-string@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.2.3.tgz#48e1158ec37eaa82e98dbcb7307103ec303fe0e7" + integrity sha512-I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ== pg-cursor@^2.1.10: version "2.1.10" @@ -11381,15 +11381,15 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-packet-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914" - integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg== +pg-pool@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.1.tgz#5f4afc0f58063659aeefa952d36af49fa28b30e0" + integrity sha512-BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA== -pg-pool@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.0.0.tgz#2330d18888db1c444a67461122b44f83d2c9c231" - integrity sha512-AJWVHFre7CjOtu4D/PQjX+U9uhNKGRFSO9xQAzB7cn1Xu1vmhyo8s8eg9cw6kf2m2/+TYuvMH8i5jeFPSdllPw== +pg-protocol@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.2.4.tgz#3139cac0e51347f1e21e03954b1bb9fe2c20962e" + integrity sha512-/8L/G+vW/VhWjTGXpGh8XVkXOFx1ZDY+Yuz//Ab8CfjInzFkreI+fDG3WjCeSra7fIZwAFxzbGptNbm8xSXenw== pg-query-stream@^3.0.4: version "3.0.7" @@ -11409,16 +11409,16 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.0.0.tgz#6559c6f895b9e735b3079995acb5de3f39ade59f" - integrity sha512-jinx9Xcmkeh7Y7gatu2EJiXr37mcDeF0G5X14MjqPMwYjoZMk7PMMSTTXQQl03GRp2IICxo/zyybqfv2RNgXsg== +pg@^8.2.1: + version "8.2.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.2.1.tgz#f5a81f5e2025182fbe701514d3e1a43e68a616ac" + integrity sha512-DKzffhpkWRr9jx7vKxA+ur79KG+SKw+PdjMb1IRhMiKI9zqYUGczwFprqy+5Veh/DCcFs1Y6V8lRLN5I1DlleQ== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" - pg-connection-string "0.1.3" - pg-packet-stream "^1.1.0" - pg-pool "^3.0.0" + pg-connection-string "^2.2.3" + pg-pool "^3.2.1" + pg-protocol "^1.2.4" pg-types "^2.1.0" pgpass "1.x" semver "4.3.2" @@ -12813,7 +12813,7 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -sha.js@^2.4.0, sha.js@^2.4.8: +sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== @@ -14020,10 +14020,10 @@ typeforce@^1.11.5: resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc" integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g== -typeorm@^0.2.21: - version "0.2.21" - resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.21.tgz#d8d63bec783c128913b140b52f65e9fd76e44510" - integrity sha512-4abj5aFjwt4Y+Gs3VmykcjURUZwIezwPWYVMNl2swRk8/iluGZZ9Lbwd4tdzJ7ZdsgKyHsT8zf8zPZPL5jH+EQ== +typeorm@^0.2.25: + version "0.2.25" + resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.25.tgz#1a33513b375b78cc7740d2405202208b918d7dde" + integrity sha512-yzQ995fyDy5wolSLK9cmjUNcmQdixaeEm2TnXB5HN++uKbs9TiR6Y7eYAHpDlAE8s9J1uniDBgytecCZVFergQ== dependencies: app-root-path "^3.0.0" buffer "^5.1.0" @@ -14033,8 +14033,9 @@ typeorm@^0.2.21: dotenv "^6.2.0" glob "^7.1.2" js-yaml "^3.13.1" - mkdirp "^0.5.1" + mkdirp "^1.0.3" reflect-metadata "^0.1.13" + sha.js "^2.4.11" tslib "^1.9.0" xml2js "^0.4.17" yargonaut "^1.1.2"