Add database method

ArkEcosystem · Jan 10, 2025 · 55e42dd · 55e42dd
1 parent f19ea60
commit 55e42dd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/packages/api-evm/source/actions/eth-get-transaction-by-block-number-and-index.ts b/packages/api-evm/source/actions/eth-get-transaction-by-block-number-and-index.ts
@@ -19,13 +19,13 @@ export class EthGetTransactionByBlockNumberAndIndex implements Contracts.Api.RPC
 		maxItems: 2,
 		minItems: 2,
 
-		prefixItems: [{ $ref: "prefixedHex" }, { $ref: "prefixedHex" }], // TODO: Use block id & limit sequence
+		prefixItems: [{ $ref: "prefixedHex" }, { $ref: "prefixedHex" }], // TODO: Limit sequence
 		type: "array",
 	};
 
 	public async handle(parameters: [string, string]): Promise<any> {
-		const transaction = await this.databaseService.getTransactionByBlockIdAndIndex(
-			parameters[0].slice(2),
+		const transaction = await this.databaseService.getTransactionByBlockHeightAndIndex(
+			Number.parseInt(parameters[0]),
 			Number.parseInt(parameters[1]),
 		);
 

diff --git a/packages/contracts/source/contracts/database.ts b/packages/contracts/source/contracts/database.ts
@@ -27,6 +27,7 @@ export interface DatabaseService {
 
 	getTransactionById(id: string): Promise<Transaction | undefined>;
 	getTransactionByBlockIdAndIndex(blockId: string, index: number): Promise<Transaction | undefined>;
+	getTransactionByBlockHeightAndIndex(height: number, index: number): Promise<Transaction | undefined>;
 
 	addCommit(block: Commit): void;
 	persist(): Promise<void>;

diff --git a/packages/database/source/database-service.ts b/packages/database/source/database-service.ts
@@ -214,6 +214,25 @@ export class DatabaseService implements Contracts.Database.DatabaseService {
 		return this.#readTransaction(`${height}-${index}`);
 	}
 
+	public async getTransactionByBlockHeightAndIndex(
+		height: number,
+		index: number,
+	): Promise<Contracts.Crypto.Transaction | undefined> {
+		// Get TX from cache
+		if (this.#commitCache.has(height)) {
+			const block = this.#commitCache.get(height)!.block;
+
+			if (block.transactions.length <= index) {
+				return undefined;
+			}
+
+			return block.transactions[index];
+		}
+
+		// Get TX from storage
+		return this.#readTransaction(`${height}-${index}`);
+	}
+
 	public async *readCommits(start: number, end: number): AsyncGenerator<Contracts.Crypto.Commit> {
 		for (let height = start; height <= end; height++) {
 			const data = await this.#readCommitBytes(height);