HIP - 367 #2997

anighanta · 2022-03-16T21:58:13Z

Description:

Replaces PR #2934 which was merged before starting the 0.25.0 dev cycle.

Related issue(s):
HIP - 367
Fixes #2917

Notes for reviewer:

Checklist

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

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…y should only return the next 1000 assocaitions Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…hing anymore Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…in the getInfo query on an account/contract where n is dynamic prop Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…ntil the next release Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…here and during migrations update the links in MapValuedLinkedList Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…List Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…ve1000LimitOnTokenAssociations Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…edLinkedList Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…ons limited by the setting tokens.maxPerAccount Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…o use tokenRelations from a instaed of loading it again Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…lance is zero Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

…ing relationships for dissociation Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

) * Use June 10, 2022 system entity expiry to simplify DevOps workflows Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Remove gRPC intermediary from `EvmFnResult` construction (#2954) * Initial commit with EvmFnResultBench Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Disable CI for now Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Re-enable CI Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Avoid gRPC intermediary in creating ExpirableTxnRecord w/ call result Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix code smells Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Include benchmarks directory in build image Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Remove duplicate code Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Uncomment EETs Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix approve/allowance issue with INFINITE supply type fungible tokens (#2956) * Fix approve/allowance issue with INFINITE supply type fungible tokens Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> * Fix unit tests for approve/adjust allowance checks Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> * Remove all `FCOneToManyRelation` use and update EETs to only verify NOT… (#2962) * Remove all FCOneToManyRelation use and update EETs to only verify NOT_SUPPORTED Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix unit test Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix code smells Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Remove unused tokens.nfts.areQueriesEnabled property, MerkleUniqueTokenId class Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Bump crypto from 22.1.0 to 22.1.1 (#2930) * Bump log4j.version from 2.17.1 to 2.17.2 (#2931) * Update maven version in Dockerfile - 3.8.4 is missing from https://dlcdn.apache.org/maven/maven-3/ (#2975) Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> * Back `AliasManager` with `FCHashMap` from `StateMetadata` (#2969) * Remove unnecessary StateAccessor wrapper Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Add the aliases FCHashMap<ByteString, EntityNum> to state metadata and MutableStateChildren Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Switch to FCHashMap in AliasManager Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Use separate AliasManager in StateChildrenSigMetadataLookup Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Eliminate unnecessary use of TokenStore in StateView Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Use different maven download link Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix unit tests Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Address reviewer comments Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix StateModule.provideWorkingAliases() signature Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Use receiver (not sender address) to infer expiry of just-created contract (#2967) * Intermezzo Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Intermezzo Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Disable CI for now Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Reenable CI Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Uncomment suites Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix javadoc, code smells Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Remove the intermediary TransferList for converting to CurrencyAdjustments (#2966) * initial commit Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * fix a few tests Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * fix a few tests Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * fix sonar smells Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * add benchmark Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * add benchmark Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * use static constant Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * update benchmark to have purging adjustments Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * update changes array size to 10 Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * change to modify in place Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * fix tests Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * Use different maven download link Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * address review comments Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * reset tracker every invocation Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * fix sonar smells Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * remove `numHbarBalancesChangedSoFar` pased to `CurrencyAdjustments` Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> * ALWAYS copy the arrays passed into `CurrencyAdjustments` to avoid problems Signed-off-by: Neeharika-Sompalli <neeharika.sompalli@hedera.com> Co-authored-by: tinker-michaelj <michael.tinker@hedera.com> * Add fee to record, expiry to new account in `AutoCreationLogic` (#2979) * Add fee to record, expiry to new account in AutoCreationLogic Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Stabilize CI Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix all but one unit test 😓 Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Intermezzo Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix unit test Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix all unit tests, remove dead code Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> * Fix code smells Signed-off-by: tinker-michaelj <michael.tinker@hedera.com> Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Neeha <52669918+Neeharika-Sompalli@users.noreply.github.com>

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Signed-off-by: tinker-michaelj <michael.tinker@hedera.com>

github-actions · 2022-03-16T22:26:26Z

E2E Tests Results

    3 files ±0     3 suites ±0 1h 6m 11s ⏱️ + 2m 31s
    7 tests ±0     7 ✔️ ±0 0 💤 ±0 0 ❌ ±0
236 runs - 1 236 ✔️ - 1 0 💤 ±0 0 ❌ ±0

Results for commit 00d13aa. ± Comparison against base commit ae3db58.

♻️ This comment has been updated with latest results.

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

codecov · 2022-03-28T23:31:10Z

Codecov Report

Merging #2997 (00d13aa) into master (ae3db58) will increase coverage by 0.01%.
The diff coverage is 96.48%.

@@             Coverage Diff              @@
##             master    #2997      +/-   ##
============================================
+ Coverage     96.22%   96.24%   +0.01%     
+ Complexity    10433    10413      -20     
============================================
  Files           723      721       -2     
  Lines         28871    28890      +19     
  Branches       3063     3068       +5     
============================================
+ Hits          27781    27804      +23     
+ Misses          520      507      -13     
- Partials        570      579       +9

Impacted Files	Coverage Δ
...java/com/hedera/services/ledger/TransferLogic.java	`91.91% <ø> (ø)`
...dera/services/ledger/backing/BackingTokenRels.java	`94.73% <ø> (ø)`
...a/com/hedera/services/store/tokens/TokenStore.java	`80.76% <ø> (ø)`
...vices/txns/crypto/CryptoCreateTransitionLogic.java	`95.08% <ø> (-0.24%)`	⬇️
...vices/txns/crypto/CryptoUpdateTransitionLogic.java	`96.25% <ø> (-0.14%)`	⬇️
...ces/state/exports/SignedStateBalancesExporter.java	`95.72% <80.00%> (-0.95%)`	⬇️
...n/java/com/hedera/services/store/models/Token.java	`96.33% <84.61%> (-0.59%)`	⬇️
...vices/fees/calculation/utils/OpUsageCtxHelper.java	`95.61% <86.66%> (-3.49%)`	⬇️
...a/services/state/expiry/renewal/RenewalHelper.java	`96.62% <94.11%> (+0.66%)`	⬆️
...dera/services/state/merkle/MerkleAccountState.java	`97.87% <94.44%> (+0.16%)`	⬆️
... and 49 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ae3db58...00d13aa. Read the comment docs.

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

tinker-michaelj

LGTM

anighanta added 30 commits February 25, 2022 11:59

initial commit

a37567e

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

port away from MerkleAccountTokens

9f2c1ae

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

feature complete.. need unit tests

50e14fe

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

address code smells

0be36a5

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

fix HTSPrecompiledContract with the right assocationLogic

467f939

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add unit tests

edcd859

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add more unit tests

c043615

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

eet for demo

74308dd

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

remove assocaition limit on token per account and getAccountInfo quer…

ac45129

…y should only return the next 1000 assocaitions Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

comment out irrelevant specs

7bb03e3

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

handle empty ids array

96f52d3

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

remove irrelevant unit tests

3a331c8

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

only persist the tokenIdsIndex on the acutal getInfo query

25c9296

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add a limit of 1 token association to prove the limit doenst mean a t…

f3f151d

…hing anymore Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

make account getInfo query only return the first n token association …

de1f2bd

…in the getInfo query on an account/contract where n is dynamic prop Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

address code smells

193fd09

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

remove dead code

0449fc2

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add more unit tests

7d42c76

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add even more unit tests

74a71d7

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

remove irrelevant eet specs

a167858

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add back the deleted MerkleAccountTokens for backward compatibility u…

203026f

…ntil the next release Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

merge master

e139122

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

update the MerkleAccount back to having tokens but dont use them anyw…

99b8538

…here and during migrations update the links in MapValuedLinkedList Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add unit test for migration of MerkleAccountTokens to mapValuedLinked…

f9e7524

…List Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Merge branch 'master' into 02917-M-migrateToMapValuedLinkedList

668d60c

Merge branch 'master' into 02917-M-remove1000LimitOnTokenAssociations

b70c33f

merged branches 02917-M-migrateToMapValuedLinkedList and 02917-M-remo…

c7d2c06

…ve1000LimitOnTokenAssociations Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

fixed the euqality check for migrating MerkleAccountTokens to mapValu…

dd9383a

…edLinkedList Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

add asserts to getInfo for validating we only give out tokenAssocaiti…

5c38efe

…ons limited by the setting tokens.maxPerAccount Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

remove commented out irrelavent tests and fix dissocaition workflow t…

3942ea7

…o use tokenRelations from a instaed of loading it again Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

anighanta and others added 15 commits March 8, 2022 15:44

add unit test coverage on servicesState

4fcd7ea

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

only decrement numZeroBalance when dissociating if the association ba…

f1db027

…lance is zero Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

move updating the association and zeroBalance counter to before updat…

7c9dec0

…ing relationships for dissociation Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Merge branch 'master' into 02917-HIP-1000

e537ed9

Merge branch '02917-caseStudy-useTokenMetadata' into 02917-HIP-1000

9bc1f09

fix comparing alias address

70ed537

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Merge branch 'master' into 02917-HIP-1000

159eb03

address review comments

15cef91

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

merge master and resolve conflicts

cdc72ca

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

Add javadoc and unit tests

fe564cc

Signed-off-by: tinker-michaelj <michael.tinker@hedera.com>

Remove unnecessary object creation in doBoundedIteration

fc4e7a0

Signed-off-by: tinker-michaelj <michael.tinker@hedera.com>

Be more idiomatic

f1cec03

Signed-off-by: tinker-michaelj <michael.tinker@hedera.com>

Remove dead code

3b3c860

Signed-off-by: tinker-michaelj <michael.tinker@hedera.com>

Merge branch 'master' into 02917-M-HIP367

c9a8992

anighanta requested review from rjuang, superboo, qnswirlds, tinker-michaelj and Neeharika-Sompalli March 16, 2022 21:58

anighanta added 2 commits March 28, 2022 18:23

merge master

e2d5c3f

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

merge master

767a736

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

fix unit test

00d13aa

Signed-off-by: anighanta <anirudh.ghanta@hedera.com>

SimiHunjan linked an issue Mar 29, 2022 that may be closed by this pull request

HIP-367 : Ensure removing token association limit doest not effect functionality and performance. #3012

Closed

tinker-michaelj approved these changes Mar 29, 2022

View reviewed changes

anighanta merged commit 6c62b3d into master Mar 29, 2022

anighanta deleted the 02917-M-HIP367 branch March 29, 2022 18:00

anighanta mentioned this pull request Mar 31, 2022

Add a feature flag for Token Association Limit removal. #3063

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HIP - 367 #2997

HIP - 367 #2997

anighanta commented Mar 16, 2022 •

edited

Loading

github-actions bot commented Mar 16, 2022 •

edited

Loading

codecov bot commented Mar 28, 2022 •

edited

Loading

tinker-michaelj left a comment

HIP - 367 #2997

HIP - 367 #2997

Conversation

anighanta commented Mar 16, 2022 • edited Loading

github-actions bot commented Mar 16, 2022 • edited Loading

E2E Tests Results

codecov bot commented Mar 28, 2022 • edited Loading

Codecov Report

tinker-michaelj left a comment

Choose a reason for hiding this comment

anighanta commented Mar 16, 2022 •

edited

Loading

github-actions bot commented Mar 16, 2022 •

edited

Loading

codecov bot commented Mar 28, 2022 •

edited

Loading