Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: HIP-904: Adapt creation flows to support unlimited auto associations and adjust fees #13350

Merged
merged 47 commits into from
Jun 6, 2024
Merged

feat: HIP-904: Adapt creation flows to support unlimited auto associations and adjust fees #13350

merged 47 commits into from
Jun 6, 2024
+297 −104

Conversation

stoyanov-st
Copy link
Contributor

@stoyanov-st stoyanov-st commented May 16, 2024 •
edited

Description:
We are adding validations for -1 maxAutoAssociations that acts as unlimited flag for auto associations.
We are also removing the fees for auto association slots if we have enabled the unlimitedAutoAssociationsEnabled flag.

Related issue(s):

Fixes #13061

Notes for reviewer:

Checklist

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

@stoyanov-st
feat: add unlimitedAutoAssociations feature flag
1769c1b 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
feat: Add new feature flag to conditions
f3080bd 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
feat: add configuration to bootstrap.properties
6bd8e0a 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
feat: adjust feature flag checks
5e5c173 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: update tests
b351d39 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: fix tests
eff67da 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: remove mono changes
8628741 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
nit: spotless
3dbde00 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: remove unneeded logic
1091df0 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
nit: spotless
ae69bb0 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: adjust association checks
ba08163 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: move unlimitedAutoAssociation to EntitiesConfig
8f35ae2 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: adjust test
ad5a00b 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: correct mock test
918e6d5 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: remove unnecessary stubbing
96e0568 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: override unlimitedAutoAssociations to ensure vanilla behaviour
3acc6dc 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
nit: remove unnecessary brackets
0fcff82 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
refactor: rename flag for clarity
7270b85 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: adjust logic for unlimitedAutoAssoc
56dcec2 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
nit: spotless
7fcde28 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: validate negative values for maxAutoAssoc
6b652e3 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: adjust tests
d9d8314 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
feat: adjust validation and modify fee calculation for crypto create
a8002e1 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
feat: adjust contract create flows to validate for unlimited auto assoc
d7cbc48 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@mustafauzunn mustafauzunn added the Limechain Work planned for the LimeChain team label May 16, 2024
@stoyanov-st
nit: spotless
0cfaac8 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@mustafauzunn mustafauzunn linked an issue May 16, 2024 that may be closed by this pull request
HIP-904: Adapt Creation flows to support the unlimited maxAutoAssociation and update fee calculations #13061
Closed
@stoyanov-st
test: add more tests
5ba6151 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
mustafauzunn and others added 3 commits May 21, 2024 15:12
@mustafauzunn
fix: usage accumulator for cryptoCreate
1a692d5 
Signed-off-by: Mustafa Uzun <mustafa.uzun@limechain.tech>
@stoyanov-st
test: correct the overriding of feature flag
6ab5b57 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: explicitly set unlimited auto assoc to true for tests
b6b372f 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
Base automatically changed from 012981-hip-904-unlimited-max-auto-associations-feature-flag to 012981-hip-904-unlimited-max-auto-associations May 29, 2024 10:57
@stoyanov-st
Merge branch 'refs/heads/012981-hip-904-unlimited-max-auto-associatio…
11cdf9e 
…ns' into 012981-hip-904-unlimited-max-auto-associations-create-flows

# Conflicts:
#	hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/validators/CryptoCreateValidator.java
@stoyanov-st
Merge branch 'refs/heads/012981-hip-904-unlimited-max-auto-associatio…
0dd05b4 
…ns' into 012981-hip-904-unlimited-max-auto-associations-create-flows

# Conflicts:
#	hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/hapi/ContractCreateSuite.java
#	hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/crypto/AutoAccountCreationSuite.java
#	hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/crypto/CryptoCreateSuite.java
@stoyanov-st
test: Add more test cases
abad40b 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: explicitly disable property
779a6f7 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: adjustment
bddcbbd 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: explicit property set
f9f1eb4 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@kselveliev kselveliev self-requested a review May 31, 2024 10:48
@stoyanov-st
test: tag property updating specs
8879798 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: tag property updating specs
7ff2841 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@mustafauzunn mustafauzunn added this to the v0.51 milestone Jun 4, 2024
netopyr
netopyr reviewed Jun 5, 2024
View reviewed changes
...-node/hapi-fees/src/main/java/com/hedera/node/app/hapi/fees/usage/crypto/CryptoOpsUsage.java Outdated
@@ -192,13 +192,13 @@ public void cryptoCreateUsage(

if (maxAutomaticTokenAssociations > 0) {
baseSize += INT_SIZE;
accumulator.addRbs(maxAutomaticTokenAssociations * lifeTime * CREATE_SLOT_MULTIPLIER);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my understanding, all automatic token association slots should be free.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to completely remove this as I don't see a way to check the feature flag there?

...l/src/main/java/com/hedera/node/app/service/token/impl/validators/CryptoCreateValidator.java
@@ -100,7 +100,7 @@ public boolean tooManyAutoAssociations(
@NonNull final TokensConfig tokensConfig) {
return (entitiesConfig.limitTokenAssociations() && n > tokensConfig.maxPerAccount())
|| n > ledgerConfig.maxAutoAssociations()
|| (n < 0 && !entitiesConfig.unlimitedAutoAssociationsEnabled())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the Javadoc of this method. We are not only checking the upper bound.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javadoc updated to reflect the changes

@stoyanov-st
Merge branch 'refs/heads/012981-hip-904-unlimited-max-auto-associatio…
e14dfe8 
…ns' into 012981-hip-904-unlimited-max-auto-associations-create-flows

# Conflicts:
#	hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/crypto/AutoAccountCreationSuite.java
@stoyanov-st
nit: update javadoc
94b8846 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st stoyanov-st requested a review from netopyr June 5, 2024 12:24
@stoyanov-st
fix: remove charge for auto assoc slots
7ff4c4c 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
fix: adjust expected fee
49e11e4 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
test: fix unit tests
176936e 
Signed-off-by: Stanimir Stoyanov <stanimir.stoyanov@limechain.tech>
@stoyanov-st
Copy link
Contributor Author

Merging this PR, any further comments can be addressed in the base PR

@stoyanov-st stoyanov-st merged commit 024f410 into 012981-hip-904-unlimited-max-auto-associations Jun 6, 2024
45 of 46 checks passed
@stoyanov-st stoyanov-st deleted the 012981-hip-904-unlimited-max-auto-associations-create-flows branch June 6, 2024 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kselveliev kselveliev kselveliev approved these changes

@anastasiya-kovaliova anastasiya-kovaliova anastasiya-kovaliova approved these changes

@MrValioBg MrValioBg Awaiting requested review from MrValioBg

@mustafauzunn mustafauzunn Awaiting requested review from mustafauzunn

@Neeharika-Sompalli Neeharika-Sompalli Awaiting requested review from Neeharika-Sompalli

@tinker-michaelj tinker-michaelj Awaiting requested review from tinker-michaelj tinker-michaelj is a code owner

@derektriley derektriley Awaiting requested review from derektriley derektriley is a code owner automatically assigned from hashgraph/hedera-services

@quiet-node quiet-node Awaiting requested review from quiet-node quiet-node is a code owner automatically assigned from hashgraph/hedera-smart-contracts

@lukelee-sl lukelee-sl Awaiting requested review from lukelee-sl

@netopyr netopyr Awaiting requested review from netopyr

Assignees

@stoyanov-st stoyanov-st

Labels
Limechain Work planned for the LimeChain team
Projects
None yet
Milestone
v0.51
Development

Successfully merging this pull request may close these issues.

HIP-904: Adapt Creation flows to support the unlimited maxAutoAssociation and update fee calculations
5 participants
@stoyanov-st @netopyr @kselveliev @anastasiya-kovaliova @mustafauzunn