Skip to content

Commit fadba08

Browse files
authored
chore(transactions): remove unused index parameter (#1266)
* remove unused `index` parameter * empty commit
1 parent 3cf38fa commit fadba08

9 files changed

Lines changed: 18 additions & 28 deletions

File tree

packages/contracts/source/contracts/evm/evm.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ export interface TransactionContext {
118118
readonly data: Buffer;
119119
readonly blockContext: BlockContext;
120120
readonly txHash: string;
121-
readonly index?: number;
122121
readonly specId: SpecId;
123122
}
124123

packages/contracts/source/contracts/processor/transaction-processor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import type { TransactionReceipt } from "../evm/index.js";
33
import type { ProcessableUnit } from "./processable-unit.js";
44

55
export interface TransactionProcessor {
6-
process(unit: ProcessableUnit, transaction: Transaction, index: number): Promise<TransactionReceipt>;
6+
process(unit: ProcessableUnit, transaction: Transaction): Promise<TransactionReceipt>;
77
}

packages/contracts/source/contracts/transactions.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface TransactionHandler {
1616

1717
throwIfCannotBeApplied(transaction: Transaction, sender: Wallet, evm: Instance): Promise<void>;
1818

19-
apply(context: TransactionHandlerContext, transaction: Transaction, index: number): Promise<TransactionReceipt>;
19+
apply(context: TransactionHandlerContext, transaction: Transaction): Promise<TransactionReceipt>;
2020
}
2121

2222
export interface TransactionHandlerRegistry {
@@ -46,11 +46,7 @@ export interface TransactionValidatorContext {
4646

4747
export interface TransactionValidator {
4848
getEvm(): Instance;
49-
validate(
50-
context: TransactionValidatorContext,
51-
transaction: Transaction,
52-
index: number,
53-
): Promise<TransactionReceipt>;
49+
validate(context: TransactionValidatorContext, transaction: Transaction): Promise<TransactionReceipt>;
5450
}
5551

5652
export type TransactionValidatorFactory = () => TransactionValidator;

packages/processor/source/block-processor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export class BlockProcessor implements Contracts.Processor.BlockProcessor {
7878
await sleep(0);
7979
}
8080

81-
const receipt = await this.transactionProcessor.process(unit, transaction, index);
81+
const receipt = await this.transactionProcessor.process(unit, transaction);
8282
processResult.receipts.set(transaction.hash, receipt);
8383

8484
this.#consumeGas(block, processResult, Number(receipt.gasUsed));

packages/processor/source/transaction-processor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export class TransactionProcessor implements Contracts.Processor.TransactionProc
2929
async process(
3030
unit: Contracts.Processor.ProcessableUnit,
3131
transaction: Contracts.Crypto.Transaction,
32-
index: number,
3332
): Promise<Contracts.Evm.TransactionReceipt> {
3433
const block = unit.getBlock();
3534

@@ -57,7 +56,7 @@ export class TransactionProcessor implements Contracts.Processor.TransactionProc
5756
throw new InvalidSignatureError();
5857
}
5958

60-
const receipt = await this.transactionHandler.apply(transactionHandlerContext, transaction, index);
59+
const receipt = await this.transactionHandler.apply(transactionHandlerContext, transaction);
6160

6261
const feeConsumed = this.feeCalculator.calculateConsumed(transaction.gasPrice, Number(receipt.gasUsed));
6362
this.logger.debug(

packages/transactions/source/handlers/transaction.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ export class TransactionHandler implements Contracts.Transactions.TransactionHan
7171
public async apply(
7272
context: Contracts.Transactions.TransactionHandlerContext,
7373
transaction: Contracts.Crypto.Transaction,
74-
index: number,
7574
): Promise<Contracts.Evm.TransactionReceipt> {
7675
assert.string(transaction.hash);
7776

@@ -85,7 +84,6 @@ export class TransactionHandler implements Contracts.Transactions.TransactionHan
8584
from: transaction.from,
8685
gasLimit: BigInt(transaction.gasLimit),
8786
gasPrice: BigInt(transaction.gasPrice),
88-
index,
8987
legacyAddress: transaction.senderLegacyAddress,
9088
nonce: transaction.nonce.toBigInt(),
9189
specId: evmSpec,

packages/transactions/source/transaction-validator.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export class TransactionValidator implements Contracts.Transactions.TransactionV
2424
public async validate(
2525
context: Contracts.Transactions.TransactionValidatorContext,
2626
transaction: Contracts.Crypto.Transaction,
27-
index: number,
2827
): Promise<Contracts.Evm.TransactionReceipt> {
2928
const deserialized: Contracts.Crypto.Transaction = await this.transactionFactory.fromBytes(
3029
transaction.serialized,
@@ -46,7 +45,6 @@ export class TransactionValidator implements Contracts.Transactions.TransactionV
4645
},
4746
},
4847
transaction,
49-
index,
5048
);
5149

5250
assert.string(transaction.from);

packages/validator/source/validator.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export class Validator implements Contracts.Validator.Validator {
174174
performance.now() +
175175
milestone.timeouts.blockPrepareTime * this.configuration.getRequired<number>("txCollatorFactor");
176176

177-
for (const [index, bytes] of transactionBytes.entries()) {
177+
for (const bytes of transactionBytes.values()) {
178178
if (performance.now() > timeLimit) {
179179
break;
180180
}
@@ -210,7 +210,6 @@ export class Validator implements Contracts.Validator.Validator {
210210
const result = await validator.validate(
211211
{ commitKey, gasLimit: milestone.block.maxGasLimit, generatorAddress, timestamp },
212212
transaction,
213-
index,
214213
);
215214

216215
gasLeft -= Number(result.gasUsed);

tests/functional/consensus/source/custom-proposal.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const makeCustomProposal = async (
6161
const transactionData: Contracts.Crypto.TransactionData[] = [];
6262
let payloadSize = 2;
6363

64-
for (const [index,transaction] of transactions.entries()) {
64+
for (const transaction of transactions.values()) {
6565
let result = { gasRefunded: 0n, gasUsed: 0n, logs: [] as any, status: 0 };
6666

6767
try {
@@ -73,7 +73,6 @@ export const makeCustomProposal = async (
7373
timestamp: dayjs().valueOf(),
7474
},
7575
transaction,
76-
index,
7776
);
7877
} catch {
7978
result = { ...result, gasUsed: BigInt(transaction.gasLimit) };
@@ -129,14 +128,12 @@ export const makeCustomProposal = async (
129128
lockProof: undefined,
130129
});
131130

132-
const serializedProposal = await messageSerializer.serializeProposalUnsigned(
133-
{
134-
payloadSerialized: proposedBytes.toString("hex"),
135-
round,
136-
validRound: undefined,
137-
validatorIndex: 0,
138-
},
139-
);
131+
const serializedProposal = await messageSerializer.serializeProposalUnsigned({
132+
payloadSerialized: proposedBytes.toString("hex"),
133+
round,
134+
validRound: undefined,
135+
validatorIndex: 0,
136+
});
140137

141138
const proposalSignature = await app
142139
.getTagged<Contracts.Crypto.SignatureBls>(Identifiers.Cryptography.Signature.Instance, "type", "consensus")
@@ -158,7 +155,11 @@ export const makeCustomProposal = async (
158155
return proposal;
159156
};
160157

161-
export const makeTransactionBuilderContext = (app: Contracts.Kernel.Application, apps: Contracts.Kernel.Application[], validators: Validator[]) => {
158+
export const makeTransactionBuilderContext = (
159+
app: Contracts.Kernel.Application,
160+
apps: Contracts.Kernel.Application[],
161+
validators: Validator[],
162+
) => {
162163
const context = {
163164
app,
164165
wallets: validators.map((v) => ({

0 commit comments

Comments
 (0)