From 4e191a50ff44fa755ef06d88d7c981173ace814d Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:37:38 +0900 Subject: [PATCH 1/4] rename state store height to number --- .../api-development/source/controllers/node.ts | 2 +- .../api-development/source/controllers/round.ts | 6 +++--- .../source/actions/eth-block-number.test.ts | 2 +- .../api-evm/source/actions/eth-block-number.ts | 2 +- .../eth-get-uncle-by-block-number-and-index.ts | 2 +- .../eth-get-uncle-count-by-block-number.ts | 2 +- .../api-evm/source/utils/resolve-block-tag.ts | 2 +- packages/api-evm/source/validation/keywords.ts | 2 +- .../source/controllers/configuration.ts | 2 +- packages/bootstrap/source/bootstrapper.ts | 4 ++-- .../contracts/source/contracts/state/store.ts | 4 ++-- .../evm-api-worker/source/handlers/commit.ts | 4 ++-- packages/evm-api-worker/source/handlers/start.ts | 4 ++-- .../p2p/source/downloader/block-downloader.ts | 8 ++++---- .../p2p/source/downloader/message-downloader.ts | 4 ++-- .../socket-server/controllers/get-blocks.ts | 2 +- .../source/socket-server/utils/get-headers.ts | 2 +- packages/state/source/store.ts | 16 ++++++++-------- packages/test-framework/source/utils/generic.ts | 2 +- .../source/utilities.ts | 8 ++++---- .../transaction-pool-service/source/service.ts | 6 +++--- .../source/handlers/commit.ts | 4 ++-- .../source/handlers/start.ts | 4 ++-- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/packages/api-development/source/controllers/node.ts b/packages/api-development/source/controllers/node.ts index 7e36c0aab6..b7c2646155 100644 --- a/packages/api-development/source/controllers/node.ts +++ b/packages/api-development/source/controllers/node.ts @@ -30,7 +30,7 @@ export class NodeController extends Controller { return { data: { - constants: this.configuration.getMilestone(this.stateStore.getHeight()), + constants: this.configuration.getMilestone(this.stateStore.getBlockNumber()), core: { version: this.app.version(), }, diff --git a/packages/api-development/source/controllers/round.ts b/packages/api-development/source/controllers/round.ts index 956c8a4760..c50bfdc20a 100644 --- a/packages/api-development/source/controllers/round.ts +++ b/packages/api-development/source/controllers/round.ts @@ -23,11 +23,11 @@ export class RoundController extends Controller { (_, index) => roundValidators[this.proposerCalculator.getValidatorIndex(index)], ); - const height = this.stateStore.getHeight(); + const blockNumber = this.stateStore.getBlockNumber(); return { - height, - ...this.roundCalculator.calculateRound(height), + blockNumber, + ...this.roundCalculator.calculateRound(blockNumber), // Map the round validator set (static, vote-weighted, etc.) to actual proposal order validators: orderedValidators.map((validator) => ({ // rank: validator.getVoteBalance().toFixed(), diff --git a/packages/api-evm/source/actions/eth-block-number.test.ts b/packages/api-evm/source/actions/eth-block-number.test.ts index 2fb7f9cfc8..a15af89e2d 100644 --- a/packages/api-evm/source/actions/eth-block-number.test.ts +++ b/packages/api-evm/source/actions/eth-block-number.test.ts @@ -14,7 +14,7 @@ describe<{ beforeEach(async (context) => { context.store = { - getHeight() { + getBlockNumber() { return height; }, }; diff --git a/packages/api-evm/source/actions/eth-block-number.ts b/packages/api-evm/source/actions/eth-block-number.ts index 32fce1f307..6c2ac1ab9f 100644 --- a/packages/api-evm/source/actions/eth-block-number.ts +++ b/packages/api-evm/source/actions/eth-block-number.ts @@ -15,6 +15,6 @@ export class EthBlockNumberAction implements Contracts.Api.RPC.Action { }; public async handle(parameters: []): Promise { - return `0x${this.stateStore.getHeight().toString(16)}`; + return `0x${this.stateStore.getBlockNumber().toString(16)}`; } } diff --git a/packages/api-evm/source/actions/eth-get-uncle-by-block-number-and-index.ts b/packages/api-evm/source/actions/eth-get-uncle-by-block-number-and-index.ts index 51c415dd62..3e9c1a2887 100644 --- a/packages/api-evm/source/actions/eth-get-uncle-by-block-number-and-index.ts +++ b/packages/api-evm/source/actions/eth-get-uncle-by-block-number-and-index.ts @@ -18,7 +18,7 @@ export class EthGetUncleByBlockNumberAndIndex implements Contracts.Api.RPC.Actio }; public async handle(parameters: [string]): Promise { - if (this.stateStore.getHeight() < Number(parameters[0])) { + if (this.stateStore.getBlockNumber() < Number(parameters[0])) { throw new Exceptions.RpcError("Block not found"); } diff --git a/packages/api-evm/source/actions/eth-get-uncle-count-by-block-number.ts b/packages/api-evm/source/actions/eth-get-uncle-count-by-block-number.ts index 5a634e57aa..e49d203dc8 100644 --- a/packages/api-evm/source/actions/eth-get-uncle-count-by-block-number.ts +++ b/packages/api-evm/source/actions/eth-get-uncle-count-by-block-number.ts @@ -18,7 +18,7 @@ export class EthGetUncleCountByBlockNumber implements Contracts.Api.RPC.Action { }; public async handle(parameters: [string]): Promise { - if (this.stateStore.getHeight() < Number(parameters[0])) { + if (this.stateStore.getBlockNumber() < Number(parameters[0])) { throw new Exceptions.RpcError("Block not found"); } diff --git a/packages/api-evm/source/utils/resolve-block-tag.ts b/packages/api-evm/source/utils/resolve-block-tag.ts index c8b6ffa29f..eb2ce755ab 100644 --- a/packages/api-evm/source/utils/resolve-block-tag.ts +++ b/packages/api-evm/source/utils/resolve-block-tag.ts @@ -12,7 +12,7 @@ export const resolveBlockTag = async ( case "finalized": case "latest": case "safe": { - return stateStore.getHeight(); + return stateStore.getBlockNumber(); } default: { throw new Error("invalid blockTag:" + tag); diff --git a/packages/api-evm/source/validation/keywords.ts b/packages/api-evm/source/validation/keywords.ts index 26bfd1df67..3f1d85d7fe 100644 --- a/packages/api-evm/source/validation/keywords.ts +++ b/packages/api-evm/source/validation/keywords.ts @@ -3,7 +3,7 @@ import { FuncKeywordDefinition } from "ajv"; export const makeKeywords = (stateStore: Contracts.State.Store) => { const currentHeight: FuncKeywordDefinition = { - compile: (schema) => (data) => Number(data) === stateStore.getHeight(), + compile: (schema) => (data) => Number(data) === stateStore.getBlockNumber(), errors: false, keyword: "currentHeightHex", metaSchema: { diff --git a/packages/api-transaction-pool/source/controllers/configuration.ts b/packages/api-transaction-pool/source/controllers/configuration.ts index 81dfb46faf..b584e638e3 100644 --- a/packages/api-transaction-pool/source/controllers/configuration.ts +++ b/packages/api-transaction-pool/source/controllers/configuration.ts @@ -19,7 +19,7 @@ export class ConfigurationController extends AbstractController { core: { version: this.app.version(), }, - height: this.stateStore.getHeight(), + blockNumber: this.stateStore.getBlockNumber(), transactionPool: { maxTransactionAge: this.pluginConfiguration.get("maxTransactionAge"), maxTransactionBytes: this.pluginConfiguration.get("maxTransactionBytes"), diff --git a/packages/bootstrap/source/bootstrapper.ts b/packages/bootstrap/source/bootstrapper.ts index 037ea4699e..4bc1c1f04d 100644 --- a/packages/bootstrap/source/bootstrapper.ts +++ b/packages/bootstrap/source/bootstrapper.ts @@ -69,8 +69,8 @@ export class Bootstrapper { this.state.setBootstrap(false); this.validatorRepository.printLoadedValidators(); - await this.txPoolWorker.start(this.stateStore.getHeight()); - await this.evmWorker.start(this.stateStore.getHeight()); + await this.txPoolWorker.start(this.stateStore.getBlockNumber()); + await this.evmWorker.start(this.stateStore.getBlockNumber()); void this.runConsensus(); diff --git a/packages/contracts/source/contracts/state/store.ts b/packages/contracts/source/contracts/state/store.ts index a70b501fb5..32b092f93d 100644 --- a/packages/contracts/source/contracts/state/store.ts +++ b/packages/contracts/source/contracts/state/store.ts @@ -7,8 +7,8 @@ export interface Store extends CommitHandler { getLastBlock(): Block; setLastBlock(block: Block): void; - setHeight(height: number): void; - getHeight(): number; + setBlockNumber(blockNumber: number): void; + getBlockNumber(): number; setTotalRound(totalRound: number): void; getTotalRound(): number; diff --git a/packages/evm-api-worker/source/handlers/commit.ts b/packages/evm-api-worker/source/handlers/commit.ts index dbb975bccc..540df58556 100644 --- a/packages/evm-api-worker/source/handlers/commit.ts +++ b/packages/evm-api-worker/source/handlers/commit.ts @@ -9,7 +9,7 @@ export class CommitHandler { @inject(Identifiers.Services.Log.Service) protected readonly logger!: Contracts.Kernel.Logger; - public async handle(height: number): Promise { - this.stateStore.setHeight(height); + public async handle(blockNumber: number): Promise { + this.stateStore.setBlockNumber(blockNumber); } } diff --git a/packages/evm-api-worker/source/handlers/start.ts b/packages/evm-api-worker/source/handlers/start.ts index 0a9a8f9124..35812c494f 100644 --- a/packages/evm-api-worker/source/handlers/start.ts +++ b/packages/evm-api-worker/source/handlers/start.ts @@ -14,8 +14,8 @@ export class StartHandler { @tagged("plugin", "api-evm") private readonly configuration!: Providers.PluginConfiguration; - public async handle(height: number): Promise { - this.store.setHeight(height); + public async handle(blockNumber: number): Promise { + this.store.setBlockNumber(blockNumber); if (this.configuration.get("server.http.enabled")) { await this.app.get(Identifiers.Evm.API.HTTP).boot(); diff --git a/packages/p2p/source/downloader/block-downloader.ts b/packages/p2p/source/downloader/block-downloader.ts index 3ca14ee542..e3a6239787 100644 --- a/packages/p2p/source/downloader/block-downloader.ts +++ b/packages/p2p/source/downloader/block-downloader.ts @@ -93,7 +93,7 @@ export class BlockDownloader implements Contracts.P2P.Downloader { #getLastRequestedBlockNumber(): number { const latestJob = this.#downloadJobs.at(-1); if (latestJob === undefined) { - return this.stateStore.getHeight(); + return this.stateStore.getBlockNumber(); } return latestJob.blockNumberTo; @@ -210,7 +210,7 @@ export class BlockDownloader implements Contracts.P2P.Downloader { } #handleMissingBlocks(job: DownloadJob): void { - const configuration = this.configuration.getMilestone(this.stateStore.getHeight() + 1); + const configuration = this.configuration.getMilestone(this.stateStore.getBlockNumber() + 1); const size = job.blocks.reduce((size, block) => size + block.length, 0); @@ -233,13 +233,13 @@ export class BlockDownloader implements Contracts.P2P.Downloader { } const isFirstJob = index === 0; - const blockNumberFrom = isFirstJob ? this.stateStore.getHeight() + 1 : job.blockNumberFrom; + const blockNumberFrom = isFirstJob ? this.stateStore.getBlockNumber() + 1 : job.blockNumberFrom; // Skip if next job is higher than current block number if ( isFirstJob && this.#downloadJobs.length > 1 && - this.#downloadJobs[1].blockNumberFrom > this.stateStore.getHeight() + this.#downloadJobs[1].blockNumberFrom > this.stateStore.getBlockNumber() ) { this.#downloadJobs.shift(); return; diff --git a/packages/p2p/source/downloader/message-downloader.ts b/packages/p2p/source/downloader/message-downloader.ts index afc08b3562..808ea9ceee 100644 --- a/packages/p2p/source/downloader/message-downloader.ts +++ b/packages/p2p/source/downloader/message-downloader.ts @@ -70,8 +70,8 @@ export class MessageDownloader implements Contracts.P2P.Downloader { public initialize(): void { this.events.listen(Events.BlockEvent.Applied, { handle: () => { - this.#downloadsByBlockNumber.delete(this.stateStore.getHeight()); - this.#fullDownloadsByBlockNumber.delete(this.stateStore.getHeight()); + this.#downloadsByBlockNumber.delete(this.stateStore.getBlockNumber()); + this.#fullDownloadsByBlockNumber.delete(this.stateStore.getBlockNumber()); }, }); } diff --git a/packages/p2p/source/socket-server/controllers/get-blocks.ts b/packages/p2p/source/socket-server/controllers/get-blocks.ts index 279402d170..2f6afeee86 100644 --- a/packages/p2p/source/socket-server/controllers/get-blocks.ts +++ b/packages/p2p/source/socket-server/controllers/get-blocks.ts @@ -24,7 +24,7 @@ export class GetBlocksController implements Contracts.P2P.Controller { const requestBlockNumber: number = request.payload.fromBlockNumber; const requestBlockLimit: number = request.payload.limit; - const lastBlockNumber: number = this.stateStore.getHeight(); + const lastBlockNumber: number = this.stateStore.getBlockNumber(); if (requestBlockNumber > lastBlockNumber) { return { blocks: [] }; } diff --git a/packages/p2p/source/socket-server/utils/get-headers.ts b/packages/p2p/source/socket-server/utils/get-headers.ts index 3453d70144..6f323824a5 100644 --- a/packages/p2p/source/socket-server/utils/get-headers.ts +++ b/packages/p2p/source/socket-server/utils/get-headers.ts @@ -16,7 +16,7 @@ export const getHeaders = (app: Contracts.Kernel.Application) => { version: app.version(), }; - headers.height = app.get(Identifiers.State.Store).getHeight(); + headers.height = app.get(Identifiers.State.Store).getBlockNumber(); return headers; }; diff --git a/packages/state/source/store.ts b/packages/state/source/store.ts index 3cf3d7f582..c73fa6ffff 100644 --- a/packages/state/source/store.ts +++ b/packages/state/source/store.ts @@ -15,7 +15,7 @@ export class Store implements Contracts.State.Store { #genesisCommit?: Contracts.Crypto.Commit; #lastBlock?: Contracts.Crypto.Block; - #height = 0; + #blockNumber = 0; #totalRound = 0; public setGenesisCommit(block: Contracts.Crypto.Commit): void { @@ -30,7 +30,7 @@ export class Store implements Contracts.State.Store { public setLastBlock(block: Contracts.Crypto.Block): void { this.#lastBlock = block; - this.setHeight(block.data.number); + this.setBlockNumber(block.data.number); } public getLastBlock(): Contracts.Crypto.Block { @@ -38,10 +38,10 @@ export class Store implements Contracts.State.Store { return this.#lastBlock; } - // Set height is used on workers, because last block is not transferred - public setHeight(height: number): void { - this.#height = height; - this.configuration.setHeight(height + 1); + // Set blockNumber is used on workers, because last block is not transferred + public setBlockNumber(blockNumber: number): void { + this.#blockNumber = blockNumber; + this.configuration.setHeight(blockNumber + 1); if (this.configuration.isNewMilestone()) { this.logger.notice(`Milestone change: ${JSON.stringify(this.configuration.getMilestoneDiff())}`); @@ -49,8 +49,8 @@ export class Store implements Contracts.State.Store { } } - public getHeight(): number { - return this.#height; + public getBlockNumber(): number { + return this.#blockNumber; } public setTotalRound(totalRound: number): void { diff --git a/packages/test-framework/source/utils/generic.ts b/packages/test-framework/source/utils/generic.ts index 524cf87218..ae247aa556 100644 --- a/packages/test-framework/source/utils/generic.ts +++ b/packages/test-framework/source/utils/generic.ts @@ -13,7 +13,7 @@ export const injectMilestone = ( }); export const getLastHeight = (app: Contracts.Kernel.Application): number => - app.get(Identifiers.State.Store).getHeight(); + app.get(Identifiers.State.Store).getBlockNumber(); export const getWalletNonce = async (app: Contracts.Kernel.Application, publicKey: string): Promise => BigNumber.ZERO; diff --git a/packages/test-transaction-builders/source/utilities.ts b/packages/test-transaction-builders/source/utilities.ts index e46df026d9..0a2644b44c 100644 --- a/packages/test-transaction-builders/source/utilities.ts +++ b/packages/test-transaction-builders/source/utilities.ts @@ -163,13 +163,13 @@ export const addTransactionsToPool = async ( export const waitBlock = async (sandbox: Sandbox, count: number = 1) => { const state = sandbox.app.get(Identifiers.State.Store); - let currentHeight = state.getHeight(); - const targetHeight = currentHeight + count; + let currentBlockNumber = state.getBlockNumber(); + const targetBlockNumber = currentBlockNumber + count; do { await sleep(200); - currentHeight = state.getHeight(); - } while (currentHeight < targetHeight); + currentBlockNumber = state.getBlockNumber(); + } while (currentBlockNumber < targetBlockNumber); }; export const getRandomFundedWallet = async ( diff --git a/packages/transaction-pool-service/source/service.ts b/packages/transaction-pool-service/source/service.ts index e0efc2ef70..01ae04360d 100644 --- a/packages/transaction-pool-service/source/service.ts +++ b/packages/transaction-pool-service/source/service.ts @@ -84,7 +84,7 @@ export class Service implements Contracts.TransactionPool.Service { } this.storage.addTransaction({ - blockNumber: this.stateStore.getHeight(), + blockNumber: this.stateStore.getBlockNumber(), hash: transaction.hash, senderPublicKey: transaction.data.senderPublicKey, serialized: transaction.serialized, @@ -121,7 +121,7 @@ export class Service implements Contracts.TransactionPool.Service { let previouslyStoredFailures = 0; const maxTransactionAge: number = this.pluginConfiguration.getRequired("maxTransactionAge"); - const lastBlockNumber: number = this.stateStore.getHeight(); + const lastBlockNumber: number = this.stateStore.getBlockNumber(); const expiredBlockNumber: number = lastBlockNumber - maxTransactionAge; for (const { blockNumber, hash, serialized } of this.storage.getAllTransactions()) { @@ -179,7 +179,7 @@ export class Service implements Contracts.TransactionPool.Service { async #removeOldTransactions(): Promise { const maxTransactionAge: number = this.pluginConfiguration.getRequired("maxTransactionAge"); - const lastBlockNumber: number = this.stateStore.getHeight(); + const lastBlockNumber: number = this.stateStore.getBlockNumber(); const expiredBlockNumber: number = lastBlockNumber - maxTransactionAge; for (const { senderPublicKey, hash } of this.storage.getOldTransactions(expiredBlockNumber)) { diff --git a/packages/transaction-pool-worker/source/handlers/commit.ts b/packages/transaction-pool-worker/source/handlers/commit.ts index 2dd5cddf86..96554a941d 100644 --- a/packages/transaction-pool-worker/source/handlers/commit.ts +++ b/packages/transaction-pool-worker/source/handlers/commit.ts @@ -15,9 +15,9 @@ export class CommitHandler { @inject(Identifiers.Services.Log.Service) protected readonly logger!: Contracts.Kernel.Logger; - public async handle(height: number, sendersAddresses: string[]): Promise { + public async handle(blockNumber: number, sendersAddresses: string[]): Promise { try { - this.stateStore.setHeight(height); + this.stateStore.setBlockNumber(blockNumber); if (this.configuration.isNewMilestone()) { void this.transactionPoolService.reAddTransactions(); diff --git a/packages/transaction-pool-worker/source/handlers/start.ts b/packages/transaction-pool-worker/source/handlers/start.ts index 84fd9234ee..5b77bffa2b 100644 --- a/packages/transaction-pool-worker/source/handlers/start.ts +++ b/packages/transaction-pool-worker/source/handlers/start.ts @@ -17,8 +17,8 @@ export class StartHandler { @tagged("plugin", "api-transaction-pool") private readonly configuration!: Providers.PluginConfiguration; - public async handle(height: number): Promise { - this.store.setHeight(height); + public async handle(blockNumber: number): Promise { + this.store.setBlockNumber(blockNumber); await this.transactionPoolService.reAddTransactions(); if (this.configuration.get("server.http.enabled")) { From d919ca14d50113673cfa562948d5618aa4f1897a Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:37:58 +0900 Subject: [PATCH 2/4] update tests --- packages/consensus/source/consensus.test.ts | 2 +- .../p2p/source/socket-server/controllers/get-api-nodes.test.ts | 2 +- .../p2p/source/socket-server/controllers/get-blocks.test.ts | 2 +- packages/p2p/source/socket-server/utils/get-headers.test.ts | 2 +- packages/state/source/store.test.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/consensus/source/consensus.test.ts b/packages/consensus/source/consensus.test.ts index 4214e09e43..a19d7edeca 100644 --- a/packages/consensus/source/consensus.test.ts +++ b/packages/consensus/source/consensus.test.ts @@ -36,7 +36,7 @@ describe("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each context.state = { getLastBlock: () => {}, - getHeight: () => 1, + getBlockNumber: () => 1, }; context.cryptoConfiguration = { diff --git a/packages/p2p/source/socket-server/controllers/get-api-nodes.test.ts b/packages/p2p/source/socket-server/controllers/get-api-nodes.test.ts index 47ad5008df..05c066cea1 100644 --- a/packages/p2p/source/socket-server/controllers/get-api-nodes.test.ts +++ b/packages/p2p/source/socket-server/controllers/get-api-nodes.test.ts @@ -11,7 +11,7 @@ describe<{ const database = { findCommitBuffers: () => {} }; const store = { getLastDownloadedBlock: () => {}, - getHeight: () => {}, + getBlockNumber: () => {}, }; beforeEach((context) => { diff --git a/packages/p2p/source/socket-server/controllers/get-blocks.test.ts b/packages/p2p/source/socket-server/controllers/get-blocks.test.ts index bd9cf5302b..a4e159cf00 100644 --- a/packages/p2p/source/socket-server/controllers/get-blocks.test.ts +++ b/packages/p2p/source/socket-server/controllers/get-blocks.test.ts @@ -11,7 +11,7 @@ describe<{ const database = { findCommitBuffers: () => {} }; const store = { getLastDownloadedBlock: () => {}, - getHeight: () => {}, + getBlockNumber: () => {}, }; beforeEach((context) => { diff --git a/packages/p2p/source/socket-server/utils/get-headers.test.ts b/packages/p2p/source/socket-server/utils/get-headers.test.ts index 66b388ee6f..eac2308504 100644 --- a/packages/p2p/source/socket-server/utils/get-headers.test.ts +++ b/packages/p2p/source/socket-server/utils/get-headers.test.ts @@ -7,7 +7,7 @@ describe("getHeaders", ({ it, assert }) => { let port = 4007; const version = "3.0.9"; const height = 387; - const store = { getHeight: () => height, isStarted: () => true }; + const store = { getBlockNumber: () => height, isStarted: () => true }; const appGet = { [Identifiers.State.Store]: store, }; diff --git a/packages/state/source/store.test.ts b/packages/state/source/store.test.ts index e7d069009d..c86a608f99 100644 --- a/packages/state/source/store.test.ts +++ b/packages/state/source/store.test.ts @@ -38,7 +38,7 @@ describe<{ }); it("#initialize - should set height and totalRound", ({ store }) => { - assert.equal(store.getHeight(), 0); + assert.equal(store.getBlockNumber(), 0); assert.equal(store.getTotalRound(), 0); }); From cbe37a92798d1125a1fc41973f1e50990ac6415f Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Thu, 19 Jun 2025 04:40:11 +0000 Subject: [PATCH 3/4] style: resolve style guide violations --- .../api-transaction-pool/source/controllers/configuration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-transaction-pool/source/controllers/configuration.ts b/packages/api-transaction-pool/source/controllers/configuration.ts index b584e638e3..0adfc0566c 100644 --- a/packages/api-transaction-pool/source/controllers/configuration.ts +++ b/packages/api-transaction-pool/source/controllers/configuration.ts @@ -16,10 +16,10 @@ export class ConfigurationController extends AbstractController { public async configuration(request: Hapi.Request) { return { data: { + blockNumber: this.stateStore.getBlockNumber(), core: { version: this.app.version(), }, - blockNumber: this.stateStore.getBlockNumber(), transactionPool: { maxTransactionAge: this.pluginConfiguration.get("maxTransactionAge"), maxTransactionBytes: this.pluginConfiguration.get("maxTransactionBytes"), From 1198ff08ae1ea381474bb41b46c722692488cabf Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:55:42 +0900 Subject: [PATCH 4/4] fix --- .../transaction-pool-api/source/utilities.ts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/functional/transaction-pool-api/source/utilities.ts b/tests/functional/transaction-pool-api/source/utilities.ts index 7a52a8842d..7c8636e29e 100644 --- a/tests/functional/transaction-pool-api/source/utilities.ts +++ b/tests/functional/transaction-pool-api/source/utilities.ts @@ -103,18 +103,18 @@ export const waitBlock = async ({ sandbox }: { sandbox: Sandbox }, count: number let remainingTransactions = await query.getAll().all(); - let currentHeight = store.getHeight(); - let targetHeight = currentHeight + count; + let currentBlockNumber = store.getBlockNumber(); + let targetBlockNumber = currentBlockNumber + count; do { await sleep(100); - currentHeight = store.getHeight(); + currentBlockNumber = store.getBlockNumber(); remainingTransactions = await query.getAll().all(); if (remainingTransactions.length > 0) { - targetHeight = Math.max(currentHeight, targetHeight) + 1; + targetBlockNumber = Math.max(currentBlockNumber, targetBlockNumber) + 1; } - } while (currentHeight < targetHeight); + } while (currentBlockNumber < targetBlockNumber); }; // export const hasVotedFor = async ( @@ -224,12 +224,12 @@ export const isTransactionCommitted = async ( { hash }: Contracts.Crypto.Transaction, ): Promise => { const store = sandbox.app.get(Identifiers.State.Store); - const currentHeight = store.getHeight(); + const currentBlockNumber = store.getBlockNumber(); const database = sandbox.app.get(Identifiers.Database.Service); const forgedBlocks = await database.findBlocks( - currentHeight - 5, - currentHeight + 5 /* just a buffer in case tx got included after target height */, + currentBlockNumber - 5, + currentBlockNumber + 5 /* just a buffer in case tx got included after target height */, ); let found = false; @@ -248,10 +248,10 @@ export const getTransactionReceipt = async ( { hash }: Contracts.Crypto.Transaction, ): Promise => { const store = sandbox.app.get(Identifiers.State.Store); - const currentHeight = store.getHeight(); + const currentBlockNumber = store.getBlockNumber(); const database = sandbox.app.get(Identifiers.Database.Service); - const forgedBlocks = await database.findBlocks(0, currentHeight); + const forgedBlocks = await database.findBlocks(0, currentBlockNumber); for (const block of forgedBlocks) { if (!block.transactions.some((transaction) => transaction.hash === hash)) {