diff --git a/packages/neuron-wallet/src/database/chain/migrations/1562038960990-AddStatusToTx.ts b/packages/neuron-wallet/src/database/chain/migrations/1562038960990-AddStatusToTx.ts deleted file mode 100644 index 233ab2c59c..0000000000 --- a/packages/neuron-wallet/src/database/chain/migrations/1562038960990-AddStatusToTx.ts +++ /dev/null @@ -1,41 +0,0 @@ -import {MigrationInterface, QueryRunner, TableColumn, getConnection, In} from "typeorm"; -import TransactionEntity from '../entities/transaction' -import { OutputStatus } from '../../../services/tx/params' -import { TransactionStatus } from '../../../types/cell-types' -import OutputEntity from 'database/chain/entities/output' - -export class AddStatusToTx1562038960990 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - // TransactionStatus.Success = 'success' - await queryRunner.query(`ALTER TABLE 'transaction' ADD COLUMN 'status' varchar NOT NULL DEFAULT 'success';`) - - const pendingTxHashes: string[] = (await getConnection() - .getRepository(OutputEntity) - .createQueryBuilder('output') - .select(`output.outPointTxHash`, 'txHash') - .where({ - status: OutputStatus.Sent - }) - .getRawMany()) - .filter(output => output.txHash) - await getConnection() - .createQueryBuilder() - .update(TransactionEntity) - .set({ status: TransactionStatus.Pending }) - .where({ - hash: In(pendingTxHashes) - }) - .execute() - - await queryRunner.changeColumn('transaction', 'status', new TableColumn({ - name: 'status', - type: 'varchar', - })) - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('transaction', 'status') - } - -} diff --git a/packages/neuron-wallet/src/database/chain/migrations/1565693320664-AddConfirmed.ts b/packages/neuron-wallet/src/database/chain/migrations/1565693320664-AddConfirmed.ts deleted file mode 100644 index 69448a80d7..0000000000 --- a/packages/neuron-wallet/src/database/chain/migrations/1565693320664-AddConfirmed.ts +++ /dev/null @@ -1,13 +0,0 @@ -import {MigrationInterface, QueryRunner} from "typeorm"; - -export class AddConfirmed1565693320664 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE 'transaction' ADD COLUMN 'confirmed' boolean NOT NULL DEFAULT false;`) - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.dropColumn('transaction', 'confirmed') - } - -} diff --git a/packages/neuron-wallet/src/database/chain/migrations/1566900661931-AlterDepsFromTransaction.ts b/packages/neuron-wallet/src/database/chain/migrations/1566900661931-AlterDepsFromTransaction.ts deleted file mode 100644 index 62194ef994..0000000000 --- a/packages/neuron-wallet/src/database/chain/migrations/1566900661931-AlterDepsFromTransaction.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm'; - -export class AlterDepsFromTransaction1566900661931 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.addColumn('transaction', new TableColumn({ - name: 'cellDeps', - type: 'varchar', - default: `'[]'`, - })) - - await queryRunner.addColumn('transaction', new TableColumn({ - name: 'headerDeps', - type: 'varchar', - default: `'[]'`, - })) - - await queryRunner.dropColumn('transaction', 'deps') - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.addColumn('transaction', new TableColumn({ - name: 'deps', - type: 'varchar', - default: `'[]'`, - })) - - await queryRunner.dropColumn('transaction', 'cellDeps') - await queryRunner.dropColumn('transaction', 'headerDeps') - } - -} diff --git a/packages/neuron-wallet/src/database/chain/migrations/1561695143591-InitMigration.ts b/packages/neuron-wallet/src/database/chain/migrations/1566959757554-InitMigration.ts similarity index 91% rename from packages/neuron-wallet/src/database/chain/migrations/1561695143591-InitMigration.ts rename to packages/neuron-wallet/src/database/chain/migrations/1566959757554-InitMigration.ts index 211327651b..af467315d0 100644 --- a/packages/neuron-wallet/src/database/chain/migrations/1561695143591-InitMigration.ts +++ b/packages/neuron-wallet/src/database/chain/migrations/1566959757554-InitMigration.ts @@ -1,10 +1,10 @@ import {MigrationInterface, QueryRunner} from "typeorm"; -export class InitMigration1561695143591 implements MigrationInterface { +export class InitMigration1566959757554 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { await queryRunner.query(`CREATE TABLE "output" ("outPointTxHash" varchar NOT NULL, "outPointIndex" varchar NOT NULL, "capacity" varchar NOT NULL, "lock" text NOT NULL, "lockHash" varchar NOT NULL, "status" varchar NOT NULL, "transactionHash" varchar, PRIMARY KEY ("outPointTxHash", "outPointIndex"))`); - await queryRunner.query(`CREATE TABLE "transaction" ("hash" varchar PRIMARY KEY NOT NULL, "version" varchar NOT NULL, "deps" text NOT NULL, "witnesses" text NOT NULL, "timestamp" varchar, "blockNumber" varchar, "blockHash" varchar, "description" varchar, "createdAt" varchar NOT NULL, "updatedAt" varchar NOT NULL)`); + await queryRunner.query(`CREATE TABLE "transaction" ("hash" varchar PRIMARY KEY NOT NULL, "version" varchar NOT NULL, "cellDeps" text NOT NULL, "headerDeps" text NOT NULL, "witnesses" text NOT NULL, "timestamp" varchar, "blockNumber" varchar, "blockHash" varchar, "description" varchar, "status" varchar NOT NULL, "createdAt" varchar NOT NULL, "updatedAt" varchar NOT NULL, "confirmed" boolean NOT NULL)`); await queryRunner.query(`CREATE TABLE "input" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "outPointTxHash" varchar, "outPointIndex" varchar, "since" varchar NOT NULL, "lockHash" varchar, "capacity" varchar, "transactionHash" varchar)`); await queryRunner.query(`CREATE TABLE "sync_info" ("name" varchar PRIMARY KEY NOT NULL, "value" varchar NOT NULL)`); await queryRunner.query(`CREATE TABLE "temporary_output" ("outPointTxHash" varchar NOT NULL, "outPointIndex" varchar NOT NULL, "capacity" varchar NOT NULL, "lock" text NOT NULL, "lockHash" varchar NOT NULL, "status" varchar NOT NULL, "transactionHash" varchar, CONSTRAINT "FK_29236a0eb11fac458990882f985" FOREIGN KEY ("transactionHash") REFERENCES "transaction" ("hash") ON DELETE CASCADE ON UPDATE NO ACTION, PRIMARY KEY ("outPointTxHash", "outPointIndex"))`); diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts index 25fdbcd658..d7732905f5 100644 --- a/packages/neuron-wallet/src/database/chain/ormconfig.ts +++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts @@ -9,11 +9,7 @@ import Transaction from './entities/transaction' import Input from './entities/input' import Output from './entities/output' import SyncInfo from './entities/sync-info' - -import { InitMigration1561695143591 } from './migrations/1561695143591-InitMigration' -import { AddStatusToTx1562038960990 } from './migrations/1562038960990-AddStatusToTx' -import { AddConfirmed1565693320664 } from './migrations/1565693320664-AddConfirmed' -import { AlterDepsFromTransaction1566900661931 } from './migrations/1566900661931-AlterDepsFromTransaction' +import { InitMigration1566959757554 } from './migrations/1566959757554-InitMigration' export const CONNECTION_NOT_FOUND_NAME = 'ConnectionNotFoundError' @@ -33,12 +29,7 @@ const connectOptions = async (genesisBlockHash: string): Promise