Skip to content

Commit f58d398

Browse files
committed
feat(core): Transaction.getFee
1 parent d81b42c commit f58d398

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

.changeset/new-flowers-accept.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@ckb-ccc/core": minor
3+
---
4+
5+
feat(core): Transaction.getFee

packages/core/src/ckb/transaction.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,13 +1643,13 @@ export class Transaction extends mol.Entity.Base<
16431643
return this.completeInputsAddOne(from, filter);
16441644
}
16451645

1646-
async fee(client: Client): Promise<Num> {
1646+
async getFee(client: Client): Promise<Num> {
16471647
return (await this.getInputsCapacity(client)) - this.getOutputsCapacity();
16481648
}
16491649

1650-
async feeRate(client: Client): Promise<Num> {
1650+
async getFeeRate(client: Client): Promise<Num> {
16511651
return (
1652-
((await this.fee(client)) * numFrom(1000)) /
1652+
((await this.getFee(client)) * numFrom(1000)) /
16531653
numFrom(this.toBytes().length + 4)
16541654
);
16551655
}
@@ -1700,7 +1700,7 @@ export class Transaction extends mol.Entity.Base<
17001700
// The initial fee is calculated based on prepared transaction
17011701
leastFee = tx.estimateFee(feeRate);
17021702
}
1703-
const fee = await tx.fee(from.client);
1703+
const fee = await tx.getFee(from.client);
17041704
// The extra capacity paid the fee without a change
17051705
if (fee === leastFee) {
17061706
this.copy(tx);
@@ -1714,7 +1714,7 @@ export class Transaction extends mol.Entity.Base<
17141714
continue;
17151715
}
17161716

1717-
if ((await tx.fee(from.client)) !== leastFee) {
1717+
if ((await tx.getFee(from.client)) !== leastFee) {
17181718
throw new Error(
17191719
"The change function doesn't use all available capacity",
17201720
);

packages/core/src/client/client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,9 +596,9 @@ export abstract class Client {
596596
const tx = Transaction.from(transaction);
597597

598598
const maxFeeRate = numFrom(options?.maxFeeRate ?? DEFAULT_MAX_FEE_RATE);
599-
const fee = await tx.feeRate(this);
600-
if (maxFeeRate > Zero && fee > maxFeeRate) {
601-
throw new ErrorClientMaxFeeRateExceeded(maxFeeRate, fee);
599+
const feeRate = await tx.getFeeRate(this);
600+
if (maxFeeRate > Zero && feeRate > maxFeeRate) {
601+
throw new ErrorClientMaxFeeRateExceeded(maxFeeRate, feeRate);
602602
}
603603

604604
const txHash = await this.sendTransactionNoCache(tx, validator);

0 commit comments

Comments
 (0)