diff --git a/app/service/BlockchainService.ts b/app/service/BlockchainService.ts index e8148d81d2945f241a7f7be44384050b6b75991d..37a76412ad969828d5e39267edd9ff5fa954e8f6 100644 --- a/app/service/BlockchainService.ts +++ b/app/service/BlockchainService.ts @@ -1,5 +1,4 @@ -import { IdentityForRequirements } from './BlockchainService'; -"use strict"; +import {IdentityForRequirements} from './BlockchainService'; import {Server} from "../../server" import {GlobalFifoPromise} from "./GlobalFifoPromise" import {BlockchainContext} from "../lib/computation/BlockchainContext" @@ -7,7 +6,6 @@ import {ConfDTO} from "../lib/dto/ConfDTO" import {FileDAL} from "../lib/dal/fileDAL" import {QuickSynchronizer} from "../lib/computation/QuickSync" import {BlockDTO} from "../lib/dto/BlockDTO" -import {DBIdentity} from "../lib/dal/sqliteDAL/IdentityDAL" import {DBBlock} from "../lib/db/DBBlock" import {GLOBAL_RULES_HELPERS} from "../lib/rules/global_rules" import {parsers} from "../lib/common-libs/parsers/index" @@ -18,6 +16,8 @@ import {LOCAL_RULES_FUNCTIONS} from "../lib/rules/local_rules" import {Switcher, SwitcherDao} from "../lib/blockchain/Switcher" import {OtherConstants} from "../lib/other_constants" +"use strict"; + const _ = require('underscore'); const constants = require('../lib/constants'); @@ -206,6 +206,11 @@ export class BlockchainService extends FIFOService { while (!added && i < potentials.length) { const dto = BlockDTO.fromJSONObject(potentials[i]) try { + if (dto.issuer === this.conf.pair.pub) { + for (const tx of dto.transactions) { + await this.dal.removeTxByHash(tx.hash); + } + } const addedBlock = await this.mainContext.checkAndAddBlock(dto) added = true this.push({