feat: Update CryptoCreate/CryptoDelete to use new simple fees #21901

aderevets · 2025-10-28T19:04:00Z

Description:
Update CryptoCreate/CryptoDelete handler to use new simple fees model based on this HIP

Update simpleFeesSchedules.json with correct values

Related issue(s):

Fixes #20443

Notes for reviewer:

Checklist

Documented (Code comments, README, etc.)
Tested (unit, integration, etc.)

Signed-off-by: artemderevets <[email protected]>

lfdt-bot · 2025-10-28T19:04:21Z

✅ Snyk checks have passed. No issues have been found so far.

Status	Scanner	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

Signed-off-by: artemderevets <[email protected]>

codecov · 2025-10-28T21:02:24Z

Codecov Report

❌ Patch coverage is 0% with 122 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...node/app/spi/fees/AbstractSimpleFeeCalculator.java	0.00%	69 Missing ⚠️
...rvice/token/impl/handlers/SimpleTxContextImpl.java	0.00%	29 Missing ⚠️
...token/impl/handlers/CryptoCreateFeeCalculator.java	0.00%	13 Missing ⚠️
...token/impl/handlers/CryptoDeleteFeeCalculator.java	0.00%	8 Missing ⚠️
...pp/workflows/dispatcher/TransactionDispatcher.java	0.00%	1 Missing ⚠️
...rvice/token/impl/handlers/CryptoCreateHandler.java	0.00%	1 Missing ⚠️
...rvice/token/impl/handlers/CryptoDeleteHandler.java	0.00%	1 Missing ⚠️

@@             Coverage Diff              @@
##               main   #21901      +/-   ##
============================================
- Coverage     70.89%   70.82%   -0.08%     
+ Complexity    24429    24428       -1     
============================================
  Files          2668     2672       +4     
  Lines        104410   104531     +121     
  Branches      10966    10973       +7     
============================================
+ Hits          74022    74031       +9     
- Misses        26343    26450     +107     
- Partials       4045     4050       +5

Files with missing lines	Coverage Δ	Complexity Δ
...pp/workflows/dispatcher/TransactionDispatcher.java	`49.58% <0.00%> (ø)`	`39.00 <0.00> (ø)`
...rvice/token/impl/handlers/CryptoCreateHandler.java	`80.40% <0.00%> (-0.41%)`	`51.00 <0.00> (ø)`
...rvice/token/impl/handlers/CryptoDeleteHandler.java	`97.29% <0.00%> (-2.71%)`	`9.00 <0.00> (ø)`
...token/impl/handlers/CryptoDeleteFeeCalculator.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...token/impl/handlers/CryptoCreateFeeCalculator.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...rvice/token/impl/handlers/SimpleTxContextImpl.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...node/app/spi/fees/AbstractSimpleFeeCalculator.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`

... and 14 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Signed-off-by: artemderevets <[email protected]>

…new-simple-fee' into 20443/update-crypto-services-to-new-simple-fee

Signed-off-by: artemderevets <[email protected]>

joshmarinacci

Overall the PR is good and contains what I expect. The part I'm confused on is in CryptoTransferHandler. Why does it need a cache? This seems overly complex.

Also, there should be full HAPI tests for each of the transaction types.

Signed-off-by: artemderevets <[email protected]>

aderevets · 2025-10-29T16:37:03Z

Overall the PR is good and contains what I expect. The part I'm confused on is in CryptoTransferHandler. Why does it need a cache? This seems overly complex.

Also, there should be full HAPI tests for each of the transaction types.

I created a cache to reduce store interaction and overall complexity. This will allow to implement crypto transfrer estimation in the single pass

Signed-off-by: artemderevets <[email protected]>

…ew-simple-fee

.../java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferFeeResultCalculator.java

Signed-off-by: artemderevets <[email protected]>

…new-simple-fee' into 20443/update-crypto-services-to-new-simple-fee

Signed-off-by: artemderevets <[email protected]>

hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/SimpleFeeCalculator.java

hedera-node/hedera-file-service-impl/src/main/resources/genesis/simpleFeesSchedules.json

Neeharika-Sompalli · 2025-11-05T22:13:38Z

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateFeeCalculator.java

+        final var usageMapper = usageBuilder()
+                .withSignatures(context.numTxnSignatures())
+                .withKeys(keyCount)
+                .build();


This looks great!

Neeharika-Sompalli · 2025-11-05T22:14:40Z

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateFeeCalculator.java

+        final var feeSchedule = feeCalculator.getSimpleFeesSchedule();
+        final var serviceDef = lookupServiceFee(feeSchedule, HederaFunctionality.CRYPTO_CREATE);
+
+        // Calculate fees
+        long nodeFee = feeSchedule.node().baseFee()
+                + calculateExtraFees(feeSchedule.node().extras(), feeSchedule, usageMapper);
+
+        long serviceFee = serviceDef.baseFee() + calculateExtraFees(serviceDef.extras(), feeSchedule, usageMapper);
+
+        long networkFee = calculateNetworkFee(nodeFee, feeSchedule.network().multiplier());
+
+        // Return result
+        final var result = new FeeResult();
+        result.node = nodeFee;
+        result.network = networkFee;
+        result.service = serviceFee;
+        return result;


Can all this code be moved to AbstractSimpleFeeCalculator ? Since it will be the same for every handler

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateFeeCalculator.java

Neeharika-Sompalli · 2025-11-05T22:18:30Z

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateFeeCalculator.java

+    private long countKeys(Key key) {
+        return switch (key.key().kind()) {
+            case ED25519, ECDSA_SECP256K1, ECDSA_384 -> 1L;
+            case THRESHOLD_KEY ->


We support other key types also right ?

Yes, we support other key types (like CONTRACT_ID, DELEGATABLE_CONTRACT_ID, RSA_3072) at the API level, but they're intentionally not counted for fee calculation. The current implementation only counts cryptographic keys (ED25519, ECDSA_SECP256K1, ECDSA_384) and recursively processes THRESHOLD_KEY and KEY_LIST. Contract ID keys return 0 because they don't contain actual key material—they're authorization references. Old fee model charges based on cryptographic complexity, not authorization complexity (as I understand). ECDSA_384 and RSA_3072 are deprecated but still handled for backward compatibility.

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteFeeCalculator.java

...-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java

Neeharika-Sompalli · 2025-11-05T22:26:25Z

...-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/SimpleTxContextImpl.java

+    public boolean existsAccountWith(@NonNull final Bytes alias) {
+        requireNonNull(alias, "alias");
+        final var hederaConfig =
+                feeContext.configuration().getConfigData(com.hedera.node.config.data.HederaConfig.class);
+        final var accountId = accountStore.getAccountIDByAlias(hederaConfig.shard(), hederaConfig.realm(), alias);
+        return accountId != null;
+    }
+
+    @Override
+    public boolean existsAccount(@NonNull final AccountID accountId) {
+        requireNonNull(accountId, "accountId");
+        return accountStore.getAliasedAccountById(accountId) != null;
+    }


Why do we need these two when we have getAccount?

refactored. Just forget to do this

Neeharika-Sompalli · 2025-11-05T22:29:02Z

...-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/SimpleTxContextImpl.java

+
+    @Override
+    public int cryptoVerificationsRequired() {
+        return feeContext.numTxnSignatures();


Should this be txInfo.signatureMap().sigPair().size() ?

No, it shouldn't be txInfo.signatureMap().sigPair().size() directly. In IngestChecker.java:325: numSigs = txInfo.signatureMap().sigPair().size(). This is passed to FeeContextImpl constructor. feeContext.numTxnSignatures() returns this value

Neeharika-Sompalli

Overall looks like a great step. Thanks @aderevets . Have a few comments

Signed-off-by: artemderevets <[email protected]>

…new-simple-fee' into 20443/update-crypto-services-to-new-simple-fee

WIP: update crypto services to use new simple fees

df68997

Signed-off-by: artemderevets <[email protected]>

aderevets requested a review from a team as a code owner October 28, 2025 19:04

aderevets requested review from Neeharika-Sompalli and joshmarinacci October 28, 2025 19:04

aderevets requested a review from tinker-michaelj October 28, 2025 19:04

WIP: update crypto services to use new simple fees

b21e8d6

Signed-off-by: artemderevets <[email protected]>

aderevets self-assigned this Oct 28, 2025

aderevets added 3 commits October 28, 2025 20:39

WIP: update crypto services to use new simple fees

d713ee2

Signed-off-by: artemderevets <[email protected]>

WIP: update crypto services to use new simple fees

b2a87cd

Signed-off-by: artemderevets <[email protected]>

WIP: update crypto services to use new simple fees

31b6cf3

Signed-off-by: artemderevets <[email protected]>

WIP: fix codacy alerts

95d1987

Signed-off-by: artemderevets <[email protected]>

aderevets requested a review from ibankov October 29, 2025 13:10

aderevets added 4 commits October 29, 2025 14:17

Merge branch 'main' into 20443/update-crypto-services-to-new-simple-fee

96676c5

WIP: remove duplicate convertion code

9c70a6c

Signed-off-by: artemderevets <[email protected]>

Merge remote-tracking branch 'origin/20443/update-crypto-services-to-…

ea625cb

…new-simple-fee' into 20443/update-crypto-services-to-new-simple-fee

WIP: remove duplicate convertion code

498085f

Signed-off-by: artemderevets <[email protected]>

joshmarinacci reviewed Oct 29, 2025

View reviewed changes

WIP: refactor tests

f7197f6

Signed-off-by: artemderevets <[email protected]>

aderevets requested a review from a team as a code owner October 29, 2025 16:34

aderevets requested a review from PavelSBorisov October 29, 2025 16:34

WIP: refactor tests

7ada0df

Signed-off-by: artemderevets <[email protected]>

aderevets added 2 commits October 29, 2025 17:38

WIP: refactor tests

8cf90bf

Signed-off-by: artemderevets <[email protected]>

WIP: add hapi test

182e806

Signed-off-by: artemderevets <[email protected]>

aderevets requested a review from a team as a code owner October 29, 2025 22:40

aderevets requested a review from joshmarinacci October 30, 2025 14:24

aderevets added 2 commits October 30, 2025 22:48

WIP: bump codecov

6ac8c83

Signed-off-by: artemderevets <[email protected]>

Merge branch 'refs/heads/main' into 20443/update-crypto-services-to-n…

828151d

…ew-simple-fee

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

.../java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferFeeResultCalculator.java Outdated Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

.../java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferFeeResultCalculator.java Outdated Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

.../java/com/hedera/node/app/service/token/impl/handlers/CryptoTransferFeeResultCalculator.java Outdated Show resolved Hide resolved

aderevets added 2 commits November 5, 2025 20:37

WIP: revert CryptoTransferHandler changes add CryptoDelete CryptoCreate

9ee5558

Signed-off-by: artemderevets <[email protected]>

WIP: revert CryptoTransferHandler changes add CryptoDelete CryptoCreate

303e4de

Signed-off-by: artemderevets <[email protected]>

aderevets changed the title ~~feat: Update CryptoTransfer to use new simple fees~~ feat: Update CryptoCreate/CryptoDelete to use new simple fees Nov 5, 2025

Merge branch 'main' into 20443/update-crypto-services-to-new-simple-fee

4c2f38e

aderevets requested a review from Neeharika-Sompalli November 5, 2025 20:26

aderevets added 5 commits November 5, 2025 21:32

WIP: revert CryptoTransferHandler changes add CryptoDelete CryptoCreate

0a76237

Signed-off-by: artemderevets <[email protected]>

Merge remote-tracking branch 'origin/20443/update-crypto-services-to-…

fb94b6c

…new-simple-fee' into 20443/update-crypto-services-to-new-simple-fee

WIP: revert CryptoTransferHandler changes add CryptoDelete CryptoCreate

3126115

Signed-off-by: artemderevets <[email protected]>

WIP: revert CryptoTransferHandler changes add CryptoDelete CryptoCreate

5f80dd4

Signed-off-by: artemderevets <[email protected]>

Merge branch 'main' into 20443/update-crypto-services-to-new-simple-fee

0c1db1e

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/fees/SimpleFeeCalculator.java Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

hedera-node/hedera-file-service-impl/src/main/resources/genesis/simpleFeesSchedules.json Outdated Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateFeeCalculator.java Outdated Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateFeeCalculator.java Outdated Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

...src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoDeleteFeeCalculator.java Outdated Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

...-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoCreateHandler.java Outdated Show resolved Hide resolved

Neeharika-Sompalli reviewed Nov 5, 2025

View reviewed changes

Neeharika-Sompalli mentioned this pull request Nov 5, 2025

feat: Simple fees implementation for Airdrops #21970

Open

2 tasks

aderevets added 3 commits November 6, 2025 00:03

WIP: address PR comments

0c14289

Signed-off-by: artemderevets <[email protected]>

Merge remote-tracking branch 'origin/20443/update-crypto-services-to-…

caaf245

…new-simple-fee' into 20443/update-crypto-services-to-new-simple-fee

Merge branch 'main' into 20443/update-crypto-services-to-new-simple-fee

1ecfb14

aderevets requested a review from Neeharika-Sompalli November 5, 2025 23:31

feat: Update CryptoCreate/CryptoDelete to use new simple fees #21901

Are you sure you want to change the base?

feat: Update CryptoCreate/CryptoDelete to use new simple fees #21901

Conversation

aderevets commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lfdt-bot commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Snyk checks have passed. No issues have been found so far.

Uh oh!

codecov bot commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

joshmarinacci left a comment

Choose a reason for hiding this comment

Uh oh!

aderevets commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Neeharika-Sompalli Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Neeharika-Sompalli Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Neeharika-Sompalli Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

aderevets Nov 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Neeharika-Sompalli Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

aderevets Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Neeharika-Sompalli Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

aderevets Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Neeharika-Sompalli left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

aderevets commented Oct 28, 2025 •

edited

Loading

lfdt-bot commented Oct 28, 2025 •

edited

Loading

codecov bot commented Oct 28, 2025 •

edited

Loading

aderevets commented Oct 29, 2025 •

edited

Loading

aderevets Nov 5, 2025 •

edited

Loading