remove transaction from pool if apply fails

packages/contracts/source/contracts/transaction-pool/worker.ts

@@ -8,6 +8,7 @@ export interface WorkerFlags extends KeyValuePair {}
 export interface WorkerScriptHandler {
 	boot(flags: WorkerFlags): Promise<void>;
 	getTransactions(): Promise<string[]>;
+	removeTransaction(address: string, id: string): Promise<void>;
 	commit(height: number, sendersAddresses: string[]): Promise<void>;
 	setPeer(ip: string): Promise<void>;
 	forgetPeer(ip: string): Promise<void>;
@@ -25,5 +26,6 @@ export interface Worker extends Omit<WorkerScriptHandler, "commit" | "getTransac
 	getQueueSize(): number;
 	kill(): Promise<number>;
 	getTransactionBytes(): Promise<Buffer[]>;
+	removeTransaction(address: string, id: string): Promise<void>;
 	registerEventHandler(event: string, callback: EventCallback<any>): void;
 }

packages/transaction-pool-worker/source/handlers/index.ts

@@ -2,5 +2,6 @@ export * from "./commit.js";
 export * from "./forget-peer.js";
 export * from "./get-transactions.js";
 export * from "./reload-webhooks.js";
+export * from "./remove-transaction.js";
 export * from "./set-peer.js";
 export * from "./start.js";

packages/transaction-pool-worker/source/handlers/remove-transaction.ts

@@ -0,0 +1,12 @@
+import { inject, injectable } from "@mainsail/container";
+import { Contracts, Identifiers } from "@mainsail/contracts";
+
+@injectable()
+export class RemoveTransactionHandler {
+	@inject(Identifiers.TransactionPool.Mempool)
+	private readonly mempool!: Contracts.TransactionPool.Mempool;
+
+	public async handle(address: string, id: string): Promise<void> {
+		await this.mempool.removeTransaction(address, id);
+	}
+}

packages/transaction-pool-worker/source/worker-handler.ts

@@ -7,6 +7,7 @@ import {
 	ForgetPeerHandler,
 	GetTransactionsHandler,
 	ReloadWebhooksHandler,
+	RemoveTransactionHandler,
 	SetPeerHandler,
 	StartHandler,
 } from "./handlers/index.js";
@@ -39,6 +40,10 @@ export class WorkerScriptHandler implements Contracts.TransactionPool.WorkerScri
 		return await this.#app.resolve(GetTransactionsHandler).handle();
 	}
 
+	public async removeTransaction(address: string, id: string): Promise<void> {
+		await this.#app.resolve(RemoveTransactionHandler).handle(address, id);
+	}
+
 	public async setPeer(ip: string): Promise<void> {
 		return await this.#app.resolve(SetPeerHandler).handle(ip);
 	}

packages/transaction-pool-worker/source/worker.ts

@@ -69,6 +69,10 @@ export class Worker implements Contracts.TransactionPool.Worker {
 		return response.map((transaction: string) => Buffer.from(transaction, "hex"));
 	}
 
+	public async removeTransaction(address: string, id: string): Promise<void> {
+		await this.ipcSubprocess.sendRequest("removeTransaction", address, id);
+	}
+
 	public async setPeer(ip: string): Promise<void> {
 		await this.ipcSubprocess.sendRequest("setPeer", ip);
 	}

packages/validator/source/validator.ts

@@ -179,6 +179,9 @@ export class Validator implements Contracts.Validator.Validator {
 				candidateTransactions.push(transaction);
 			} catch (error) {
 				this.logger.warning(`${transaction.id} failed to collate: ${error.message}`);
+
+				await this.txPoolWorker.removeTransaction(transaction.data.senderAddress, transaction.id);
+
 				failedSenders.add(transaction.data.senderPublicKey);
 			}
 		}

tests/functional/transaction-pool-api/source/pool-worker.ts

@@ -36,6 +36,10 @@ export class PoolWorker implements Contracts.TransactionPool.Worker {
 		return response.map((transaction: string) => Buffer.from(transaction, "hex"));
 	}
 
+	public async removeTransaction(address: string, id: string): Promise<void> {
+		await this.transactionPoolMempool.removeTransaction(address, id);
+	}
+
 	registerEventHandler(event: string, callback: Contracts.Kernel.IPC.EventCallback<any>): void {}
 
 	async setPeer(ip: string): Promise<void> {}