diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c9477ea1799..0329d0735a4f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2222,7 +2222,7 @@ workflows: filters: branches: ignore: - - /.*-PERF/ + - NONE workflow-name: "Continuous-integration" - sonar-check: context: SonarCloud diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/EstimatorUtils.java b/hapi-fees/src/main/java/com/hedera/services/usage/EstimatorUtils.java index d1bcdc82b335..04171ea66078 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/EstimatorUtils.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/EstimatorUtils.java @@ -22,6 +22,7 @@ import com.hederahashgraph.api.proto.java.FeeComponents; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TransactionBody; import static com.hederahashgraph.fee.FeeBuilder.BASIC_TX_BODY_SIZE; @@ -54,7 +55,7 @@ default long changeInBsUsage(long oldB, long oldLifetimeSecs, long newB, long ne } long baseNetworkRbs(); - FeeData withDefaultTxnPartitioning(FeeComponents usage, long networkRbh, int numPayerKeys); + FeeData withDefaultTxnPartitioning(FeeComponents usage, SubType subType, long networkRbh, int numPayerKeys); FeeData withDefaultQueryPartitioning(FeeComponents usage); UsageEstimate baseEstimate(TransactionBody txn, SigUsage sigUsage); } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/SingletonEstimatorUtils.java b/hapi-fees/src/main/java/com/hedera/services/usage/SingletonEstimatorUtils.java index 82f82801a6e1..f607275f8fa8 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/SingletonEstimatorUtils.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/SingletonEstimatorUtils.java @@ -23,6 +23,7 @@ import com.hederahashgraph.api.proto.java.FeeComponents; import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.TransactionBody; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TransferList; import static com.hederahashgraph.fee.FeeBuilder.BASIC_ACCOUNT_AMT_SIZE; @@ -51,8 +52,7 @@ public UsageEstimate baseEstimate(TransactionBody txn, SigUsage sigUsage) { return estimate; } - @Override - public FeeData withDefaultTxnPartitioning(FeeComponents usage, long networkRbh, int numPayerKeys) { + public FeeData withDefaultTxnPartitioning(FeeComponents usage, SubType subType, long networkRbh, int numPayerKeys) { var usages = FeeData.newBuilder(); var network = FeeComponents.newBuilder() @@ -75,6 +75,7 @@ public FeeData withDefaultTxnPartitioning(FeeComponents usage, long networkRbh, .setNetworkdata(network) .setNodedata(node) .setServicedata(service) + .setSubType(subType) .build(); } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/SingletonUsageProperties.java b/hapi-fees/src/main/java/com/hedera/services/usage/SingletonUsageProperties.java index 71762bb609ea..a3639fe7f497 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/SingletonUsageProperties.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/SingletonUsageProperties.java @@ -31,6 +31,11 @@ public int accountAmountBytes() { return LONG_SIZE + BASIC_ENTITY_ID_SIZE; } + @Override + public int nftTransferBytes() { + return LONG_SIZE + 2 * BASIC_ENTITY_ID_SIZE; + } + @Override public long legacyReceiptStorageSecs() { return 180; diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/TxnUsageEstimator.java b/hapi-fees/src/main/java/com/hedera/services/usage/TxnUsageEstimator.java index c10be4de6ed4..23d7d7fd273e 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/TxnUsageEstimator.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/TxnUsageEstimator.java @@ -21,6 +21,7 @@ */ import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TransactionBody; import static com.hederahashgraph.fee.FeeBuilder.HRS_DIVISOR; @@ -39,10 +40,15 @@ public TxnUsageEstimator(SigUsage sigUsage, TransactionBody txn, EstimatorUtils } public FeeData get() { + return get(SubType.DEFAULT); + } + + public FeeData get(SubType subType) { var usage = utils.baseEstimate(txn, sigUsage); customize(usage); return utils.withDefaultTxnPartitioning( usage.build(), + subType, utils.nonDegenerateDiv(networkRbs, HRS_DIVISOR), sigUsage.numPayerKeys()); } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/UsageProperties.java b/hapi-fees/src/main/java/com/hedera/services/usage/UsageProperties.java index 26b454fe0f2a..ecd40fc0eea7 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/UsageProperties.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/UsageProperties.java @@ -22,5 +22,8 @@ public interface UsageProperties { int accountAmountBytes(); + + int nftTransferBytes(); + long legacyReceiptStorageSecs(); } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/crypto/CryptoOpsUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/crypto/CryptoOpsUsage.java index f15ac3095228..8efde02d0705 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/crypto/CryptoOpsUsage.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/crypto/CryptoOpsUsage.java @@ -74,7 +74,7 @@ public void cryptoTransferUsage( accumulator.addBpt(incBpt); long incRb = totalXfers * LONG_ACCOUNT_AMOUNT_BYTES; - incRb += TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(weightedTokensInvolved, weightedTokenXfers); + incRb += TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(weightedTokensInvolved, weightedTokenXfers, 0); accumulator.addRbs(incRb * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/crypto/CryptoTxnUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/crypto/CryptoTxnUsage.java deleted file mode 100644 index 06a6bfbfb4c5..000000000000 --- a/hapi-fees/src/main/java/com/hedera/services/usage/crypto/CryptoTxnUsage.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hedera.services.usage.crypto; -/*- - * ‌ - * Hedera Services API Fees - * ​ - * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC - * ​ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ‍ - */ - -import com.hedera.services.usage.TxnUsage; -import com.hedera.services.usage.TxnUsageEstimator; -import com.hedera.services.usage.token.entities.TokenEntitySizes; -import com.hederahashgraph.api.proto.java.TransactionBody; - -import static com.hedera.services.usage.token.entities.TokenEntitySizes.TOKEN_ENTITY_SIZES; - -public abstract class CryptoTxnUsage> extends TxnUsage { - static TokenEntitySizes tokenEntitySizes = TOKEN_ENTITY_SIZES; - - abstract T self(); - - protected CryptoTxnUsage(TransactionBody cryptoOp, TxnUsageEstimator usageEstimator) { - super(cryptoOp, usageEstimator); - } - - void addTokenTransfersRecordRb(int numTokens, int numTransfers) { - addRecordRb(tokenEntitySizes.bytesUsedToRecordTokenTransfers(numTokens, numTransfers)); - } -} diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenBurnUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenBurnUsage.java index 5f70f7441c32..903c79ec24fc 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenBurnUsage.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenBurnUsage.java @@ -23,11 +23,16 @@ import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.TxnUsageEstimator; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TransactionBody; import static com.hedera.services.usage.SingletonEstimatorUtils.ESTIMATOR_UTILS; +import static com.hederahashgraph.fee.FeeBuilder.LONG_SIZE; public class TokenBurnUsage extends TokenTxnUsage { + + private SubType currentSubType; + private TokenBurnUsage(TransactionBody tokenBurnOp, TxnUsageEstimator usageEstimator) { super(tokenBurnOp, usageEstimator); } @@ -36,15 +41,27 @@ public static TokenBurnUsage newEstimate(TransactionBody tokenBurnOp, SigUsage s return new TokenBurnUsage(tokenBurnOp, estimatorFactory.get(sigUsage, tokenBurnOp, ESTIMATOR_UTILS)); } + public TokenBurnUsage givenSubType(SubType subType){ + this.currentSubType = subType; + return this; + } + @Override TokenBurnUsage self() { return this; } public FeeData get() { + var op = this.op.getTokenBurn(); + + if (currentSubType == SubType.TOKEN_NON_FUNGIBLE_UNIQUE) { + usageEstimator.addBpt((long) op.getSerialNumbersCount() * LONG_SIZE); + addTokenTransfersRecordRb(1, 0, op.getSerialNumbersCount()); + } else if (currentSubType == SubType.TOKEN_FUNGIBLE_COMMON) { + addAmountBpt(); + addTokenTransfersRecordRb(1, 1, 0); + } addEntityBpt(); - addAmountBpt(); - addTokenTransfersRecordRb(1, 1); - return usageEstimator.get(); + return usageEstimator.get(currentSubType); } } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenCreateUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenCreateUsage.java index ddedda734f01..9730f59b366f 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenCreateUsage.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenCreateUsage.java @@ -65,7 +65,7 @@ public FeeData get() { usageEstimator.addBpt(baseSize); usageEstimator.addRbs(baseSize * lifetime); addNetworkRecordRb(BASIC_ENTITY_ID_SIZE); - addTokenTransfersRecordRb(1, 1); + addTokenTransfersRecordRb(1, op.getInitialSupply() > 0 ? 1 : 0, 0); return usageEstimator.get(); } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenGetAccountNftInfosUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenGetAccountNftInfosUsage.java new file mode 100644 index 000000000000..243b32c50979 --- /dev/null +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenGetAccountNftInfosUsage.java @@ -0,0 +1,55 @@ +package com.hedera.services.usage.token; + +/*- + * ‌ + * Hedera Services API Fees + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hedera.services.usage.QueryUsage; +import com.hederahashgraph.api.proto.java.Query; + +import java.util.List; + +import static com.hedera.services.usage.token.entities.NftEntitySizes.NFT_ENTITY_SIZES; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_ENTITY_ID_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.INT_SIZE; + +public class TokenGetAccountNftInfosUsage extends QueryUsage { + private static final long INT_SIZE_AS_LONG = INT_SIZE; + + public TokenGetAccountNftInfosUsage(Query query) { + super(query.getTokenGetAccountNftInfos().getHeader().getResponseType()); + updateTb(BASIC_ENTITY_ID_SIZE); + updateTb(2 * INT_SIZE_AS_LONG); + } + + public static TokenGetAccountNftInfosUsage newEstimate(Query query) { + return new TokenGetAccountNftInfosUsage(query); + } + + public TokenGetAccountNftInfosUsage givenMetadata(List metadata) { + int additionalRb = 0; + for (ByteString m : metadata) { + additionalRb += m.size(); + } + updateRb(additionalRb); + updateRb(NFT_ENTITY_SIZES.fixedBytesInNftRepr() * metadata.size()); + return this; + } +} \ No newline at end of file diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenGetNftInfoUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenGetNftInfoUsage.java new file mode 100644 index 000000000000..4a6a259b9d20 --- /dev/null +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenGetNftInfoUsage.java @@ -0,0 +1,46 @@ +package com.hedera.services.usage.token; + +/*- + * ‌ + * Hedera Services API Fees + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.usage.QueryUsage; +import com.hederahashgraph.api.proto.java.Query; + +import static com.hedera.services.usage.token.entities.NftEntitySizes.NFT_ENTITY_SIZES; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_ENTITY_ID_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.LONG_SIZE; + +public class TokenGetNftInfoUsage extends QueryUsage { + public TokenGetNftInfoUsage(Query query) { + super(query.getTokenGetNftInfo().getHeader().getResponseType()); + updateTb(BASIC_ENTITY_ID_SIZE); + updateTb(LONG_SIZE); + updateRb(NFT_ENTITY_SIZES.fixedBytesInNftRepr()); + } + + public static TokenGetNftInfoUsage newEstimate(Query query) { + return new TokenGetNftInfoUsage(query); + } + + public TokenGetNftInfoUsage givenMetadata(String memo) { + updateRb(memo.length()); + return this; + } +} \ No newline at end of file diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenMintUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenMintUsage.java index 0c3d83bdf030..518c7edfffb1 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenMintUsage.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenMintUsage.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,18 +20,28 @@ * ‍ */ +import com.google.protobuf.ByteString; import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.TxnUsageEstimator; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TransactionBody; import static com.hedera.services.usage.SingletonEstimatorUtils.ESTIMATOR_UTILS; public class TokenMintUsage extends TokenTxnUsage { + + private SubType currentSubType; + private TokenMintUsage(TransactionBody tokenMintOp, TxnUsageEstimator usageEstimator) { super(tokenMintOp, usageEstimator); } + public TokenMintUsage givenSubType(SubType subType) { + this.currentSubType = subType; + return this; + } + public static TokenMintUsage newEstimate(TransactionBody tokenMintOp, SigUsage sigUsage) { return new TokenMintUsage(tokenMintOp, estimatorFactory.get(sigUsage, tokenMintOp, ESTIMATOR_UTILS)); } @@ -42,9 +52,22 @@ TokenMintUsage self() { } public FeeData get() { + var op = this.op.getTokenMint(); + + if (currentSubType == SubType.TOKEN_NON_FUNGIBLE_UNIQUE) { + var metadataBytes = 0; + for (ByteString o : op.getMetadataList()) { + metadataBytes += o.size(); + } + usageEstimator.addBpt(metadataBytes); + usageEstimator.addRbs(tokenEntitySizes.bytesUsedForUniqueTokenTransfers(op.getMetadataCount())); + addTokenTransfersRecordRb(1, 0, op.getMetadataCount()); + } else if (currentSubType == SubType.TOKEN_FUNGIBLE_COMMON) { + addAmountBpt(); + addTokenTransfersRecordRb(1, 1, 0); + } + addEntityBpt(); - addAmountBpt(); - addTokenTransfersRecordRb(1, 1); - return usageEstimator.get(); + return usageEstimator.get(currentSubType); } } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenTxnUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenTxnUsage.java index 91d86a97bcc4..2b0025ff7ae9 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenTxnUsage.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenTxnUsage.java @@ -26,6 +26,7 @@ import com.hederahashgraph.api.proto.java.TransactionBody; import static com.hedera.services.usage.token.entities.TokenEntitySizes.TOKEN_ENTITY_SIZES; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_RICH_INSTANT_SIZE; public abstract class TokenTxnUsage> extends TxnUsage { static TokenEntitySizes tokenEntitySizes = TOKEN_ENTITY_SIZES; @@ -36,8 +37,8 @@ protected TokenTxnUsage(TransactionBody tokenOp, TxnUsageEstimator usageEstimato super(tokenOp, usageEstimator); } - void addTokenTransfersRecordRb(int numTokens, int numTransfers) { - addRecordRb(tokenEntitySizes.bytesUsedToRecordTokenTransfers(numTokens, numTransfers)); + void addTokenTransfersRecordRb(int numTokens, int fungibleNumTransfers, int uniqueNumTransfers) { + addRecordRb(tokenEntitySizes.bytesUsedToRecordTokenTransfers(numTokens, fungibleNumTransfers, uniqueNumTransfers)); } public T novelRelsLasting(int n, long secs) { diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenUpdateUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenUpdateUsage.java index 72c9839f94a4..36b1bbffc792 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenUpdateUsage.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenUpdateUsage.java @@ -142,7 +142,7 @@ public FeeData get() { long txnBytes = newMutableRb + BASIC_ENTITY_ID_SIZE + noRbImpactBytes(op); usageEstimator.addBpt(txnBytes); if (op.hasTreasury()) { - addTokenTransfersRecordRb(1, 2); + addTokenTransfersRecordRb(1, 2, 0); } return usageEstimator.get(); diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenWipeUsage.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenWipeUsage.java index 86d18dd0070b..30a3b43ae024 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenWipeUsage.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/TokenWipeUsage.java @@ -45,7 +45,7 @@ public FeeData get() { addEntityBpt(); addAmountBpt(); addEntityBpt(); - addTokenTransfersRecordRb(1, 1); + addTokenTransfersRecordRb(1, 1, 0); return usageEstimator.get(); } } diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/entities/NftEntitySizes.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/entities/NftEntitySizes.java new file mode 100644 index 000000000000..c911e358f993 --- /dev/null +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/entities/NftEntitySizes.java @@ -0,0 +1,38 @@ +package com.hedera.services.usage.token.entities; + +/*- + * ‌ + * Hedera Services API Fees + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import static com.hederahashgraph.fee.FeeBuilder.BASIC_ENTITY_ID_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_RICH_INSTANT_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.LONG_SIZE; + +public enum NftEntitySizes { + NFT_ENTITY_SIZES; + + public long fixedBytesInNftRepr() { + /* { creation time } */ + return BASIC_RICH_INSTANT_SIZE // creation time + /* { tokenID, accountID } */ + + 2 * BASIC_ENTITY_ID_SIZE + /* { serialNum } */ + + LONG_SIZE; + } +} \ No newline at end of file diff --git a/hapi-fees/src/main/java/com/hedera/services/usage/token/entities/TokenEntitySizes.java b/hapi-fees/src/main/java/com/hedera/services/usage/token/entities/TokenEntitySizes.java index d3a36f6c4aa4..18cbc65fc563 100644 --- a/hapi-fees/src/main/java/com/hedera/services/usage/token/entities/TokenEntitySizes.java +++ b/hapi-fees/src/main/java/com/hedera/services/usage/token/entities/TokenEntitySizes.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,6 +22,7 @@ import static com.hedera.services.usage.SingletonUsageProperties.USAGE_PROPERTIES; import static com.hederahashgraph.fee.FeeBuilder.BASIC_ENTITY_ID_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_RICH_INSTANT_SIZE; import static com.hederahashgraph.fee.FeeBuilder.BOOL_SIZE; import static com.hederahashgraph.fee.FeeBuilder.INT_SIZE; import static com.hederahashgraph.fee.FeeBuilder.LONG_SIZE; @@ -31,10 +32,10 @@ public enum TokenEntitySizes { /* { deleted, accountsFrozenByDefault, accountsKycGrantedByDefault } */ static int NUM_FLAGS_IN_BASE_TOKEN_REPRESENTATION = 3; - /* { decimals } */ - static int NUM_INT_FIELDS_IN_BASE_TOKEN_REPRESENTATION = 1; - /* { expiry, totalSupply, autoRenewPeriod } */ - static int NUM_LONG_FIELDS_IN_BASE_TOKEN_REPRESENTATION = 3; + /* { decimals, tokenType, supplyType } */ + static int NUM_INT_FIELDS_IN_BASE_TOKEN_REPRESENTATION = 3; + /* { expiry, maxSupply, totalSupply, autoRenewPeriod, currentSerialNum } */ + static int NUM_LONG_FIELDS_IN_BASE_TOKEN_REPRESENTATION = 5; /* { treasury } */ static int NUM_ENTITY_ID_FIELDS_IN_BASE_TOKEN_REPRESENTATION = 1; @@ -49,8 +50,13 @@ public int totalBytesInTokenReprGiven(String symbol, String name) { return fixedBytesInTokenRepr() + symbol.length() + name.length(); } - public int bytesUsedToRecordTokenTransfers(int numTokens, int numTransfers) { - return numTokens * BASIC_ENTITY_ID_SIZE + numTransfers * USAGE_PROPERTIES.accountAmountBytes(); + public int bytesUsedToRecordTokenTransfers(int numTokens, int fungibleNumTransfers, int uniqueNumTransfers) { + return numTokens * BASIC_ENTITY_ID_SIZE + fungibleNumTransfers * USAGE_PROPERTIES.accountAmountBytes() + + uniqueNumTransfers * USAGE_PROPERTIES.nftTransferBytes(); + } + + public long bytesUsedForUniqueTokenTransfers(int numTokens) { + return numTokens * (BASIC_RICH_INSTANT_SIZE + BASIC_ENTITY_ID_SIZE + LONG_SIZE + BASIC_ENTITY_ID_SIZE); } public int bytesUsedPerAccountRelationship() { diff --git a/hapi-fees/src/test/java/com/hedera/services/calc/OverflowCheckingCalcTest.java b/hapi-fees/src/test/java/com/hedera/services/calc/OverflowCheckingCalcTest.java index 6f8a62311bd5..25f0b3f8a036 100644 --- a/hapi-fees/src/test/java/com/hedera/services/calc/OverflowCheckingCalcTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/calc/OverflowCheckingCalcTest.java @@ -24,6 +24,7 @@ import com.hederahashgraph.api.proto.java.ExchangeRate; import com.hederahashgraph.api.proto.java.FeeComponents; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.fee.FeeBuilder; import org.junit.jupiter.api.Test; @@ -250,7 +251,7 @@ void safeAccumulateFourWorks() { .setSbpr(sbpr) .build(); private final FeeData mockUsage = ESTIMATOR_UTILS.withDefaultTxnPartitioning( - mockUsageVector, network_rbh, 3); + mockUsageVector, SubType.DEFAULT, network_rbh, 3); public static void copyData(FeeData feeData, UsageAccumulator into) { into.setNumPayerKeys(feeData.getNodedata().getVpt()); diff --git a/hapi-fees/src/test/java/com/hedera/services/test/IdUtils.java b/hapi-fees/src/test/java/com/hedera/services/test/IdUtils.java index 2cf62301817b..97584ff1f582 100644 --- a/hapi-fees/src/test/java/com/hedera/services/test/IdUtils.java +++ b/hapi-fees/src/test/java/com/hedera/services/test/IdUtils.java @@ -23,6 +23,7 @@ import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.ContractID; import com.hederahashgraph.api.proto.java.FileID; +import com.hederahashgraph.api.proto.java.NftID; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.TokenBalance; import com.hederahashgraph.api.proto.java.TokenID; @@ -98,6 +99,15 @@ static long[] asDotDelimitedLongArray(String s) { return Stream.of(parts).mapToLong(Long::valueOf).toArray(); } + public static NftID asNftID(String v, long serialNum) { + final var tokenID = asToken(v); + + return NftID.newBuilder() + .setTokenID(tokenID) + .setSerialNumber(serialNum) + .build(); + } + public static String asAccountString(AccountID account) { return String.format("%d.%d.%d", account.getShardNum(), account.getRealmNum(), account.getAccountNum()); } diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/SingletonEstimatorUtilsTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/SingletonEstimatorUtilsTest.java index 2570d6173d58..cfdfe1b6f120 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/SingletonEstimatorUtilsTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/SingletonEstimatorUtilsTest.java @@ -24,6 +24,7 @@ import com.hederahashgraph.api.proto.java.AccountAmount; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.CryptoTransferTransactionBody; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.api.proto.java.TransactionID; @@ -107,7 +108,7 @@ void partitionsAsExpected() { // expect: assertEquals( A_USAGES_MATRIX, - ESTIMATOR_UTILS.withDefaultTxnPartitioning(A_USAGE_VECTOR, NETWORK_RBH, NUM_PAYER_KEYS)); + ESTIMATOR_UTILS.withDefaultTxnPartitioning(A_USAGE_VECTOR, SubType.DEFAULT, NETWORK_RBH, NUM_PAYER_KEYS)); } @Test diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/TxnUsageEstimatorTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/TxnUsageEstimatorTest.java index ba8e415278a6..f4e6efdaefbb 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/TxnUsageEstimatorTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/TxnUsageEstimatorTest.java @@ -20,6 +20,7 @@ * ‍ */ +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TransactionBody; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -58,6 +59,7 @@ public void plusHelpersWork() { given(utils.baseEstimate(txn, sigUsage)).willReturn(baseEstimate()); given(utils.withDefaultTxnPartitioning( expectedEstimate().build(), + SubType.DEFAULT, ESTIMATOR_UTILS.nonDegenerateDiv(2 * networkRbs, HRS_DIVISOR), sigUsage.numPayerKeys())).willReturn(A_USAGES_MATRIX); // and: @@ -107,6 +109,7 @@ public void baseEstimateDelegatesAsExpected() { given(utils.baseEstimate(txn, sigUsage)).willReturn(baseEstimate()); given(utils.withDefaultTxnPartitioning( baseEstimate().build(), + SubType.DEFAULT, ESTIMATOR_UTILS.nonDegenerateDiv(networkRbs, HRS_DIVISOR), sigUsage.numPayerKeys())).willReturn(A_USAGES_MATRIX); diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenBurnUsageTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenBurnUsageTest.java index f29fd50a006c..b2fd3c675397 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenBurnUsageTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenBurnUsageTest.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,18 +25,24 @@ import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.TxnUsage; import com.hedera.services.usage.TxnUsageEstimator; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TokenBurnTransactionBody; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.api.proto.java.TransactionID; -import com.hederahashgraph.fee.FeeBuilder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.InOrder; +import org.mockito.Mockito; + +import java.util.List; import static com.hedera.services.test.UsageUtils.A_USAGES_MATRIX; import static com.hedera.services.usage.SingletonUsageProperties.USAGE_PROPERTIES; import static com.hedera.services.usage.token.entities.TokenEntitySizes.TOKEN_ENTITY_SIZES; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_ENTITY_ID_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.LONG_SIZE; import static org.junit.Assert.assertEquals; import static org.mockito.BDDMockito.any; import static org.mockito.BDDMockito.given; @@ -72,7 +78,8 @@ public void createsExpectedDelta() { givenOp(); // and: subject = TokenBurnUsage.newEstimate(txn, sigUsage); - + subject.givenSubType(SubType.TOKEN_FUNGIBLE_COMMON); + given(base.get(SubType.TOKEN_FUNGIBLE_COMMON)).willReturn(A_USAGES_MATRIX); // when: var actual = subject.get(); @@ -80,15 +87,44 @@ public void createsExpectedDelta() { assertEquals(A_USAGES_MATRIX, actual); // and: verify(base).addBpt(8); - verify(base).addBpt(FeeBuilder.BASIC_ENTITY_ID_SIZE); + verify(base).addBpt(BASIC_ENTITY_ID_SIZE); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1) * + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1, 0) * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } + @Test + public void createsExpectedDeltaForUnique() { + op = TokenBurnTransactionBody.newBuilder() + .setToken(id) + .addAllSerialNumbers(List.of(1L, 2L, 3L)) + .build(); + setTxn(); + // and: + subject = TokenBurnUsage.newEstimate(txn, sigUsage).givenSubType(SubType.TOKEN_NON_FUNGIBLE_UNIQUE); + given(base.get(SubType.TOKEN_NON_FUNGIBLE_UNIQUE)).willReturn(A_USAGES_MATRIX); + // when: + var actual = subject.get(); + + // then: + assertEquals(A_USAGES_MATRIX, actual); + // and: + InOrder inOrder = Mockito.inOrder(base); + inOrder.verify(base).addBpt((long) op.getSerialNumbersCount() * LONG_SIZE); + inOrder.verify(base) + .addBpt(BASIC_ENTITY_ID_SIZE); + } + + @Test + void selfTest() { + subject = TokenBurnUsage.newEstimate(txn, sigUsage).givenSubType(SubType.TOKEN_NON_FUNGIBLE_UNIQUE); + assertEquals(subject, subject.self()); + } + private void givenOp() { op = TokenBurnTransactionBody.newBuilder() .setToken(id) + .setAmount(10) .build(); setTxn(); } @@ -101,4 +137,4 @@ private void setTxn() { .setTokenBurn(op) .build(); } -} +} \ No newline at end of file diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenCreateUsageTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenCreateUsageTest.java index 93232375d3e5..42d88899835e 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenCreateUsageTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenCreateUsageTest.java @@ -141,8 +141,8 @@ void createsExpectedDeltaForAutoRenewBased() { verify(base).addBpt(expectedBytes); verify(base).addRbs(expectedBytes * autoRenewPeriod); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1) * - USAGE_PROPERTIES.legacyReceiptStorageSecs()); + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1, 0) * + USAGE_PROPERTIES.legacyReceiptStorageSecs()); verify(base).addNetworkRbs(BASIC_ENTITY_ID_SIZE * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } @@ -187,6 +187,7 @@ private void givenAutoRenewBasedOp() { .setFreezeKey(freezeKey) .setSupplyKey(supplyKey) .setWipeKey(wipeKey) + .setInitialSupply(1) .build(); setTxn(); } diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenGetAccountNftInfosUsageTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenGetAccountNftInfosUsageTest.java new file mode 100644 index 000000000000..8311577de209 --- /dev/null +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenGetAccountNftInfosUsageTest.java @@ -0,0 +1,79 @@ +package com.hedera.services.usage.token; + +/*- + * ‌ + * Hedera Services API Fees + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosQuery; +import com.hederahashgraph.fee.FeeBuilder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static com.hedera.services.usage.token.entities.NftEntitySizes.NFT_ENTITY_SIZES; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_ENTITY_ID_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_QUERY_RES_HEADER; +import static com.hederahashgraph.fee.FeeBuilder.INT_SIZE; +import static org.junit.Assert.assertEquals; + +public class TokenGetAccountNftInfosUsageTest { + private TokenGetAccountNftInfosUsage subject; + private AccountID id; + private List metadata; + + @BeforeEach + private void setup() { + metadata = List.of(ByteString.copyFromUtf8("some metadata")); + id = AccountID.newBuilder() + .setShardNum(0) + .setRealmNum(0) + .setAccountNum(1) + .build(); + subject = TokenGetAccountNftInfosUsage.newEstimate(tokenQuery()); + } + + @Test + void assessesEverything() { + // given: + subject.givenMetadata(metadata); + + // when: + var usage = subject.get(); + int additionalRb = metadata.stream().mapToInt(ByteString::size).sum(); + var expectedBytes = BASIC_QUERY_RES_HEADER + + NFT_ENTITY_SIZES.fixedBytesInNftRepr() * metadata.size() + + additionalRb; + + // then: + var node = usage.getNodedata(); + assertEquals(FeeBuilder.BASIC_QUERY_HEADER + BASIC_ENTITY_ID_SIZE + 2 * INT_SIZE, node.getBpt()); + assertEquals(expectedBytes, node.getBpr()); + } + + private Query tokenQuery() { + var op = TokenGetAccountNftInfosQuery.newBuilder() + .setAccountID(id) + .build(); + return Query.newBuilder().setTokenGetAccountNftInfos(op).build(); + } +} diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenGetNftInfoUsageTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenGetNftInfoUsageTest.java new file mode 100644 index 000000000000..c888eba4a5a9 --- /dev/null +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenGetNftInfoUsageTest.java @@ -0,0 +1,73 @@ +package com.hedera.services.usage.token; + +/*- + * ‌ + * Hedera Services API Fees + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.test.IdUtils; +import com.hederahashgraph.api.proto.java.NftID; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoQuery; +import com.hederahashgraph.fee.FeeBuilder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static com.hedera.services.usage.token.entities.NftEntitySizes.NFT_ENTITY_SIZES; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_ENTITY_ID_SIZE; +import static com.hederahashgraph.fee.FeeBuilder.BASIC_QUERY_RES_HEADER; +import static com.hederahashgraph.fee.FeeBuilder.LONG_SIZE; +import static org.junit.Assert.assertEquals; + +public class TokenGetNftInfoUsageTest { + String memo = "Hope"; + NftID id = IdUtils.asNftID("0.0.75231", 1); + + TokenGetNftInfoUsage subject; + + @BeforeEach + public void setup() { + subject = TokenGetNftInfoUsage.newEstimate(query()); + } + + @Test + public void assessesEverything() { + // given: + subject.givenMetadata(memo); + // and: + var expectedBytes = BASIC_QUERY_RES_HEADER + + NFT_ENTITY_SIZES.fixedBytesInNftRepr() + + memo.length(); + + // when: + var usage = subject.get(); + + // then: + var node = usage.getNodedata(); + + assertEquals(FeeBuilder.BASIC_QUERY_HEADER + BASIC_ENTITY_ID_SIZE + LONG_SIZE, node.getBpt()); + assertEquals(expectedBytes, node.getBpr()); + } + + private Query query() { + var op = TokenGetNftInfoQuery.newBuilder() + .setNftID(id) + .build(); + return Query.newBuilder().setTokenGetNftInfo(op).build(); + } +} \ No newline at end of file diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenMintUsageTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenMintUsageTest.java index c24847fd053b..eb0b6a83a357 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenMintUsageTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenMintUsageTest.java @@ -20,11 +20,13 @@ * ‍ */ +import com.google.protobuf.ByteString; import com.hedera.services.test.IdUtils; import com.hedera.services.usage.EstimatorFactory; import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.TxnUsage; import com.hedera.services.usage.TxnUsageEstimator; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenMintTransactionBody; @@ -34,6 +36,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.List; + import static com.hedera.services.test.UsageUtils.A_USAGES_MATRIX; import static com.hedera.services.usage.SingletonUsageProperties.USAGE_PROPERTIES; import static com.hedera.services.usage.token.entities.TokenEntitySizes.TOKEN_ENTITY_SIZES; @@ -60,6 +64,7 @@ public class TokenMintUsageTest { public void setUp() throws Exception { base = mock(TxnUsageEstimator.class); given(base.get()).willReturn(A_USAGES_MATRIX); + given(base.get(SubType.TOKEN_FUNGIBLE_COMMON)).willReturn(A_USAGES_MATRIX); factory = mock(EstimatorFactory.class); given(factory.get(any(), any(), any())).willReturn(base); @@ -72,6 +77,7 @@ public void createsExpectedDelta() { givenOp(); // and: subject = TokenMintUsage.newEstimate(txn, sigUsage); + subject.givenSubType(SubType.TOKEN_FUNGIBLE_COMMON); // when: var actual = subject.get(); @@ -81,10 +87,37 @@ public void createsExpectedDelta() { // and: verify(base).addBpt(FeeBuilder.BASIC_ENTITY_ID_SIZE); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1) * + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1, 0) * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } + @Test + public void createsExpectedDeltaForUnique() { + op = TokenMintTransactionBody.newBuilder() + .setToken(id) + .addAllMetadata(List.of(ByteString.copyFromUtf8("memo"))) + .build(); + setTxn(); + // and: + subject = TokenMintUsage.newEstimate(txn, sigUsage); + subject.givenSubType(SubType.TOKEN_NON_FUNGIBLE_UNIQUE); + given(base.get(SubType.TOKEN_NON_FUNGIBLE_UNIQUE)).willReturn(A_USAGES_MATRIX); + // when: + var actual = subject.get(); + + // then: + assertEquals(A_USAGES_MATRIX, actual); + // and: + verify(base).addRbs(TOKEN_ENTITY_SIZES.bytesUsedForUniqueTokenTransfers(op.getMetadataCount())); + verify(base).addBpt(4L); + } + + @Test + void selfTest() { + subject = TokenMintUsage.newEstimate(txn, sigUsage).givenSubType(SubType.TOKEN_NON_FUNGIBLE_UNIQUE); + assertEquals(subject, subject.self()); + } + private void givenOp() { op = TokenMintTransactionBody.newBuilder() .setToken(id) diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenUpdateUsageTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenUpdateUsageTest.java index 19ef27530d82..c0fcb518aae5 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenUpdateUsageTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenUpdateUsageTest.java @@ -117,7 +117,7 @@ void createsExpectedCappedLifetimeDeltaForNewLargerKeys() { verify(base).addBpt(expectedBytes); verify(base).addRbs((newRb - curRb) * maxLifetime); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2) * + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2, 0) * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } @@ -141,7 +141,7 @@ void createsExpectedDeltaForNewLargerKeys() { verify(base).addBpt(expectedBytes); verify(base).addRbs((newRb - curRb) * (expiry - now)); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2) * + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2, 0) * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } @@ -186,7 +186,7 @@ void ignoresNewAutoRenewBytesIfAlreadyUsingAutoRenew() { verify(base).addBpt(expectedBytes); verify(base).addRbs((newRb - curRb) * (expiry - now)); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2) * + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2, 0) * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } @@ -213,7 +213,7 @@ void understandsRemovingAutoRenew() { verify(base).addBpt(expectedBytes); verify(base).addRbs((newRb - curRb) * (expiry - now)); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2) * + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 2, 0) * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenWipeUsageTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenWipeUsageTest.java index 3f71a22343fa..18d66aa3b431 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenWipeUsageTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/TokenWipeUsageTest.java @@ -83,7 +83,7 @@ public void createsExpectedDelta() { verify(base, times(2)).addBpt(FeeBuilder.BASIC_ENTITY_ID_SIZE); verify(base).addBpt(8); verify(base).addRbs( - TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1) * + TOKEN_ENTITY_SIZES.bytesUsedToRecordTokenTransfers(1, 1, 0) * USAGE_PROPERTIES.legacyReceiptStorageSecs()); } diff --git a/hapi-fees/src/test/java/com/hedera/services/usage/token/entities/TokenEntitySizesTest.java b/hapi-fees/src/test/java/com/hedera/services/usage/token/entities/TokenEntitySizesTest.java index c317d8ad0eb2..e5d5c4731fc4 100644 --- a/hapi-fees/src/test/java/com/hedera/services/usage/token/entities/TokenEntitySizesTest.java +++ b/hapi-fees/src/test/java/com/hedera/services/usage/token/entities/TokenEntitySizesTest.java @@ -70,13 +70,13 @@ public void sizesAsExpected() { @Test public void understandsRecordTransfersSize() { // setup: - int numTokens = 3, numTransfers = 8; + int numTokens = 3, fungibleNumTransfers = 8, uniqueNumTransfers = 2; // given: - var expected = 3 * BASIC_ENTITY_ID_SIZE + 8 * (8 + BASIC_ENTITY_ID_SIZE); + var expected = 3 * BASIC_ENTITY_ID_SIZE + 8 * (8 + BASIC_ENTITY_ID_SIZE) + 2 * (8 + 2 * BASIC_ENTITY_ID_SIZE); // then: - assertEquals(expected, subject.bytesUsedToRecordTokenTransfers(numTokens, numTransfers)); + assertEquals(expected, subject.bytesUsedToRecordTokenTransfers(numTokens, fungibleNumTransfers, uniqueNumTransfers)); } @Test diff --git a/hapi-utils/src/main/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottles.java b/hapi-utils/src/main/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottles.java index 31ec0d49be29..8d30be650130 100644 --- a/hapi-utils/src/main/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottles.java +++ b/hapi-utils/src/main/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottles.java @@ -62,7 +62,9 @@ import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDelete; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDissociateFromAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenFreezeAccount; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetAccountNftInfos; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetInfo; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetNftInfo; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGrantKycToAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenMint; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenRevokeKycFromAccount; @@ -72,7 +74,7 @@ import static com.hederahashgraph.api.proto.java.HederaFunctionality.TransactionGetRecord; public class ExpectedCustomThrottles { - public static final EnumSet OPS_FOR_RELEASE_0130 = EnumSet.of( + public static final EnumSet OPS_FOR_RELEASE_0160 = EnumSet.of( CryptoCreate, CryptoTransfer, CryptoUpdate, @@ -90,6 +92,8 @@ public class ExpectedCustomThrottles { ConsensusDeleteTopic, ConsensusSubmitMessage, TokenCreate, + TokenGetNftInfo, + TokenGetAccountNftInfos, TokenFreezeAccount, TokenUnfreezeAccount, TokenGrantKycToAccount, diff --git a/hapi-utils/src/test/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottlesTest.java b/hapi-utils/src/test/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottlesTest.java index 576a3149938a..d4fd7fcbf774 100644 --- a/hapi-utils/src/test/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottlesTest.java +++ b/hapi-utils/src/test/java/com/hedera/services/sysfiles/validation/ExpectedCustomThrottlesTest.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; -import static com.hedera.services.sysfiles.validation.ExpectedCustomThrottles.OPS_FOR_RELEASE_0130; +import static com.hedera.services.sysfiles.validation.ExpectedCustomThrottles.OPS_FOR_RELEASE_0160; import static com.hederahashgraph.api.proto.java.HederaFunctionality.ConsensusCreateTopic; import static com.hederahashgraph.api.proto.java.HederaFunctionality.ConsensusDeleteTopic; import static com.hederahashgraph.api.proto.java.HederaFunctionality.ConsensusGetTopicInfo; @@ -60,7 +60,9 @@ import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDelete; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDissociateFromAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenFreezeAccount; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetAccountNftInfos; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetInfo; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetNftInfo; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGrantKycToAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenMint; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenRevokeKycFromAccount; @@ -74,56 +76,58 @@ class ExpectedCustomThrottlesTest { @Test - void release0130HasExpected() { + void release0160HasExpected() { assertDoesNotThrow(ExpectedCustomThrottles::new); - assertEquals(46, OPS_FOR_RELEASE_0130.size()); + assertEquals(48, OPS_FOR_RELEASE_0160.size()); // and: - assertTrue(OPS_FOR_RELEASE_0130.contains(CryptoCreate), "Missing CryptoCreate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(CryptoTransfer), "Missing CryptoTransfer!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(CryptoUpdate), "Missing CryptoUpdate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(CryptoDelete), "Missing CryptoDelete!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(FileCreate), "Missing FileCreate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(FileUpdate), "Missing FileUpdate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(FileDelete), "Missing FileDelete!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(FileAppend), "Missing FileAppend!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractCreate), "Missing ContractCreate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractUpdate), "Missing ContractUpdate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractCreate), "Missing ContractCreate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractDelete), "Missing ContractDelete!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ConsensusCreateTopic), "Missing ConsensusCreateTopic!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ConsensusUpdateTopic), "Missing ConsensusUpdateTopic!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ConsensusDeleteTopic), "Missing ConsensusDeleteTopic!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ConsensusSubmitMessage), "Missing ConsensusSubmitMessage!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenCreate), "Missing TokenCreate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenFreezeAccount), "Missing TokenFreezeAccount!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenUnfreezeAccount), "Missing TokenUnfreezeAccount!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenGrantKycToAccount), "Missing TokenGrantKycToAccount!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenRevokeKycFromAccount), "Missing TokenRevokeKycFromAccount!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenDelete), "Missing TokenDelete!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenMint), "Missing TokenMint!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenBurn), "Missing TokenBurn!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenAccountWipe), "Missing TokenAccountWipe!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenUpdate), "Missing TokenUpdate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenAssociateToAccount), "Missing TokenAssociateToAccount!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenDissociateFromAccount), "Missing TokenDissociateFromAccount!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ScheduleCreate), "Missing ScheduleCreate!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ScheduleSign), "Missing ScheduleSign!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ScheduleDelete), "Missing ScheduleDelete!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ConsensusGetTopicInfo), "Missing ConsensusGetTopicInfo!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractCallLocal), "Missing ContractCallLocal!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractGetInfo), "Missing ContractGetInfo!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractGetBytecode), "Missing ContractGetBytecode!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ContractGetRecords), "Missing ContractGetRecords!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(CryptoGetAccountBalance), "Missing CryptoGetAccountBalance!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(CryptoGetAccountRecords), "Missing CryptoGetAccountRecords!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(CryptoGetInfo), "Missing CryptoGetInfo!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(FileGetContents), "Missing FileGetContents!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(FileGetInfo), "Missing FileGetInfo!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TransactionGetReceipt), "Missing TransactionGetReceipt!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TransactionGetRecord), "Missing TransactionGetRecord!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(GetVersionInfo), "Missing GetVersionInfo!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(TokenGetInfo), "Missing TokenGetInfo!"); - assertTrue(OPS_FOR_RELEASE_0130.contains(ScheduleGetInfo), "Missing ScheduleGetInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(CryptoCreate), "Missing CryptoCreate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(CryptoTransfer), "Missing CryptoTransfer!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(CryptoUpdate), "Missing CryptoUpdate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(CryptoDelete), "Missing CryptoDelete!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(FileCreate), "Missing FileCreate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(FileUpdate), "Missing FileUpdate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(FileDelete), "Missing FileDelete!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(FileAppend), "Missing FileAppend!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractCreate), "Missing ContractCreate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractUpdate), "Missing ContractUpdate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractCreate), "Missing ContractCreate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractDelete), "Missing ContractDelete!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ConsensusCreateTopic), "Missing ConsensusCreateTopic!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ConsensusUpdateTopic), "Missing ConsensusUpdateTopic!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ConsensusDeleteTopic), "Missing ConsensusDeleteTopic!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ConsensusSubmitMessage), "Missing ConsensusSubmitMessage!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenCreate), "Missing TokenCreate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenFreezeAccount), "Missing TokenFreezeAccount!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenGetNftInfo), "Missing TokenGetNftInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenGetAccountNftInfos), "Missing TokenGetAccountNftInfos!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenUnfreezeAccount), "Missing TokenUnfreezeAccount!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenGrantKycToAccount), "Missing TokenGrantKycToAccount!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenRevokeKycFromAccount), "Missing TokenRevokeKycFromAccount!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenDelete), "Missing TokenDelete!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenMint), "Missing TokenMint!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenBurn), "Missing TokenBurn!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenAccountWipe), "Missing TokenAccountWipe!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenUpdate), "Missing TokenUpdate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenAssociateToAccount), "Missing TokenAssociateToAccount!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenDissociateFromAccount), "Missing TokenDissociateFromAccount!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ScheduleCreate), "Missing ScheduleCreate!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ScheduleSign), "Missing ScheduleSign!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ScheduleDelete), "Missing ScheduleDelete!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ConsensusGetTopicInfo), "Missing ConsensusGetTopicInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractCallLocal), "Missing ContractCallLocal!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractGetInfo), "Missing ContractGetInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractGetBytecode), "Missing ContractGetBytecode!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ContractGetRecords), "Missing ContractGetRecords!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(CryptoGetAccountBalance), "Missing CryptoGetAccountBalance!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(CryptoGetAccountRecords), "Missing CryptoGetAccountRecords!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(CryptoGetInfo), "Missing CryptoGetInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(FileGetContents), "Missing FileGetContents!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(FileGetInfo), "Missing FileGetInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TransactionGetReceipt), "Missing TransactionGetReceipt!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TransactionGetRecord), "Missing TransactionGetRecord!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(GetVersionInfo), "Missing GetVersionInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(TokenGetInfo), "Missing TokenGetInfo!"); + assertTrue(OPS_FOR_RELEASE_0160.contains(ScheduleGetInfo), "Missing ScheduleGetInfo!"); } } diff --git a/hedera-node/configuration/compose/api-permission.properties b/hedera-node/configuration/compose/api-permission.properties index d917262ea4b3..8cbc233060c1 100644 --- a/hedera-node/configuration/compose/api-permission.properties +++ b/hedera-node/configuration/compose/api-permission.properties @@ -44,6 +44,8 @@ tokenBurn=0-* tokenAccountWipe=0-* tokenUpdate=0-* tokenGetInfo=0-* +tokenGetNftInfo=0-* +tokenGetAccountNftInfos=0-* tokenAssociateToAccount=0-* tokenDissociateFromAccount=0-* getVersionInfo=0-* diff --git a/hedera-node/configuration/dev/api-permission.properties b/hedera-node/configuration/dev/api-permission.properties index 87289571fe42..2e6dfa7dfbd6 100644 --- a/hedera-node/configuration/dev/api-permission.properties +++ b/hedera-node/configuration/dev/api-permission.properties @@ -47,8 +47,10 @@ tokenBurn=0-* tokenAccountWipe=0-* tokenUpdate=0-* tokenGetInfo=0-* +tokenGetAccountNftInfos=0-* tokenAssociateToAccount=0-* tokenDissociateFromAccount=0-* +tokenGetNftInfo=0-* # Network getVersionInfo=0-* systemDelete=2-59 diff --git a/hedera-node/configuration/mainnet/api-permission.properties b/hedera-node/configuration/mainnet/api-permission.properties index bcabdf789eba..5bc6a9227f01 100644 --- a/hedera-node/configuration/mainnet/api-permission.properties +++ b/hedera-node/configuration/mainnet/api-permission.properties @@ -47,6 +47,8 @@ tokenBurn=0-* tokenAccountWipe=0-* tokenUpdate=0-* tokenGetInfo=0-* +tokenGetNftInfo=0-* +tokenGetAccountNftInfos=0-* tokenAssociateToAccount=0-* tokenDissociateFromAccount=0-* # Network diff --git a/hedera-node/configuration/preprod/api-permission.properties b/hedera-node/configuration/preprod/api-permission.properties index bcabdf789eba..5bc6a9227f01 100644 --- a/hedera-node/configuration/preprod/api-permission.properties +++ b/hedera-node/configuration/preprod/api-permission.properties @@ -47,6 +47,8 @@ tokenBurn=0-* tokenAccountWipe=0-* tokenUpdate=0-* tokenGetInfo=0-* +tokenGetNftInfo=0-* +tokenGetAccountNftInfos=0-* tokenAssociateToAccount=0-* tokenDissociateFromAccount=0-* # Network diff --git a/hedera-node/configuration/previewnet/api-permission.properties b/hedera-node/configuration/previewnet/api-permission.properties index bcabdf789eba..5bc6a9227f01 100644 --- a/hedera-node/configuration/previewnet/api-permission.properties +++ b/hedera-node/configuration/previewnet/api-permission.properties @@ -47,6 +47,8 @@ tokenBurn=0-* tokenAccountWipe=0-* tokenUpdate=0-* tokenGetInfo=0-* +tokenGetNftInfo=0-* +tokenGetAccountNftInfos=0-* tokenAssociateToAccount=0-* tokenDissociateFromAccount=0-* # Network diff --git a/hedera-node/configuration/testnet/api-permission.properties b/hedera-node/configuration/testnet/api-permission.properties index bcabdf789eba..5bc6a9227f01 100644 --- a/hedera-node/configuration/testnet/api-permission.properties +++ b/hedera-node/configuration/testnet/api-permission.properties @@ -47,6 +47,8 @@ tokenBurn=0-* tokenAccountWipe=0-* tokenUpdate=0-* tokenGetInfo=0-* +tokenGetNftInfo=0-* +tokenGetAccountNftInfos=0-* tokenAssociateToAccount=0-* tokenDissociateFromAccount=0-* # Network diff --git a/hedera-node/src/main/java/com/hedera/services/ServicesState.java b/hedera-node/src/main/java/com/hedera/services/ServicesState.java index 3891ac73559a..7abb4dc16b5a 100644 --- a/hedera-node/src/main/java/com/hedera/services/ServicesState.java +++ b/hedera-node/src/main/java/com/hedera/services/ServicesState.java @@ -36,6 +36,9 @@ import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; import com.hedera.services.state.merkle.MerkleTopic; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.state.submerkle.ExchangeRates; import com.hedera.services.state.submerkle.SequenceNumber; import com.hedera.services.stream.RecordsRunningHashLeaf; @@ -52,6 +55,7 @@ import com.swirlds.common.crypto.RunningHash; import com.swirlds.common.merkle.MerkleNode; import com.swirlds.common.merkle.utility.AbstractNaryMerkleInternal; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -63,6 +67,7 @@ import static com.hedera.services.context.SingletonContextsManager.CONTEXTS; import static com.hedera.services.sigs.HederaToPlatformSigOps.expandIn; +import static com.hedera.services.state.initialization.ViewBuilder.rebuildUniqueTokenViews; import static com.hedera.services.state.merkle.MerkleNetworkContext.UNKNOWN_CONSENSUS_TIME; import static com.hedera.services.utils.EntityIdUtils.asLiteralString; import static com.hedera.services.utils.EntityIdUtils.parseAccount; @@ -81,7 +86,8 @@ public class ServicesState extends AbstractNaryMerkleInternal implements SwirldS static final int RELEASE_0130_VERSION = 7; static final int RELEASE_0140_VERSION = 8; static final int RELEASE_0150_VERSION = 9; - static final int MERKLE_VERSION = RELEASE_0150_VERSION; + static final int RELEASE_0160_VERSION = 10; + static final int MERKLE_VERSION = RELEASE_0160_VERSION; static final long RUNTIME_CONSTRUCTABLE_ID = 0x8e300b0dfdafbb1aL; static final String UNSUPPORTED_VERSION_MSG_TPL = "Argument 'version=%d' is invalid!"; @@ -90,6 +96,8 @@ public class ServicesState extends AbstractNaryMerkleInternal implements SwirldS NodeId nodeId = null; boolean skipDiskFsHashCheck = false; + private FCOneToManyRelation uniqueTokenAssociations; + private FCOneToManyRelation uniqueOwnershipAssociations; /* Order of Merkle node children */ static class ChildIndices { @@ -112,18 +120,30 @@ static class ChildIndices { static final int NUM_0130_CHILDREN = 10; static final int NUM_0140_CHILDREN = 10; static final int NUM_0150_CHILDREN = 10; + static final int UNIQUE_TOKENS = 10; + static final int NUM_0160_CHILDREN = 11; } ServicesContext ctx; public ServicesState() { + /* RuntimeConstructable */ } - public ServicesState(ServicesContext ctx, NodeId nodeId, List children, ServicesState immutableState) { + public ServicesState( + ServicesContext ctx, + NodeId nodeId, + List children, + FCOneToManyRelation mutableUniqueTokenAssociations, + FCOneToManyRelation mutableUniqueOwnershipAssociations, + ServicesState immutableState + ) { super(immutableState); addDeserializedChildren(children, MERKLE_VERSION); this.ctx = ctx; this.nodeId = nodeId; + this.uniqueTokenAssociations = mutableUniqueTokenAssociations; + this.uniqueOwnershipAssociations = mutableUniqueOwnershipAssociations; if (ctx != null) { ctx.update(this); } @@ -143,6 +163,8 @@ public int getVersion() { @Override public int getMinimumChildCount(int version) { switch (version) { + case RELEASE_0160_VERSION: + return ChildIndices.NUM_0160_CHILDREN; case RELEASE_0150_VERSION: return ChildIndices.NUM_0150_CHILDREN; case RELEASE_0140_VERSION: @@ -171,6 +193,13 @@ public void genesisInit(Platform platform, AddressBook addressBook) { this.init(platform, addressBook); } + @Override + public void initialize() { + if (uniqueTokens() == null) { + setChild(ChildIndices.UNIQUE_TOKENS, new FCMap<>()); + } + } + /* --- SwirldState --- */ @Override public void init(Platform platform, AddressBook addressBook) { @@ -187,7 +216,7 @@ public void init(Platform platform, AddressBook addressBook) { } catch (ContextNotFoundException ignoreToInstantiateNewContext) { ctx = new ServicesContext(nodeId, platform, this, properties); } - if (getNumberOfChildren() < ChildIndices.NUM_0130_CHILDREN) { + if (getNumberOfChildren() < ChildIndices.NUM_0150_CHILDREN) { log.info("Init called on Services node {} WITHOUT Merkle saved state", nodeId); long seqStart = bootstrapProps.getLongProperty("hedera.numReservedSystemEntities") + 1; setChild(ChildIndices.NETWORK_CTX, new MerkleNetworkContext( @@ -202,6 +231,7 @@ public void init(Platform platform, AddressBook addressBook) { setChild(ChildIndices.TOKEN_ASSOCIATIONS, new FCMap<>()); setChild(ChildIndices.DISK_FS, new MerkleDiskFs()); setChild(ChildIndices.SCHEDULE_TXS, new FCMap<>()); + setChild(ChildIndices.UNIQUE_TOKENS, new FCMap()); /* Initialize the running hash leaf at genesis to an empty hash. */ final var firstRunningHash = new RunningHash(); @@ -245,6 +275,9 @@ private void initializeContext(final ServicesContext ctx) { ctx.update(this); ctx.rebuildBackingStoresIfPresent(); ctx.rebuildStoreViewsIfPresent(); + uniqueTokenAssociations = new FCOneToManyRelation<>(); + uniqueOwnershipAssociations = new FCOneToManyRelation<>(); + rebuildUniqueTokenViews(uniqueTokens(), uniqueTokenAssociations, uniqueOwnershipAssociations); /* Use any payer records stored in state to rebuild the recent transaction * history. This history has two main uses: Purging expired records, and @@ -314,8 +347,9 @@ public synchronized ServicesState copy() { tokenAssociations().copy(), diskFs().copy(), scheduleTxs().copy(), - runningHashLeaf().copy() - ), this); + runningHashLeaf().copy(), + uniqueTokens().copy() + ), uniqueTokenAssociations.copy(), uniqueOwnershipAssociations.copy(), this); } /* --------------- */ @@ -343,7 +377,8 @@ private void logHashes() { " NetworkContext :: %s\n" + " AddressBook :: %s\n" + " RecordsRunningHashLeaf :: %s\n" + - " ↪ Running hash :: %s", + " ↪ Running hash :: %s\n" + + " UniqueTokens :: %s\n", getHash(), accounts().getHash(), storage().getHash(), @@ -355,7 +390,8 @@ private void logHashes() { networkCtx().getHash(), addressBook().getHash(), runningHashLeaf().getHash(), - runningHashLeaf().getRunningHash().getHash())); + runningHashLeaf().getRunningHash().getHash(), + uniqueTokens().getHash())); } public FCMap accounts() { @@ -397,4 +433,24 @@ public MerkleDiskFs diskFs() { public RecordsRunningHashLeaf runningHashLeaf() { return getChild(ChildIndices.RECORD_STREAM_RUNNING_HASH); } + + public FCMap uniqueTokens() { + return getChild(ChildIndices.UNIQUE_TOKENS); + } + + public FCOneToManyRelation uniqueTokenAssociations() { + return uniqueTokenAssociations; + } + + public FCOneToManyRelation uniqueOwnershipAssociations() { + return uniqueOwnershipAssociations; + } + + void setUniqueTokenAssociations(FCOneToManyRelation uniqueTokenAssociations) { + this.uniqueTokenAssociations = uniqueTokenAssociations; + } + + void setUniqueOwnershipAssociations(FCOneToManyRelation uniqueOwnershipAssociations) { + this.uniqueOwnershipAssociations = uniqueOwnershipAssociations; + } } diff --git a/hedera-node/src/main/java/com/hedera/services/context/AwareTransactionContext.java b/hedera-node/src/main/java/com/hedera/services/context/AwareTransactionContext.java index 74d8e42d4b95..646f01aa8bd3 100644 --- a/hedera-node/src/main/java/com/hedera/services/context/AwareTransactionContext.java +++ b/hedera-node/src/main/java/com/hedera/services/context/AwareTransactionContext.java @@ -310,6 +310,11 @@ public List expiringEntities() { return expiringEntities; } + @Override + public void setCreated(List serialNumbers) { + receiptConfig = receipt -> receipt.setSerialNumbers(serialNumbers.stream().mapToLong(l -> l).toArray()); + } + List getAssessedCustomFees() { return assessedCustomFees; } diff --git a/hedera-node/src/main/java/com/hedera/services/context/ServicesContext.java b/hedera-node/src/main/java/com/hedera/services/context/ServicesContext.java index 03f7aba53eae..77d5d061a135 100644 --- a/hedera-node/src/main/java/com/hedera/services/context/ServicesContext.java +++ b/hedera-node/src/main/java/com/hedera/services/context/ServicesContext.java @@ -87,7 +87,9 @@ import com.hedera.services.fees.calculation.schedule.txns.ScheduleDeleteResourceUsage; import com.hedera.services.fees.calculation.schedule.txns.ScheduleSignResourceUsage; import com.hedera.services.fees.calculation.system.txns.FreezeResourceUsage; +import com.hedera.services.fees.calculation.token.queries.GetAccountNftInfosResourceUsage; import com.hedera.services.fees.calculation.token.queries.GetTokenInfoResourceUsage; +import com.hedera.services.fees.calculation.token.queries.GetTokenNftInfoResourceUsage; import com.hedera.services.fees.calculation.token.txns.TokenAssociateResourceUsage; import com.hedera.services.fees.calculation.token.txns.TokenBurnResourceUsage; import com.hedera.services.fees.calculation.token.txns.TokenCreateResourceUsage; @@ -142,6 +144,7 @@ import com.hedera.services.ledger.PureTransferSemanticChecks; import com.hedera.services.ledger.TransactionalLedger; import com.hedera.services.ledger.accounts.BackingAccounts; +import com.hedera.services.ledger.accounts.BackingNfts; import com.hedera.services.ledger.accounts.BackingStore; import com.hedera.services.ledger.accounts.BackingTokenRels; import com.hedera.services.ledger.accounts.PureBackingAccounts; @@ -149,6 +152,7 @@ import com.hedera.services.ledger.ids.SeqNoEntityIdSource; import com.hedera.services.ledger.properties.AccountProperty; import com.hedera.services.ledger.properties.ChangeSummaryManager; +import com.hedera.services.ledger.properties.NftProperty; import com.hedera.services.ledger.properties.TokenRelProperty; import com.hedera.services.legacy.handler.FreezeHandler; import com.hedera.services.legacy.handler.SmartContractRequestHandler; @@ -183,7 +187,9 @@ import com.hedera.services.queries.meta.MetaAnswers; import com.hedera.services.queries.schedule.GetScheduleInfoAnswer; import com.hedera.services.queries.schedule.ScheduleAnswers; +import com.hedera.services.queries.token.GetAccountNftInfosAnswer; import com.hedera.services.queries.token.GetTokenInfoAnswer; +import com.hedera.services.queries.token.GetTokenNftInfoAnswer; import com.hedera.services.queries.token.TokenAnswers; import com.hedera.services.queries.validation.QueryFeeCheck; import com.hedera.services.records.AccountRecordsHistorian; @@ -226,6 +232,8 @@ import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; import com.hedera.services.state.merkle.MerkleTopic; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.migration.StateMigrations; import com.hedera.services.state.migration.StdStateMigrations; import com.hedera.services.state.submerkle.EntityId; @@ -243,6 +251,7 @@ import com.hedera.services.stats.SpeedometerFactory; import com.hedera.services.store.AccountStore; import com.hedera.services.store.TypedTokenStore; +import com.hedera.services.store.models.NftId; import com.hedera.services.store.schedule.HederaScheduleStore; import com.hedera.services.store.schedule.ScheduleStore; import com.hedera.services.store.tokens.HederaTokenStore; @@ -342,6 +351,7 @@ import com.swirlds.common.crypto.Hash; import com.swirlds.common.crypto.ImmutableHash; import com.swirlds.common.crypto.RunningHash; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; @@ -451,13 +461,14 @@ public class ServicesContext { private HederaFs hfs; private NodeInfo nodeInfo; private StateView currentView; + private TokenStore tokenStore; private AnswerFlow answerFlow; private HcsAnswers hcsAnswers; private FileNumbers fileNums; private FileAnswers fileAnswers; private MetaAnswers metaAnswers; private RecordCache recordCache; - private TokenStore tokenStore; + private BackingNfts backingNfts; private AccountStore accountStore; private TokenAnswers tokenAnswers; private HederaLedger ledger; @@ -543,6 +554,7 @@ public class ServicesContext { private ServicesStatsManager statsManager; private LedgerAccountsSource accountSource; private TransitionLogicLookup transitionLogic; + private FcmCustomFeeSchedules activeCustomFeeSchedules; private PricedUsageCalculator pricedUsageCalculator; private TransactionThrottling txnThrottling; private ConsensusStatusCounts statusCounts; @@ -572,8 +584,10 @@ public class ServicesContext { private AtomicReference> queryableAccounts; private AtomicReference> queryableSchedules; private AtomicReference> queryableStorage; + private AtomicReference> queryableUniqueTokens; private AtomicReference> queryableTokenAssociations; - private FcmCustomFeeSchedules activeCustomFeeSchedules; + private AtomicReference> queryableUniqueTokenAssociations; + private AtomicReference> queryableUniqueOwnershipAssociations; /* Context-free infrastructure. */ private static Pause pause; @@ -609,6 +623,9 @@ public void update(ServicesState state) { queryableTokens().set(tokens()); queryableTokenAssociations().set(tokenAssociations()); queryableSchedules().set(schedules()); + queryableUniqueTokens().set(uniqueTokens()); + queryableUniqueTokenAssociations().set(uniqueTokenAssociations()); + queryableUniqueOwnershipAssociations().set(uniqueOwnershipAssociations()); } public SwirldDualState getDualState() { @@ -626,6 +643,9 @@ public void rebuildBackingStoresIfPresent() { if (backingAccounts != null) { backingAccounts.rebuildFromSources(); } + if (backingNfts != null) { + backingNfts.rebuildFromSources(); + } } public void rebuildStoreViewsIfPresent() { @@ -842,7 +862,10 @@ public Supplier stateViews() { () -> queryableTopics().get(), () -> queryableAccounts().get(), () -> queryableStorage().get(), + () -> queryableUniqueTokens().get(), () -> queryableTokenAssociations().get(), + () -> queryableUniqueTokenAssociations().get(), + () -> queryableUniqueOwnershipAssociations().get(), this::diskFs, nodeLocalProperties()); } @@ -857,7 +880,10 @@ public StateView currentView() { this::topics, this::accounts, this::storage, + this::uniqueTokens, this::tokenAssociations, + this::uniqueTokenAssociations, + this::uniqueOwnershipAssociations, this::diskFs, nodeLocalProperties()); } @@ -965,8 +991,12 @@ public TypedTokenStore typedTokenStore() { accountStore(), new TransactionRecordService(txnCtx()), this::tokens, + this::uniqueTokens, + this::uniqueOwnershipAssociations, + this::uniqueTokenAssociations, this::tokenAssociations, - (BackingTokenRels) backingTokenRels()); + (BackingTokenRels) backingTokenRels(), + backingNfts()); } return typedTokenStore; } @@ -976,7 +1006,7 @@ public TypedTokenStore typedTokenStore() { * Instant, SwirldTransaction, SwirldDualState)} to load, save, and create accounts from the Swirlds application * state. It decouples the {@code handleTransaction} logic from the details of the Merkle state. * - * @return the singleton AccountStore + * @return the singleton accounts store */ public AccountStore accountStore() { if (accountStore == null) { @@ -1007,7 +1037,9 @@ public EntityNumbers entityNums() { public TokenAnswers tokenAnswers() { if (tokenAnswers == null) { tokenAnswers = new TokenAnswers( - new GetTokenInfoAnswer() + new GetTokenInfoAnswer(), + new GetTokenNftInfoAnswer(), + new GetAccountNftInfosAnswer(validator()) ); } return tokenAnswers; @@ -1085,7 +1117,10 @@ public FeeCalculator fees() { /* Token */ new GetTokenInfoResourceUsage(), /* Schedule */ - new GetScheduleInfoResourceUsage(scheduleOpsUsage) + new GetScheduleInfoResourceUsage(scheduleOpsUsage), + /* NftInfo */ + new GetTokenNftInfoResourceUsage(), + new GetAccountNftInfosResourceUsage() ), txnUsageEstimators( cryptoOpsUsage, fileOpsUsage, fileFees, cryptoFees, contractFees, scheduleOpsUsage) @@ -1413,9 +1448,11 @@ private Function> transitions() { entry(TokenDelete, List.of(new TokenDeleteTransitionLogic(tokenStore(), txnCtx()))), entry(TokenMint, - List.of(new TokenMintTransitionLogic(typedTokenStore(), txnCtx()))), + List.of(new TokenMintTransitionLogic(validator(), accountStore(), typedTokenStore(), + txnCtx()))), entry(TokenBurn, - List.of(new TokenBurnTransitionLogic(typedTokenStore(), txnCtx()))), + List.of(new TokenBurnTransitionLogic(validator(), accountStore(), typedTokenStore(), + txnCtx()))), entry(TokenAccountWipe, List.of(new TokenWipeTransitionLogic(tokenStore(), txnCtx()))), entry(TokenAssociateToAccount, @@ -1539,8 +1576,21 @@ public GlobalDynamicProperties globalDynamicProperties() { return globalDynamicProperties; } + public BackingNfts backingNfts() { + if (backingNfts == null) { + backingNfts = new BackingNfts(this::uniqueTokens); + } + return backingNfts; + } + public TokenStore tokenStore() { if (tokenStore == null) { + TransactionalLedger nftsLedger = + new TransactionalLedger<>( + NftProperty.class, + MerkleUniqueToken::new, + backingNfts(), + new ChangeSummaryManager<>()); TransactionalLedger, TokenRelProperty, MerkleTokenRelStatus> tokenRelsLedger = new TransactionalLedger<>( TokenRelProperty.class, @@ -1553,7 +1603,9 @@ public TokenStore tokenStore() { validator(), globalDynamicProperties(), this::tokens, - tokenRelsLedger); + this::uniqueOwnershipAssociations, + tokenRelsLedger, + nftsLedger); } return tokenStore; } @@ -2042,10 +2094,30 @@ public AtomicReference> queryableSchedules if (queryableSchedules == null) { queryableSchedules = new AtomicReference<>(schedules()); } - return queryableSchedules; } + public AtomicReference> queryableUniqueTokens() { + if (queryableUniqueTokens == null) { + queryableUniqueTokens = new AtomicReference<>(uniqueTokens()); + } + return queryableUniqueTokens; + } + + public AtomicReference> queryableUniqueTokenAssociations() { + if (queryableUniqueTokenAssociations == null) { + queryableUniqueTokenAssociations = new AtomicReference<>(uniqueTokenAssociations()); + } + return queryableUniqueTokenAssociations; + } + + public AtomicReference> queryableUniqueOwnershipAssociations() { + if (queryableUniqueOwnershipAssociations == null) { + queryableUniqueOwnershipAssociations = new AtomicReference<>(uniqueOwnershipAssociations()); + } + return queryableUniqueOwnershipAssociations; + } + public UsagePricesProvider usagePrices() { if (usagePrices == null) { usagePrices = new AwareFcfsUsagePrices(hfs(), fileNums(), txnCtx()); @@ -2157,6 +2229,18 @@ public FCMap tokenAssociations() return state.tokenAssociations(); } + public FCMap uniqueTokens() { + return state.uniqueTokens(); + } + + public FCOneToManyRelation uniqueTokenAssociations() { + return state.uniqueTokenAssociations(); + } + + public FCOneToManyRelation uniqueOwnershipAssociations() { + return state.uniqueOwnershipAssociations(); + } + public FCMap schedules() { return state.scheduleTxs(); } @@ -2225,6 +2309,10 @@ void setBackingTokenRels(BackingTokenRels backingTokenRels) { this.backingTokenRels = backingTokenRels; } + public void setBackingNfts(BackingNfts backingNfts) { + this.backingNfts = backingNfts; + } + void setBackingAccounts(BackingAccounts backingAccounts) { this.backingAccounts = backingAccounts; } diff --git a/hedera-node/src/main/java/com/hedera/services/context/TransactionContext.java b/hedera-node/src/main/java/com/hedera/services/context/TransactionContext.java index 47911d562aad..93c8d30dc668 100644 --- a/hedera-node/src/main/java/com/hedera/services/context/TransactionContext.java +++ b/hedera-node/src/main/java/com/hedera/services/context/TransactionContext.java @@ -265,6 +265,12 @@ default AccountID effectivePayer() { */ void setTokenTransferLists(List tokenTransfers); + /** + * Update the serial numbers after minting unique tokens + * @param serialNumbers - the serial numbers used in the mint op + */ + void setCreated(List serialNumbers); + /** * Set the assessed custom fees as a result of the active transaction. It is used for {@link ExpirableTxnRecord}. * diff --git a/hedera-node/src/main/java/com/hedera/services/context/domain/security/PermissionFileUtils.java b/hedera-node/src/main/java/com/hedera/services/context/domain/security/PermissionFileUtils.java index 813de0f8572f..814fec941a2c 100644 --- a/hedera-node/src/main/java/com/hedera/services/context/domain/security/PermissionFileUtils.java +++ b/hedera-node/src/main/java/com/hedera/services/context/domain/security/PermissionFileUtils.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -76,7 +76,9 @@ import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDelete; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDissociateFromAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenFreezeAccount; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetAccountNftInfos; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetInfo; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetNftInfo; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGrantKycToAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenMint; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenRevokeKycFromAccount; @@ -164,6 +166,8 @@ public static String permissionFileKeyForQuery(Query query) { permissionKeys.put(GetVersionInfo, "getVersionInfo"); permissionKeys.put(TokenGetInfo, "tokenGetInfo"); permissionKeys.put(ScheduleGetInfo, "scheduleGetInfo"); + permissionKeys.put(TokenGetNftInfo, "tokenGetNftInfo"); + permissionKeys.put(TokenGetAccountNftInfos, "tokenGetAccountNftInfos"); legacyKeys = permissionKeys.entrySet().stream() .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)); diff --git a/hedera-node/src/main/java/com/hedera/services/context/primitives/StateView.java b/hedera-node/src/main/java/com/hedera/services/context/primitives/StateView.java index 9eba40d2f1f2..0241cdf23fd8 100644 --- a/hedera-node/src/main/java/com/hedera/services/context/primitives/StateView.java +++ b/hedera-node/src/main/java/com/hedera/services/context/primitives/StateView.java @@ -38,6 +38,8 @@ import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; import com.hedera.services.state.merkle.MerkleTopic; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.state.submerkle.RawTokenRelationship; import com.hedera.services.store.schedule.ScheduleStore; @@ -52,6 +54,7 @@ import com.hederahashgraph.api.proto.java.FileID; import com.hederahashgraph.api.proto.java.Key; import com.hederahashgraph.api.proto.java.KeyList; +import com.hederahashgraph.api.proto.java.NftID; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.ScheduleInfo; import com.hederahashgraph.api.proto.java.Timestamp; @@ -59,7 +62,10 @@ import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenInfo; import com.hederahashgraph.api.proto.java.TokenKycStatus; +import com.hederahashgraph.api.proto.java.TokenNftInfo; import com.hederahashgraph.api.proto.java.TokenRelationship; +import com.hederahashgraph.api.proto.java.TokenType; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -76,6 +82,8 @@ import static com.hedera.services.state.merkle.MerkleEntityId.fromAccountId; import static com.hedera.services.state.merkle.MerkleEntityId.fromContractId; import static com.hedera.services.state.submerkle.EntityId.MISSING_ENTITY_ID; +import static com.hedera.services.state.submerkle.EntityId.fromGrpcAccountId; +import static com.hedera.services.state.submerkle.EntityId.fromGrpcTokenId; import static com.hedera.services.store.schedule.ExceptionalScheduleStore.NOOP_SCHEDULE_STORE; import static com.hedera.services.store.schedule.ScheduleStore.MISSING_SCHEDULE; import static com.hedera.services.store.tokens.ExceptionalTokenStore.NOOP_TOKEN_STORE; @@ -116,6 +124,21 @@ public class StateView { public static final Supplier> EMPTY_TOKEN_ASSOCS_SUPPLIER = () -> EMPTY_TOKEN_ASSOCIATIONS; + public static final FCMap EMPTY_UNIQUE_TOKENS = + new FCMap<>(); + public static final Supplier> EMPTY_UNIQUE_TOKENS_SUPPLIER = + () -> EMPTY_UNIQUE_TOKENS; + + public static final FCOneToManyRelation EMPTY_UNIQUE_TOKEN_ASSOCS = + new FCOneToManyRelation<>(); + public static final Supplier> EMPTY_UNIQUE_TOKEN_ASSOCS_SUPPLIER = + () -> EMPTY_UNIQUE_TOKEN_ASSOCS; + + public static final FCOneToManyRelation EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS = + new FCOneToManyRelation<>(); + public static final Supplier> EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS_SUPPLIER = + () -> EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS; + public static final StateView EMPTY_VIEW = new StateView( EMPTY_TOPICS_SUPPLIER, EMPTY_ACCOUNTS_SUPPLIER, @@ -125,6 +148,7 @@ public class StateView { Map contractBytecode; Map fileContents; Map fileAttrs; + private final TokenStore tokenStore; private final ScheduleStore scheduleStore; private final Supplier diskFs; @@ -132,6 +156,10 @@ public class StateView { private final Supplier> accounts; private final Supplier> tokenAssociations; + private Supplier> uniqueTokens; + private final Supplier> uniqueTokenAssociations; + private final Supplier> uniqueTokenAccountOwnerships; + private final NodeLocalProperties properties; public StateView( @@ -140,8 +168,18 @@ public StateView( NodeLocalProperties properties, Supplier diskFs ) { - this(NOOP_TOKEN_STORE, NOOP_SCHEDULE_STORE, topics, accounts, EMPTY_STORAGE_SUPPLIER, - EMPTY_TOKEN_ASSOCS_SUPPLIER, diskFs, properties); + this( + NOOP_TOKEN_STORE, + NOOP_SCHEDULE_STORE, + topics, + accounts, + EMPTY_STORAGE_SUPPLIER, + EMPTY_UNIQUE_TOKENS_SUPPLIER, + EMPTY_TOKEN_ASSOCS_SUPPLIER, + EMPTY_UNIQUE_TOKEN_ASSOCS_SUPPLIER, + EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS_SUPPLIER, + diskFs, + properties); } public StateView( @@ -152,7 +190,17 @@ public StateView( NodeLocalProperties properties, Supplier diskFs ) { - this(tokenStore, scheduleStore, topics, accounts, EMPTY_STORAGE_SUPPLIER, EMPTY_TOKEN_ASSOCS_SUPPLIER, diskFs, + this( + tokenStore, + scheduleStore, + topics, + accounts, + EMPTY_STORAGE_SUPPLIER, + EMPTY_UNIQUE_TOKENS_SUPPLIER, + EMPTY_TOKEN_ASSOCS_SUPPLIER, + EMPTY_UNIQUE_TOKEN_ASSOCS_SUPPLIER, + EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS_SUPPLIER, + diskFs, properties); } @@ -162,15 +210,21 @@ public StateView( Supplier> topics, Supplier> accounts, Supplier> storage, + Supplier> uniqueTokens, Supplier> tokenAssociations, + Supplier> uniqueTokenAssociations, + Supplier> uniqueTokenAccountOwnerships, Supplier diskFs, NodeLocalProperties properties ) { this.topics = topics; this.accounts = accounts; this.tokenStore = tokenStore; - this.tokenAssociations = tokenAssociations; + this.uniqueTokens = uniqueTokens; this.scheduleStore = scheduleStore; + this.tokenAssociations = tokenAssociations; + this.uniqueTokenAssociations = uniqueTokenAssociations; + this.uniqueTokenAccountOwnerships = uniqueTokenAccountOwnerships; Map blobStore = unmodifiableMap(new FcBlobsBytesStore(MerkleOptionalBlob::new, storage)); @@ -237,6 +291,8 @@ public Optional infoForToken(TokenID tokenID) { } var token = tokenStore.get(id); var info = TokenInfo.newBuilder() + .setTokenTypeValue(token.tokenType().ordinal()) + .setSupplyTypeValue(token.supplyType().ordinal()) .setTokenId(id) .setDeleted(token.isDeleted()) .setSymbol(token.symbol()) @@ -244,6 +300,7 @@ public Optional infoForToken(TokenID tokenID) { .setMemo(token.memo()) .setTreasury(token.treasury().toGrpcAccountId()) .setTotalSupply(token.totalSupply()) + .setMaxSupply(token.maxSupply()) .setDecimals(token.decimals()) .setExpiry(Timestamp.newBuilder().setSeconds(token.expiry())); @@ -323,6 +380,43 @@ public Optional infoForSchedule(ScheduleID scheduleID) { } } + public Optional infoForNft(NftID target) { + final var currentNfts = uniqueTokens.get(); + final var targetKey = new MerkleUniqueTokenId(fromGrpcTokenId(target.getTokenID()), target.getSerialNumber()); + if (!currentNfts.containsKey(targetKey)) { + return Optional.empty(); + } + final var targetNft = currentNfts.get(targetKey); + final var info = TokenNftInfo.newBuilder() + .setNftID(target) + .setAccountID(targetNft.getOwner().toGrpcAccountId()) + .setCreationTime(targetNft.getCreationTime().toGrpc()) + .setMetadata(ByteString.copyFrom(targetNft.getMetadata())) + .build(); + return Optional.of(info); + } + + public boolean nftExists(NftID id) { + return uniqueTokens.get().containsKey(new MerkleUniqueTokenId(fromGrpcTokenId(id.getTokenID()), id.getSerialNumber())); + } + + public Optional tokenType(TokenID tokenID) { + try { + var id = tokenStore.resolve(tokenID); + if (id == MISSING_TOKEN) { + return Optional.empty(); + } + var token = tokenStore.get(id); + return Optional.ofNullable(TokenType.forNumber(token.tokenType().ordinal())); + } catch (Exception unexpected) { + log.warn( + "Unexpected failure getting info for token {}!", + readableId(tokenID), + unexpected); + return Optional.empty(); + } + } + TokenFreezeStatus tfsFor(boolean flag) { return flag ? TokenFreezeStatus.Frozen : TokenFreezeStatus.Unfrozen; } @@ -397,7 +491,8 @@ public Optional infoForAccount(AccountID id) .setAutoRenewPeriod(Duration.newBuilder().setSeconds(account.getAutoRenewSecs())) .setBalance(account.getBalance()) .setExpirationTime(Timestamp.newBuilder().setSeconds(account.getExpiry())) - .setContractAccountID(asSolidityAddressHex(id)); + .setContractAccountID(asSolidityAddressHex(id)) + .setOwnedNfts(account.getNftsOwned()); Optional.ofNullable(account.getProxy()) .map(EntityId::toGrpcAccountId) .ifPresent(info::setProxyAccountID); @@ -409,6 +504,32 @@ public Optional infoForAccount(AccountID id) return Optional.of(info.build()); } + public Optional> infoForAccountNfts(AccountID aid, long start, long end) { + var account = accounts().get(fromAccountId(aid)); + if (account == null) { + return Optional.empty(); + } + + List nftInfos = new ArrayList<>(); + var uniqueTokensMap = uniqueTokens.get(); + uniqueTokenAccountOwnerships.get() + .get(fromGrpcAccountId(aid), (int)start, (int)end).forEachRemaining(nftId -> { + var nft = uniqueTokensMap.get(nftId); + nftInfos.add( + TokenNftInfo.newBuilder() + .setAccountID(aid) + .setCreationTime(nft.getCreationTime().toGrpc()) + .setNftID(NftID.newBuilder() + .setTokenID(nftId.tokenId().toGrpcTokenId()) + .setSerialNumber(nftId.serialNumber()) + .build()) + .setMetadata(ByteString.copyFrom(nft.getMetadata())) + .build() + ); + }); + return Optional.of(nftInfos); + } + public Optional infoForContract(ContractID id) { var contract = contracts().get(fromContractId(id)); if (contract == null) { @@ -459,4 +580,8 @@ public FCMap contracts() { public Supplier> tokenAssociations() { return tokenAssociations; } + + public long accountNftsCount(AccountID accountID) { + return uniqueTokenAccountOwnerships.get().getCount(fromGrpcAccountId(accountID)); + } } diff --git a/hedera-node/src/main/java/com/hedera/services/context/properties/BootstrapProperties.java b/hedera-node/src/main/java/com/hedera/services/context/properties/BootstrapProperties.java index b5b2cfbd32a7..e6279a101dbc 100644 --- a/hedera-node/src/main/java/com/hedera/services/context/properties/BootstrapProperties.java +++ b/hedera-node/src/main/java/com/hedera/services/context/properties/BootstrapProperties.java @@ -213,6 +213,7 @@ public Set allPropertyNames() { "ledger.maxAccountNum", "ledger.transfers.maxLen", "ledger.tokenTransfers.maxLen", + "ledger.nftTransfers.maxLen", "ledger.schedule.txExpiryTimeSecs", "rates.intradayChangeLimitPercent", "rates.midnightCheckInterval", @@ -221,6 +222,11 @@ public Set allPropertyNames() { "tokens.maxSymbolUtf8Bytes", "tokens.maxTokenNameUtf8Bytes", "tokens.maxCustomFeesAllowed", + "tokens.nfts.maxMetadataBytes", + "tokens.nfts.maxBatchSizeBurn", + "tokens.nfts.maxBatchSizeWipe", + "tokens.nfts.maxBatchSizeMint", + "tokens.nfts.maxQueryRange", "consensus.message.maxBytesAllowed" ); @@ -333,6 +339,7 @@ public static Function transformFor(String prop) { entry("ledger.numSystemAccounts", AS_INT), entry("ledger.transfers.maxLen", AS_INT), entry("ledger.tokenTransfers.maxLen", AS_INT), + entry("ledger.nftTransfers.maxLen", AS_INT), entry("ledger.totalTinyBarFloat", AS_LONG), entry("ledger.schedule.txExpiryTimeSecs", AS_INT), entry("iss.dumpFcms", AS_BOOLEAN), @@ -347,6 +354,11 @@ public static Function transformFor(String prop) { entry("tokens.maxCustomFeesAllowed", AS_INT), entry("tokens.maxSymbolUtf8Bytes", AS_INT), entry("tokens.maxTokenNameUtf8Bytes", AS_INT), + entry("tokens.nfts.maxMetadataBytes", AS_INT), + entry("tokens.nfts.maxBatchSizeBurn", AS_INT), + entry("tokens.nfts.maxBatchSizeWipe", AS_INT), + entry("tokens.nfts.maxBatchSizeMint", AS_INT), + entry("tokens.nfts.maxQueryRange", AS_LONG), entry("contracts.localCall.estRetBytes", AS_INT), entry("contracts.maxStorageKb", AS_INT), entry("contracts.defaultLifetime", AS_LONG), diff --git a/hedera-node/src/main/java/com/hedera/services/context/properties/GlobalDynamicProperties.java b/hedera-node/src/main/java/com/hedera/services/context/properties/GlobalDynamicProperties.java index fcdc70aaa186..3898c5ad2116 100644 --- a/hedera-node/src/main/java/com/hedera/services/context/properties/GlobalDynamicProperties.java +++ b/hedera-node/src/main/java/com/hedera/services/context/properties/GlobalDynamicProperties.java @@ -31,6 +31,12 @@ public class GlobalDynamicProperties { private final HederaNumbers hederaNums; private final PropertySource properties; + private int maxNFTMetadataBytes; + private int maxBatchSizeBurn; + private int maxBatchSizeMint; + private int maxNftTransfersLen; + private int maxBatchSizeWipe; + private long maxNftQueryRange; private int maxTokensPerAccount; private int maxCustomFeesAllowed; private int maxTokenSymbolUtf8Bytes; @@ -82,6 +88,11 @@ public GlobalDynamicProperties( public void reload() { shouldKeepRecordsInState = properties.getBooleanProperty("ledger.keepRecordsInState"); + maxNFTMetadataBytes = properties.getIntProperty("tokens.nfts.maxMetadataBytes"); + maxBatchSizeBurn = properties.getIntProperty("tokens.nfts.maxBatchSizeBurn"); + maxBatchSizeMint = properties.getIntProperty("tokens.nfts.maxBatchSizeMint"); + maxBatchSizeWipe = properties.getIntProperty("tokens.nfts.maxBatchSizeWipe"); + maxNftQueryRange = properties.getLongProperty("tokens.nfts.maxQueryRange"); maxTokensPerAccount = properties.getIntProperty("tokens.maxPerAccount"); maxTokenSymbolUtf8Bytes = properties.getIntProperty("tokens.maxSymbolUtf8Bytes"); maxTokenNameUtf8Bytes = properties.getIntProperty("tokens.maxTokenNameUtf8Bytes"); @@ -102,6 +113,7 @@ public void reload() { shouldExportTokenBalances = properties.getBooleanProperty("balances.exportTokenBalances"); maxTransfersLen = properties.getIntProperty("ledger.transfers.maxLen"); maxTokenTransfersLen = properties.getIntProperty("ledger.tokenTransfers.maxLen"); + maxNftTransfersLen = properties.getIntProperty("ledger.nftTransfers.maxLen"); maxMemoUtf8Bytes = properties.getIntProperty("hedera.transaction.maxMemoUtf8Bytes"); maxTxnDuration = properties.getLongProperty("hedera.transaction.maxValidDuration"); minTxnDuration = properties.getLongProperty("hedera.transaction.minValidDuration"); @@ -119,7 +131,7 @@ public void reload() { localCallEstRetBytes = properties.getIntProperty("contracts.localCall.estRetBytes"); scheduledTxExpiryTimeSecs = properties.getIntProperty("ledger.schedule.txExpiryTimeSecs"); schedulingWhitelist = properties.getFunctionsProperty("scheduling.whitelist"); - messageMaxBytesAllowed = properties.getIntProperty( "consensus.message.maxBytesAllowed"); + messageMaxBytesAllowed = properties.getIntProperty("consensus.message.maxBytesAllowed"); congestionMultipliers = properties.getCongestionMultiplierProperty("fees.percentCongestionMultipliers"); feesMinCongestionPeriod = properties.getIntProperty("fees.minCongestionPeriod"); ratesMidnightCheckInterval = properties.getLongProperty("rates.midnightCheckInterval"); @@ -134,6 +146,18 @@ public int maxCustomFeesAllowed() { return maxCustomFeesAllowed; } + public int maxNftMetadataBytes() { return maxNFTMetadataBytes; } + + public int maxBatchSizeBurn() { return maxBatchSizeBurn; } + + public int maxNftTransfersLen() { return maxNftTransfersLen; } + + public int maxBatchSizeWipe() { return maxBatchSizeWipe; } + + public int maxBatchSizeMint() { return maxBatchSizeMint; } + + public long maxNftQueryRange() { return maxNftQueryRange; } + public int maxTokenSymbolUtf8Bytes() { return maxTokenSymbolUtf8Bytes; } @@ -164,7 +188,7 @@ public int maxContractStorageKb() { public int ratesIntradayChangeLimitPercent() { return ratesIntradayChangeLimitPercent; - } + } public boolean shouldKeepRecordsInState() { return shouldKeepRecordsInState; diff --git a/hedera-node/src/main/java/com/hedera/services/fees/bootstrap/JsonToProtoSerde.java b/hedera-node/src/main/java/com/hedera/services/fees/bootstrap/JsonToProtoSerde.java index 357627b99777..96cca2cd7929 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/bootstrap/JsonToProtoSerde.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/bootstrap/JsonToProtoSerde.java @@ -26,6 +26,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.FeeSchedule; import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TimestampSeconds; import com.hederahashgraph.api.proto.java.TransactionFeeSchedule; @@ -46,7 +47,7 @@ public class JsonToProtoSerde { private static String[] FEE_SCHEDULE_KEYS = { "currentFeeSchedule", "nextFeeSchedule" }; private static final String EXPIRY_TIME_KEY = "expiryTime"; private static final String TXN_FEE_SCHEDULE_KEY = "transactionFeeSchedule"; - private static final String FEE_DATA_KEY = "feeData"; + private static final String FEE_DATA_KEY = "fees"; private static final String HEDERA_FUNCTION_KEY = "hederaFunctionality"; private static final String[] FEE_COMPONENT_KEYS = { "nodedata", "networkdata", "servicedata" }; private static final String[] RESOURCE_KEYS = @@ -98,7 +99,12 @@ static TransactionFeeSchedule bindTxnFeeScheduleFrom(Map rawTxnF TransactionFeeSchedule.Builder txnFeeSchedule = TransactionFeeSchedule.newBuilder(); var key = translateClaimFunction((String)rawTxnFeeSchedule.get(HEDERA_FUNCTION_KEY)); txnFeeSchedule.setHederaFunctionality(HederaFunctionality.valueOf(key)); - txnFeeSchedule.setFeeData(bindFeeDataFrom((Map)rawTxnFeeSchedule.get(FEE_DATA_KEY))); + var feesList = (List)rawTxnFeeSchedule.get(FEE_DATA_KEY); + + for (Object o : feesList) { + txnFeeSchedule.addFees(bindFeeDataFrom((Map) o)); + } + return txnFeeSchedule.build(); } @@ -117,6 +123,13 @@ private static String translateClaimFunction(String key) { static FeeData bindFeeDataFrom(Map rawFeeData) throws Exception { FeeData.Builder feeData = FeeData.newBuilder(); + if (rawFeeData.get("subType") == null) { + feeData.setSubType(SubType.DEFAULT); + } else { + feeData.setSubType(stringToSubType((String)rawFeeData.get("subType"))); + } + + for (String feeComponent : FEE_COMPONENT_KEYS) { set( FeeData.Builder.class, @@ -129,6 +142,17 @@ static FeeData bindFeeDataFrom(Map rawFeeData) throws Exception return feeData.build(); } + static SubType stringToSubType(String subType) { + switch (subType){ + case "TOKEN_FUNGIBLE_COMMON": + return SubType.TOKEN_FUNGIBLE_COMMON; + case "TOKEN_NON_FUNGIBLE_UNIQUE": + return SubType.TOKEN_NON_FUNGIBLE_UNIQUE; + default: + return SubType.DEFAULT; + } + } + static FeeComponents bindFeeComponentsFrom(Map rawFeeComponents) throws Exception { FeeComponents.Builder feeComponents = FeeComponents.newBuilder(); for (String resource : RESOURCE_KEYS) { diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/AutoRenewCalcs.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/AutoRenewCalcs.java index 374a215b4c8f..4040bf66eb29 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/calculation/AutoRenewCalcs.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/AutoRenewCalcs.java @@ -25,11 +25,13 @@ import com.hedera.services.usage.crypto.ExtantCryptoContext; import com.hederahashgraph.api.proto.java.ExchangeRate; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.time.Instant; +import java.util.Map; import static com.hedera.services.utils.MiscUtils.asKeyUnchecked; import static com.hederahashgraph.fee.FeeBuilder.FEE_DIVISOR_FACTOR; @@ -43,7 +45,7 @@ public class AutoRenewCalcs { private final CryptoOpsUsage cryptoOpsUsage; - private Triple cryptoAutoRenewPriceSeq = null; + private Triple, Instant, Map> cryptoAutoRenewPriceSeq = null; private long firstConstantCryptoAutoRenewFee = 0L; private long secondConstantCryptoAutoRenewFee = 0L; @@ -54,17 +56,17 @@ public AutoRenewCalcs(CryptoOpsUsage cryptoOpsUsage) { this.cryptoOpsUsage = cryptoOpsUsage; } - public void setCryptoAutoRenewPriceSeq(Triple cryptoAutoRenewPriceSeq) { + public void setCryptoAutoRenewPriceSeq(Triple, Instant, Map> cryptoAutoRenewPriceSeq) { this.cryptoAutoRenewPriceSeq = cryptoAutoRenewPriceSeq; if (cryptoAutoRenewPriceSeq.getLeft() == null) { log.warn("No prices known for CryptoAccountAutoRenew, will charge zero fees!"); } else { - this.firstConstantCryptoAutoRenewFee = constantFeeFrom(cryptoAutoRenewPriceSeq.getLeft()); - this.secondConstantCryptoAutoRenewFee = constantFeeFrom(cryptoAutoRenewPriceSeq.getRight()); + this.firstConstantCryptoAutoRenewFee = constantFeeFrom(cryptoAutoRenewPriceSeq.getLeft().get(SubType.DEFAULT)); + this.secondConstantCryptoAutoRenewFee = constantFeeFrom(cryptoAutoRenewPriceSeq.getRight().get(SubType.DEFAULT)); - this.firstServiceRbhPrice = cryptoAutoRenewPriceSeq.getLeft().getServicedata().getRbh(); - this.secondServiceRbhPrice = cryptoAutoRenewPriceSeq.getRight().getServicedata().getRbh(); + this.firstServiceRbhPrice = cryptoAutoRenewPriceSeq.getLeft().get(SubType.DEFAULT).getServicedata().getRbh(); + this.secondServiceRbhPrice = cryptoAutoRenewPriceSeq.getRight().get(SubType.DEFAULT).getServicedata().getRbh(); } } diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java index 181290a98be7..f7b3bf191037 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/AwareFcfsUsagePrices.java @@ -29,14 +29,17 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.FeeSchedule; import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TimestampSeconds; +import com.hederahashgraph.api.proto.java.TransactionFeeSchedule; import org.apache.commons.lang3.tuple.Triple; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.time.Instant; import java.util.EnumMap; +import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -58,11 +61,11 @@ public class AwareFcfsUsagePrices implements UsagePricesProvider { .setMax(DEFAULT_FEE) .setConstant(0).setBpt(0).setVpt(0).setRbh(0).setSbh(0).setGas(0).setTv(0).setBpr(0).setSbpr(0) .build(); - public static final FeeData DEFAULT_USAGE_PRICES = FeeData.newBuilder() + public static final Map DEFAULT_USAGE_PRICES = Map.of(SubType.DEFAULT, FeeData.newBuilder() .setNetworkdata(DEFAULT_RESOURCE_USAGE_PRICES) .setNodedata(DEFAULT_RESOURCE_USAGE_PRICES) .setServicedata(DEFAULT_RESOURCE_USAGE_PRICES) - .build(); + .build()); private final HederaFs hfs; private final FileNumbers fileNumbers; @@ -73,8 +76,8 @@ public class AwareFcfsUsagePrices implements UsagePricesProvider { private Timestamp currFunctionUsagePricesExpiry; private Timestamp nextFunctionUsagePricesExpiry; - private EnumMap currFunctionUsagePrices; - private EnumMap nextFunctionUsagePrices; + private EnumMap> currFunctionUsagePrices; + private EnumMap> nextFunctionUsagePrices; public AwareFcfsUsagePrices(HederaFs hfs, FileNumbers fileNumbers, TransactionContext txnCtx) { this.hfs = hfs; @@ -100,7 +103,18 @@ public void loadPriceSchedules() { } @Override - public FeeData activePrices() { + public FeeData defaultActivePrices() { + try { + var accessor = txnCtx.accessor(); + return defaultPricesGiven(accessor.getFunction(), accessor.getTxnId().getTransactionValidStart()); + } catch (Exception e) { + log.warn("Using default usage prices to calculate fees for {}!", txnCtx.accessor().getSignedTxnWrapper(), e); + } + return DEFAULT_USAGE_PRICES.get(SubType.DEFAULT); + } + + @Override + public Map activePrices() { try { var accessor = txnCtx.accessor(); return pricesGiven(accessor.getFunction(), accessor.getTxnId().getTransactionValidStart()); @@ -111,10 +125,10 @@ public FeeData activePrices() { } @Override - public FeeData pricesGiven(HederaFunctionality function, Timestamp at) { + public Map pricesGiven(HederaFunctionality function, Timestamp at) { try { - Map functionUsagePrices = applicableUsagePrices(at); - FeeData usagePrices = functionUsagePrices.get(function); + Map> functionUsagePrices = applicableUsagePrices(at); + Map usagePrices = functionUsagePrices.get(function); Objects.requireNonNull(usagePrices); return usagePrices; } catch (Exception e) { @@ -126,7 +140,12 @@ public FeeData pricesGiven(HederaFunctionality function, Timestamp at) { } @Override - public Triple activePricingSequence(HederaFunctionality function) { + public FeeData defaultPricesGiven(HederaFunctionality function, Timestamp at) { + return pricesGiven(function, at).get(SubType.DEFAULT); + } + + @Override + public Triple, Instant, Map> activePricingSequence(HederaFunctionality function) { return Triple.of( currFunctionUsagePrices.get(function), Instant.ofEpochSecond( @@ -135,7 +154,7 @@ public Triple activePricingSequence(HederaFunctionali nextFunctionUsagePrices.get(function)); } - private Map applicableUsagePrices(Timestamp at) { + private Map> applicableUsagePrices(Timestamp at) { if (onlyNextScheduleApplies(at)) { return nextFunctionUsagePrices; } else { @@ -162,11 +181,18 @@ private Timestamp asTimestamp(TimestampSeconds ts) { return Timestamp.newBuilder().setSeconds(ts.getSeconds()).build(); } - private EnumMap functionUsagePricesFrom(FeeSchedule feeSchedule) { - final EnumMap ans = new EnumMap<>(HederaFunctionality.class); - for (final var tfs : feeSchedule.getTransactionFeeScheduleList()) { - ans.put(tfs.getHederaFunctionality(), tfs.getFeeData()); + private EnumMap> functionUsagePricesFrom(FeeSchedule feeSchedule) { + EnumMap> feeScheduleMap = new EnumMap<>(HederaFunctionality.class); + for (TransactionFeeSchedule transactionFeeSchedule : feeSchedule.getTransactionFeeScheduleList()) { + Map map = feeScheduleMap.get(transactionFeeSchedule.getHederaFunctionality()); + if (map == null) { + map = new HashMap<>(); + } + for (FeeData feeData : transactionFeeSchedule.getFeesList()) { + map.put(feeData.getSubType(), feeData); + } + feeScheduleMap.put(transactionFeeSchedule.getHederaFunctionality(), map); } - return ans; + return feeScheduleMap; } } diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculator.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculator.java index 117b222b0c4e..c7d6d104713a 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculator.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculator.java @@ -34,6 +34,7 @@ import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.Query; import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.exception.InvalidTxBodyException; import com.hederahashgraph.fee.FeeObject; @@ -149,20 +150,20 @@ public FeeObject computeFee(TxnAccessor accessor, JKey payerKey, StateView view) @Override public FeeObject estimateFee(TxnAccessor accessor, JKey payerKey, StateView view, Timestamp at) { - final var prices = uncheckedPricesGiven(accessor, at); + Map prices = uncheckedPricesGiven(accessor, at); return feeGiven(accessor, payerKey, view, prices, exchange.rate(at), false); } @Override public long activeGasPriceInTinybars() { - return gasPriceInTinybars(usagePrices.activePrices(), exchange.activeRate()); + return gasPriceInTinybars(usagePrices.defaultActivePrices(), exchange.activeRate()); } @Override public long estimatedGasPriceInTinybars(HederaFunctionality function, Timestamp at) { var rates = exchange.rate(at); - var prices = usagePrices.pricesGiven(function, at); + var prices = usagePrices.defaultPricesGiven(function, at); return gasPriceInTinybars(prices, rates); } @@ -202,7 +203,7 @@ private long gasPriceInTinybars(FeeData prices, ExchangeRate rates) { return Math.max(priceInTinyBars, 1L); } - private FeeData uncheckedPricesGiven(TxnAccessor accessor, Timestamp at) { + private Map uncheckedPricesGiven(TxnAccessor accessor, Timestamp at) { try { return usagePrices.pricesGiven(accessor.getFunction(), at); } catch (Exception e) { @@ -215,21 +216,22 @@ private FeeObject feeGiven( TxnAccessor accessor, JKey payerKey, StateView view, - FeeData prices, + Map prices, ExchangeRate rate, boolean inHandle ) { final var function = accessor.getFunction(); if (pricedUsageCalculator.supports(function)) { + // TODO this will not work for NonFungible Mints/Burn/Wipes return inHandle - ? pricedUsageCalculator.inHandleFees(accessor, prices, rate, payerKey) - : pricedUsageCalculator.extraHandleFees(accessor, prices, rate, payerKey); + ? pricedUsageCalculator.inHandleFees(accessor, prices.get(SubType.DEFAULT), rate, payerKey) + : pricedUsageCalculator.extraHandleFees(accessor, prices.get(SubType.DEFAULT), rate, payerKey); } else { var sigUsage = getSigUsage(accessor, payerKey); var usageEstimator = getTxnUsageEstimator(accessor); try { FeeData metrics = usageEstimator.usageGiven(accessor.getTxn(), sigUsage, view); - return getFeeObject(prices, metrics, rate, feeMultiplierSource.currentMultiplier()); + return getFeeObject(prices.get(metrics.getSubType()), metrics, rate, feeMultiplierSource.currentMultiplier()); } catch (InvalidTxBodyException e) { log.warn( "Argument accessor={} malformed for implied estimator {}!", diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsagePricesProvider.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsagePricesProvider.java index 690a9077b80a..8d4f9e81a92c 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsagePricesProvider.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/UsagePricesProvider.java @@ -22,10 +22,12 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import org.apache.commons.lang3.tuple.Triple; import java.time.Instant; +import java.util.Map; /** * Defines a type able to provide the prices (in tinyCents) that must @@ -43,13 +45,34 @@ public interface UsagePricesProvider { void loadPriceSchedules(); /** - * Returns the prices in tinyCents that must be paid to + * Returns the prices in a map SubType keys and FeeData values in 1/1000th of a tinyCent that must be paid to * consume various resources while processing the active * transaction. * * @return the prices for the active transaction */ - FeeData activePrices(); + Map activePrices(); + + /** + * Returns the prices corresponding to the SubType.NONE in tinyCents that must be paid to + * consume various resources while processing the active + * transaction. + * + * @return the prices for the active transaction + */ + FeeData defaultActivePrices(); + + /** + * Returns the prices in tinyCents that are likely to be + * required to consume various resources while processing + * the given operation at the given time. (In principle, the + * price schedules could change in the interim.) + * + * @param function the operation of interest + * @param at the expected consensus time for the operation + * @return the estimated prices + */ + Map pricesGiven(HederaFunctionality function, Timestamp at); /** * Returns the prices in tinyCents that are likely to be @@ -61,7 +84,7 @@ public interface UsagePricesProvider { * @param at the expected consensus time for the operation * @return the estimated prices */ - FeeData pricesGiven(HederaFunctionality function, Timestamp at); + FeeData defaultPricesGiven(HederaFunctionality function, Timestamp at); /** * Returns a triple whose middle value is a "rollover consensus time" @@ -71,5 +94,5 @@ public interface UsagePricesProvider { * @param function the operation of interest * @return the triple of price sequences */ - Triple activePricingSequence(HederaFunctionality function); + Triple, Instant, Map> activePricingSequence(HederaFunctionality function); } diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/queries/GetAccountNftInfosResourceUsage.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/queries/GetAccountNftInfosResourceUsage.java new file mode 100644 index 000000000000..45459f58dbc3 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/queries/GetAccountNftInfosResourceUsage.java @@ -0,0 +1,95 @@ +package com.hedera.services.fees.calculation.token.queries; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.fees.calculation.QueryResourceUsageEstimator; +import com.hedera.services.usage.token.TokenGetAccountNftInfosUsage; +import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.Key; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.TokenInfo; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Predicate; + +import static com.hedera.services.queries.AnswerService.NO_QUERY_CTX; +import static com.hedera.services.queries.token.GetAccountNftInfosAnswer.ACCOUNT_NFT_INFO_CTX_KEY; + +public class GetAccountNftInfosResourceUsage implements QueryResourceUsageEstimator { + private static final Logger log = LogManager.getLogger(GetAccountNftInfosResourceUsage.class); + + static Function factory = TokenGetAccountNftInfosUsage::newEstimate; + + @Override + public boolean applicableTo(Query query) { + return query.hasTokenGetAccountNftInfos(); + } + + @Override + public FeeData usageGiven(Query query, StateView view) { + return usageFor(query, view, query.getTokenGetAccountNftInfos().getHeader().getResponseType(), NO_QUERY_CTX); + } + + @Override + public FeeData usageGivenType(Query query, StateView view, ResponseType type) { + return usageFor(query, view, type, NO_QUERY_CTX); + } + + @Override + public FeeData usageGiven(Query query, StateView view, Map queryCtx) { + return usageFor( + query, + view, + query.getTokenGetAccountNftInfos().getHeader().getResponseType(), + Optional.of(queryCtx)); + } + + private FeeData usageFor(Query query, StateView view, ResponseType type, Optional> queryCtx) { + var op = query.getTokenGetAccountNftInfos(); + var optionalInfo = view.infoForAccountNfts( + op.getAccountID(), + op.getStart(), + op.getEnd()); + if (optionalInfo.isPresent()) { + var info = optionalInfo.get(); + queryCtx.ifPresent(ctx -> ctx.put(ACCOUNT_NFT_INFO_CTX_KEY, info)); + + List m = new ArrayList<>(); + info.forEach(s -> m.add(s.getMetadata())); + return factory.apply(query).givenMetadata(m).get(); + } else { + return FeeData.getDefaultInstance(); + } + } + + public static Optional ifPresent(TokenInfo info, Predicate check, Function getter) { + return check.test(info) ? Optional.of(getter.apply(info)) : Optional.empty(); + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/queries/GetTokenNftInfoResourceUsage.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/queries/GetTokenNftInfoResourceUsage.java new file mode 100644 index 000000000000..66f2f3a45cd5 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/queries/GetTokenNftInfoResourceUsage.java @@ -0,0 +1,81 @@ +package com.hedera.services.fees.calculation.token.queries; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.fees.calculation.QueryResourceUsageEstimator; +import com.hedera.services.usage.token.TokenGetNftInfoUsage; +import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.ResponseType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; + +import static com.hedera.services.queries.AnswerService.NO_QUERY_CTX; +import static com.hedera.services.queries.token.GetTokenNftInfoAnswer.NFT_INFO_CTX_KEY; + +public class GetTokenNftInfoResourceUsage implements QueryResourceUsageEstimator { + private static final Logger log = LogManager.getLogger(GetTokenNftInfoResourceUsage.class); + + static Function factory = TokenGetNftInfoUsage::newEstimate; + + @Override + public boolean applicableTo(Query query) { + return query.hasTokenGetNftInfo(); + } + + @Override + public FeeData usageGiven(Query query, StateView view) { + return usageFor(query, view, query.getTokenGetNftInfo().getHeader().getResponseType(), NO_QUERY_CTX); + } + + @Override + public FeeData usageGivenType(Query query, StateView view, ResponseType type) { + return usageFor(query, view, type, NO_QUERY_CTX); + } + + @Override + public FeeData usageGiven(Query query, StateView view, Map queryCtx) { + return usageFor( + query, + view, + query.getTokenGetNftInfo().getHeader().getResponseType(), + Optional.of(queryCtx)); + } + + private FeeData usageFor(Query query, StateView view, ResponseType type, Optional> queryCtx) { + var op = query.getTokenGetNftInfo(); + var optionalInfo = view.infoForNft(op.getNftID()); + if (optionalInfo.isPresent()) { + var info = optionalInfo.get(); + queryCtx.ifPresent(ctx -> ctx.put(NFT_INFO_CTX_KEY, info)); + var estimate = factory.apply(query) + .givenMetadata(info.getMetadata().toString()); + return estimate.get(); + } else { + return FeeData.getDefaultInstance(); + } + } +} \ No newline at end of file diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsage.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsage.java index 33e5afaf058e..fa60bf0bea99 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsage.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsage.java @@ -22,16 +22,22 @@ import com.hedera.services.context.primitives.StateView; import com.hedera.services.fees.calculation.TxnResourceUsageEstimator; +import com.hedera.services.fees.calculation.utils.ResourceUsageSubtypeHelper; import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.token.TokenBurnUsage; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; +import com.hederahashgraph.api.proto.java.TokenType; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.exception.InvalidTxBodyException; import com.hederahashgraph.fee.SigValueObj; +import java.util.Optional; import java.util.function.BiFunction; public class TokenBurnResourceUsage implements TxnResourceUsageEstimator { + private static final ResourceUsageSubtypeHelper subtypeHelper = new ResourceUsageSubtypeHelper(); + static BiFunction factory = TokenBurnUsage::newEstimate; @Override @@ -41,8 +47,10 @@ public boolean applicableTo(TransactionBody txn) { @Override public FeeData usageGiven(TransactionBody txn, SigValueObj svo, StateView view) throws InvalidTxBodyException { + Optional tokenType = view.tokenType(txn.getTokenBurn().getToken()); + SubType subType = subtypeHelper.determineTokenType(tokenType); var sigUsage = new SigUsage(svo.getTotalSigCount(), svo.getSignatureSize(), svo.getPayerAcctSigCount()); - var estimate = factory.apply(txn, sigUsage); + var estimate = factory.apply(txn, sigUsage).givenSubType(subType); return estimate.get(); } } diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsage.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsage.java index d19ee2e7e530..10268d3a73d6 100644 --- a/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsage.java +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsage.java @@ -22,16 +22,22 @@ import com.hedera.services.context.primitives.StateView; import com.hedera.services.fees.calculation.TxnResourceUsageEstimator; +import com.hedera.services.fees.calculation.utils.ResourceUsageSubtypeHelper; import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.token.TokenMintUsage; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; +import com.hederahashgraph.api.proto.java.TokenType; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.exception.InvalidTxBodyException; import com.hederahashgraph.fee.SigValueObj; +import java.util.Optional; import java.util.function.BiFunction; public class TokenMintResourceUsage implements TxnResourceUsageEstimator { + private static final ResourceUsageSubtypeHelper subtypeHelper = new ResourceUsageSubtypeHelper(); + static BiFunction factory = TokenMintUsage::newEstimate; @Override @@ -41,8 +47,10 @@ public boolean applicableTo(TransactionBody txn) { @Override public FeeData usageGiven(TransactionBody txn, SigValueObj svo, StateView view) throws InvalidTxBodyException { + Optional tokenType = view.tokenType(txn.getTokenMint().getToken()); + SubType subType = subtypeHelper.determineTokenType(tokenType); var sigUsage = new SigUsage(svo.getTotalSigCount(), svo.getSignatureSize(), svo.getPayerAcctSigCount()); - var estimate = factory.apply(txn, sigUsage); + var estimate = factory.apply(txn, sigUsage).givenSubType(subType); return estimate.get(); } } diff --git a/hedera-node/src/main/java/com/hedera/services/fees/calculation/utils/ResourceUsageSubtypeHelper.java b/hedera-node/src/main/java/com/hedera/services/fees/calculation/utils/ResourceUsageSubtypeHelper.java new file mode 100644 index 000000000000..a435c2bf7b18 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/fees/calculation/utils/ResourceUsageSubtypeHelper.java @@ -0,0 +1,43 @@ +package com.hedera.services.fees.calculation.utils; + +/*- + * ‌ + * Hedera Services API Fees + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hederahashgraph.api.proto.java.SubType; +import com.hederahashgraph.api.proto.java.TokenType; + +import java.util.Optional; + +public class ResourceUsageSubtypeHelper { + public SubType determineTokenType(Optional tokenType) { + if (tokenType.isPresent()) { + switch (tokenType.get()) { + case FUNGIBLE_COMMON: + return SubType.TOKEN_FUNGIBLE_COMMON; + case NON_FUNGIBLE_UNIQUE: + return SubType.TOKEN_NON_FUNGIBLE_UNIQUE; + default: + return SubType.DEFAULT; + } + } else { + return SubType.DEFAULT; + } + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/files/interceptors/ThrottleDefsManager.java b/hedera-node/src/main/java/com/hedera/services/files/interceptors/ThrottleDefsManager.java index 221b824bc28b..3ac2d0da7f8e 100644 --- a/hedera-node/src/main/java/com/hedera/services/files/interceptors/ThrottleDefsManager.java +++ b/hedera-node/src/main/java/com/hedera/services/files/interceptors/ThrottleDefsManager.java @@ -64,7 +64,7 @@ public class ThrottleDefsManager implements FileUpdateInterceptor { static final int APPLICABLE_PRIORITY = 0; - EnumSet expectedOps = ExpectedCustomThrottles.OPS_FOR_RELEASE_0130; + EnumSet expectedOps = ExpectedCustomThrottles.OPS_FOR_RELEASE_0160; private final FileNumbers fileNums; private final Supplier addressBook; diff --git a/hedera-node/src/main/java/com/hedera/services/grpc/controllers/TokenController.java b/hedera-node/src/main/java/com/hedera/services/grpc/controllers/TokenController.java index d9e052cef81f..af64a23e835b 100644 --- a/hedera-node/src/main/java/com/hedera/services/grpc/controllers/TokenController.java +++ b/hedera-node/src/main/java/com/hedera/services/grpc/controllers/TokenController.java @@ -39,7 +39,9 @@ import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDelete; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDissociateFromAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenFreezeAccount; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetAccountNftInfos; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetInfo; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetNftInfo; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGrantKycToAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenMint; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenRevokeKycFromAccount; @@ -127,4 +129,14 @@ public void dissociateTokens(Transaction signedTxn, StreamObserver observer) { queryHelper.answer(query, observer, tokenAnswers.getTokenInfo(), TokenGetInfo); } + + @Override + public void getTokenNftInfo(Query query, StreamObserver observer) { + queryHelper.answer(query, observer, tokenAnswers.getNftInfoAnswer(), TokenGetNftInfo); + } + + @Override + public void getAccountNftInfos(Query query, StreamObserver observer) { + queryHelper.answer(query, observer, tokenAnswers.getAccountNftInfosAnswer(), TokenGetAccountNftInfos); + } } diff --git a/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfers.java b/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfers.java index 3be1440cbbf3..1072643e99db 100644 --- a/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfers.java +++ b/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfers.java @@ -61,22 +61,20 @@ private ImpliedTransfers( } public static ImpliedTransfers valid( - int maxHbarAdjusts, - int maxTokenAdjusts, + ImpliedTransfersMeta.ValidationProps validationProps, List changes, - List>> entityCustomFees, + List>> tokenFeeSchedules, List assessedCustomFees ) { - final var meta = new ImpliedTransfersMeta(maxHbarAdjusts, maxTokenAdjusts, OK, entityCustomFees); - return new ImpliedTransfers(meta, changes, entityCustomFees, assessedCustomFees); + final var meta = new ImpliedTransfersMeta(validationProps, OK, tokenFeeSchedules); + return new ImpliedTransfers(meta, changes, tokenFeeSchedules, assessedCustomFees); } public static ImpliedTransfers invalid( - int maxHbarAdjusts, - int maxTokenAdjusts, + ImpliedTransfersMeta.ValidationProps validationProps, ResponseCodeEnum code ) { - final var meta = new ImpliedTransfersMeta(maxHbarAdjusts, maxTokenAdjusts, code, Collections.emptyList()); + final var meta = new ImpliedTransfersMeta(validationProps, code, Collections.emptyList()); return new ImpliedTransfers(meta, Collections.emptyList(), Collections.emptyList(), Collections.emptyList()); } diff --git a/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshal.java b/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshal.java index 637a9976eb2d..67702701bc86 100644 --- a/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshal.java +++ b/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshal.java @@ -37,12 +37,15 @@ import java.util.List; import java.util.Map; +import static com.hedera.services.ledger.BalanceChange.changingHbar; +import static com.hedera.services.ledger.BalanceChange.changingFtUnits; +import static com.hedera.services.ledger.BalanceChange.changingNftOwnership; import static com.hedera.services.ledger.BalanceChange.hbarAdjust; import static com.hedera.services.ledger.BalanceChange.tokenAdjust; import static com.hedera.services.store.models.Id.MISSING_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_PAYER_BALANCE_FOR_CUSTOM_FEE; -import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; /** * Contains the logic to translate from a gRPC CryptoTransfer operation @@ -64,22 +67,26 @@ public ImpliedTransfersMarshal( } public ImpliedTransfers unmarshalFromGrpc(CryptoTransferTransactionBody op, AccountID payer) { - final var maxTokenAdjusts = dynamicProperties.maxTokenTransferListSize(); final var maxHbarAdjusts = dynamicProperties.maxTransferListSize(); + final var maxTokenAdjusts = dynamicProperties.maxTokenTransferListSize(); + final var maxOwnershipChanges = dynamicProperties.maxNftTransfersLen(); + + final var validationProps = new ImpliedTransfersMeta.ValidationProps( + maxHbarAdjusts, maxTokenAdjusts, maxOwnershipChanges); final var validity = transferSemanticChecks.fullPureValidation( - maxHbarAdjusts, maxTokenAdjusts, op.getTransfers(), op.getTokenTransfersList()); + op.getTransfers(), op.getTokenTransfersList(), validationProps); if (validity != OK) { - return ImpliedTransfers.invalid(maxHbarAdjusts, maxTokenAdjusts, validity); + return ImpliedTransfers.invalid(validationProps, validity); } final List changes = new ArrayList<>(); - final List>> entityCustomFees = new ArrayList<>(); - final List assessedCustomFeesForRecord = new ArrayList<>(); + final List>> tokenFeeSchedules = new ArrayList<>(); + final List assessedCustomFees = new ArrayList<>(); final Map, BalanceChange> existingBalanceChanges = new HashMap<>(); for (var aa : op.getTransfers().getAccountAmountsList()) { - BalanceChange change = hbarAdjust(aa); + final var change = changingHbar(aa); changes.add(change); existingBalanceChanges.put(Pair.of(change.getAccount(), MISSING_ID), change); } @@ -90,20 +97,22 @@ public ImpliedTransfers unmarshalFromGrpc(CryptoTransferTransactionBody op, Acco final var scopingToken = Id.fromGrpcToken(grpcTokenId); var amount = 0L; for (var aa : scopedTransfers.getTransfersList()) { - final var tokenChange = tokenAdjust(scopingToken, grpcTokenId, aa); + final var tokenChange = changingFtUnits(scopingToken, grpcTokenId, aa); changes.add(tokenChange); existingBalanceChanges.put(Pair.of(tokenChange.getAccount(), tokenChange.getToken()), tokenChange); if (aa.getAmount() > 0) { amount += aa.getAmount(); if (amount < 0) { - return ImpliedTransfers.invalid( - maxHbarAdjusts, maxTokenAdjusts, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); + return ImpliedTransfers.invalid(validationProps, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); } } + } + for (var oc : scopedTransfers.getNftTransfersList()) { + changes.add(changingNftOwnership(scopingToken, grpcTokenId, oc)); } final var feeSchedule = customFeeSchedules.lookupScheduleFor(scopingToken.asEntityId()); - entityCustomFees.add(Pair.of(scopingToken, feeSchedule)); + tokenFeeSchedules.add(Pair.of(scopingToken, feeSchedule)); try { final var customFeeChanges = computeBalanceChangeForCustomFee( scopingToken, @@ -111,14 +120,13 @@ public ImpliedTransfers unmarshalFromGrpc(CryptoTransferTransactionBody op, Acco amount, feeSchedule, existingBalanceChanges, - assessedCustomFeesForRecord); + assessedCustomFees); changes.addAll(customFeeChanges); } catch (ArithmeticException overflow) { - return ImpliedTransfers.invalid(maxHbarAdjusts, maxTokenAdjusts, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); + return ImpliedTransfers.invalid(validationProps, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); } } - return ImpliedTransfers.valid( - maxHbarAdjusts, maxTokenAdjusts, changes, entityCustomFees, assessedCustomFeesForRecord); + return ImpliedTransfers.valid(validationProps, changes, tokenFeeSchedules, assessedCustomFees); } /** @@ -127,19 +135,20 @@ public ImpliedTransfers unmarshalFromGrpc(CryptoTransferTransactionBody op, Acco private List computeBalanceChangeForCustomFee( Id scopingToken, Id payerId, - long totalAmount, List customFeesOfToken, + long totalAmount, + List feeSchedule, Map, BalanceChange> existingBalanceChanges, - List assessedCustomFeesForRecord + List assessedCustomFees ) { List customFeeChanges = new ArrayList<>(); - for (CustomFee fees : customFeesOfToken) { + for (CustomFee fees : feeSchedule) { if (fees.getFeeType() == CustomFee.FeeType.FIXED_FEE) { addFixedFeeBalanceChanges( fees, payerId, customFeeChanges, existingBalanceChanges, - assessedCustomFeesForRecord); + assessedCustomFees); } else if (fees.getFeeType() == CustomFee.FeeType.FRACTIONAL_FEE) { addFractionalFeeBalanceChanges( fees, @@ -148,7 +157,7 @@ private List computeBalanceChangeForCustomFee( scopingToken, customFeeChanges, existingBalanceChanges, - assessedCustomFeesForRecord); + assessedCustomFees); } } return customFeeChanges; @@ -164,7 +173,7 @@ private void addFractionalFeeBalanceChanges( Id scopingToken, List customFeeChanges, Map, BalanceChange> existingBalanceChanges, - List assessedCustomFeesForRecord + List assessedCustomFees ) { final var spec = fees.getFractionalFeeSpec(); final var nominalFee = safeFractionMultiply(spec.getNumerator(), spec.getDenominator(), totalAmount); @@ -189,7 +198,7 @@ private void addFractionalFeeBalanceChanges( tokenAdjust(payerId, scopingToken, -effectiveFee), true); - assessedCustomFeesForRecord.add( + assessedCustomFees.add( new AssessedCustomFee(fees.getFeeCollectorAccountId(), scopingToken.asEntityId(), effectiveFee)); } @@ -209,7 +218,7 @@ private void addFixedFeeBalanceChanges( Id payerId, List customFeeChanges, Map, BalanceChange> existingBalanceChanges, - List assessedCustomFeesForRecord + List assessedCustomFees ) { final var spec = fees.getFixedFeeSpec(); final var unitsToCollect = spec.getUnitsToCollect(); @@ -228,7 +237,7 @@ private void addFixedFeeBalanceChanges( -unitsToCollect, hbarAdjust(payerId, -unitsToCollect), true); - assessedCustomFeesForRecord.add( + assessedCustomFees.add( new AssessedCustomFee(fees.getFeeCollectorAccountId(), null, unitsToCollect)); } else { modifyBalanceChange( @@ -245,7 +254,7 @@ private void addFixedFeeBalanceChanges( -unitsToCollect, tokenAdjust(payerId, spec.getTokenDenomination().asId(), -unitsToCollect), true); - assessedCustomFeesForRecord.add( + assessedCustomFees.add( new AssessedCustomFee(fees.getFeeCollectorAccountId(), spec.getTokenDenomination(), unitsToCollect)); } } diff --git a/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMeta.java b/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMeta.java index 7347f68143ff..86553b1db898 100644 --- a/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMeta.java +++ b/hedera-node/src/main/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMeta.java @@ -49,30 +49,29 @@ * validation result. */ public class ImpliedTransfersMeta { - private final int maxExplicitHbarAdjusts; - private final int maxExplicitTokenAdjusts; private final ResponseCodeEnum code; - private final List>> customFeeSchedulesUsedInMarshal; + private final ValidationProps validationProps; + private final List>> tokenFeeSchedules; public ImpliedTransfersMeta( - int maxExplicitHbarAdjusts, - int maxExplicitTokenAdjusts, + ValidationProps validationProps, ResponseCodeEnum code, - List>> customFeeSchedulesUsedInMarshal + List>> tokenFeeSchedules ) { this.code = code; - this.maxExplicitHbarAdjusts = maxExplicitHbarAdjusts; - this.maxExplicitTokenAdjusts = maxExplicitTokenAdjusts; - this.customFeeSchedulesUsedInMarshal = customFeeSchedulesUsedInMarshal; + this.validationProps = validationProps; + this.tokenFeeSchedules = tokenFeeSchedules; } public boolean wasDerivedFrom(GlobalDynamicProperties dynamicProperties, CustomFeeSchedules customFeeSchedules) { - final var validationParamsMatch = maxExplicitHbarAdjusts == dynamicProperties.maxTransferListSize() && - maxExplicitTokenAdjusts == dynamicProperties.maxTokenTransferListSize(); + final var validationParamsMatch = + (validationProps.maxHbarAdjusts == dynamicProperties.maxTransferListSize()) && + (validationProps.maxTokenAdjusts == dynamicProperties.maxTokenTransferListSize()) && + (validationProps.maxOwnershipChanges == dynamicProperties.maxNftTransfersLen()); if (!validationParamsMatch) { return false; } - for (var pair : customFeeSchedulesUsedInMarshal) { + for (var pair : tokenFeeSchedules) { var customFees = pair.getValue(); var newCustomFees = customFeeSchedules.lookupScheduleFor(pair.getKey().asEntityId()); if (!customFees.equals(newCustomFees)) { @@ -86,9 +85,6 @@ public ResponseCodeEnum code() { return code; } - /* NOTE: The object methods below are only overridden to improve - readability of unit tests; this model object is not used in hash-based - collections, so the performance of these methods doesn't matter. */ @Override public boolean equals(Object obj) { return EqualsBuilder.reflectionEquals(this, obj); @@ -103,9 +99,44 @@ public int hashCode() { public String toString() { return MoreObjects.toStringHelper(ImpliedTransfersMeta.class) .add("code", code) - .add("maxExplicitHbarAdjusts", maxExplicitHbarAdjusts) - .add("maxExplicitTokenAdjusts", maxExplicitTokenAdjusts) - .add("customFeeSchedulesUsedInMarshal", customFeeSchedulesUsedInMarshal) + .add("maxExplicitHbarAdjusts", validationProps.maxHbarAdjusts) + .add("maxExplicitTokenAdjusts", validationProps.maxTokenAdjusts) + .add("maxExplicitOwnershipChanges", validationProps.maxOwnershipChanges) + .add("tokenFeeSchedules", tokenFeeSchedules) .toString(); } + + public static class ValidationProps { + private final int maxHbarAdjusts; + private final int maxTokenAdjusts; + private final int maxOwnershipChanges; + + public ValidationProps(int maxHbarAdjusts, int maxTokenAdjusts, int maxOwnershipChanges) { + this.maxHbarAdjusts = maxHbarAdjusts; + this.maxTokenAdjusts = maxTokenAdjusts; + this.maxOwnershipChanges = maxOwnershipChanges; + } + + public int getMaxHbarAdjusts() { + return maxHbarAdjusts; + } + + public int getMaxTokenAdjusts() { + return maxTokenAdjusts; + } + + public int getMaxOwnershipChanges() { + return maxOwnershipChanges; + } + + @Override + public boolean equals(Object obj) { + return EqualsBuilder.reflectionEquals(this, obj); + } + + @Override + public int hashCode() { + return HashCodeBuilder.reflectionHashCode(this); + } + } } diff --git a/hedera-node/src/main/java/com/hedera/services/ledger/BalanceChange.java b/hedera-node/src/main/java/com/hedera/services/ledger/BalanceChange.java index bc52036e746c..e0d83742dc5d 100644 --- a/hedera-node/src/main/java/com/hedera/services/ledger/BalanceChange.java +++ b/hedera-node/src/main/java/com/hedera/services/ledger/BalanceChange.java @@ -22,8 +22,10 @@ import com.google.common.base.MoreObjects; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.NftId; import com.hederahashgraph.api.proto.java.AccountAmount; import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.TokenID; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -31,9 +33,10 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_ACCOUNT_BALANCE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_TOKEN_BALANCE; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.SENDER_DOES_NOT_OWN_NFT_SERIAL_NO; /** - * Process object that encapsulates a balance change, either ℏ or token unit. + * Process object that encapsulates a balance change, either ℏ or token unit . * * Includes an optional override for the {@link ResponseCodeEnum} to be used * in the case that the change is determined to result to an insufficient balance; @@ -54,20 +57,43 @@ public class BalanceChange { private long units; private ResponseCodeEnum codeForInsufficientBalance; private long newBalance; + private NftId nftId = null; private TokenID tokenId = null; private AccountID accountId; + private AccountID counterPartyAccountId = null; - private BalanceChange(final Id token, final AccountAmount aa, final ResponseCodeEnum code) { + private BalanceChange(Id token, AccountAmount aa, ResponseCodeEnum code) { this.token = token; - final var account = aa.getAccountID(); - this.accountId = account; - final var id = Id.fromGrpcAccount(account); - this.account = id; + + this.accountId = aa.getAccountID(); + this.account = Id.fromGrpcAccount(accountId); this.units = aa.getAmount(); + + this.codeForInsufficientBalance = code; + } + + private BalanceChange(Id token, AccountID sender, AccountID receiver, long serialNo, ResponseCodeEnum code) { + this.token = token; + + this.accountId = sender; + this.counterPartyAccountId = receiver; + this.account = Id.fromGrpcAccount(accountId); + this.units = serialNo; + this.codeForInsufficientBalance = code; } - private BalanceChange(final Id account, final long amount, final ResponseCodeEnum code) { + public static BalanceChange changingHbar(AccountAmount aa) { + return new BalanceChange(null, aa, INSUFFICIENT_ACCOUNT_BALANCE); + } + + public static BalanceChange changingFtUnits(Id token, TokenID tokenId, AccountAmount aa) { + final var tokenChange = new BalanceChange(token, aa, INSUFFICIENT_TOKEN_BALANCE); + tokenChange.tokenId = tokenId; + return tokenChange; + } + + private BalanceChange(Id account, long amount, ResponseCodeEnum code) { this.token = null; this.account = account; this.accountId = account.asGrpcAccount(); @@ -75,25 +101,28 @@ private BalanceChange(final Id account, final long amount, final ResponseCodeEnu this.codeForInsufficientBalance = code; } - public void adjustUnits(final long units) { + public void adjustUnits(long units) { this.units += units; } - public static BalanceChange hbarAdjust(final AccountAmount aa) { - return new BalanceChange(null, aa, INSUFFICIENT_ACCOUNT_BALANCE); - } - - public static BalanceChange hbarAdjust(final Id id, long amount) { + public static BalanceChange hbarAdjust(Id id, long amount) { return new BalanceChange(id, amount, INSUFFICIENT_ACCOUNT_BALANCE); } - public static BalanceChange tokenAdjust(final Id token, final TokenID tokenId, final AccountAmount aa) { - final var tokenChange = new BalanceChange(token, aa, INSUFFICIENT_TOKEN_BALANCE); - tokenChange.tokenId = tokenId; - return tokenChange; - } - - public static BalanceChange tokenAdjust(final Id account, final Id token, final long amount) { + public static BalanceChange changingNftOwnership(Id token, TokenID tokenId, NftTransfer nftTransfer) { + final var serialNo = nftTransfer.getSerialNumber(); + final var nftChange = new BalanceChange( + token, + nftTransfer.getSenderAccountID(), + nftTransfer.getReceiverAccountID(), + serialNo, + SENDER_DOES_NOT_OWN_NFT_SERIAL_NO); + nftChange.nftId = new NftId(token.getShard(), token.getRealm(), token.getNum(), serialNo); + nftChange.tokenId = tokenId; + return nftChange; + } + + public static BalanceChange tokenAdjust(Id account, Id token, long amount) { final var tokenChange = new BalanceChange(account, amount, INSUFFICIENT_TOKEN_BALANCE); tokenChange.token = token; tokenChange.tokenId = token.asGrpcToken(); @@ -104,10 +133,22 @@ public boolean isForHbar() { return token == null; } + public boolean isForNft() { + return token != null && counterPartyAccountId != null; + } + + public NftId nftId() { + return nftId; + } + public long units() { return units; } + public long serialNo() { + return units; + } + public long getNewBalance() { return newBalance; } @@ -124,6 +165,10 @@ public AccountID accountId() { return accountId; } + public AccountID counterPartyAccountId() { + return counterPartyAccountId; + } + public Id getAccount() { return account; } @@ -152,12 +197,20 @@ public int hashCode() { @Override public String toString() { - return MoreObjects.toStringHelper(BalanceChange.class) - .add("token", token == null ? "ℏ" : token) - .add("account", account) - .add("units", units) - .add("codeForInsufficientBalance", codeForInsufficientBalance) - .toString(); + if (counterPartyAccountId == null) { + return MoreObjects.toStringHelper(BalanceChange.class) + .add("token", token == null ? "ℏ" : token) + .add("account", account) + .add("units", units) + .toString(); + } else { + return MoreObjects.toStringHelper(BalanceChange.class) + .add("nft", token) + .add("serialNo", units) + .add("from", account) + .add("to", Id.fromGrpcAccount(counterPartyAccountId)) + .toString(); + } } public void setCodeForInsufficientBalance(ResponseCodeEnum codeForInsufficientBalance) { diff --git a/hedera-node/src/main/java/com/hedera/services/ledger/HederaLedger.java b/hedera-node/src/main/java/com/hedera/services/ledger/HederaLedger.java index 5de54e85757d..b2c9a8af55f6 100644 --- a/hedera-node/src/main/java/com/hedera/services/ledger/HederaLedger.java +++ b/hedera-node/src/main/java/com/hedera/services/ledger/HederaLedger.java @@ -29,18 +29,23 @@ import com.hedera.services.ledger.accounts.HederaAccountCustomizer; import com.hedera.services.ledger.ids.EntityIdSource; import com.hedera.services.ledger.properties.AccountProperty; +import com.hedera.services.ledger.properties.NftProperty; import com.hedera.services.ledger.properties.TokenRelProperty; import com.hedera.services.records.AccountRecordsHistorian; import com.hedera.services.state.EntityCreator; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleAccountTokens; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.store.models.NftId; import com.hedera.services.store.tokens.TokenStore; import com.hedera.services.txns.validation.OptionValidator; import com.hederahashgraph.api.proto.java.AccountAmount; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.FileID; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenTransferList; @@ -124,6 +129,7 @@ public class HederaLedger { private final AccountRecordsHistorian historian; private final TransactionalLedger accountsLedger; + private TransactionalLedger nftsLedger = null; private TransactionalLedger< Pair, TokenRelProperty, @@ -132,6 +138,7 @@ public class HederaLedger { int numTouches = 0; final TokenID[] tokensTouched = new TokenID[MAX_CONCEIVABLE_TOKENS_PER_TXN]; final Map netTokenTransfers = new HashMap<>(); + final Map uniqueTokenTransfers = new HashMap<>(); public HederaLedger( TokenStore tokenStore, @@ -154,18 +161,26 @@ public HederaLedger( tokenStore.setHederaLedger(this); } + public void setNftsLedger(TransactionalLedger nftsLedger) { + this.nftsLedger = nftsLedger; + } + public void setTokenRelsLedger( TransactionalLedger, TokenRelProperty, MerkleTokenRelStatus> tokenRelsLedger ) { this.tokenRelsLedger = tokenRelsLedger; } + /* -- TRANSACTIONAL SEMANTICS -- */ public void begin() { accountsLedger.begin(); if (tokenRelsLedger != null) { tokenRelsLedger.begin(); } + if (nftsLedger != null) { + nftsLedger.begin(); + } } public void rollback() { @@ -173,6 +188,9 @@ public void rollback() { if (tokenRelsLedger != null && tokenRelsLedger.isInTransaction()) { tokenRelsLedger.rollback(); } + if (nftsLedger != null && nftsLedger.isInTransaction()) { + nftsLedger.rollback(); + } netTransfers.clear(); clearNetTokenTransfers(); } @@ -186,6 +204,9 @@ public void commit() { if (tokenRelsLedger != null && tokenRelsLedger.isInTransaction()) { tokenRelsLedger.commit(); } + if (nftsLedger != null && nftsLedger.isInTransaction()) { + nftsLedger.commit(); + } netTransfers.clear(); clearNetTokenTransfers(); } @@ -209,12 +230,22 @@ public List netTokenTransfersInTxn() { for (int i = 0; i < numTouches; i++) { var token = tokensTouched[i]; if (i == 0 || !token.equals(tokensTouched[i - 1])) { - var netTransfersHere = netTokenTransfers.get(token); - purgeZeroAdjustments(netTransfersHere); - all.add(TokenTransferList.newBuilder() - .setToken(token) - .addAllTransfers(netTransfersHere.getAccountAmountsList()) - .build()); + final var fungibleTransfersHere = netTokenTransfers.get(token); + if (fungibleTransfersHere != null) { + purgeZeroAdjustments(fungibleTransfersHere); + all.add(TokenTransferList.newBuilder() + .setToken(token) + .addAllTransfers(fungibleTransfersHere.getAccountAmountsList()) + .build()); + } else { + var uniqueTransfersHere = uniqueTokenTransfers.get(token); + if (uniqueTransfersHere != null) { + all.add(TokenTransferList.newBuilder() + .setToken(token) + .addAllNftTransfers(uniqueTransfersHere.getNftTransfersList()) + .build()); + } + } } } return all; @@ -228,6 +259,10 @@ public String currentChangeSet() { sb.append("\n--- TOKEN RELATIONSHIPS ---\n") .append(tokenRelsLedger.changeSetSoFar()); } + if (nftsLedger != null) { + sb.append("\n--- NFTS ---\n") + .append(nftsLedger.changeSetSoFar()); + } return sb.toString(); } else { return NO_ACTIVE_TXN_CHANGE_SET; @@ -353,7 +388,7 @@ public ResponseCodeEnum doTokenTransfer( public ResponseCodeEnum doZeroSum(List changes) { var validity = OK; for (var change : changes) { - if (change.isForHbar()) { + if (change.isForHbar()) { validity = plausibilityOf(change); } else { validity = tokenStore.tryTokenChange(change); @@ -540,6 +575,13 @@ public void updateTokenXfers(TokenID tId, AccountID aId, long amount) { updateXfers(aId, amount, xfers); } + public void updateOwnershipChanges(NftId nftId, AccountID from, AccountID to) { + final var tId = nftId.tokenId(); + tokensTouched[numTouches++] = tId; + var xfers = uniqueTokenTransfers.computeIfAbsent(tId, ignore -> TokenTransferList.newBuilder()); + xfers.addNftTransfers(nftTransferBuilderWith(from, to, nftId.serialNo())); + } + private void updateXfers(AccountID account, long amount, TransferList.Builder xfers) { int loc = 0, diff = -1; var soFar = xfers.getAccountAmountsBuilderList(); @@ -566,9 +608,20 @@ private AccountAmount.Builder aaBuilderWith(AccountID account, long amount) { return AccountAmount.newBuilder().setAccountID(account).setAmount(amount); } + private NftTransfer.Builder nftTransferBuilderWith(AccountID senderId, AccountID receiverId, long serialNumber) { + var nftTransfer = NftTransfer.newBuilder().setReceiverAccountID(receiverId).setSerialNumber(serialNumber); + return nftTransfer.setSenderAccountID(senderId); + } + private void clearNetTokenTransfers() { + TransferList.Builder fungibleBuilder; for (int i = 0; i < numTouches; i++) { - netTokenTransfers.get(tokensTouched[i]).clearAccountAmounts(); + fungibleBuilder = netTokenTransfers.get(tokensTouched[i]); + if (fungibleBuilder != null) { + fungibleBuilder.clearAccountAmounts(); + } else { + uniqueTokenTransfers.get(tokensTouched[i]).clearNftTransfers(); + } } numTouches = 0; } @@ -589,7 +642,7 @@ private void purgeZeroAdjustments(TransferList.Builder xfers) { private void adjustHbarUnchecked(List changes) { for (var change : changes) { - if (change.isForHbar()) { + if (change.isForHbar()) { final var accountId = change.accountId(); setBalance(accountId, change.getNewBalance()); updateXfers(accountId, change.units(), netTransfers); diff --git a/hedera-node/src/main/java/com/hedera/services/ledger/PureTransferSemanticChecks.java b/hedera-node/src/main/java/com/hedera/services/ledger/PureTransferSemanticChecks.java index ac35bf8ee763..aceb3d62822a 100644 --- a/hedera-node/src/main/java/com/hedera/services/ledger/PureTransferSemanticChecks.java +++ b/hedera-node/src/main/java/com/hedera/services/ledger/PureTransferSemanticChecks.java @@ -20,6 +20,7 @@ * ‍ */ +import com.hedera.services.grpc.marshalling.ImpliedTransfersMeta; import com.hedera.services.utils.TxnAccessor; import com.hederahashgraph.api.proto.java.AccountAmount; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; @@ -33,6 +34,7 @@ import java.util.Set; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.BATCH_SIZE_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.EMPTY_TOKEN_TRANSFER_ACCOUNT_AMOUNTS; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_AMOUNTS; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; @@ -54,11 +56,14 @@ */ public class PureTransferSemanticChecks { public ResponseCodeEnum fullPureValidation( - int maxHbarAdjusts, - int maxTokenAdjusts, TransferList hbarAdjustsWrapper, - List tokenAdjustsList + List tokenAdjustsList, + ImpliedTransfersMeta.ValidationProps validationProps ) { + final var maxHbarAdjusts = validationProps.getMaxHbarAdjusts(); + final var maxTokenAdjusts = validationProps.getMaxTokenAdjusts(); + final var maxOwnershipChanges = validationProps.getMaxOwnershipChanges(); + final var hbarAdjusts = hbarAdjustsWrapper.getAccountAmountsList(); if (hasRepeatedAccount(hbarAdjusts)) { @@ -71,7 +76,7 @@ public ResponseCodeEnum fullPureValidation( return TRANSFER_LIST_SIZE_LIMIT_EXCEEDED; } - final var tokenValidity = validateTokenTransferSizes(tokenAdjustsList, maxTokenAdjusts); + final var tokenValidity = validateTokenTransferSizes(tokenAdjustsList, maxTokenAdjusts, maxOwnershipChanges); if (tokenValidity != OK) { return tokenValidity; } @@ -80,28 +85,32 @@ public ResponseCodeEnum fullPureValidation( ResponseCodeEnum validateTokenTransferSizes( List tokenTransfersList, - int maxListLen + int maxListLen, + int maxOwnershipChanges ) { final int numScopedTransfers = tokenTransfersList.size(); if (numScopedTransfers == 0) { return OK; } - if (numScopedTransfers > maxListLen) { - return TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED; - } - var count = 0; + var numOwnershipChanges = 0; for (var scopedTransfers : tokenTransfersList) { - int transferCounts = scopedTransfers.getTransfersCount(); - if (transferCounts == 0) { - return EMPTY_TOKEN_TRANSFER_ACCOUNT_AMOUNTS; - } - - count += transferCounts; - - if (count > maxListLen) { - return TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED; + final var ownershipChangesHere = scopedTransfers.getNftTransfersCount(); + if (ownershipChangesHere > 0) { + numOwnershipChanges += ownershipChangesHere; + if (numOwnershipChanges > maxOwnershipChanges) { + return BATCH_SIZE_LIMIT_EXCEEDED; + } + } else { + int transferCounts = scopedTransfers.getTransfersCount(); + if (transferCounts == 0) { + return EMPTY_TOKEN_TRANSFER_ACCOUNT_AMOUNTS; + } + count += transferCounts; + if (count > maxListLen) { + return TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED; + } } } diff --git a/hedera-node/src/main/java/com/hedera/services/ledger/accounts/BackingNfts.java b/hedera-node/src/main/java/com/hedera/services/ledger/accounts/BackingNfts.java new file mode 100644 index 000000000000..18df9bf2d2a2 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/ledger/accounts/BackingNfts.java @@ -0,0 +1,97 @@ +package com.hedera.services.ledger.accounts; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.store.models.NftId; +import com.swirlds.fcmap.FCMap; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.HashSet; +import java.util.Set; +import java.util.function.Supplier; + +import static com.hedera.services.state.merkle.MerkleUniqueTokenId.fromNftId; + +public class BackingNfts implements BackingStore { + static final Logger log = LogManager.getLogger(BackingNfts.class); + + private final Set existing = new HashSet<>(); + + private final Supplier> delegate; + + public BackingNfts(Supplier> delegate) { + this.delegate = delegate; + rebuildFromSources(); + } + + @Override + public void rebuildFromSources() { + existing.clear(); + delegate.get().keySet().stream() + .map(MerkleUniqueTokenId::asNftId) + .forEach(existing::add); + } + + @Override + public MerkleUniqueToken getRef(NftId id) { + return delegate.get().getForModify(fromNftId(id)); + } + + @Override + public MerkleUniqueToken getImmutableRef(NftId id) { + return delegate.get().get(fromNftId(id)); + } + + @Override + public void put(NftId id, MerkleUniqueToken nft) { + if (!existing.contains(id)) { + delegate.get().put(fromNftId(id), nft); + existing.add(id); + } + } + + @Override + public void remove(NftId id) { + existing.remove(id); + delegate.get().remove(fromNftId(id)); + } + + @Override + public boolean contains(NftId id) { + return existing.contains(id); + } + + @Override + public Set idSet() { + return existing; + } + + public void addToExistingNfts(NftId nftId) { + existing.add(nftId); + } + + public void removeFromExistingNfts(NftId nftId) { + existing.remove(nftId); + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/ledger/properties/AccountProperty.java b/hedera-node/src/main/java/com/hedera/services/ledger/properties/AccountProperty.java index c180d7c3878d..2f9254bfc093 100644 --- a/hedera-node/src/main/java/com/hedera/services/ledger/properties/AccountProperty.java +++ b/hedera-node/src/main/java/com/hedera/services/ledger/properties/AccountProperty.java @@ -149,6 +149,17 @@ public Function getter() { return MerkleAccount::getProxy; } }, + NUM_NFTS_OWNED { + @Override + public BiConsumer setter() { + return (a, n) -> a.setNftsOwned((long) n); + } + + @Override + public Function getter() { + return MerkleAccount::getNftsOwned; + } + }, TOKENS { @Override public BiConsumer setter() { diff --git a/hedera-node/src/main/java/com/hedera/services/ledger/properties/NftProperty.java b/hedera-node/src/main/java/com/hedera/services/ledger/properties/NftProperty.java new file mode 100644 index 000000000000..f5beb0bbf809 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/ledger/properties/NftProperty.java @@ -0,0 +1,41 @@ +package com.hedera.services.ledger.properties; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.submerkle.EntityId; + +import java.util.function.BiConsumer; +import java.util.function.Function; + +public enum NftProperty implements BeanProperty { + OWNER { + @Override + public BiConsumer setter() { + return (t, o) -> t.setOwner((EntityId) o); + } + + @Override + public Function getter() { + return MerkleUniqueToken::getOwner; + } + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/legacy/core/jproto/TxnReceipt.java b/hedera-node/src/main/java/com/hedera/services/legacy/core/jproto/TxnReceipt.java index a12d469556ef..34faa7e6040b 100644 --- a/hedera-node/src/main/java/com/hedera/services/legacy/core/jproto/TxnReceipt.java +++ b/hedera-node/src/main/java/com/hedera/services/legacy/core/jproto/TxnReceipt.java @@ -40,6 +40,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Objects; +import java.util.stream.Collectors; import static com.swirlds.common.CommonUtils.getNormalisedStringFromBytes; @@ -48,9 +49,11 @@ public class TxnReceipt implements SelfSerializable { private static final int MAX_STATUS_BYTES = 128; private static final int MAX_RUNNING_HASH_BYTES = 1024; + private static final int MAX_SERIAL_NUMBERS = 1024; // Is this number enough? static final TxnId MISSING_SCHEDULED_TXN_ID = null; static final byte[] MISSING_RUNNING_HASH = null; + static final long[] MISSING_SERIAL_NUMBERS = null; static final long MISSING_TOPIC_SEQ_NO = 0L; static final long MISSING_RUNNING_HASH_VERSION = 0L; @@ -60,7 +63,8 @@ public class TxnReceipt implements SelfSerializable { static final int RELEASE_0100_VERSION = 4; static final int RELEASE_0110_VERSION = 5; static final int RELEASE_0120_VERSION = 6; - static final int MERKLE_VERSION = RELEASE_0120_VERSION; + static final int RELEASE_0160_VERSION = 7; + static final int MERKLE_VERSION = RELEASE_0160_VERSION; static final long RUNTIME_CONSTRUCTABLE_ID = 0x65ef569a77dcf125L; static DomainSerdes serdes = new DomainSerdes(); @@ -78,6 +82,7 @@ public class TxnReceipt implements SelfSerializable { EntityId scheduleId; ExchangeRates exchangeRates; long newTotalSupply = -1L; + long[] serialNumbers; public TxnReceipt() { } @@ -97,6 +102,7 @@ public TxnReceipt (Builder builder){ this.runningHashVersion = builder.runningHashVersion; this.newTotalSupply = builder.newTotalSupply; this.scheduledTxnId = builder.scheduledTxnId; + this.serialNumbers = ((builder.serialNumbers != MISSING_SERIAL_NUMBERS) && (builder.serialNumbers.length > 0)) ? builder.serialNumbers : MISSING_SERIAL_NUMBERS; } /* --- SelfSerializable --- */ @@ -131,6 +137,7 @@ public void serialize(SerializableDataOutputStream out) throws IOException { } out.writeLong(newTotalSupply); serdes.writeNullableSerializable(scheduledTxnId, out); + out.writeLongArray(serialNumbers); } @Override @@ -159,6 +166,9 @@ public void deserialize(SerializableDataInputStream in, int version) throws IOEx if (version >= RELEASE_0120_VERSION) { scheduledTxnId = serdes.readNullableSerializable(in); } + if (version >= RELEASE_0160_VERSION) { + serialNumbers = in.readLongArray(MAX_SERIAL_NUMBERS); + } } public long getRunningHashVersion() { @@ -213,6 +223,10 @@ public TxnId getScheduledTxnId() { return scheduledTxnId; } + public long[] getSerialNumbers() { + return serialNumbers; + } + /* --- Object --- */ @Override @@ -234,7 +248,8 @@ public boolean equals(Object o) { Objects.equals(topicSequenceNumber, that.topicSequenceNumber) && Arrays.equals(topicRunningHash, that.topicRunningHash) && Objects.equals(newTotalSupply, that.newTotalSupply) && - Objects.equals(scheduledTxnId, that.scheduledTxnId); + Objects.equals(scheduledTxnId, that.scheduledTxnId) && + Arrays.equals(serialNumbers, that.serialNumbers); } @Override @@ -243,7 +258,7 @@ public int hashCode() { runningHashVersion, status, accountId, fileId, contractId, topicId, tokenId, topicSequenceNumber, Arrays.hashCode(topicRunningHash), - newTotalSupply, scheduledTxnId); + newTotalSupply, scheduledTxnId, Arrays.hashCode(serialNumbers)); } @Override @@ -258,7 +273,8 @@ public String toString() { .add("contractCreated", contractId) .add("topicCreated", topicId) .add("newTotalTokenSupply", newTotalSupply) - .add("scheduledTxnId", scheduledTxnId); + .add("scheduledTxnId", scheduledTxnId) + .add("serialNumbers", serialNumbers); if (topicRunningHash != MISSING_RUNNING_HASH) { helper.add("topicSeqNo", topicSequenceNumber); helper.add("topicRunningHash", CommonUtils.hex(topicRunningHash)); @@ -283,6 +299,7 @@ public static TxnReceipt fromGrpc(TransactionReceipt grpc) { EntityId scheduleId = grpc.hasScheduleID() ? EntityId.fromGrpcScheduleId(grpc.getScheduleID()) : null; long runningHashVersion = Math.max(MISSING_RUNNING_HASH_VERSION, grpc.getTopicRunningHashVersion()); long newTotalSupply = grpc.getNewTotalSupply(); + long[] serialNumbers = grpc.getSerialNumbersList().stream().mapToLong(l -> l).toArray(); TxnId scheduledTxnId = grpc.hasScheduledTransactionID() ? TxnId.fromGrpc(grpc.getScheduledTransactionID()) : MISSING_SCHEDULED_TXN_ID; @@ -300,6 +317,7 @@ public static TxnReceipt fromGrpc(TransactionReceipt grpc) { .setRunningHashVersion(runningHashVersion) .setNewTotalSupply(newTotalSupply) .setScheduledTxnId(scheduledTxnId) + .setSerialNumbers(serialNumbers) .build(); } @@ -360,6 +378,10 @@ public static TransactionReceipt convert(TxnReceipt txReceipt) { if (txReceipt.getScheduledTxnId() != MISSING_SCHEDULED_TXN_ID) { builder.setScheduledTransactionID(txReceipt.getScheduledTxnId().toGrpc()); } + + if (txReceipt.getSerialNumbers() != MISSING_SERIAL_NUMBERS) { + builder.addAllSerialNumbers(Arrays.stream(txReceipt.getSerialNumbers()).boxed().collect(Collectors.toList())); + } return builder.build(); } @@ -381,6 +403,7 @@ public static class Builder { private long runningHashVersion; private long newTotalSupply; private TxnId scheduledTxnId; + private long[] serialNumbers; public Builder setStatus(String status) { this.status = status; @@ -447,6 +470,11 @@ public Builder setScheduledTxnId(TxnId scheduledTxnId) { return this; } + public Builder setSerialNumbers (long[] serialNumbers) { + this.serialNumbers = serialNumbers; + return this; + } + public TxnReceipt build(){ return new TxnReceipt(this); } diff --git a/hedera-node/src/main/java/com/hedera/services/legacy/handler/SmartContractRequestHandler.java b/hedera-node/src/main/java/com/hedera/services/legacy/handler/SmartContractRequestHandler.java index f1d2fe7487f9..4a92d597e8f7 100644 --- a/hedera-node/src/main/java/com/hedera/services/legacy/handler/SmartContractRequestHandler.java +++ b/hedera-node/src/main/java/com/hedera/services/legacy/handler/SmartContractRequestHandler.java @@ -752,7 +752,7 @@ private long getContractCreateRbhInTinyBars(Timestamp at) { } private long rbhPriceTinyBarsGiven(HederaFunctionality function, Timestamp at) { - FeeData prices = usagePrices.pricesGiven(function, at); + FeeData prices = usagePrices.defaultPricesGiven(function, at); long feeInTinyCents = prices.getServicedata().getRbh() / 1000; long feeInTinyBars = FeeBuilder.getTinybarsFromTinyCents(exchange.rate(at), feeInTinyCents); return Math.max(1L, feeInTinyBars); @@ -767,7 +767,7 @@ private long getContractCallGasPriceInTinyBars(Timestamp at) { } private long gasPriceTinyBarsGiven(HederaFunctionality function, Timestamp at) { - FeeData prices = usagePrices.pricesGiven(function, at); + FeeData prices = usagePrices.defaultPricesGiven(function, at); long feeInTinyCents = prices.getServicedata().getGas() / 1000; long feeInTinyBars = FeeBuilder.getTinybarsFromTinyCents(exchange.rate(at), feeInTinyCents); return Math.max(1L, feeInTinyBars); @@ -782,7 +782,7 @@ private long getContractCreateSbhInTinyBars(Timestamp at) { } private long sbhPriceTinyBarsGiven(HederaFunctionality function, Timestamp at) { - FeeData prices = usagePrices.pricesGiven(function, at); + FeeData prices = usagePrices.defaultPricesGiven(function, at); long feeInTinyCents = prices.getServicedata().getSbh() / 1000; long feeInTinyBars = FeeBuilder.getTinybarsFromTinyCents(exchange.rate(at), feeInTinyCents); return Math.max(1L, feeInTinyBars); diff --git a/hedera-node/src/main/java/com/hedera/services/queries/answering/StakedAnswerFlow.java b/hedera-node/src/main/java/com/hedera/services/queries/answering/StakedAnswerFlow.java index 72b785442102..21d70bfeed4e 100644 --- a/hedera-node/src/main/java/com/hedera/services/queries/answering/StakedAnswerFlow.java +++ b/hedera-node/src/main/java/com/hedera/services/queries/answering/StakedAnswerFlow.java @@ -122,7 +122,7 @@ public Response satisfyUsing(AnswerService service, Query query) { final var bestGuessNow = optionalPayment .map(a -> a.getTxnId().getTransactionValidStart()) .orElse(asTimestamp(now.get())); - final var usagePrices = resourceCosts.pricesGiven(service.canonicalFunction(), bestGuessNow); + final var usagePrices = resourceCosts.defaultPricesGiven(service.canonicalFunction(), bestGuessNow); long fee = 0L; final Map queryCtx = new HashMap<>(); diff --git a/hedera-node/src/main/java/com/hedera/services/queries/token/GetAccountNftInfosAnswer.java b/hedera-node/src/main/java/com/hedera/services/queries/token/GetAccountNftInfosAnswer.java new file mode 100644 index 000000000000..28681ca0e67b --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/queries/token/GetAccountNftInfosAnswer.java @@ -0,0 +1,179 @@ +package com.hedera.services.queries.token; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.queries.AnswerService; +import com.hedera.services.txns.validation.OptionValidator; +import com.hedera.services.utils.SignedTxnAccessor; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.Response; +import com.hederahashgraph.api.proto.java.ResponseCodeEnum; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosQuery; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosResponse; +import com.hederahashgraph.api.proto.java.TokenNftInfo; + +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import static com.hedera.services.utils.SignedTxnAccessor.uncheckedFrom; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_QUERY_RANGE; +import static com.hederahashgraph.api.proto.java.ResponseType.COST_ANSWER; + +public class GetAccountNftInfosAnswer implements AnswerService { + public static final String ACCOUNT_NFT_INFO_CTX_KEY = GetAccountNftInfosAnswer.class.getSimpleName() + "_accountNftInfos"; + private OptionValidator validator; + + public GetAccountNftInfosAnswer(OptionValidator validator) { + this.validator = validator; + } + + @Override + public boolean needsAnswerOnlyCost(Query query) { + return COST_ANSWER == query.getTokenGetAccountNftInfos().getHeader().getResponseType(); + } + + @Override + public boolean requiresNodePayment(Query query) { + return typicallyRequiresNodePayment(query.getTokenGetAccountNftInfos().getHeader().getResponseType()); + } + + @Override + public Response responseGiven(Query query, StateView view, ResponseCodeEnum validity, long cost) { + return responseFor(query, view, validity, cost, NO_QUERY_CTX); + } + + @Override + public Response responseGiven( + Query query, + StateView view, + ResponseCodeEnum validity, + long cost, + Map queryCtx + ) { + return responseFor(query, view, validity, cost, Optional.of(queryCtx)); + } + + @Override + public ResponseCodeEnum checkValidity(Query query, StateView view) { + var accountNftInfoQuery = query.getTokenGetAccountNftInfos(); + AccountID id = accountNftInfoQuery.getAccountID(); + + if (accountNftInfoQuery.getStart() >= accountNftInfoQuery.getEnd()) { + return INVALID_QUERY_RANGE; + } + + var validity = validator.nftMaxQueryRangeCheck(accountNftInfoQuery.getStart(), accountNftInfoQuery.getEnd()); + if (validity != OK) { + return validity; + } + + validity = validator.queryableAccountStatus(id, view.accounts()); + if (validity != OK) { + return validity; + } + + var nftCount = view.accountNftsCount(id); + if ( + accountNftInfoQuery.getStart() < 0 || + accountNftInfoQuery.getEnd() < 0 || + accountNftInfoQuery.getStart() >= nftCount || + accountNftInfoQuery.getEnd() > nftCount + ) { + return INVALID_QUERY_RANGE; + } + + return OK; + } + + @Override + public HederaFunctionality canonicalFunction() { + return HederaFunctionality.TokenGetAccountNftInfos; + } + + @Override + public ResponseCodeEnum extractValidityFrom(Response response) { + return response.getTokenGetAccountNftInfos().getHeader().getNodeTransactionPrecheckCode(); + } + + @Override + public Optional extractPaymentFrom(Query query) { + var paymentTxn = query.getTokenGetAccountNftInfos().getHeader().getPayment(); + return Optional.ofNullable(uncheckedFrom(paymentTxn)); + } + + private Response responseFor( + Query query, + StateView view, + ResponseCodeEnum validity, + long cost, + Optional> queryCtx + ) { + var op = query.getTokenGetAccountNftInfos(); + var response = TokenGetAccountNftInfosResponse.newBuilder(); + + var type = op.getHeader().getResponseType(); + if (validity != OK) { + response.setHeader(header(validity, type, cost)); + } else { + if (type == COST_ANSWER) { + response.setHeader(costAnswerHeader(OK, cost)); + } else { + setAnswerOnly(response, view, op, cost, queryCtx); + } + } + + return Response.newBuilder() + .setTokenGetAccountNftInfos(response) + .build(); + } + + private void setAnswerOnly( + TokenGetAccountNftInfosResponse.Builder response, + StateView view, + TokenGetAccountNftInfosQuery op, + long cost, + Optional> queryCtx + ) { + if (queryCtx.isPresent()) { + var ctx = queryCtx.get(); + if (!ctx.containsKey(ACCOUNT_NFT_INFO_CTX_KEY)) { + response.setHeader(answerOnlyHeader(INVALID_ACCOUNT_ID)); + } else { + response.setHeader(answerOnlyHeader(OK, cost)); + response.addAllNfts((List)ctx.get(ACCOUNT_NFT_INFO_CTX_KEY)); + } + } else { + var info = view.infoForAccountNfts(op.getAccountID(), op.getStart(), op.getEnd()); + if (info.isEmpty()) { + response.setHeader(answerOnlyHeader(INVALID_ACCOUNT_ID)); + } else { + response.setHeader(answerOnlyHeader(OK, cost)); + response.addAllNfts(info.get()); + } + } + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/queries/token/GetTokenNftInfoAnswer.java b/hedera-node/src/main/java/com/hedera/services/queries/token/GetTokenNftInfoAnswer.java new file mode 100644 index 000000000000..0df38530ed9c --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/queries/token/GetTokenNftInfoAnswer.java @@ -0,0 +1,155 @@ +package com.hedera.services.queries.token; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.queries.AnswerService; +import com.hedera.services.utils.SignedTxnAccessor; +import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.Response; +import com.hederahashgraph.api.proto.java.ResponseCodeEnum; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoQuery; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoResponse; +import com.hederahashgraph.api.proto.java.TokenNftInfo; + +import java.util.Map; +import java.util.Optional; + +import static com.hedera.services.utils.SignedTxnAccessor.uncheckedFrom; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NFT_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_NFT_SERIAL_NUMBER; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseType.COST_ANSWER; + +public class GetTokenNftInfoAnswer implements AnswerService { + public static final String NFT_INFO_CTX_KEY = GetTokenNftInfoAnswer.class.getSimpleName() + "_nftInfo"; + + @Override + public boolean needsAnswerOnlyCost(Query query) { + return COST_ANSWER == query.getTokenGetNftInfo().getHeader().getResponseType(); + } + + @Override + public boolean requiresNodePayment(Query query) { + return typicallyRequiresNodePayment(query.getTokenGetNftInfo().getHeader().getResponseType()); + } + + @Override + public Response responseGiven(Query query, StateView view, ResponseCodeEnum validity, long cost) { + return responseFor(query, view, validity, cost, NO_QUERY_CTX); + } + + @Override + public Response responseGiven( + Query query, + StateView view, + ResponseCodeEnum validity, + long cost, + Map queryCtx + ) { + return responseFor(query, view, validity, cost, Optional.of(queryCtx)); + } + + @Override + public ResponseCodeEnum checkValidity(Query query, StateView view) { + var nftID = query.getTokenGetNftInfo().getNftID(); + if (!nftID.hasTokenID()) { + return INVALID_TOKEN_ID; + } + + if (nftID.getSerialNumber() <= 0) { + return INVALID_TOKEN_NFT_SERIAL_NUMBER; + } + + return view.nftExists(nftID) ? OK : INVALID_NFT_ID; + } + + @Override + public HederaFunctionality canonicalFunction() { + return HederaFunctionality.TokenGetNftInfo; + } + + @Override + public ResponseCodeEnum extractValidityFrom(Response response) { + return response.getTokenGetNftInfo().getHeader().getNodeTransactionPrecheckCode(); + } + + @Override + public Optional extractPaymentFrom(Query query) { + var paymentTxn = query.getTokenGetNftInfo().getHeader().getPayment(); + return Optional.ofNullable(uncheckedFrom(paymentTxn)); + } + + private Response responseFor( + Query query, + StateView view, + ResponseCodeEnum validity, + long cost, + Optional> queryCtx + ) { + var op = query.getTokenGetNftInfo(); + var response = TokenGetNftInfoResponse.newBuilder(); + + var type = op.getHeader().getResponseType(); + if (validity != OK) { + response.setHeader(header(validity, type, cost)); + } else { + if (type == COST_ANSWER) { + response.setHeader(costAnswerHeader(OK, cost)); + } else { + setAnswerOnly(response, view, op, cost, queryCtx); + } + } + + return Response.newBuilder() + .setTokenGetNftInfo(response) + .build(); + } + + @SuppressWarnings("unchecked") + private void setAnswerOnly( + TokenGetNftInfoResponse.Builder response, + StateView view, + TokenGetNftInfoQuery op, + long cost, + Optional> queryCtx + ) { + if (queryCtx.isPresent()) { + var ctx = queryCtx.get(); + if (!ctx.containsKey(NFT_INFO_CTX_KEY)) { + response.setHeader(answerOnlyHeader(INVALID_NFT_ID)); + } else { + response.setHeader(answerOnlyHeader(OK, cost)); + response.setNft((TokenNftInfo) ctx.get(NFT_INFO_CTX_KEY)); + } + } else { + var info = view.infoForNft(op.getNftID()); + if (info.isEmpty()) { + response.setHeader(answerOnlyHeader(INVALID_NFT_ID)); + } else { + response.setHeader(answerOnlyHeader(OK, cost)); + response.setNft(info.get()); + } + } + } +} \ No newline at end of file diff --git a/hedera-node/src/main/java/com/hedera/services/queries/token/TokenAnswers.java b/hedera-node/src/main/java/com/hedera/services/queries/token/TokenAnswers.java index c38292d9d718..3f3fff81f590 100644 --- a/hedera-node/src/main/java/com/hedera/services/queries/token/TokenAnswers.java +++ b/hedera-node/src/main/java/com/hedera/services/queries/token/TokenAnswers.java @@ -22,12 +22,20 @@ public class TokenAnswers { private final GetTokenInfoAnswer tokenInfo; + private final GetTokenNftInfoAnswer nftInfo; + private final GetAccountNftInfosAnswer accountNftInfos; - public TokenAnswers(GetTokenInfoAnswer tokenInfo) { + public TokenAnswers(GetTokenInfoAnswer tokenInfo, GetTokenNftInfoAnswer nftInfo, GetAccountNftInfosAnswer accountNftInfos) { this.tokenInfo = tokenInfo; + this.nftInfo = nftInfo; + this.accountNftInfos = accountNftInfos; } public GetTokenInfoAnswer getTokenInfo() { return tokenInfo; } + + public GetTokenNftInfoAnswer getNftInfoAnswer() { return nftInfo; } + + public GetAccountNftInfosAnswer getAccountNftInfosAnswer() { return accountNftInfos; } } diff --git a/hedera-node/src/main/java/com/hedera/services/records/TransactionRecordService.java b/hedera-node/src/main/java/com/hedera/services/records/TransactionRecordService.java index 084070d03687..00c325521e03 100644 --- a/hedera-node/src/main/java/com/hedera/services/records/TransactionRecordService.java +++ b/hedera-node/src/main/java/com/hedera/services/records/TransactionRecordService.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,13 +21,18 @@ */ import com.hedera.services.context.TransactionContext; +import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.OwnershipTracker; import com.hedera.services.store.models.Token; import com.hedera.services.store.models.TokenRelationship; +import com.hedera.services.store.models.UniqueToken; import com.hederahashgraph.api.proto.java.AccountAmount; import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenTransferList; +import java.util.ArrayList; import java.util.List; public class TransactionRecordService { @@ -39,20 +44,28 @@ public TransactionRecordService(TransactionContext txnCtx) { /** * Update the record of the active transaction with the changes to the - * given token. There are two cases, + * given token. There are three cases, *
    *
  1. The token was just created, and the receipt should include its id.
    2. *
  2. The token's total supply has changed, and the receipt should include its new supply.
    3. + *
  3. The token is of type {@link com.hedera.services.state.enums.TokenType} NON_FUNGIBLE_UNIQUE and Mint operation was executed
    4. *
- * Only the second is implemented at this time. + * Only the second and third is implemented at this time. * - * @param token - * the model of a changed token + * @param token the model of a changed token */ public void includeChangesToToken(Token token) { if (token.hasChangedSupply()) { txnCtx.setNewTotalSupply(token.getTotalSupply()); } + + if (token.hasMintedUniqueTokens()) { + List serialNumbers = new ArrayList<>(); + for (UniqueToken uniqueToken : token.mintedUniqueTokens()) { + serialNumbers.add(uniqueToken.getSerialNumber()); + } + txnCtx.setCreated(serialNumbers); + } } /** @@ -66,30 +79,70 @@ public void includeChangesToToken(Token token) { * with just a refactor of burn and mint, the below implementation suffices * for now. * - * @param tokenRel - * the model of a changed token relationship + * @param tokenRel the model of a changed token relationship */ public void includeChangesToTokenRel(TokenRelationship tokenRel) { - if (tokenRel.getBalanceChange() == 0L) { + if (tokenRel.getBalanceChange() == 0L || !tokenRel.hasCommonRepresentation()) { return; } final var tokenId = tokenRel.getToken().getId(); final var accountId = tokenRel.getAccount().getId(); - final var supplyChangeXfers = List.of( - TokenTransferList.newBuilder() - .setToken(TokenID.newBuilder() - .setShardNum(tokenId.getShard()) - .setRealmNum(tokenId.getRealm()) - .setTokenNum(tokenId.getNum())) - .addTransfers(AccountAmount.newBuilder() - .setAccountID(AccountID.newBuilder() - .setShardNum(accountId.getShard()) - .setRealmNum(accountId.getRealm()) - .setAccountNum(accountId.getNum())) - .setAmount(tokenRel.getBalanceChange())) - .build() + + final var supplyChangeXfers = List.of(TokenTransferList.newBuilder() + .setToken(TokenID.newBuilder() + .setShardNum(tokenId.getShard()) + .setRealmNum(tokenId.getRealm()) + .setTokenNum(tokenId.getNum())) + .addTransfers(AccountAmount.newBuilder() + .setAccountID(AccountID.newBuilder() + .setShardNum(accountId.getShard()) + .setRealmNum(accountId.getRealm()) + .setAccountNum(accountId.getNum())) + .setAmount(tokenRel.getBalanceChange())) + .build() ); txnCtx.setTokenTransferLists(supplyChangeXfers); } + + /** + * Update the record of the active transaction with the ownership changes produced in the context of the current transaction + * @param ownershipTracker the model of ownership changes + */ + public void includeOwnershipChanges(OwnershipTracker ownershipTracker) { + if (ownershipTracker.isEmpty()) { + return; + } + + List transferLists = new ArrayList<>(); + var changes = ownershipTracker.getChanges(); + for (Id token : changes.keySet()) { + TokenID tokenID = TokenID.newBuilder() + .setShardNum(token.getShard()) + .setRealmNum(token.getRealm()) + .setTokenNum(token.getNum()) + .build(); + + List transfers = new ArrayList<>(); + for (OwnershipTracker.Change change : changes.get(token)) { + Id previousOwner = change.getPreviousOwner(); + Id newOwner = change.getNewOwner(); + transfers.add(NftTransfer.newBuilder() + .setSenderAccountID(AccountID.newBuilder() + .setShardNum(previousOwner.getShard()) + .setRealmNum(previousOwner.getRealm()) + .setAccountNum(previousOwner.getNum())) + .setReceiverAccountID(AccountID.newBuilder() + .setShardNum(newOwner.getShard()) + .setRealmNum(newOwner.getRealm()) + .setAccountNum(newOwner.getNum())) + .setSerialNumber(change.getSerialNumber()).build()); + } + transferLists.add(TokenTransferList.newBuilder() + .setToken(tokenID) + .addAllNftTransfers(transfers) + .build()); + } + txnCtx.setTokenTransferLists(transferLists); + } } diff --git a/hedera-node/src/main/java/com/hedera/services/sigs/order/HederaSigningOrder.java b/hedera-node/src/main/java/com/hedera/services/sigs/order/HederaSigningOrder.java index f2f2b08e6aa2..0749abf6495e 100644 --- a/hedera-node/src/main/java/com/hedera/services/sigs/order/HederaSigningOrder.java +++ b/hedera-node/src/main/java/com/hedera/services/sigs/order/HederaSigningOrder.java @@ -47,6 +47,7 @@ import com.hederahashgraph.api.proto.java.FileUpdateTransactionBody; import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.Key; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.ScheduleCreateTransactionBody; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.TokenAssociateTransactionBody; @@ -550,11 +551,21 @@ private SigningOrderResult cryptoTransfer( KeyOrderingFailure failure; for (TokenTransferList xfers : op.getTokenTransfersList()) { + // fungible tokens for (AccountAmount adjust : xfers.getTransfersList()) { if ((failure = includeIfPresentAndNecessary(adjust, required)) != NONE) { return accountFailure(adjust.getAccountID(), txnId, failure, factory); } } + // non fungible tokens + for (NftTransfer adjust : xfers.getNftTransfersList()) { + if ((failure = includeIfPresentAndNecessary(adjust.getSenderAccountID(), true, required)) != NONE) { + return accountFailure(adjust.getSenderAccountID(), txnId, failure, factory); + } + if ((failure = includeIfPresentAndNecessary(adjust.getReceiverAccountID(), false, required)) != NONE) { + return accountFailure(adjust.getReceiverAccountID(), txnId, failure, factory); + } + } } for (AccountAmount adjust : op.getTransfers().getAccountAmountsList()) { if ((failure = includeIfPresentAndNecessary(adjust, required)) != NONE) { @@ -998,6 +1009,21 @@ private KeyOrderingFailure includeIfPresentAndNecessary(AccountAmount adjust, Li return result.failureIfAny(); } + private KeyOrderingFailure includeIfPresentAndNecessary(AccountID accountID, Boolean isSender, List required) { + var result = sigMetaLookup.accountSigningMetaFor(accountID); + if (result.succeeded()) { + var meta = result.metadata(); + if (Boolean.TRUE.equals(isSender)) { + required.add(meta.getKey()); + } else { + if (meta.isReceiverSigRequired()) { + required.add(meta.getKey()); + } + } + } + return result.failureIfAny(); + } + private void addToMutableReqIfPresent( T op, Predicate checker, diff --git a/hedera-node/src/main/java/com/hedera/services/state/enums/TokenSupplyType.java b/hedera-node/src/main/java/com/hedera/services/state/enums/TokenSupplyType.java new file mode 100644 index 000000000000..982e8c50dc92 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/state/enums/TokenSupplyType.java @@ -0,0 +1,32 @@ +package com.hedera.services.state.enums; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +/** + * Token Supply Types of {@link com.hedera.services.state.merkle.MerkleToken} + * Indicates how many tokens can have during its lifetime. + */ +public enum TokenSupplyType { + // Indicates that tokens of that type have an upper bound of Long.MAX_VALUE. + INFINITE, + // Indicates that tokens of that type have an upper bound of maxSupply, provided on token creation. + FINITE +} \ No newline at end of file diff --git a/hedera-node/src/main/java/com/hedera/services/state/enums/TokenType.java b/hedera-node/src/main/java/com/hedera/services/state/enums/TokenType.java new file mode 100644 index 000000000000..bdde5a5c4310 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/state/enums/TokenType.java @@ -0,0 +1,39 @@ +package com.hedera.services.state.enums; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +/** + * Token Types of {@link com.hedera.services.state.merkle.MerkleToken} + * Apart from fungible and non-fungible, Tokens can have either a common or unique representation. This distinction might seem subtle, but it is important when considering + * how tokens can be traced and if they can have isolated and unique properties. + */ +public enum TokenType { + /** + * Interchangeable value with one another, where any quantity of them has the same value as another equal quantity if they are in the same class. + * Share a single set of properties, not distinct from one another. Simply represented as a balance or quantity to a given Hedera account. + */ + FUNGIBLE_COMMON, + /** + * Unique, not interchangeable with other tokens of the same type as they typically have different values. + * Individually traced and can carry unique properties (e.g. serial number). + */ + NON_FUNGIBLE_UNIQUE +} \ No newline at end of file diff --git a/hedera-node/src/main/java/com/hedera/services/state/expiry/ExpiringCreations.java b/hedera-node/src/main/java/com/hedera/services/state/expiry/ExpiringCreations.java index 421984fb9a22..84e66c695eab 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/expiry/ExpiringCreations.java +++ b/hedera-node/src/main/java/com/hedera/services/state/expiry/ExpiringCreations.java @@ -31,6 +31,7 @@ import com.hedera.services.state.submerkle.AssessedCustomFee; import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.state.submerkle.ExpirableTxnRecord; +import com.hedera.services.state.submerkle.NftAdjustments; import com.hedera.services.state.submerkle.RichInstant; import com.hedera.services.state.submerkle.TxnId; import com.hedera.services.utils.TxnAccessor; @@ -147,11 +148,13 @@ private void setTokensAndTokenAdjustments( ) { final List tokens = new ArrayList<>(); final List tokenAdjustments = new ArrayList<>(); + final List nftTokenAdjustments = new ArrayList<>(); for (TokenTransferList tokenTransfers : tokenTransferList) { tokens.add(EntityId.fromGrpcTokenId(tokenTransfers.getToken())); tokenAdjustments.add(CurrencyAdjustments.fromGrpc(tokenTransfers.getTransfersList())); + nftTokenAdjustments.add(NftAdjustments.fromGrpc(tokenTransfers.getNftTransfersList())); } - builder.setTokens(tokens).setTokenAdjustments(tokenAdjustments); + builder.setTokens(tokens).setTokenAdjustments(tokenAdjustments).setNftTokenAdjustments(nftTokenAdjustments); } private void addToState(MerkleEntityId key, ExpirableTxnRecord record) { diff --git a/hedera-node/src/main/java/com/hedera/services/state/initialization/ViewBuilder.java b/hedera-node/src/main/java/com/hedera/services/state/initialization/ViewBuilder.java new file mode 100644 index 000000000000..c84d7babe6ae --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/state/initialization/ViewBuilder.java @@ -0,0 +1,20 @@ +package com.hedera.services.state.initialization; + +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.state.submerkle.EntityId; +import com.swirlds.fchashmap.FCOneToManyRelation; +import com.swirlds.fcmap.FCMap; + +public class ViewBuilder { + public static void rebuildUniqueTokenViews( + FCMap uniqueTokens, + FCOneToManyRelation uniqueTokenAssociations, + FCOneToManyRelation uniqueOwnershipAssociations + ) { + uniqueTokens.forEach((id, uniq) -> { + uniqueTokenAssociations.associate(id.tokenId(), id); + uniqueOwnershipAssociations.associate(uniq.getOwner(), id); + }); + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccount.java b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccount.java index 1c38cff66ba0..c5e752942e31 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccount.java +++ b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccount.java @@ -167,6 +167,11 @@ public void setTokens(MerkleAccountTokens tokens) { } /* ---- Bean ---- */ + + public long getNftsOwned() { return state().nftsOwned(); } + + public void setNftsOwned(long nftsOwned) { state().setNftsOwned(nftsOwned); } + public String getMemo() { return state().memo(); } diff --git a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccountState.java b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccountState.java index 549245a3aa1d..c0b7b965e73e 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccountState.java +++ b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleAccountState.java @@ -44,11 +44,9 @@ public class MerkleAccountState extends AbstractMerkleLeaf { static final int MAX_CONCEIVABLE_MEMO_UTF8_BYTES = 1_024; static final int MAX_CONCEIVABLE_TOKEN_BALANCES_SIZE = 4_096; - static final int RELEASE_070_VERSION = 1; - static final int RELEASE_08x_VERSION = 2; - static final int RELEASE_090_ALPHA_VERSION = 3; static final int RELEASE_090_VERSION = 4; - static final int MERKLE_VERSION = RELEASE_090_VERSION; + static final int RELEASE_0160_VERSION = 5; + static final int MERKLE_VERSION = RELEASE_0160_VERSION; static final long RUNTIME_CONSTRUCTABLE_ID = 0x354cfc55834e7f12L; static DomainSerdes serdes = new DomainSerdes(); @@ -64,6 +62,7 @@ public class MerkleAccountState extends AbstractMerkleLeaf { private boolean smartContract; private boolean receiverSigRequired; private EntityId proxy; + private long nftsOwned; public MerkleAccountState() { } @@ -111,6 +110,10 @@ public void deserialize(SerializableDataInputStream in, int version) throws IOEx smartContract = in.readBoolean(); receiverSigRequired = in.readBoolean(); proxy = serdes.readNullableSerializable(in); + if (version >= RELEASE_0160_VERSION) { + /* The number of nfts owned is being saved in the state after RELEASE_0160_VERSION */ + nftsOwned = in.readLong(); + } } @Override @@ -124,12 +127,13 @@ public void serialize(SerializableDataOutputStream out) throws IOException { out.writeBoolean(smartContract); out.writeBoolean(receiverSigRequired); serdes.writeNullableSerializable(proxy, out); + out.writeLong(nftsOwned); } /* --- Copyable --- */ public MerkleAccountState copy() { setImmutable(true); - return new MerkleAccountState( + var copied = new MerkleAccountState( key, expiry, hbarBalance, @@ -139,6 +143,8 @@ public MerkleAccountState copy() { smartContract, receiverSigRequired, proxy); + copied.setNftsOwned(nftsOwned); + return copied; } @Override @@ -160,6 +166,7 @@ public boolean equals(Object o) { this.smartContract == that.smartContract && this.receiverSigRequired == that.receiverSigRequired && Objects.equals(this.proxy, that.proxy) && + this.nftsOwned == that.nftsOwned && equalUpToDecodability(this.key, that.key); } @@ -174,7 +181,8 @@ public int hashCode() { deleted, smartContract, receiverSigRequired, - proxy); + proxy, + nftsOwned); } /* --- Bean --- */ @@ -190,6 +198,7 @@ public String toString() { .add("smartContract", smartContract) .add("receiverSigRequired", receiverSigRequired) .add("proxy", proxy) + .add("nftsOwned", nftsOwned) .toString(); } @@ -229,6 +238,8 @@ public EntityId proxy() { return proxy; } + public long nftsOwned() { return nftsOwned; } + public void setKey(JKey key) { assertMutable("key"); this.key = key; @@ -274,6 +285,10 @@ public void setProxy(EntityId proxy) { this.proxy = proxy; } + public void setNftsOwned(long nftsOwned) { + this.nftsOwned = nftsOwned; + } + private void assertMutable(String proximalField) { if (isImmutable()) { throw new MutabilityException("Cannot set " + proximalField + " on an immutable account state!"); diff --git a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleToken.java b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleToken.java index 049a7ffd469d..b70aef2411f1 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleToken.java +++ b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleToken.java @@ -22,6 +22,8 @@ import com.google.common.base.MoreObjects; import com.hedera.services.legacy.core.jproto.JKey; +import com.hedera.services.state.enums.TokenSupplyType; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.state.serdes.DomainSerdes; import com.hedera.services.state.submerkle.CustomFee; import com.hedera.services.state.submerkle.EntityId; @@ -59,8 +61,12 @@ public class MerkleToken extends AbstractMerkleLeaf { public static final int UPPER_BOUND_SYMBOL_UTF8_BYTES = 1024; public static final int UPPER_BOUND_TOKEN_NAME_UTF8_BYTES = 1024; + private TokenType tokenType; + private TokenSupplyType supplyType; private int decimals; + private long lastUsedSerialNumber; private long expiry; + private long maxSupply; private long totalSupply; private long autoRenewPeriod = UNUSED_AUTO_RENEW_PERIOD; private JKey adminKey = UNUSED_KEY; @@ -114,11 +120,15 @@ public boolean equals(Object o) { } var that = (MerkleToken) o; - return this.expiry == that.expiry && + return this.tokenType == that.tokenType && + this.supplyType == that.supplyType && + this.expiry == that.expiry && this.autoRenewPeriod == that.autoRenewPeriod && this.deleted == that.deleted && + this.maxSupply == that.maxSupply && this.totalSupply == that.totalSupply && this.decimals == that.decimals && + this.lastUsedSerialNumber == that.lastUsedSerialNumber && this.accountsFrozenByDefault == that.accountsFrozenByDefault && this.accountsKycGrantedByDefault == that.accountsKycGrantedByDefault && this.feeScheduleMutable == that.feeScheduleMutable && @@ -138,10 +148,14 @@ public boolean equals(Object o) { @Override public int hashCode() { return Objects.hash( + tokenType, + supplyType, expiry, deleted, + maxSupply, totalSupply, decimals, + lastUsedSerialNumber, adminKey, freezeKey, kycKey, @@ -164,14 +178,18 @@ public int hashCode() { public String toString() { return MoreObjects.toStringHelper(MerkleToken.class) .omitNullValues() + .add("tokenType", tokenType) + .add("supplyType", supplyType) .add("deleted", deleted) .add("expiry", expiry) .add("symbol", symbol) .add("name", name) .add("memo", memo) .add("treasury", treasury.toAbbrevString()) + .add("maxSupply", maxSupply) .add("totalSupply", totalSupply) .add("decimals", decimals) + .add("lastUsedSerialNumber", lastUsedSerialNumber) .add("autoRenewAccount", readableAutoRenewAccount()) .add("autoRenewPeriod", autoRenewPeriod) .add("adminKey", describe(adminKey)) @@ -222,9 +240,19 @@ public void deserialize(SerializableDataInputStream in, int version) throws IOEx /* Memo present since 0.12.0 */ memo = in.readNormalisedString(UPPER_BOUND_MEMO_UTF8_BYTES); if (version >= RELEASE_0160_VERSION) { + tokenType = TokenType.values()[in.readInt()]; + supplyType = TokenSupplyType.values()[in.readInt()]; + maxSupply = in.readLong(); + lastUsedSerialNumber = in.readLong(); feeSchedule = unmodifiableList(in.readSerializableList(Integer.MAX_VALUE, true, CustomFee::new)); feeScheduleMutable = in.readBoolean(); } + if (tokenType == null) { + tokenType = TokenType.FUNGIBLE_COMMON; + } + if (supplyType == null) { + supplyType = TokenSupplyType.INFINITE; + } } @Override @@ -246,6 +274,10 @@ public void serialize(SerializableDataOutputStream out) throws IOException { serdes.writeNullable(supplyKey, out, serdes::serializeKey); serdes.writeNullable(wipeKey, out, serdes::serializeKey); out.writeNormalisedString(memo); + out.writeInt(tokenType.ordinal()); + out.writeInt(supplyType.ordinal()); + out.writeLong(maxSupply); + out.writeLong(lastUsedSerialNumber); out.writeSerializableList(feeSchedule, true, true); out.writeBoolean(feeScheduleMutable); } @@ -268,6 +300,10 @@ public MerkleToken copy() { fc.setFeeScheduleMutable(feeScheduleMutable); fc.setAutoRenewPeriod(autoRenewPeriod); fc.setAutoRenewAccount(autoRenewAccount); + fc.lastUsedSerialNumber = lastUsedSerialNumber; + fc.setTokenType(tokenType); + fc.setSupplyType(supplyType); + fc.setMaxSupply(maxSupply); if (adminKey != UNUSED_KEY) { fc.setAdminKey(adminKey); } @@ -430,6 +466,11 @@ public void adjustTotalSupplyBy(long amount) { "Argument 'amount=%d' would negate totalSupply=%d!", amount, totalSupply)); } + if (maxSupply != 0 && maxSupply < newTotalSupply) { + throw new IllegalArgumentException(String.format( + "Argument 'amount=%d' would exceed maxSupply=%d!", + amount, maxSupply)); + } totalSupply += amount; } @@ -461,6 +502,44 @@ public void setAccountsFrozenByDefault(boolean accountsFrozenByDefault) { this.accountsFrozenByDefault = accountsFrozenByDefault; } + public long getLastUsedSerialNumber() { + return lastUsedSerialNumber; + } + + public void setLastUsedSerialNumber(long serialNum){ + this.lastUsedSerialNumber = serialNum; + } + + public TokenType tokenType() { + return tokenType; + } + + public void setTokenType(TokenType tokenType) { + this.tokenType = tokenType; + } + + public void setTokenType(int tokenTypeInt) { + this.tokenType = TokenType.values()[tokenTypeInt]; + } + + public TokenSupplyType supplyType() { return supplyType; } + + public void setSupplyType(TokenSupplyType supplyType) { + this.supplyType = supplyType; + } + + public void setSupplyType(int supplyTypeInt) { + this.supplyType = TokenSupplyType.values()[supplyTypeInt]; + } + + public long maxSupply() { + return maxSupply; + } + + public void setMaxSupply(long maxSupply) { + this.maxSupply = maxSupply; + } + public boolean isFeeScheduleMutable() { return feeScheduleMutable; } diff --git a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleUniqueToken.java b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleUniqueToken.java new file mode 100644 index 000000000000..0fdff84b938c --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleUniqueToken.java @@ -0,0 +1,146 @@ +package com.hedera.services.state.merkle; + +/* + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.common.base.MoreObjects; +import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.state.submerkle.RichInstant; +import com.swirlds.common.io.SerializableDataInputStream; +import com.swirlds.common.io.SerializableDataOutputStream; +import com.swirlds.common.merkle.utility.AbstractMerkleLeaf; + +import java.io.IOException; +import java.util.Objects; + +/** + * Represents an uniqueToken entity. Part of the nft implementation. + */ +public class MerkleUniqueToken extends AbstractMerkleLeaf { + + public static final int UPPER_BOUND_METADATA_BYTES = 1024; + static final int MERKLE_VERSION = 1; + static final long RUNTIME_CONSTRUCTABLE_ID = 0x899641dafcc39164L; + + private EntityId owner; + private RichInstant creationTime; + private byte[] metadata; + + /** + * @param owner The entity which owns the unique token. + * @param metadata Metadata about the token. + * @param creationTime The consensus time at which the token was created. + */ + public MerkleUniqueToken( + EntityId owner, + byte[] metadata, + RichInstant creationTime + ) { + this.owner = owner; + this.metadata = metadata; + this.creationTime = creationTime; + } + + public MerkleUniqueToken() { + /* No-op. */ + } + + /* Object */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || MerkleUniqueToken.class != o.getClass()) { + return false; + } + + var that = (MerkleUniqueToken) o; + return this.owner.equals(that.owner) && + Objects.deepEquals(this.metadata, that.metadata) && + Objects.equals(creationTime, that.creationTime); + } + + @Override + public int hashCode() { + return Objects.hash( + owner, + creationTime, + metadata); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(MerkleUniqueToken.class) + .add("owner", owner) + .add("creationTime", creationTime) + .add("metadata", metadata) + .toString(); + } + + /* --- MerkleLeaf --- */ + + @Override + public long getClassId() { + return RUNTIME_CONSTRUCTABLE_ID; + } + + @Override + public int getVersion() { + return MERKLE_VERSION; + } + + @Override + public void deserialize(SerializableDataInputStream in, int i) throws IOException { + owner = in.readSerializable(); + creationTime = RichInstant.from(in); + metadata = in.readByteArray(UPPER_BOUND_METADATA_BYTES); + } + + @Override + public void serialize(SerializableDataOutputStream out) throws IOException { + out.writeSerializable(owner, true); + creationTime.serialize(out); + out.writeByteArray(metadata); + } + + /* --- FastCopyable --- */ + @Override + public MerkleUniqueToken copy() { + return new MerkleUniqueToken(owner, metadata, creationTime); + } + + public void setOwner(EntityId owner) { + this.owner = owner; + } + + public EntityId getOwner() { + return owner; + } + + public byte[] getMetadata() { + return metadata; + } + + public RichInstant getCreationTime() { + return creationTime; + } + +} \ No newline at end of file diff --git a/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleUniqueTokenId.java b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleUniqueTokenId.java new file mode 100644 index 000000000000..eba01850e497 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/state/merkle/MerkleUniqueTokenId.java @@ -0,0 +1,141 @@ +package com.hedera.services.state.merkle; + +/* + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.common.base.MoreObjects; +import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.store.models.NftId; +import com.hederahashgraph.api.proto.java.NftID; +import com.swirlds.common.io.SerializableDataInputStream; +import com.swirlds.common.io.SerializableDataOutputStream; +import com.swirlds.common.merkle.utility.AbstractMerkleLeaf; + +import java.io.IOException; +import java.util.Objects; + +import static com.hedera.services.state.submerkle.EntityId.MISSING_ENTITY_ID; + +/** + * Represents the ID of {@link MerkleUniqueTokenId} + */ +public class MerkleUniqueTokenId extends AbstractMerkleLeaf { + + static final int MERKLE_VERSION = 1; + static final long RUNTIME_CONSTRUCTABLE_ID = 0x52dd6afda193e8bcL; + + private EntityId tokenId = MISSING_ENTITY_ID; + private long serialNumber; + + public MerkleUniqueTokenId() { + /* No-op. */ + } + + /** + * + * @param tokenId The underlying token id. + * @param serialNumber Represents the serial num of the token. + */ + public MerkleUniqueTokenId( + EntityId tokenId, + long serialNumber + ) { + this.tokenId = tokenId; + this.serialNumber = serialNumber; + } + + public static MerkleUniqueTokenId fromNftId(NftId id) { + return new MerkleUniqueTokenId(new EntityId(id.shard(), id.realm(), id.num()), id.serialNo()); + } + + /* --- Object --- */ + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || MerkleUniqueTokenId.class != o.getClass()) { + return false; + } + + var that = (MerkleUniqueTokenId) o; + + return Objects.equals(tokenId, that.tokenId) && + Objects.equals(this.serialNumber, that.serialNumber); + } + + @Override + public int hashCode() { + return Objects.hash( + tokenId, + serialNumber); + } + + /* --- Bean --- */ + @Override + public String toString() { + return MoreObjects.toStringHelper(MerkleUniqueTokenId.class) + .add("tokenId", tokenId) + .add("serialNumber", serialNumber) + .toString(); + } + + public EntityId tokenId() { + return tokenId; + } + + public long serialNumber() { + return serialNumber; + } + + public NftId asNftId() { + return new NftId(tokenId.shard(), tokenId.realm(), tokenId.num(), serialNumber); + } + + /* --- MerkleLeaf --- */ + @Override + public long getClassId() { + return RUNTIME_CONSTRUCTABLE_ID; + } + + @Override + public int getVersion() { + return MERKLE_VERSION; + } + + @Override + public void deserialize(SerializableDataInputStream in, int i) throws IOException { + tokenId = in.readSerializable(); + serialNumber = in.readInt(); + } + + @Override + public void serialize(SerializableDataOutputStream out) throws IOException { + out.writeSerializable(tokenId, true); + out.writeLong(serialNumber); + } + + /* --- FastCopyable --- */ + @Override + public MerkleUniqueTokenId copy() { + return new MerkleUniqueTokenId(tokenId, serialNumber); + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/state/submerkle/EntityId.java b/hedera-node/src/main/java/com/hedera/services/state/submerkle/EntityId.java index 54d1e898e3cb..3cdbc4b86a45 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/submerkle/EntityId.java +++ b/hedera-node/src/main/java/com/hedera/services/state/submerkle/EntityId.java @@ -108,6 +108,10 @@ public boolean equals(Object o) { return shard == that.shard && realm == that.realm && num == that.num; } + public boolean matches(AccountID aId) { + return shard == aId.getShardNum() && realm == aId.getRealmNum() && num == aId.getAccountNum(); + } + @Override public int hashCode() { return Objects.hash(shard, realm, num); diff --git a/hedera-node/src/main/java/com/hedera/services/state/submerkle/ExpirableTxnRecord.java b/hedera-node/src/main/java/com/hedera/services/state/submerkle/ExpirableTxnRecord.java index b70b13c159fd..6ef14a3b7911 100644 --- a/hedera-node/src/main/java/com/hedera/services/state/submerkle/ExpirableTxnRecord.java +++ b/hedera-node/src/main/java/com/hedera/services/state/submerkle/ExpirableTxnRecord.java @@ -47,6 +47,7 @@ public class ExpirableTxnRecord implements FCQueueElement { public static final long UNKNOWN_SUBMITTING_MEMBER = -1; static final List NO_TOKENS = null; static final List NO_TOKEN_ADJUSTMENTS = null; + static final List NO_NFT_TOKEN_ADJUSTMENTS = null; static final List NO_CUSTOM_FEES = null; static final EntityId NO_SCHEDULE_REF = null; @@ -81,8 +82,9 @@ public class ExpirableTxnRecord implements FCQueueElement { private SolidityFnResult contractCreateResult; private List tokens = NO_TOKENS; private List tokenAdjustments = NO_TOKEN_ADJUSTMENTS; + private List nftTokenAdjustments = NO_NFT_TOKEN_ADJUSTMENTS; private EntityId scheduleRef = NO_SCHEDULE_REF; - private List customFeesCharged = NO_CUSTOM_FEES; + private List assessedCustomFees = NO_CUSTOM_FEES; @Override public void release() { @@ -104,12 +106,13 @@ public ExpirableTxnRecord(Builder builder) { this.contractCreateResult = builder.contractCreateResult; this.tokens = builder.tokens; this.tokenAdjustments = builder.tokenAdjustments; + this.nftTokenAdjustments = builder.nftTokenAdjustments; + this.scheduleRef = builder.scheduleRef; - this.customFeesCharged = builder.customFeesCharged; + this.assessedCustomFees = builder.assessedCustomFees; } /* --- Object --- */ - @Override public String toString() { var helper = MoreObjects.toStringHelper(this) @@ -137,12 +140,12 @@ public String toString() { helper.add("tokenAdjustments", readable); } - if (customFeesCharged != NO_CUSTOM_FEES) { - int n = customFeesCharged.size(); + if (assessedCustomFees != NO_CUSTOM_FEES) { + int n = assessedCustomFees.size(); var readable = IntStream.range(0, n) - .mapToObj(i -> String.format("(%s)", customFeesCharged.get(i))) + .mapToObj(i -> String.format("(%s)", assessedCustomFees.get(i))) .collect(joining(", ")); - helper.add("customFeesCharged", readable); + helper.add("assessedCustomFees", readable); } return helper.toString(); } @@ -159,7 +162,7 @@ public boolean equals(Object o) { return fee == that.fee && this.expiry == that.expiry && this.submittingMember == that.submittingMember && - this.receipt.equals(that.receipt) && + Objects.equals(this.receipt, that.receipt) && Arrays.equals(this.txnHash, that.txnHash) && this.txnId.equals(that.txnId) && Objects.equals(this.consensusTimestamp, that.consensusTimestamp) && @@ -169,8 +172,8 @@ public boolean equals(Object o) { Objects.equals(this.hbarAdjustments, that.hbarAdjustments) && Objects.equals(this.tokens, that.tokens) && Objects.equals(this.tokenAdjustments, that.tokenAdjustments) && - Objects.equals(this.scheduleRef, that.scheduleRef) && - Objects.equals(this.customFeesCharged, that.customFeesCharged); + Objects.equals(this.nftTokenAdjustments, that.nftTokenAdjustments) && + Objects.equals(this.assessedCustomFees, that.assessedCustomFees); } @Override @@ -188,8 +191,9 @@ public int hashCode() { submittingMember, tokens, tokenAdjustments, + nftTokenAdjustments, scheduleRef, - customFeesCharged); + assessedCustomFees); return result * 31 + Arrays.hashCode(txnHash); } @@ -227,7 +231,8 @@ public void serialize(SerializableDataOutputStream out) throws IOException { out.writeSerializableList(tokenAdjustments, true, true); serdes.writeNullableSerializable(scheduleRef, out); - out.writeSerializableList(customFeesCharged, true, true); + out.writeSerializableList(nftTokenAdjustments, true, true); + out.writeSerializableList(assessedCustomFees, true, true); } @Override @@ -243,16 +248,13 @@ public void deserialize(SerializableDataInputStream in, int version) throws IOEx contractCreateResult = serdes.readNullableSerializable(in); expiry = in.readLong(); submittingMember = in.readLong(); - if (version > RELEASE_070_VERSION) { - tokens = in.readSerializableList(MAX_INVOLVED_TOKENS); - tokenAdjustments = in.readSerializableList(MAX_INVOLVED_TOKENS); - } - if (version > RELEASE_080_VERSION) { - scheduleRef = serdes.readNullableSerializable(in); - } - + /* Tokens present since v0.7.0 */ + tokens = in.readSerializableList(MAX_INVOLVED_TOKENS); + tokenAdjustments = in.readSerializableList(MAX_INVOLVED_TOKENS); /* Schedule references present since v0.8.0 */ + scheduleRef = serdes.readNullableSerializable(in); if (version >= RELEASE_0160_VERSION) { - customFeesCharged = in.readSerializableList(MAX_ASSESSED_CUSTOM_FEES_CHANGES); + nftTokenAdjustments = in.readSerializableList(MAX_INVOLVED_TOKENS); + assessedCustomFees = in.readSerializableList(MAX_ASSESSED_CUSTOM_FEES_CHANGES); } } @@ -280,6 +282,10 @@ public List getTokenAdjustments() { return tokenAdjustments; } + public List getNftTokenAdjustments() { + return nftTokenAdjustments; + } + public TxnReceipt getReceipt() { return receipt; } @@ -333,7 +339,7 @@ public void setSubmittingMember(long submittingMember) { } public List getCustomFeesCharged() { - return customFeesCharged; + return assessedCustomFees; } /* --- FastCopyable --- */ @@ -352,14 +358,25 @@ public ExpirableTxnRecord copy() { public static ExpirableTxnRecord fromGprc(TransactionRecord record) { List tokens = NO_TOKENS; - List tokenAdjustments = NO_TOKEN_ADJUSTMENTS; + List tokenAdjustments = null; + List nftTokenAdjustments = null; int n = record.getTokenTransferListsCount(); if (n > 0) { tokens = new ArrayList<>(); - tokenAdjustments = new ArrayList<>(); for (TokenTransferList tokenTransfers : record.getTokenTransferListsList()) { tokens.add(EntityId.fromGrpcTokenId(tokenTransfers.getToken())); - tokenAdjustments.add(CurrencyAdjustments.fromGrpc(tokenTransfers.getTransfersList())); + if (!tokenTransfers.getTransfersList().isEmpty()) { + if (tokenAdjustments == null) { + tokenAdjustments = new ArrayList<>(); + } + tokenAdjustments.add(CurrencyAdjustments.fromGrpc(tokenTransfers.getTransfersList())); + } + if (!tokenTransfers.getNftTransfersList().isEmpty()) { + if (nftTokenAdjustments == null) { + nftTokenAdjustments = new ArrayList<>(); + } + nftTokenAdjustments.add(NftAdjustments.fromGrpc(tokenTransfers.getNftTransfersList())); + } } } @@ -382,6 +399,7 @@ public static ExpirableTxnRecord fromGprc(TransactionRecord record) { record.getContractCreateResult()) : null) .setTokens(tokens) .setTokenAdjustments(tokenAdjustments) + .setNftTokenAdjustments(nftTokenAdjustments) .setScheduleRef(record.hasScheduleRef() ? fromGrpcScheduleId(record.getScheduleRef()) : null) .setCustomFeesCharged(fcAssessedFees) .build(); @@ -424,9 +442,15 @@ public TransactionRecord asGrpc() { } if (tokens != NO_TOKENS) { for (int i = 0, n = tokens.size(); i < n; i++) { - grpc.addTokenTransferLists(TokenTransferList.newBuilder() - .setToken(tokens.get(i).toGrpcTokenId()) - .addAllTransfers(tokenAdjustments.get(i).toGrpc().getAccountAmountsList())); + var tokenTransferList = TokenTransferList.newBuilder() + .setToken(tokens.get(i).toGrpcTokenId()); + if (tokenAdjustments != null && !tokenAdjustments.isEmpty()) { + tokenTransferList.addAllTransfers(tokenAdjustments.get(i).toGrpc().getAccountAmountsList()); + } + if (nftTokenAdjustments != null && !nftTokenAdjustments.isEmpty()) { + tokenTransferList.addAllNftTransfers(nftTokenAdjustments.get(i).toGrpc().getNftTransfersList()); + } + grpc.addTokenTransferLists(tokenTransferList); } } @@ -434,8 +458,8 @@ public TransactionRecord asGrpc() { grpc.setScheduleRef(scheduleRef.toGrpcScheduleId()); } - if (customFeesCharged != NO_CUSTOM_FEES) { - grpc.addAllAssessedCustomFees(customFeesCharged.stream().map(AssessedCustomFee::toGrpc).collect(toList())); + if (assessedCustomFees != NO_CUSTOM_FEES) { + grpc.addAllAssessedCustomFees(assessedCustomFees.stream().map(AssessedCustomFee::toGrpc).collect(toList())); } return grpc.build(); @@ -457,8 +481,9 @@ public static class Builder { private SolidityFnResult contractCreateResult; private List tokens; private List tokenAdjustments; + private List nftTokenAdjustments; private EntityId scheduleRef; - private List customFeesCharged; + private List assessedCustomFees; public Builder setFee(long fee) { this.fee = fee; @@ -515,13 +540,18 @@ public Builder setTokenAdjustments(List tokenAdjustments) { return this; } + public Builder setNftTokenAdjustments(List nftTokenAdjustments) { + this.nftTokenAdjustments = nftTokenAdjustments; + return this; + } + public Builder setScheduleRef(EntityId scheduleRef) { this.scheduleRef = scheduleRef; return this; } - public Builder setCustomFeesCharged(List customFeesCharged) { - this.customFeesCharged = customFeesCharged; + public Builder setCustomFeesCharged(List assessedCustomFees) { + this.assessedCustomFees = assessedCustomFees; return this; } @@ -541,8 +571,9 @@ public Builder clear() { contractCreateResult = null; tokens = NO_TOKENS; tokenAdjustments = NO_TOKEN_ADJUSTMENTS; + nftTokenAdjustments = NO_NFT_TOKEN_ADJUSTMENTS; scheduleRef = NO_SCHEDULE_REF; - customFeesCharged = NO_CUSTOM_FEES; + assessedCustomFees = NO_CUSTOM_FEES; return this; } } diff --git a/hedera-node/src/main/java/com/hedera/services/state/submerkle/NftAdjustments.java b/hedera-node/src/main/java/com/hedera/services/state/submerkle/NftAdjustments.java new file mode 100644 index 000000000000..ad7dd2b89c3f --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/state/submerkle/NftAdjustments.java @@ -0,0 +1,143 @@ +package com.hedera.services.state.submerkle; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.common.base.MoreObjects; +import com.hedera.services.utils.EntityIdUtils; +import com.hederahashgraph.api.proto.java.NftTransfer; +import com.hederahashgraph.api.proto.java.TokenTransferList; +import com.swirlds.common.io.SelfSerializable; +import com.swirlds.common.io.SerializableDataInputStream; +import com.swirlds.common.io.SerializableDataOutputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.IntStream; + +import static com.hedera.services.utils.MiscUtils.readableNftTransferList; +import static java.util.stream.Collectors.toList; + +public class NftAdjustments implements SelfSerializable { + private static final Logger log = LogManager.getLogger(NftAdjustments.class); + + private static final int MERKLE_VERSION = 1; + private static final long RUNTIME_CONSTRUCTABLE_ID = 0xd7a02bf45e103466L; + private static final long[] NO_ADJUSTMENTS = new long[0]; + + static final int MAX_NUM_ADJUSTMENTS = 1024; + + private long[] serialNums = NO_ADJUSTMENTS; + private List senderAccIds = Collections.emptyList(); + private List receiverAccIds = Collections.emptyList(); + + public NftAdjustments() { + /* RuntimeConstructable */ + } + + @Override + public long getClassId() { + return RUNTIME_CONSTRUCTABLE_ID; + } + + @Override + public int getVersion() { + return MERKLE_VERSION; + } + + @Override + public void deserialize(SerializableDataInputStream in, int version) throws IOException { + serialNums = in.readLongArray(MAX_NUM_ADJUSTMENTS); + senderAccIds = in.readSerializableList(MAX_NUM_ADJUSTMENTS, true, EntityId::new); + receiverAccIds = in.readSerializableList(MAX_NUM_ADJUSTMENTS, true, EntityId::new); + } + + @Override + public void serialize(SerializableDataOutputStream out) throws IOException { + out.writeLongArray(serialNums); + out.writeSerializableList(senderAccIds, true, true); + out.writeSerializableList(receiverAccIds, true, true); + } + + /* ---- Object --- */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + NftAdjustments that = (NftAdjustments) o; + return Arrays.equals(serialNums, that.serialNums) + && senderAccIds.equals(that.senderAccIds) && receiverAccIds.equals(that.receiverAccIds); + } + + @Override + public int hashCode() { + int result = Long.hashCode(RUNTIME_CONSTRUCTABLE_ID); + result = result * 31 + senderAccIds.hashCode(); + result = result * 31 + receiverAccIds.hashCode(); + return result * 31 + Arrays.hashCode(serialNums); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("readable", readableNftTransferList(toGrpc())) + .toString(); + } + + /* --- Helpers --- */ + public TokenTransferList toGrpc() { + var grpc = TokenTransferList.newBuilder(); + IntStream.range(0, serialNums.length) + .mapToObj(i -> NftTransfer.newBuilder() + .setSerialNumber(serialNums[i]) + .setSenderAccountID(EntityIdUtils.asAccount(senderAccIds.get(i))) + .setReceiverAccountID(EntityIdUtils.asAccount(receiverAccIds.get(i)))) + .forEach(grpc::addNftTransfers); + + return grpc.build(); + } + + public static NftAdjustments fromGrpc(List grpc) { + var pojo = new NftAdjustments(); + + pojo.serialNums = grpc.stream() + .mapToLong(NftTransfer::getSerialNumber) + .toArray(); + pojo.senderAccIds = grpc.stream() + .filter(nftTransfer -> nftTransfer.getSenderAccountID() != null) + .map(NftTransfer::getSenderAccountID) + .map(EntityId::fromGrpcAccountId) + .collect(toList()); + pojo.receiverAccIds = grpc.stream() + .map(NftTransfer::getReceiverAccountID) + .map(EntityId::fromGrpcAccountId) + .collect(toList()); + + return pojo; + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/store/AccountStore.java b/hedera-node/src/main/java/com/hedera/services/store/AccountStore.java index 24bc3ecfc6d6..a78ac6290cd3 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/AccountStore.java +++ b/hedera-node/src/main/java/com/hedera/services/store/AccountStore.java @@ -76,6 +76,7 @@ public Account loadAccount(Id id) { account.setExpiry(merkleAccount.getExpiry()); account.initBalance(merkleAccount.getBalance()); account.setAssociatedTokens(merkleAccount.tokens().getIds().copy()); + account.setOwnedNfts(merkleAccount.getNftsOwned()); return account; } @@ -94,6 +95,7 @@ public void persistAccount(Account account) { final var currentAccounts = accounts.get(); final var mutableAccount = currentAccounts.getForModify(key); mutableAccount.tokens().updateAssociationsFrom(account.getAssociatedTokens()); + mutableAccount.setNftsOwned(account.getOwnedNfts()); } diff --git a/hedera-node/src/main/java/com/hedera/services/store/TypedTokenStore.java b/hedera-node/src/main/java/com/hedera/services/store/TypedTokenStore.java index c5ce66e9de92..61388dc1520a 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/TypedTokenStore.java +++ b/hedera-node/src/main/java/com/hedera/services/store/TypedTokenStore.java @@ -21,21 +21,29 @@ */ import com.hedera.services.exceptions.InvalidTransactionException; +import com.hedera.services.ledger.accounts.BackingNfts; import com.hedera.services.ledger.accounts.BackingTokenRels; import com.hedera.services.records.TransactionRecordService; import com.hedera.services.state.merkle.MerkleEntityAssociation; import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.store.models.Account; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.OwnershipTracker; import com.hedera.services.store.models.Token; import com.hedera.services.store.models.TokenRelationship; +import com.hedera.services.store.models.UniqueToken; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.TokenID; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; import java.util.function.Supplier; @@ -50,51 +58,69 @@ * Loads and saves token-related entities to and from the Swirlds state, hiding * the details of Merkle types from client code by providing an interface in * terms of model objects whose methods can perform validated business logic. - * + *

* When loading an token, fails fast by throwing an {@link InvalidTransactionException} * if the token is not usable in normal business logic. There are three such * cases: *

    - *
  1. The token is missing.
    2. - *
  2. The token is deleted.
    3. - *
  3. The token is expired and pending removal.
    4. + *
  4. The token is missing.
    5. + *
  5. The token is deleted.
    6. + *
  6. The token is expired and pending removal.
    7. *
* Note that in the third case, there is one valid use of the token; * namely, in an update transaction whose only purpose is to manually renew * the expired token. Such update transactions must use a dedicated * expiry-extension service, which will be implemented before TokenUpdate. - * + *

* When saving a token or token relationship, invites an injected * {@link TransactionRecordService} to inspect the entity for changes that * may need to be included in the record of the transaction. */ public class TypedTokenStore { + static final Logger log = LogManager.getLogger(TypedTokenStore.class); + private final AccountStore accountStore; private final TransactionRecordService transactionRecordService; private final Supplier> tokens; private final Supplier> tokenRels; + + /* Data Structures for Tokens of type Non-Fungible Unique */ + private final Supplier> uniqueTokens; + private final Supplier> uniqueTokenAssociations; + private final Supplier> uniqueOwnershipAssociations; + + /* Only needed for interoperability with legacy HTS during refactor */ + private final BackingNfts backingNfts; private final BackingTokenRels backingTokenRels; public TypedTokenStore( AccountStore accountStore, TransactionRecordService transactionRecordService, Supplier> tokens, + Supplier> uniqueTokens, + Supplier> uniqueOwnershipAssociations, + Supplier> uniqueTokenAssociations, Supplier> tokenRels, - BackingTokenRels backingTokenRels + BackingTokenRels backingTokenRels, + BackingNfts backingNfts ) { this.tokens = tokens; + this.uniqueTokenAssociations = uniqueTokenAssociations; + this.uniqueOwnershipAssociations = uniqueOwnershipAssociations; this.tokenRels = tokenRels; + this.uniqueTokens = uniqueTokens; this.accountStore = accountStore; this.transactionRecordService = transactionRecordService; + this.backingNfts = backingNfts; this.backingTokenRels = backingTokenRels; } /** * Returns a model of the requested token relationship, with operations that * can be used to implement business logic in a transaction. - * + *

* The arguments should be model objects that were returned by the * {@link TypedTokenStore#loadToken(Id)} and {@link AccountStore#loadAccount(Id)} * methods, respectively, since it will very rarely (or never) be correct @@ -165,6 +191,19 @@ public void persistTokenRelationship(TokenRelationship tokenRelationship) { transactionRecordService.includeChangesToTokenRel(tokenRelationship); } + /** + * Invites the injected {@link TransactionRecordService} to include the changes to the exported transaction record + * Currently, the only implemented tracker is the {@link OwnershipTracker} which records the changes to the + * ownership + * of {@link UniqueToken} + * + * @param ownershipTracker + * holds changes to {@link UniqueToken} ownership + */ + public void persistTrackers(OwnershipTracker ownershipTracker) { + transactionRecordService.includeOwnershipChanges(ownershipTracker); + } + /** * Returns a model of the requested token, with operations that can be used to * implement business logic in a transaction. @@ -207,8 +246,32 @@ public void persistToken(Token token) { final var currentTokens = tokens.get(); final var mutableToken = currentTokens.getForModify(key); + final var treasury = new EntityId(mutableToken.treasury()); mapModelChangesToMutable(token, mutableToken); + if (token.hasMintedUniqueTokens()) { + for (var uniqueToken : token.mintedUniqueTokens()) { + final var merkleUniqueTokenId = new MerkleUniqueTokenId( + new EntityId(uniqueToken.getTokenId()), uniqueToken.getSerialNumber()); + final var merkleUniqueToken = new MerkleUniqueToken( + new EntityId(uniqueToken.getOwner()), uniqueToken.getMetadata(), uniqueToken.getCreationTime()); + uniqueTokens.get().put(merkleUniqueTokenId, merkleUniqueToken); + uniqueTokenAssociations.get().associate(new EntityId(uniqueToken.getTokenId()), merkleUniqueTokenId); + uniqueOwnershipAssociations.get().associate(treasury, merkleUniqueTokenId); + backingNfts.addToExistingNfts(merkleUniqueTokenId.asNftId()); + } + } + if (token.hasBurnedUniqueTokens()) { + for (var uniqueToken : token.burnedUniqueTokens()) { + final var merkleUniqueTokenId = new MerkleUniqueTokenId( + new EntityId(uniqueToken.getTokenId()), uniqueToken.getSerialNumber()); + uniqueTokens.get().remove(merkleUniqueTokenId); + uniqueTokenAssociations.get().disassociate(new EntityId(uniqueToken.getTokenId()), merkleUniqueTokenId); + uniqueOwnershipAssociations.get().disassociate(treasury, merkleUniqueTokenId); + backingNfts.removeFromExistingNfts(merkleUniqueTokenId.asNftId()); + } + } + transactionRecordService.includeChangesToToken(token); } @@ -229,6 +292,7 @@ private void mapModelChangesToMutable(Token token, MerkleToken mutableToken) { mutableToken.setTreasury(new EntityId(token.getTreasury().getId())); mutableToken.setTotalSupply(token.getTotalSupply()); mutableToken.setAccountsFrozenByDefault(token.isFrozenByDefault()); + mutableToken.setLastUsedSerialNumber(token.getLastUsedSerialNumber()); } private void initModelAccounts(Token token, EntityId _treasuryId, @Nullable EntityId _autoRenewId) { @@ -244,10 +308,13 @@ private void initModelAccounts(Token token, EntityId _treasuryId, @Nullable Enti private void initModelFields(Token token, MerkleToken immutableToken) { token.initTotalSupply(immutableToken.totalSupply()); + token.initSupplyConstraints(immutableToken.supplyType(), immutableToken.maxSupply()); token.setKycKey(immutableToken.getKycKey()); token.setFreezeKey(immutableToken.getFreezeKey()); token.setSupplyKey(immutableToken.getSupplyKey()); token.setFrozenByDefault(immutableToken.accountsAreFrozenByDefault()); + token.setType(immutableToken.tokenType()); + token.setLastUsedSerialNumber(immutableToken.getLastUsedSerialNumber()); } private void alertTokenBackingStoreOfNew(TokenRelationship newRel) { diff --git a/hedera-node/src/main/java/com/hedera/services/store/models/Account.java b/hedera-node/src/main/java/com/hedera/services/store/models/Account.java index 52851a84c5ec..8c64adc7989f 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/models/Account.java +++ b/hedera-node/src/main/java/com/hedera/services/store/models/Account.java @@ -52,6 +52,7 @@ public class Account { private long balance; private boolean deleted = false; private CopyOnWriteIds associatedTokens; + private long ownedNfts; public Account(Id id) { this.id = id; @@ -69,6 +70,12 @@ public void initBalance(long balance) { this.balance = balance; } + public long getOwnedNfts() { return ownedNfts; } + + public void setOwnedNfts(long ownedNfts) { this.ownedNfts = ownedNfts; } + + public void incrementOwnedNfts() { this.ownedNfts++; } + public void associateWith(List tokens, int maxAllowed) { final var alreadyAssociated = associatedTokens.size(); final var proposedNewAssociations = tokens.size() + alreadyAssociated; diff --git a/hedera-node/src/main/java/com/hedera/services/store/models/Id.java b/hedera-node/src/main/java/com/hedera/services/store/models/Id.java index f20441b4e0fc..39e1360e93e4 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/models/Id.java +++ b/hedera-node/src/main/java/com/hedera/services/store/models/Id.java @@ -29,6 +29,8 @@ * Represents the id of a Hedera entity (account, topic, token, contract, file, or schedule). */ public class Id { + public static final Id DEFAULT = new Id(0, 0, 0); + private final long shard; private final long realm; private final long num; diff --git a/hedera-node/src/main/java/com/hedera/services/store/models/NftId.java b/hedera-node/src/main/java/com/hedera/services/store/models/NftId.java new file mode 100644 index 000000000000..e122562c6558 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/store/models/NftId.java @@ -0,0 +1,96 @@ +package com.hedera.services.store.models; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.common.base.MoreObjects; +import com.hederahashgraph.api.proto.java.TokenID; + +public class NftId { + private final long shard; + private final long realm; + private final long num; + private final long serialNo; + + public NftId(long shard, long realm, long num, long serialNo) { + this.shard = shard; + this.realm = realm; + this.num = num; + this.serialNo = serialNo; + } + + public long shard() { + return shard; + } + + public long realm() { + return realm; + } + + public long num() { + return num; + } + + public long serialNo() { + return serialNo; + } + + public TokenID tokenId() { + return TokenID.newBuilder() + .setShardNum(shard) + .setRealmNum(realm) + .setTokenNum(num) + .build(); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(NftId.class) + .add("shard", shard) + .add("realm", realm) + .add("num", num) + .add("serialNo", serialNo) + .toString(); + } + + @Override + public int hashCode() { + int result = Long.hashCode(shard); + result = 31 * result + Long.hashCode(realm); + result = 31 * result + Long.hashCode(num); + return 31 * result + Long.hashCode(serialNo); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || NftId.class != o.getClass()) { + return false; + } + + var that = (NftId) o; + return this.shard == that.shard && + this.realm == that.realm && + this.num == that.num && + this.serialNo == that.serialNo; + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/store/models/OwnershipTracker.java b/hedera-node/src/main/java/com/hedera/services/store/models/OwnershipTracker.java new file mode 100644 index 000000000000..4933cd6ff9b5 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/store/models/OwnershipTracker.java @@ -0,0 +1,125 @@ +package com.hedera.services.store.models;/* + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +/* + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2020 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Encapsulates the changes of {@link UniqueToken} ownership within the context of one Transaction + * + */ +public class OwnershipTracker { + + private Map> changes = new HashMap<>(); + + public void add(Id token, Change change) { + if (changes.containsKey(token)) { + changes.get(token).add(change); + } else { + var changeList = new ArrayList(); + changeList.add(change); + changes.put(token, changeList); + } + } + + public Map> getChanges() { return changes; } + + public boolean isEmpty() { return changes.isEmpty(); } + + public static Change fromMinting(Id treasury, long serialNumber) { + var change = new Change(); + change.setPreviousOwner(Id.DEFAULT); + change.setNewOwner(treasury); + change.setSerialNumber(serialNumber); + return change; + } + + public static Change fromBurning(Id treasury, long serialNumber) { + Change change = new Change(); + change.setNewOwner(Id.DEFAULT); + change.setPreviousOwner(treasury); + change.setSerialNumber(serialNumber); + return change; + } + + /** + * Encapsulates one set of Change of a given {@link UniqueToken} + */ + public static class Change { + + private Id previousOwner; + private Id newOwner; + private long serialNumber; + + public Change(Id previousOwner, Id newOwner, long serialNumber) { + this.previousOwner = previousOwner; + this.newOwner = newOwner; + this.serialNumber = serialNumber; + } + + public Change() { } + + public Id getPreviousOwner() { + return previousOwner; + } + + public void setPreviousOwner(Id previousOwner) { + this.previousOwner = previousOwner; + } + + public Id getNewOwner() { + return newOwner; + } + + public void setNewOwner(Id newOwner) { + this.newOwner = newOwner; + } + + public long getSerialNumber() { + return serialNumber; + } + + public void setSerialNumber(long serialNumber) { + this.serialNumber = serialNumber; + } + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/store/models/Token.java b/hedera-node/src/main/java/com/hedera/services/store/models/Token.java index 130a7b534464..4ef99963d0ea 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/models/Token.java +++ b/hedera-node/src/main/java/com/hedera/services/store/models/Token.java @@ -21,11 +21,18 @@ */ import com.google.common.base.MoreObjects; +import com.google.protobuf.ByteString; import com.hedera.services.legacy.core.jproto.JKey; +import com.hedera.services.state.enums.TokenSupplyType; +import com.hedera.services.state.enums.TokenType; +import com.hedera.services.state.submerkle.RichInstant; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import java.util.ArrayList; +import java.util.List; + import static com.hedera.services.exceptions.ValidationUtils.validateTrue; import static com.hedera.services.utils.MiscUtils.describe; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.FAIL_INVALID; @@ -33,10 +40,11 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_BURN_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MINT_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_HAS_NO_SUPPLY_KEY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_MAX_SUPPLY_REACHED; /** * Encapsulates the state and operations of a Hedera token. - * + *

* Operations are validated, and throw a {@link com.hedera.services.exceptions.InvalidTransactionException} * with response code capturing the failure when one occurs. * @@ -50,8 +58,13 @@ public class Token { private final Id id; private boolean supplyHasChanged; + private final List mintedUniqueTokens = new ArrayList<>(); + private final List burnedUniqueTokens = new ArrayList<>(); + private TokenType type; + private TokenSupplyType supplyType; private long totalSupply; + private long maxSupply; private JKey kycKey; private JKey freezeKey; private JKey supplyKey; @@ -59,6 +72,8 @@ public class Token { private Account treasury; private Account autoRenewAccount; + private long lastUsedSerialNumber; + public Token(Id id) { this.id = id; } @@ -72,9 +87,51 @@ public void burn(TokenRelationship treasuryRel, long amount) { public void mint(TokenRelationship treasuryRel, long amount) { validateTrue(amount > 0, FAIL_INVALID, () -> "Cannot mint " + amount + " units of " + this + " from " + treasuryRel); + validateTrue(type == TokenType.FUNGIBLE_COMMON, FAIL_INVALID, () -> + "Fungible mint can be invoked only on Fungible token type"); + changeSupply(treasuryRel, +amount, INVALID_TOKEN_MINT_AMOUNT); } + public void burn( + final OwnershipTracker ownershipTracker, + final TokenRelationship treasuryRelationship, + final List serialNumbers + ){ + validateTrue( type == TokenType.NON_FUNGIBLE_UNIQUE, FAIL_INVALID, () -> + "Non fungible burn can be invoked only on Non fungible tokens!"); + validateTrue( serialNumbers.size() > 0 , FAIL_INVALID, ()-> + "Non fungible burn cannot be invoked with no serial numbers"); + for (final long serialNum : serialNumbers) { + ownershipTracker.add(id, OwnershipTracker.fromBurning(id, serialNum)); + burnedUniqueTokens.add(new UniqueToken(id, serialNum)); + } + treasury.setOwnedNfts(treasury.getOwnedNfts() - serialNumbers.size()); + changeSupply(treasuryRelationship, -serialNumbers.size(), FAIL_INVALID); + } + + public void mint( + final OwnershipTracker ownershipTracker, + final TokenRelationship treasuryRel, + final List metadata, + final RichInstant creationTime + ) { + validateTrue(metadata.size() > 0, FAIL_INVALID, () -> + "Cannot mint " + metadata.size() + " numbers of Unique Tokens"); + validateTrue(type == TokenType.NON_FUNGIBLE_UNIQUE, FAIL_INVALID, () -> + "Non fungible mint can be invoked only on Non fungible token type"); + + changeSupply(treasuryRel, metadata.size(), FAIL_INVALID); + + for (ByteString m : metadata) { + lastUsedSerialNumber++; + var uniqueToken = new UniqueToken(id, lastUsedSerialNumber, creationTime, treasury.getId(), m.toByteArray()); + mintedUniqueTokens.add(uniqueToken); + ownershipTracker.add(id, OwnershipTracker.fromMinting(treasury.getId(), lastUsedSerialNumber)); + } + treasury.setOwnedNfts(treasury.getOwnedNfts() + metadata.size()); + } + public TokenRelationship newRelationshipWith(Account account) { final var newRel = new TokenRelationship(this, account); if (hasFreezeKey() && frozenByDefault) { @@ -95,6 +152,11 @@ private void changeSupply(TokenRelationship treasuryRel, long amount, ResponseCo final long newTotalSupply = totalSupply + amount; validateTrue(newTotalSupply >= 0, negSupplyCode); + if (supplyType == TokenSupplyType.FINITE) { + validateTrue(maxSupply >= newTotalSupply, TOKEN_MAX_SUPPLY_REACHED, () -> + "Cannot mint new supply (" + amount + "). Max supply (" + maxSupply + ") reached"); + } + final long newTreasuryBalance = treasuryRel.getBalance() + amount; validateTrue(newTreasuryBalance >= 0, INSUFFICIENT_TOKEN_BALANCE); @@ -131,6 +193,15 @@ public void setTotalSupply(long totalSupply) { this.totalSupply = totalSupply; } + public void initSupplyConstraints(TokenSupplyType supplyType, long maxSupply) { + this.supplyType = supplyType; + this.maxSupply = maxSupply; + } + + public long getMaxSupply() { + return maxSupply; + } + public void setSupplyKey(JKey supplyKey) { this.supplyKey = supplyKey; } @@ -167,6 +238,34 @@ public Id getId() { return id; } + public void setType(TokenType type) { + this.type = type; + } + + public TokenType getType() { + return type; + } + + public void setLastUsedSerialNumber(long lastUsedSerialNumber) { + this.lastUsedSerialNumber = lastUsedSerialNumber; + } + + public long getLastUsedSerialNumber() { + return lastUsedSerialNumber; + } + + public boolean hasMintedUniqueTokens() { + return !mintedUniqueTokens.isEmpty(); + } + + public boolean hasBurnedUniqueTokens() { return !burnedUniqueTokens.isEmpty(); } + + public List burnedUniqueTokens() { return burnedUniqueTokens; } + + public List mintedUniqueTokens() { + return mintedUniqueTokens; + } + /* NOTE: The object methods below are only overridden to improve readability of unit tests; this model object is not used in hash-based collections, so the performance of these methods doesn't matter. */ diff --git a/hedera-node/src/main/java/com/hedera/services/store/models/TokenRelationship.java b/hedera-node/src/main/java/com/hedera/services/store/models/TokenRelationship.java index 9c0bcbf51ec9..555f79855615 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/models/TokenRelationship.java +++ b/hedera-node/src/main/java/com/hedera/services/store/models/TokenRelationship.java @@ -21,9 +21,14 @@ */ import com.google.common.base.MoreObjects; +import com.hedera.services.state.enums.TokenType; +import javafx.util.Pair; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import java.util.ArrayList; +import java.util.List; + import static com.hedera.services.exceptions.ValidationUtils.validateTrue; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_FROZEN_FOR_TOKEN; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_KYC_NOT_GRANTED_FOR_TOKEN; @@ -38,8 +43,8 @@ * of this class as NFTs are fully supported. For example, a * {@link TokenRelationship#getBalanceChange()} signature only makes * sense for a token of type {@code FUNGIBLE_COMMON}; the analogous signature - * for a {@code NON_FUNGIBLE_UNIQUE} will likely be {@code getOwnershipChanges())}, - * returning perhaps a type that is structurally equivalent to a + * for a {@code NON_FUNGIBLE_UNIQUE} is {@code getOwnershipChanges())}, + * returning a type that is structurally equivalent to a * {@code Pair} of acquired and relinquished serial numbers. */ public class TokenRelationship { @@ -63,7 +68,7 @@ public long getBalance() { } /** - * Set the balance of this relationship's ({@code FUNGIBLE_COMMON}) token that + * Set the balance of this relationship's token that * the account holds at the beginning of a user transaction. (In particular, does * not change the return value of {@link TokenRelationship#getBalanceChange()}.) * @@ -75,8 +80,7 @@ public void initBalance(long balance) { } /** - * Update the balance of this relationship's ({@code FUNGIBLE_COMMMON}) token - * held by the account. + * Update the balance of this relationship token held by the account. * * This does change the return value of {@link TokenRelationship#getBalanceChange()}. * @@ -131,6 +135,14 @@ public void setNotYetPersisted(boolean notYetPersisted) { this.notYetPersisted = notYetPersisted; } + public boolean hasCommonRepresentation() { + return token.getType() == TokenType.FUNGIBLE_COMMON; + } + + public boolean hasUniqueRepresentation() { + return token.getType() == TokenType.NON_FUNGIBLE_UNIQUE; + } + /* The object methods below are only overridden to improve readability of unit tests; model objects are not used in hash-based collections, so the performance of these methods doesn't matter. */ diff --git a/hedera-node/src/main/java/com/hedera/services/store/models/UniqueToken.java b/hedera-node/src/main/java/com/hedera/services/store/models/UniqueToken.java new file mode 100644 index 000000000000..da3e16eceb56 --- /dev/null +++ b/hedera-node/src/main/java/com/hedera/services/store/models/UniqueToken.java @@ -0,0 +1,92 @@ +package com.hedera.services.store.models; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.submerkle.RichInstant; + +/** + * Encapsulates the state and operations of a Hedera Unique token. + * + * Operations are validated, and throw a {@link com.hedera.services.exceptions.InvalidTransactionException} + * with response code capturing the failure when one occurs. + * + */ +public class UniqueToken { + + private Id tokenId; + private long serialNumber; + private RichInstant creationTime; + private Id owner; + private byte[] metadata; + + public UniqueToken(Id tokenId, long serialNumber) { + this.tokenId = tokenId; + this.serialNumber = serialNumber; + } + + public UniqueToken(Id tokenId, long serialNumber, RichInstant creationTime, Id owner, byte[] metadata) { + this.tokenId = tokenId; + this.serialNumber = serialNumber; + this.creationTime = creationTime; + this.owner = owner; + this.metadata = metadata; + } + + public Id getTokenId() { + return tokenId; + } + + public void setTokenId(Id tokenId) { + this.tokenId = tokenId; + } + + public long getSerialNumber() { + return serialNumber; + } + + public void setSerialNumber(long serialNumber) { + this.serialNumber = serialNumber; + } + + public RichInstant getCreationTime() { + return creationTime; + } + + public void setCreationTime(RichInstant creationTime) { + this.creationTime = creationTime; + } + + public Id getOwner() { + return owner; + } + + public void setOwner(Id owner) { + this.owner = owner; + } + + public byte[] getMetadata() { + return metadata; + } + + public void setMetadata(byte[] metadata) { + this.metadata = metadata; + } +} diff --git a/hedera-node/src/main/java/com/hedera/services/store/tokens/ExceptionalTokenStore.java b/hedera-node/src/main/java/com/hedera/services/store/tokens/ExceptionalTokenStore.java index 9fb645442877..10bac2156b8b 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/tokens/ExceptionalTokenStore.java +++ b/hedera-node/src/main/java/com/hedera/services/store/tokens/ExceptionalTokenStore.java @@ -26,6 +26,7 @@ import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.store.CreationResult; +import com.hedera.services.store.models.NftId; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.TokenCreateTransactionBody; @@ -98,6 +99,11 @@ public ResponseCodeEnum adjustBalance(AccountID aId, TokenID tId, long adjustmen throw new UnsupportedOperationException(); } + @Override + public ResponseCodeEnum changeOwner(NftId nftId, AccountID from, AccountID to) { + throw new UnsupportedOperationException(); + } + @Override public CreationResult createProvisionally(TokenCreateTransactionBody request, AccountID sponsor, long now) { throw new UnsupportedOperationException(); diff --git a/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java b/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java index 6cf7d554b61b..77927de59f4c 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java +++ b/hedera-node/src/main/java/com/hedera/services/store/tokens/HederaTokenStore.java @@ -24,14 +24,19 @@ import com.hedera.services.ledger.HederaLedger; import com.hedera.services.ledger.TransactionalLedger; import com.hedera.services.ledger.ids.EntityIdSource; +import com.hedera.services.ledger.properties.NftProperty; import com.hedera.services.ledger.properties.TokenRelProperty; import com.hedera.services.legacy.core.jproto.JKey; import com.hedera.services.sigs.utils.ImmutableKeyUtils; import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.store.CreationResult; import com.hedera.services.store.HederaStore; +import com.hedera.services.store.models.NftId; import com.hedera.services.txns.validation.OptionValidator; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.Duration; @@ -41,6 +46,7 @@ import com.hederahashgraph.api.proto.java.TokenCreateTransactionBody; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenUpdateTransactionBody; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; @@ -62,12 +68,15 @@ import java.util.function.Supplier; import static com.hedera.services.ledger.accounts.BackingTokenRels.asTokenRel; +import static com.hedera.services.ledger.properties.AccountProperty.NUM_NFTS_OWNED; +import static com.hedera.services.ledger.properties.NftProperty.OWNER; import static com.hedera.services.ledger.properties.TokenRelProperty.IS_FROZEN; import static com.hedera.services.ledger.properties.TokenRelProperty.IS_KYC_GRANTED; import static com.hedera.services.ledger.properties.TokenRelProperty.TOKEN_BALANCE; import static com.hedera.services.state.merkle.MerkleEntityId.fromTokenId; import static com.hedera.services.state.merkle.MerkleToken.UNUSED_KEY; import static com.hedera.services.state.submerkle.EntityId.fromGrpcAccountId; +import static com.hedera.services.state.submerkle.EntityId.fromGrpcTokenId; import static com.hedera.services.store.CreationResult.failure; import static com.hedera.services.store.CreationResult.success; import static com.hedera.services.utils.EntityIdUtils.readableId; @@ -86,12 +95,14 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_AUTORENEW_ACCOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_CUSTOM_FEE_COLLECTOR; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_EXPIRATION_TIME; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NFT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_RENEWAL_PERIOD; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID_IN_CUSTOM_FEES; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TREASURY_ACCOUNT_FOR_TOKEN; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_WIPING_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.SENDER_DOES_NOT_OWN_NFT_SERIAL_NO; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKENS_PER_ACCOUNT_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_ALREADY_ASSOCIATED_TO_ACCOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_HAS_NO_FREEZE_KEY; @@ -118,6 +129,8 @@ public class HederaTokenStore extends HederaStore implements TokenStore { private final OptionValidator validator; private final GlobalDynamicProperties properties; private final Supplier> tokens; + private final Supplier> uniqueOwnershipAssociations; + private final TransactionalLedger nftsLedger; private final TransactionalLedger< Pair, TokenRelProperty, @@ -132,13 +145,17 @@ public HederaTokenStore( OptionValidator validator, GlobalDynamicProperties properties, Supplier> tokens, - TransactionalLedger, TokenRelProperty, MerkleTokenRelStatus> tokenRelsLedger + Supplier> uniqueOwnershipAssociations, + TransactionalLedger, TokenRelProperty, MerkleTokenRelStatus> tokenRelsLedger, + TransactionalLedger nftsLedger ) { super(ids); this.tokens = tokens; this.validator = validator; this.properties = properties; + this.nftsLedger = nftsLedger; this.tokenRelsLedger = tokenRelsLedger; + this.uniqueOwnershipAssociations = uniqueOwnershipAssociations; rebuildViewOfKnownTreasuries(); } @@ -175,6 +192,7 @@ public boolean isCreationPending() { @Override public void setHederaLedger(HederaLedger hederaLedger) { + hederaLedger.setNftsLedger(nftsLedger); hederaLedger.setTokenRelsLedger(tokenRelsLedger); super.setHederaLedger(hederaLedger); } @@ -306,11 +324,7 @@ public ResponseCodeEnum freeze(AccountID aId, TokenID tId) { return setIsFrozen(aId, tId, true); } - private ResponseCodeEnum setHasKyc( - AccountID aId, - TokenID tId, - boolean value - ) { + private ResponseCodeEnum setHasKyc(AccountID aId, TokenID tId, boolean value) { return manageFlag( aId, tId, @@ -320,11 +334,7 @@ private ResponseCodeEnum setHasKyc( MerkleToken::kycKey); } - private ResponseCodeEnum setIsFrozen( - AccountID aId, - TokenID tId, - boolean value - ) { + private ResponseCodeEnum setIsFrozen(AccountID aId, TokenID tId, boolean value) { return manageFlag( aId, tId, @@ -336,12 +346,62 @@ private ResponseCodeEnum setIsFrozen( @Override public ResponseCodeEnum adjustBalance(AccountID aId, TokenID tId, long adjustment) { - return sanityChecked(aId, tId, token -> tryAdjustment(aId, tId, adjustment)); + return sanityChecked(aId, null, tId, token -> tryAdjustment(aId, tId, adjustment)); + } + + @Override + public ResponseCodeEnum changeOwner(NftId nftId, AccountID from, AccountID to) { + final var tId = nftId.tokenId(); + return sanityChecked(from, to, tId, token -> { + if (!nftsLedger.exists(nftId)) { + return INVALID_NFT_ID; + } + + final var fromFreezeAndKycValidity = checkRelFrozenAndKycProps(from, tId); + if (fromFreezeAndKycValidity != OK) { + return fromFreezeAndKycValidity; + } + final var toFreezeAndKycValidity = checkRelFrozenAndKycProps(to, tId); + if (toFreezeAndKycValidity != OK) { + return toFreezeAndKycValidity; + } + + final var owner = (EntityId) nftsLedger.get(nftId, OWNER); + if (!owner.matches(from)) { + return SENDER_DOES_NOT_OWN_NFT_SERIAL_NO; + } + + final var nftType = nftId.tokenId(); + final var fromRel = asTokenRel(from, nftType); + final var toRel = asTokenRel(to, nftType); + final var fromNftsOwned = (long) accountsLedger.get(from, NUM_NFTS_OWNED); + final var fromThisNftsOwned = (long) tokenRelsLedger.get(fromRel, TOKEN_BALANCE); + final var toNftsOwned = (long) accountsLedger.get(to, NUM_NFTS_OWNED); + final var toThisNftsOwned = (long) tokenRelsLedger.get(asTokenRel(to, nftType), TOKEN_BALANCE); + nftsLedger.set(nftId, OWNER, EntityId.fromGrpcAccountId(to)); + accountsLedger.set(from, NUM_NFTS_OWNED, fromNftsOwned - 1); + accountsLedger.set(to, NUM_NFTS_OWNED, toNftsOwned + 1); + tokenRelsLedger.set(fromRel, TOKEN_BALANCE, fromThisNftsOwned - 1); + tokenRelsLedger.set(toRel, TOKEN_BALANCE, toThisNftsOwned + 1); + + var merkleUniqueTokenId = new MerkleUniqueTokenId(fromGrpcTokenId(nftId.tokenId()), nftId.serialNo()); + this.uniqueOwnershipAssociations.get().disassociate( + fromGrpcAccountId(from), + merkleUniqueTokenId); + + this.uniqueOwnershipAssociations.get().associate( + fromGrpcAccountId(to), + merkleUniqueTokenId); + + hederaLedger.updateOwnershipChanges(nftId, from, to); + + return OK; + }); } @Override public ResponseCodeEnum wipe(AccountID aId, TokenID tId, long amount, boolean skipKeyCheck) { - return sanityChecked(aId, tId, token -> { + return sanityChecked(aId, null, tId, token -> { if (!skipKeyCheck && !token.hasWipeKey()) { return TOKEN_HAS_NO_WIPE_KEY; } @@ -396,7 +456,10 @@ public CreationResult createProvisionally( request.getFreezeDefault(), kycKey.isEmpty(), fromGrpcAccountId(request.getTreasury())); + pendingCreation.setTokenType(request.getTokenTypeValue()); + pendingCreation.setSupplyType(request.getSupplyTypeValue()); pendingCreation.setMemo(request.getMemo()); + pendingCreation.setMaxSupply(request.getMaxSupply()); adminKey.ifPresent(pendingCreation::setAdminKey); kycKey.ifPresent(pendingCreation::setKycKey); wipeKey.ifPresent(pendingCreation::setWipeKey); @@ -474,7 +537,7 @@ public void addKnownTreasury(AccountID aId, TokenID tId) { knownTreasuries.computeIfAbsent(aId, ignore -> new HashSet<>()).add(tId); } - public void removeKnownTreasuryForToken(AccountID aId, TokenID tId) { + void removeKnownTreasuryForToken(AccountID aId, TokenID tId) { throwIfKnownTreasuryIsMissing(aId); knownTreasuries.get(aId).remove(tId); if (knownTreasuries.get(aId).isEmpty()) { @@ -491,13 +554,12 @@ private void throwIfKnownTreasuryIsMissing(AccountID aId) { } private ResponseCodeEnum tryAdjustment(AccountID aId, TokenID tId, long adjustment) { - var relationship = asTokenRel(aId, tId); - if ((boolean) tokenRelsLedger.get(relationship, IS_FROZEN)) { - return ACCOUNT_FROZEN_FOR_TOKEN; - } - if (!(boolean) tokenRelsLedger.get(relationship, IS_KYC_GRANTED)) { - return ACCOUNT_KYC_NOT_GRANTED_FOR_TOKEN; + var freezeAndKycValidity = checkRelFrozenAndKycProps(aId, tId); + if (!freezeAndKycValidity.equals(OK)) { + return freezeAndKycValidity; } + + var relationship = asTokenRel(aId, tId); long balance = (long) tokenRelsLedger.get(relationship, TOKEN_BALANCE); long newBalance = balance + adjustment; if (newBalance < 0) { @@ -508,6 +570,17 @@ private ResponseCodeEnum tryAdjustment(AccountID aId, TokenID tId, long adjustme return OK; } + private ResponseCodeEnum checkRelFrozenAndKycProps(AccountID aId, TokenID tId) { + var relationship = asTokenRel(aId, tId); + if ((boolean) tokenRelsLedger.get(relationship, IS_FROZEN)) { + return ACCOUNT_FROZEN_FOR_TOKEN; + } + if (!(boolean) tokenRelsLedger.get(relationship, IS_KYC_GRANTED)) { + return ACCOUNT_KYC_NOT_GRANTED_FOR_TOKEN; + } + return OK; + } + private boolean isValidAutoRenewPeriod(long secs) { return validator.isValidAutoRenewPeriod(Duration.newBuilder().setSeconds(secs).build()); } @@ -750,7 +823,7 @@ private ResponseCodeEnum manageFlag( TokenRelProperty flagProperty, Function> controlKeyFn ) { - return sanityChecked(aId, tId, token -> { + return sanityChecked(aId, null, tId, token -> { if (controlKeyFn.apply(token).isEmpty()) { return keyFailure; } @@ -762,10 +835,22 @@ private ResponseCodeEnum manageFlag( private ResponseCodeEnum sanityChecked( AccountID aId, + AccountID aCounterPartyId, TokenID tId, Function action ) { - var validity = checkExistence(aId, tId); + var validity = checkAccountUsability(aId); + if (validity != OK) { + return validity; + } + if (aCounterPartyId != null) { + validity = checkAccountUsability(aCounterPartyId); + if (validity != OK) { + return validity; + } + } + + validity = checkTokenExistence(tId); if (validity != OK) { return validity; } @@ -779,6 +864,12 @@ private ResponseCodeEnum sanityChecked( if (!tokenRelsLedger.exists(key)) { return TOKEN_NOT_ASSOCIATED_TO_ACCOUNT; } + if (aCounterPartyId != null) { + key = asTokenRel(aCounterPartyId, tId); + if (!tokenRelsLedger.exists(key)) { + return TOKEN_NOT_ASSOCIATED_TO_ACCOUNT; + } + } return action.apply(token); } @@ -791,6 +882,10 @@ private ResponseCodeEnum checkExistence(AccountID aId, TokenID tId) { return exists(tId) ? OK : INVALID_TOKEN_ID; } + private ResponseCodeEnum checkTokenExistence(TokenID tId) { + return exists(tId) ? OK : INVALID_TOKEN_ID; + } + Map> getKnownTreasuries() { return knownTreasuries; } diff --git a/hedera-node/src/main/java/com/hedera/services/store/tokens/TokenStore.java b/hedera-node/src/main/java/com/hedera/services/store/tokens/TokenStore.java index e12692f0b9e9..4abc25173b72 100644 --- a/hedera-node/src/main/java/com/hedera/services/store/tokens/TokenStore.java +++ b/hedera-node/src/main/java/com/hedera/services/store/tokens/TokenStore.java @@ -24,7 +24,9 @@ import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.store.CreationResult; import com.hedera.services.store.Store; +import com.hedera.services.store.models.NftId; import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.NftID; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.TokenCreateTransactionBody; import com.hederahashgraph.api.proto.java.TokenID; @@ -46,6 +48,7 @@ */ public interface TokenStore extends Store { TokenID MISSING_TOKEN = TokenID.getDefaultInstance(); + NftID MISSING_NFT = NftID.getDefaultInstance(); Consumer DELETION = token -> token.setDeleted(true); boolean isKnownTreasury(AccountID id); @@ -54,15 +57,25 @@ public interface TokenStore extends Store { List listOfTokensServed(AccountID treasury); ResponseCodeEnum wipe(AccountID aId, TokenID tId, long wipingAmount, boolean skipKeyCheck); + ResponseCodeEnum freeze(AccountID aId, TokenID tId); + ResponseCodeEnum update(TokenUpdateTransactionBody changes, long now); + ResponseCodeEnum unfreeze(AccountID aId, TokenID tId); + ResponseCodeEnum grantKyc(AccountID aId, TokenID tId); + ResponseCodeEnum revokeKyc(AccountID aId, TokenID tId); + ResponseCodeEnum associate(AccountID aId, List tokens); + ResponseCodeEnum dissociate(AccountID aId, List tokens); + ResponseCodeEnum adjustBalance(AccountID aId, TokenID tId, long adjustment); + ResponseCodeEnum changeOwner(NftId nftId, AccountID from, AccountID to); + CreationResult createProvisionally(TokenCreateTransactionBody request, AccountID sponsor, long now); default TokenID resolve(TokenID id) { @@ -94,9 +107,13 @@ default ResponseCodeEnum tryTokenChange(BalanceChange change) { validity = INVALID_TOKEN_ID; } if (validity == OK) { - validity = adjustBalance(change.accountId(), tokenId, change.units()); - if (validity == INSUFFICIENT_TOKEN_BALANCE) { - validity = change.codeForInsufficientBalance(); + if (change.isForNft()) { + validity = changeOwner(change.nftId(), change.accountId(), change.counterPartyAccountId()); + } else { + validity = adjustBalance(change.accountId(), tokenId, change.units()); + if (validity == INSUFFICIENT_TOKEN_BALANCE) { + validity = change.codeForInsufficientBalance(); + } } } return validity; diff --git a/hedera-node/src/main/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogic.java b/hedera-node/src/main/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogic.java index ba41924ce904..2a2509e0a7e0 100644 --- a/hedera-node/src/main/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogic.java +++ b/hedera-node/src/main/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogic.java @@ -24,6 +24,7 @@ import com.hedera.services.context.properties.GlobalDynamicProperties; import com.hedera.services.grpc.marshalling.ImpliedTransfers; import com.hedera.services.grpc.marshalling.ImpliedTransfersMarshal; +import com.hedera.services.grpc.marshalling.ImpliedTransfersMeta; import com.hedera.services.ledger.HederaLedger; import com.hedera.services.ledger.PureTransferSemanticChecks; import com.hedera.services.txns.TransitionLogic; @@ -119,11 +120,13 @@ public ResponseCodeEnum validateSemantics(TxnAccessor accessor) { } else { /* Accessor is for either (1) a transaction in precheck or (2) a scheduled transaction that reached consensus without a managed expand-handle span. */ + final var validationProps = new ImpliedTransfersMeta.ValidationProps( + dynamicProperties.maxTransferListSize(), + dynamicProperties.maxTokenTransferListSize(), + dynamicProperties.maxNftTransfersLen()); final var op = accessor.getTxn().getCryptoTransfer(); - final var maxHbarAdjusts = dynamicProperties.maxTransferListSize(); - final var maxTokenAdjusts = dynamicProperties.maxTokenTransferListSize(); return transferSemanticChecks.fullPureValidation( - maxHbarAdjusts, maxTokenAdjusts, op.getTransfers(), op.getTokenTransfersList()); + op.getTransfers(), op.getTokenTransfersList(), validationProps); } } } diff --git a/hedera-node/src/main/java/com/hedera/services/txns/token/TokenBurnTransitionLogic.java b/hedera-node/src/main/java/com/hedera/services/txns/token/TokenBurnTransitionLogic.java index 85540a0d2d4a..3db5d0d9d178 100644 --- a/hedera-node/src/main/java/com/hedera/services/txns/token/TokenBurnTransitionLogic.java +++ b/hedera-node/src/main/java/com/hedera/services/txns/token/TokenBurnTransitionLogic.java @@ -21,9 +21,13 @@ */ import com.hedera.services.context.TransactionContext; +import com.hedera.services.state.enums.TokenType; +import com.hedera.services.store.AccountStore; import com.hedera.services.store.TypedTokenStore; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.OwnershipTracker; import com.hedera.services.txns.TransitionLogic; +import com.hedera.services.txns.validation.OptionValidator; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.TokenBurnTransactionBody; import com.hederahashgraph.api.proto.java.TransactionBody; @@ -33,8 +37,10 @@ import java.util.function.Function; import java.util.function.Predicate; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NFT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_BURN_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TRANSACTION_BODY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; /** @@ -42,18 +48,22 @@ */ public class TokenBurnTransitionLogic implements TransitionLogic { private static final Logger log = LogManager.getLogger(TokenBurnTransitionLogic.class); - + private final OptionValidator validator; private final Function SEMANTIC_CHECK = this::validate; - private final TypedTokenStore store; private final TransactionContext txnCtx; + private final AccountStore accountStore; public TokenBurnTransitionLogic( + final OptionValidator validator, + final AccountStore accountStore, TypedTokenStore store, TransactionContext txnCtx ) { + this.validator = validator; this.store = store; this.txnCtx = txnCtx; + this.accountStore = accountStore; } @Override @@ -66,13 +76,20 @@ public void doStateTransition() { /* --- Load the model objects --- */ final var token = store.loadToken(targetId); final var treasuryRel = store.loadTokenRelationship(token, token.getTreasury()); + final var ownershipTracker = new OwnershipTracker(); /* --- Do the business logic --- */ - token.burn(treasuryRel, op.getAmount()); + if (token.getType().equals(TokenType.FUNGIBLE_COMMON)) { + token.burn(treasuryRel, op.getAmount()); + } else { + token.burn(ownershipTracker, treasuryRel, op.getSerialNumbersList()); + } /* --- Persist the updated models --- */ store.persistToken(token); store.persistTokenRelationship(treasuryRel); + store.persistTrackers(ownershipTracker); + accountStore.persistAccount(token.getTreasury()); } @Override @@ -92,10 +109,29 @@ public ResponseCodeEnum validate(TransactionBody txnBody) { return INVALID_TOKEN_ID; } - if (op.getAmount() <= 0) { + boolean bothPresent = (op.getAmount() > 0 && op.getSerialNumbersCount() > 0); + boolean nonePresent = (op.getAmount() <= 0 && op.getSerialNumbersCount() == 0); + + if (nonePresent) { return INVALID_TOKEN_BURN_AMOUNT; } + if (bothPresent) { + return INVALID_TRANSACTION_BODY; + } + + if (op.getAmount() <= 0 && op.getSerialNumbersCount() > 0) { + var validity = validator.maxBatchSizeBurnCheck(op.getSerialNumbersCount()); + if (validity != OK) { + return validity; + } + for (long serialNum : op.getSerialNumbersList()) { + if (serialNum <= 0) { + return INVALID_NFT_ID; + } + } + } + return OK; } } diff --git a/hedera-node/src/main/java/com/hedera/services/txns/token/TokenCreateTransitionLogic.java b/hedera-node/src/main/java/com/hedera/services/txns/token/TokenCreateTransitionLogic.java index ff04f684f0a9..33de389e722f 100644 --- a/hedera-node/src/main/java/com/hedera/services/txns/token/TokenCreateTransitionLogic.java +++ b/hedera-node/src/main/java/com/hedera/services/txns/token/TokenCreateTransitionLogic.java @@ -40,7 +40,9 @@ import java.util.function.Predicate; import static com.hedera.services.txns.validation.TokenListChecks.checkKeys; -import static com.hedera.services.txns.validation.TokenListChecks.initialSupplyAndDecimalsCheck; +import static com.hedera.services.txns.validation.TokenListChecks.suppliesCheck; +import static com.hedera.services.txns.validation.TokenListChecks.supplyTypeCheck; +import static com.hedera.services.txns.validation.TokenListChecks.typeCheck; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.FAIL_INVALID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_EXPIRATION_TIME; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_RENEWAL_PERIOD; @@ -211,7 +213,17 @@ public ResponseCodeEnum validate(TransactionBody txnBody) { return validity; } - validity = initialSupplyAndDecimalsCheck(op.getInitialSupply(), op.getDecimals()); + validity = typeCheck(op.getTokenType(), op.getInitialSupply(), op.getDecimals()); + if (validity != OK) { + return validity; + } + + validity = supplyTypeCheck(op.getSupplyType(), op.getMaxSupply()); + if (validity != OK) { + return validity; + } + + validity = suppliesCheck(op.getInitialSupply(), op.getMaxSupply()); if (validity != OK) { return validity; } diff --git a/hedera-node/src/main/java/com/hedera/services/txns/token/TokenMintTransitionLogic.java b/hedera-node/src/main/java/com/hedera/services/txns/token/TokenMintTransitionLogic.java index dcdbc54e3bbc..158093351014 100644 --- a/hedera-node/src/main/java/com/hedera/services/txns/token/TokenMintTransitionLogic.java +++ b/hedera-node/src/main/java/com/hedera/services/txns/token/TokenMintTransitionLogic.java @@ -20,10 +20,15 @@ * ‍ */ +import com.google.protobuf.ByteString; import com.hedera.services.context.TransactionContext; +import com.hedera.services.state.enums.TokenType; +import com.hedera.services.store.AccountStore; import com.hedera.services.store.TypedTokenStore; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.OwnershipTracker; import com.hedera.services.txns.TransitionLogic; +import com.hedera.services.txns.validation.OptionValidator; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.TokenMintTransactionBody; import com.hederahashgraph.api.proto.java.TransactionBody; @@ -33,8 +38,10 @@ import java.util.function.Function; import java.util.function.Predicate; +import static com.hedera.services.state.submerkle.RichInstant.fromJava; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MINT_AMOUNT; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TRANSACTION_BODY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; /** @@ -47,15 +54,21 @@ public class TokenMintTransitionLogic implements TransitionLogic { private final Function SEMANTIC_CHECK = this::validate; - private final TypedTokenStore store; + private final OptionValidator validator; + private final TypedTokenStore tokenStore; private final TransactionContext txnCtx; + private final AccountStore accountStore; public TokenMintTransitionLogic( - TypedTokenStore store, + OptionValidator validator, + AccountStore accountStore, + TypedTokenStore tokenStore, TransactionContext txnCtx ) { - this.store = store; + this.validator = validator; + this.tokenStore = tokenStore; this.txnCtx = txnCtx; + this.accountStore = accountStore; } @Override @@ -66,15 +79,24 @@ public void doStateTransition() { final var targetId = new Id(grpcId.getShardNum(), grpcId.getRealmNum(), grpcId.getTokenNum()); /* --- Load the model objects --- */ - final var token = store.loadToken(targetId); - final var treasuryRel = store.loadTokenRelationship(token, token.getTreasury()); + final var token = tokenStore.loadToken(targetId); + final var treasuryRel = tokenStore.loadTokenRelationship(token, token.getTreasury()); + + /* --- Instantiate change trackers --- */ + final var ownershipTracker = new OwnershipTracker(); /* --- Do the business logic --- */ - token.mint(treasuryRel, op.getAmount()); + if (token.getType() == TokenType.FUNGIBLE_COMMON) { + token.mint(treasuryRel, op.getAmount()); + } else { + token.mint(ownershipTracker, treasuryRel, op.getMetadataList(), fromJava(txnCtx.consensusTime())); + } /* --- Persist the updated models --- */ - store.persistToken(token); - store.persistTokenRelationship(treasuryRel); + tokenStore.persistToken(token); + tokenStore.persistTokenRelationship(treasuryRel); + tokenStore.persistTrackers(ownershipTracker); + accountStore.persistAccount(token.getTreasury()); } @Override @@ -94,10 +116,32 @@ public ResponseCodeEnum validate(TransactionBody txnBody) { return INVALID_TOKEN_ID; } - if (op.getAmount() <= 0) { + boolean bothPresent = (op.getAmount() > 0 && op.getMetadataCount() > 0); + boolean nonePresent = (op.getAmount() <= 0 && op.getMetadataCount() == 0); + boolean onlyMetadataIsPresent = (op.getAmount() <= 0 && op.getMetadataCount() > 0); + + if (nonePresent) { return INVALID_TOKEN_MINT_AMOUNT; } + if (bothPresent) { + return INVALID_TRANSACTION_BODY; + } + + if (onlyMetadataIsPresent) { + var validity = validator.maxBatchSizeMintCheck(op.getMetadataCount()); + if (validity != OK) { + return validity; + } + + for (ByteString bytes : op.getMetadataList()) { + validity = validator.nftMetadataCheck(bytes.toByteArray()); + if (validity != OK) { + return validity; + } + } + } + return OK; } } diff --git a/hedera-node/src/main/java/com/hedera/services/txns/validation/ContextOptionValidator.java b/hedera-node/src/main/java/com/hedera/services/txns/validation/ContextOptionValidator.java index 16767b9f42cf..5784458deee3 100644 --- a/hedera-node/src/main/java/com/hedera/services/txns/validation/ContextOptionValidator.java +++ b/hedera-node/src/main/java/com/hedera/services/txns/validation/ContextOptionValidator.java @@ -120,6 +120,71 @@ public boolean isAcceptableTransfersLength(TransferList accountAmounts) { return accountAmounts.getAccountAmountsCount() <= dynamicProperties.maxTransferListSize(); } + @Override + public ResponseCodeEnum nftMetadataCheck(byte[] metadata) { + return lengthCheck( + metadata.length, + dynamicProperties.maxNftMetadataBytes(), + ResponseCodeEnum.METADATA_TOO_LONG + ); + } + + @Override + public ResponseCodeEnum maxBatchSizeMintCheck(int length) { + return batchSizeCheck( + length, + dynamicProperties.maxBatchSizeMint() + ); + } + + @Override + public ResponseCodeEnum maxBatchSizeBurnCheck(int length) { + return batchSizeCheck( + length, + dynamicProperties.maxBatchSizeBurn() + ); + } + + @Override + public ResponseCodeEnum maxNftTransfersLenCheck(int length) { + return batchSizeCheck( + length, + dynamicProperties.maxNftTransfersLen() + ); + } + + @Override + public ResponseCodeEnum maxBatchSizeWipeCheck(int length) { + return batchSizeCheck( + length, + dynamicProperties.maxBatchSizeWipe() + ); + } + + @Override + public ResponseCodeEnum nftMaxQueryRangeCheck(long start, long end) { + return lengthCheck( + end - start, + dynamicProperties.maxNftQueryRange(), + ResponseCodeEnum.INVALID_QUERY_RANGE + ); + } + + private ResponseCodeEnum batchSizeCheck(int length, int limit) { + return lengthCheck( + length, + limit, + ResponseCodeEnum.BATCH_SIZE_LIMIT_EXCEEDED + ); + } + + private ResponseCodeEnum lengthCheck(long length, long limit, ResponseCodeEnum onFailure) { + if (length > limit) { + return onFailure; + } + return OK; + } + @Override public ResponseCodeEnum queryableTopicStatus(TopicID id, FCMap topics) { MerkleTopic merkleTopic = topics.get(MerkleEntityId.fromTopicId(id)); diff --git a/hedera-node/src/main/java/com/hedera/services/txns/validation/OptionValidator.java b/hedera-node/src/main/java/com/hedera/services/txns/validation/OptionValidator.java index d85ec0947008..779b8c9d1254 100644 --- a/hedera-node/src/main/java/com/hedera/services/txns/validation/OptionValidator.java +++ b/hedera-node/src/main/java/com/hedera/services/txns/validation/OptionValidator.java @@ -59,6 +59,13 @@ public interface OptionValidator { ResponseCodeEnum tokenNameCheck(String name); ResponseCodeEnum tokenSymbolCheck(String symbol); + ResponseCodeEnum nftMetadataCheck(byte[] metadata); + ResponseCodeEnum maxBatchSizeMintCheck(int length); + ResponseCodeEnum maxBatchSizeWipeCheck(int length); + ResponseCodeEnum maxBatchSizeBurnCheck(int length); + ResponseCodeEnum maxNftTransfersLenCheck(int length); + ResponseCodeEnum nftMaxQueryRangeCheck(long start, long end); + ResponseCodeEnum queryableTopicStatus(TopicID id, FCMap topics); default ResponseCodeEnum queryableAccountStatus(AccountID id, FCMap accounts) { diff --git a/hedera-node/src/main/java/com/hedera/services/txns/validation/TokenListChecks.java b/hedera-node/src/main/java/com/hedera/services/txns/validation/TokenListChecks.java index 94a8b534dd4b..f48bdb0a9c71 100644 --- a/hedera-node/src/main/java/com/hedera/services/txns/validation/TokenListChecks.java +++ b/hedera-node/src/main/java/com/hedera/services/txns/validation/TokenListChecks.java @@ -24,6 +24,9 @@ import com.hederahashgraph.api.proto.java.Key; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.TokenID; +import com.hederahashgraph.api.proto.java.TokenSupplyType; +import com.hederahashgraph.api.proto.java.TokenTransferList; +import com.hederahashgraph.api.proto.java.TokenType; import java.util.HashSet; import java.util.List; @@ -36,23 +39,65 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SUPPLY_KEY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_DECIMALS; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_INITIAL_SUPPLY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MAX_SUPPLY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_WIPE_KEY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.NOT_SUPPORTED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; public class TokenListChecks { - static Predicate ADMIN_KEY_REMOVAL = ImmutableKeyUtils::signalsKeyRemoval; + static Predicate ADMIN_KEY_REMOVAL = ImmutableKeyUtils::signalsKeyRemoval; - public static boolean repeatsItself(List tokens) { - return new HashSet<>(tokens).size() < tokens.size(); + public static boolean repeatsItself(List tokens) { + return new HashSet<>(tokens).size() < tokens.size(); + } + + + public static ResponseCodeEnum typeCheck(TokenType type, long initialSupply, int decimals) { + switch (type) { + case FUNGIBLE_COMMON: + return fungibleCommonTypeCheck(initialSupply, decimals); + case NON_FUNGIBLE_UNIQUE: + return nonFungibleUniqueCheck(initialSupply, decimals); + default: + return NOT_SUPPORTED; + } } - public static ResponseCodeEnum initialSupplyAndDecimalsCheck(long initialSupply, int decimals) { + public static ResponseCodeEnum nonFungibleUniqueCheck(long initialSupply, int decimals) { + if (initialSupply != 0) { + return INVALID_TOKEN_INITIAL_SUPPLY; + } + + return decimals != 0 ? INVALID_TOKEN_DECIMALS : OK; + } + + public static ResponseCodeEnum fungibleCommonTypeCheck(long initialSupply, int decimals) { if (initialSupply < 0) { return INVALID_TOKEN_INITIAL_SUPPLY; } + return decimals < 0 ? INVALID_TOKEN_DECIMALS : OK; } + public static ResponseCodeEnum suppliesCheck(long initialSupply, long maxSupply) { + if (maxSupply > 0 && initialSupply > maxSupply) { + return INVALID_TOKEN_INITIAL_SUPPLY; + } + + return OK; + } + + public static ResponseCodeEnum supplyTypeCheck(TokenSupplyType supplyType, long maxSupply) { + switch (supplyType) { + case INFINITE: + return maxSupply != 0 ? INVALID_TOKEN_MAX_SUPPLY : OK; + case FINITE: + return maxSupply <= 0 ? INVALID_TOKEN_MAX_SUPPLY : OK; + default: + return NOT_SUPPORTED; + } + } + public static ResponseCodeEnum checkKeys( boolean hasAdminKey, Key adminKey, boolean hasKycKey, Key kycKey, @@ -88,6 +133,6 @@ public static ResponseCodeEnum checkKeys( } } - return validity; - } + return validity; + } } diff --git a/hedera-node/src/main/java/com/hedera/services/utils/EntityIdUtils.java b/hedera-node/src/main/java/com/hedera/services/utils/EntityIdUtils.java index 0d58f5211011..b61585055035 100644 --- a/hedera-node/src/main/java/com/hedera/services/utils/EntityIdUtils.java +++ b/hedera-node/src/main/java/com/hedera/services/utils/EntityIdUtils.java @@ -26,6 +26,7 @@ import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.ContractID; import com.hederahashgraph.api.proto.java.FileID; +import com.hederahashgraph.api.proto.java.NftID; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TopicID; @@ -53,6 +54,10 @@ public static String readableId(Object o) { } else if (o instanceof ScheduleID) { ScheduleID id = (ScheduleID) o; return String.format("%d.%d.%d", id.getShardNum(), id.getRealmNum(), id.getScheduleNum()); + } else if (o instanceof NftID) { + NftID id = (NftID) o; + TokenID tokenID = id.getTokenID(); + return String.format("%d.%d.%d-%d", tokenID.getShardNum(), tokenID.getRealmNum(), tokenID.getTokenNum(), id.getSerialNumber()); } else { return String.valueOf(o); } @@ -61,11 +66,9 @@ public static String readableId(Object o) { /** * Returns the {@code AccountID} represented by a literal of the form {@code ..}. * - * @param literal - * the account literal + * @param literal the account literal * @return the corresponding id - * @throws IllegalArgumentException - * if the literal is not formatted correctly + * @throws IllegalArgumentException if the literal is not formatted correctly */ public static AccountID parseAccount(String literal) { try { diff --git a/hedera-node/src/main/java/com/hedera/services/utils/MiscUtils.java b/hedera-node/src/main/java/com/hedera/services/utils/MiscUtils.java index 494ccfce8f61..5729132131ad 100644 --- a/hedera-node/src/main/java/com/hedera/services/utils/MiscUtils.java +++ b/hedera-node/src/main/java/com/hedera/services/utils/MiscUtils.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,6 +34,7 @@ import com.hederahashgraph.api.proto.java.QueryHeader; import com.hederahashgraph.api.proto.java.SchedulableTransactionBody; import com.hederahashgraph.api.proto.java.Timestamp; +import com.hederahashgraph.api.proto.java.TokenTransferList; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.api.proto.java.TransferList; import com.swirlds.common.AddressBook; @@ -138,7 +139,9 @@ import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDelete; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDissociateFromAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenFreezeAccount; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetAccountNftInfos; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetInfo; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetNftInfo; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGrantKycToAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenMint; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenRevokeKycFromAccount; @@ -162,7 +165,9 @@ import static com.hederahashgraph.api.proto.java.Query.QueryCase.GETBYSOLIDITYID; import static com.hederahashgraph.api.proto.java.Query.QueryCase.NETWORKGETVERSIONINFO; import static com.hederahashgraph.api.proto.java.Query.QueryCase.SCHEDULEGETINFO; +import static com.hederahashgraph.api.proto.java.Query.QueryCase.TOKENGETACCOUNTNFTINFOS; import static com.hederahashgraph.api.proto.java.Query.QueryCase.TOKENGETINFO; +import static com.hederahashgraph.api.proto.java.Query.QueryCase.TOKENGETNFTINFO; import static com.hederahashgraph.api.proto.java.Query.QueryCase.TRANSACTIONGETRECEIPT; import static com.hederahashgraph.api.proto.java.Query.QueryCase.TRANSACTIONGETRECORD; import static java.util.Comparator.comparing; @@ -188,7 +193,9 @@ public class MiscUtils { TransactionGetRecord, GetVersionInfo, TokenGetInfo, - ScheduleGetInfo + ScheduleGetInfo, + TokenGetNftInfo, + TokenGetAccountNftInfos ); static final String TOKEN_MINT_METRIC = "mintToken"; @@ -204,6 +211,8 @@ public class MiscUtils { static final String TOKEN_ASSOCIATE_METRIC = "associateTokens"; static final String TOKEN_DISSOCIATE_METRIC = "dissociateTokens"; static final String TOKEN_GET_INFO_METRIC = "getTokenInfo"; + static final String TOKEN_GET_NFT_INFO_METRIC = "getTokenNftInfo"; + static final String TOKEN_GET_ACCOUNT_NFT_INFOS_METRIC = "getAccountNftInfos"; static final String SCHEDULE_CREATE_METRIC = "createSchedule"; static final String SCHEDULE_DELETE_METRIC = "deleteSchedule"; @@ -212,6 +221,7 @@ public class MiscUtils { private static final EnumMap queryFunctions = new EnumMap<>(Query.QueryCase.class); + static { queryFunctions.put(NETWORKGETVERSIONINFO, GetVersionInfo); queryFunctions.put(GETBYKEY, GetByKey); @@ -230,11 +240,14 @@ public class MiscUtils { queryFunctions.put(TRANSACTIONGETRECEIPT, TransactionGetReceipt); queryFunctions.put(TRANSACTIONGETRECORD, TransactionGetRecord); queryFunctions.put(TOKENGETINFO, TokenGetInfo); + queryFunctions.put(TOKENGETNFTINFO, TokenGetNftInfo); + queryFunctions.put(TOKENGETACCOUNTNFTINFOS, TokenGetAccountNftInfos); queryFunctions.put(SCHEDULEGETINFO, ScheduleGetInfo); } public static final EnumMap BASE_STAT_NAMES = new EnumMap<>(HederaFunctionality.class); + static { /* Transactions */ BASE_STAT_NAMES.put(CryptoCreate, CRYPTO_CREATE_METRIC); @@ -291,7 +304,9 @@ public class MiscUtils { BASE_STAT_NAMES.put(TransactionGetRecord, GET_RECORD_METRIC); BASE_STAT_NAMES.put(GetVersionInfo, GET_VERSION_INFO_METRIC); BASE_STAT_NAMES.put(TokenGetInfo, TOKEN_GET_INFO_METRIC); + BASE_STAT_NAMES.put(TokenGetNftInfo, TOKEN_GET_NFT_INFO_METRIC); BASE_STAT_NAMES.put(ScheduleGetInfo, SCHEDULE_GET_INFO_METRIC); + BASE_STAT_NAMES.put(TokenGetAccountNftInfos, TOKEN_GET_ACCOUNT_NFT_INFOS_METRIC); } public static String baseStatNameOf(HederaFunctionality function) { @@ -329,6 +344,18 @@ public static String readableTransferList(TransferList accountAmounts) { .toString(); } + public static String readableNftTransferList(TokenTransferList tokenTransferList) { + return tokenTransferList.getNftTransfersList() + .stream() + .map(nftTransfer -> String.format( + "%s %s %s", + Long.valueOf(nftTransfer.getSerialNumber()).toString(), + EntityIdUtils.readableId(nftTransfer.getSenderAccountID()), + EntityIdUtils.readableId(nftTransfer.getReceiverAccountID()))) + .collect(toList()) + .toString(); + } + public static JKey lookupInCustomStore(LegacyEd25519KeyReader b64Reader, String storeLoc, String kpId) { try { return new JEd25519Key(CommonUtils.unhex(b64Reader.hexedABytesFrom(storeLoc, kpId))); @@ -387,6 +414,10 @@ public static Instant timestampToInstant(Timestamp timestamp) { public static Optional activeHeaderFrom(Query query) { switch (query.getQueryCase()) { + case TOKENGETNFTINFO: + return Optional.of(query.getTokenGetNftInfo().getHeader()); + case TOKENGETACCOUNTNFTINFOS: + return Optional.of(query.getTokenGetAccountNftInfos().getHeader()); case TOKENGETINFO: return Optional.of(query.getTokenGetInfo().getHeader()); case SCHEDULEGETINFO: @@ -529,7 +560,8 @@ public static String describe(JKey k) { Key readable = null; try { readable = mapJKey(k); - } catch (Exception ignore) { } + } catch (Exception ignore) { + } return String.valueOf(readable); } } diff --git a/hedera-node/src/main/resources/api-permission.properties b/hedera-node/src/main/resources/api-permission.properties index bcabdf789eba..424c5cbda5b5 100644 --- a/hedera-node/src/main/resources/api-permission.properties +++ b/hedera-node/src/main/resources/api-permission.properties @@ -49,6 +49,8 @@ tokenUpdate=0-* tokenGetInfo=0-* tokenAssociateToAccount=0-* tokenDissociateFromAccount=0-* +tokenGetNftInfo=0-* +tokenGetAccountNftInfos=0-* # Network getVersionInfo=0-* systemDelete=2-59 diff --git a/hedera-node/src/main/resources/bootstrap.properties b/hedera-node/src/main/resources/bootstrap.properties index c8cdc5ffc954..e9b2cd3821d9 100644 --- a/hedera-node/src/main/resources/bootstrap.properties +++ b/hedera-node/src/main/resources/bootstrap.properties @@ -68,6 +68,7 @@ ledger.maxAccountNum=100000000 ledger.schedule.txExpiryTimeSecs=1800 ledger.transfers.maxLen=10 ledger.tokenTransfers.maxLen=10 +ledger.nftTransfers.maxLen=10 rates.intradayChangeLimitPercent=25 rates.midnightCheckInterval=1 scheduling.whitelist=ConsensusSubmitMessage,CryptoTransfer @@ -75,6 +76,11 @@ tokens.maxPerAccount=1000 tokens.maxSymbolUtf8Bytes=100 tokens.maxTokenNameUtf8Bytes=100 tokens.maxCustomFeesAllowed=10 +tokens.nfts.maxMetadataBytes=100 +tokens.nfts.maxBatchSizeBurn=10 +tokens.nfts.maxBatchSizeWipe=10 +tokens.nfts.maxBatchSizeMint=10 +tokens.nfts.maxQueryRange=100 consensus.message.maxBytesAllowed=1024 # Node properties (can be overridden via data/config/node.properties) dev.defaultListeningNodeAccount=0.0.3 diff --git a/hedera-node/src/main/resources/feeSchedules.json b/hedera-node/src/main/resources/feeSchedules.json index fda2569bb19e..e410d3723c24 100644 --- a/hedera-node/src/main/resources/feeSchedules.json +++ b/hedera-node/src/main/resources/feeSchedules.json @@ -2,49 +2,51 @@ "currentFeeSchedule" : [ { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoCreate", - "feeData" : { - "nodedata" : { - "constant" : 4498129603, - "bpt" : 7191161, - "vpt" : 17977903216, - "rbh" : 4794, - "sbh" : 360, - "gas" : 47941, - "bpr" : 7191161, - "sbpr" : 179779, - "min" : 0, - "max" : 1000000000000000 - }, - "networkdata" : { - "constant" : 71970073651, - "bpt" : 115058581, - "vpt" : 287646451463, - "rbh" : 76706, - "sbh" : 5753, - "gas" : 767057, - "bpr" : 115058581, - "sbpr" : 2876465, - "min" : 0, - "max" : 1000000000000000 - }, - "servicedata" : { - "constant" : 71970073651, - "bpt" : 115058581, - "vpt" : 287646451463, - "rbh" : 76706, - "sbh" : 5753, - "gas" : 767057, - "bpr" : 115058581, - "sbpr" : 2876465, - "min" : 0, - "max" : 1000000000000000 + "fees" : [ + { + "nodedata" : { + "constant" : 4498129603, + "bpt" : 7191161, + "vpt" : 17977903216, + "rbh" : 4794, + "sbh" : 360, + "gas" : 47941, + "bpr" : 7191161, + "sbpr" : 179779, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 71970073651, + "bpt" : 115058581, + "vpt" : 287646451463, + "rbh" : 76706, + "sbh" : 5753, + "gas" : 767057, + "bpr" : 115058581, + "sbpr" : 2876465, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 71970073651, + "bpt" : 115058581, + "vpt" : 287646451463, + "rbh" : 76706, + "sbh" : 5753, + "gas" : 767057, + "bpr" : 115058581, + "sbpr" : 2876465, + "min" : 0, + "max" : 1000000000000000 + } } - } + ] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAccountAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 59972622, "bpt" : 95878, @@ -81,12 +83,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 19649656, "bpt" : 31414, @@ -123,12 +125,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoTransfer", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9390055, "bpt" : 15012, @@ -165,12 +167,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 471427939, "bpt" : 753672, @@ -207,12 +209,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAddLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 5561692202, "bpt" : 8891479, @@ -249,12 +251,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDeleteLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 468546396, "bpt" : 749065, @@ -291,12 +293,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58926, "bpt" : 94, @@ -333,12 +335,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 22044, "bpt" : 35, @@ -375,12 +377,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountBalance", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 68774, "bpt" : 110, @@ -417,12 +419,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 63990, "bpt" : 102, @@ -459,12 +461,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetStakers", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 15251, "bpt" : 24, @@ -501,12 +503,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusCreateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 921577366, "bpt" : 1473326, @@ -543,12 +545,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusUpdateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 20193780, "bpt" : 32284, @@ -585,12 +587,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusDeleteTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 474345144, "bpt" : 758336, @@ -627,12 +629,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusSubmitMessage", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9248442, "bpt" : 14785, @@ -669,12 +671,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusGetTopicInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 64253, "bpt" : 103, @@ -711,12 +713,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 32203636093, "bpt" : 51483964, @@ -753,12 +755,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285588, "bpt" : 150734, @@ -795,12 +797,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 93900697, "bpt" : 150119, @@ -837,12 +839,13 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenMint", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_FUNGIBLE_COMMON", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -879,12 +882,51 @@ "min" : 0, "max" : 1000000000000000 } - } + }, { + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenBurn", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_FUNGIBLE_COMMON", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -921,12 +963,51 @@ "min" : 0, "max" : 1000000000000000 } - } + }, + { + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAssociateToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4574479485, "bpt" : 7313222, @@ -963,12 +1044,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDissociateFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4714279388, "bpt" : 7536720, @@ -1005,12 +1086,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGrantKycToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1047,12 +1128,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenRevokeKycFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1089,12 +1170,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenFreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1131,12 +1212,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUnfreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1173,12 +1254,13 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAccountWipe", - "feeData" : { + "fees" : [ { + "subType": "TOKEN_FUNGIBLE_COMMON", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -1215,12 +1297,87 @@ "min" : 0, "max" : 1000000000000000 } - } + }, { + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }, { + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + } ] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 61717, "bpt" : 99, @@ -1257,12 +1414,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 563513000, "bpt" : 900888, @@ -1299,12 +1456,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleSign", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58040915, "bpt" : 92790, @@ -1341,12 +1498,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 95360774, "bpt" : 152453, @@ -1383,12 +1540,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 53393, "bpt" : 85, @@ -1425,12 +1582,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 45218052173, "bpt" : 72290115, @@ -1467,12 +1624,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2438037058, "bpt" : 3897691, @@ -1509,12 +1666,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -1551,12 +1708,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCall", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3336515210, "bpt" : 5334088, @@ -1593,12 +1750,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71015, "bpt" : 114, @@ -1635,12 +1792,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCallLocal", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2610100486, "bpt" : 4172769, @@ -1677,12 +1834,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetBytecode", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 226589259813, "bpt" : 362248325, @@ -1719,12 +1876,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetBySolidityID", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69385, "bpt" : 111, @@ -1761,12 +1918,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 10093, "bpt" : 16, @@ -1803,12 +1960,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2934015991, "bpt" : 4690612, @@ -1845,12 +2002,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3657315129, "bpt" : 5846951, @@ -1887,12 +2044,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3663140881, "bpt" : 5856265, @@ -1929,12 +2086,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -1971,12 +2128,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileAppend", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3680730029, "bpt" : 5884384, @@ -2013,12 +2170,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetContents", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69308, "bpt" : 111, @@ -2055,12 +2212,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71080, "bpt" : 114, @@ -2097,12 +2254,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetVersionInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 6519421057, "bpt" : 10422601, @@ -2139,12 +2296,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetByKey", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -2181,12 +2338,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetReceipt", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -2223,12 +2380,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -2265,12 +2422,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemUndelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -2307,12 +2464,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetRecord", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 54605, "bpt" : 87, @@ -2349,7 +2506,7 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "expiryTime" : 1645810078 @@ -2358,7 +2515,7 @@ "nextFeeSchedule" : [ { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4498129603, "bpt" : 7191161, @@ -2395,12 +2552,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAccountAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 59972622, "bpt" : 95878, @@ -2437,12 +2594,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 19649656, "bpt" : 31414, @@ -2479,12 +2636,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoTransfer", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9390055, "bpt" : 15012, @@ -2521,12 +2678,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 471427939, "bpt" : 753672, @@ -2563,12 +2720,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAddLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 5561692202, "bpt" : 8891479, @@ -2605,12 +2762,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDeleteLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 468546396, "bpt" : 749065, @@ -2647,12 +2804,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58926, "bpt" : 94, @@ -2689,12 +2846,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 22044, "bpt" : 35, @@ -2731,12 +2888,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountBalance", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 68774, "bpt" : 110, @@ -2773,12 +2930,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 63990, "bpt" : 102, @@ -2815,12 +2972,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetStakers", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 15251, "bpt" : 24, @@ -2857,12 +3014,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusCreateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 921577366, "bpt" : 1473326, @@ -2899,12 +3056,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusUpdateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 20193780, "bpt" : 32284, @@ -2941,12 +3098,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusDeleteTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 474345144, "bpt" : 758336, @@ -2983,12 +3140,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusSubmitMessage", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9248442, "bpt" : 14785, @@ -3025,12 +3182,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusGetTopicInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 64253, "bpt" : 103, @@ -3067,12 +3224,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 32203636093, "bpt" : 51483964, @@ -3109,12 +3266,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285588, "bpt" : 150734, @@ -3151,12 +3308,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 93900697, "bpt" : 150119, @@ -3193,12 +3350,13 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenMint", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_FUNGIBLE_COMMON", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -3235,12 +3393,51 @@ "min" : 0, "max" : 1000000000000000 } - } + },{ + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenBurn", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_FUNGIBLE_COMMON", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -3277,12 +3474,50 @@ "min" : 0, "max" : 1000000000000000 } - } + },{ + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAssociateToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4574479485, "bpt" : 7313222, @@ -3319,12 +3554,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDissociateFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4714279388, "bpt" : 7536720, @@ -3361,12 +3596,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGrantKycToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3403,12 +3638,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenRevokeKycFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3445,12 +3680,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenFreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3487,12 +3722,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUnfreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3529,12 +3764,51 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAccountWipe", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_FUNGIBLE_COMMON", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + },{ + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -3572,11 +3846,12 @@ "max" : 1000000000000000 } } + ] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 61717, "bpt" : 99, @@ -3613,12 +3888,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 563513000, "bpt" : 900888, @@ -3655,12 +3930,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleSign", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58040915, "bpt" : 92790, @@ -3697,12 +3972,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 95360774, "bpt" : 152453, @@ -3739,12 +4014,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 53393, "bpt" : 85, @@ -3781,12 +4056,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 45218052173, "bpt" : 72290115, @@ -3823,12 +4098,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2438037058, "bpt" : 3897691, @@ -3865,12 +4140,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -3907,12 +4182,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCall", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3336515210, "bpt" : 5334088, @@ -3949,12 +4224,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71015, "bpt" : 114, @@ -3991,12 +4266,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCallLocal", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2610100486, "bpt" : 4172769, @@ -4033,12 +4308,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetBytecode", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 226589259813, "bpt" : 362248325, @@ -4075,12 +4350,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetBySolidityID", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69385, "bpt" : 111, @@ -4117,12 +4392,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 10093, "bpt" : 16, @@ -4159,12 +4434,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2934015991, "bpt" : 4690612, @@ -4201,12 +4476,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3657315129, "bpt" : 5846951, @@ -4243,12 +4518,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3663140881, "bpt" : 5856265, @@ -4285,12 +4560,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -4327,12 +4602,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileAppend", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3680730029, "bpt" : 5884384, @@ -4369,12 +4644,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetContents", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69308, "bpt" : 111, @@ -4411,12 +4686,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71080, "bpt" : 114, @@ -4453,12 +4728,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetVersionInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 6519421057, "bpt" : 10422601, @@ -4495,12 +4770,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetByKey", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -4537,12 +4812,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetReceipt", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -4579,12 +4854,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -4621,12 +4896,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemUndelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -4663,12 +4938,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetRecord", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 54605, "bpt" : 87, @@ -4705,9 +4980,9 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "expiryTime" : 1677346078 } ] -} ] \ No newline at end of file +} ] diff --git a/hedera-node/src/main/resources/throttles-dev.json b/hedera-node/src/main/resources/throttles-dev.json index 1591a66aab71..9ef0684bd2d6 100644 --- a/hedera-node/src/main/resources/throttles-dev.json +++ b/hedera-node/src/main/resources/throttles-dev.json @@ -9,7 +9,7 @@ "operations": [ "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", - "TokenGetInfo", + "TokenGetInfo", "TokenGetNftInfo", "TokenGetAccountNftInfos", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", diff --git a/hedera-node/src/main/resources/throttles-perf.json b/hedera-node/src/main/resources/throttles-perf.json index b11398c296e6..0019ccbdf9c4 100644 --- a/hedera-node/src/main/resources/throttles-perf.json +++ b/hedera-node/src/main/resources/throttles-perf.json @@ -10,7 +10,7 @@ "ScheduleCreate", "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", - "TokenGetInfo", + "TokenGetInfo", "TokenGetNftInfo", "TokenGetAccountNftInfos", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", diff --git a/hedera-node/src/main/resources/throttles.json b/hedera-node/src/main/resources/throttles.json index 481d3c887149..2bda6c391089 100644 --- a/hedera-node/src/main/resources/throttles.json +++ b/hedera-node/src/main/resources/throttles.json @@ -10,7 +10,7 @@ "ScheduleCreate", "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", - "TokenGetInfo", + "TokenGetInfo", "TokenNftGetInfo", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", diff --git a/hedera-node/src/test/java/com/hedera/services/ServicesStateTest.java b/hedera-node/src/test/java/com/hedera/services/ServicesStateTest.java index d0e14f9b90da..dccd25d7b9c0 100644 --- a/hedera-node/src/test/java/com/hedera/services/ServicesStateTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ServicesStateTest.java @@ -33,6 +33,7 @@ import com.hedera.services.sigs.order.HederaSigningOrder; import com.hedera.services.sigs.order.SigningOrderResult; import com.hedera.services.state.expiry.ExpiryManager; +import com.hedera.services.state.initialization.ViewBuilderTest; import com.hedera.services.state.logic.NetworkCtxManager; import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleBlobMeta; @@ -45,13 +46,16 @@ import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; import com.hedera.services.state.merkle.MerkleTopic; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.state.submerkle.ExchangeRates; import com.hedera.services.state.submerkle.SequenceNumber; import com.hedera.services.stream.RecordStreamManager; import com.hedera.services.stream.RecordsRunningHashLeaf; import com.hedera.services.throttling.FunctionalityThrottling; -import com.hedera.services.txns.span.ExpandHandleSpan; import com.hedera.services.txns.ProcessLogic; +import com.hedera.services.txns.span.ExpandHandleSpan; import com.hedera.services.utils.PlatformTxnAccessor; import com.hedera.test.extensions.LogCaptor; import com.hedera.test.extensions.LogCaptureExtension; @@ -76,6 +80,7 @@ import com.swirlds.common.crypto.ImmutableHash; import com.swirlds.common.crypto.RunningHash; import com.swirlds.common.merkle.MerkleNode; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; @@ -100,6 +105,7 @@ import static com.hedera.services.ServicesState.RELEASE_0130_VERSION; import static com.hedera.services.ServicesState.RELEASE_0140_VERSION; import static com.hedera.services.ServicesState.RELEASE_0150_VERSION; +import static com.hedera.services.ServicesState.RELEASE_0160_VERSION; import static com.hedera.services.ServicesState.RELEASE_070_VERSION; import static com.hedera.services.ServicesState.RELEASE_080_VERSION; import static com.hedera.services.ServicesState.RELEASE_090_VERSION; @@ -111,6 +117,7 @@ import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -155,6 +162,12 @@ class ServicesStateTest { private FCMap tokenAssociationsCopy; private FCMap tokensCopy; private FCMap scheduledTxsCopy; + private FCMap uniqueTokens; + private FCMap uniqueTokensCopy; + private FCOneToManyRelation uniqueTokenAssociations; + private FCOneToManyRelation uniqueTokenAssociationsCopy; + private FCOneToManyRelation uniqueOwnershipAssociations; + private FCOneToManyRelation uniqueOwnershipAssociationsCopy; private MerkleDiskFs diskFs; private MerkleDiskFs diskFsCopy; private RecordsRunningHashLeaf runningHashLeaf; @@ -215,6 +228,7 @@ private void setup() { tokensCopy = mock(FCMap.class); tokenAssociations = mock(FCMap.class); tokenAssociationsCopy = mock(FCMap.class); + uniqueTokens = mock(FCMap.class); diskFs = mock(MerkleDiskFs.class); scheduledTxs = mock(FCMap.class); runningHashLeaf = mock(RecordsRunningHashLeaf.class); @@ -222,7 +236,6 @@ private void setup() { recordsHash = mock(Hash.class); given(runningHash.getHash()).willReturn(recordsHash); given(runningHashLeaf.getRunningHash()).willReturn(runningHash); - storage = mock(FCMap.class); accounts = mock(FCMap.class); topicsCopy = mock(FCMap.class); @@ -230,7 +243,12 @@ private void setup() { accountsCopy = mock(FCMap.class); diskFsCopy = mock(MerkleDiskFs.class); scheduledTxsCopy = mock(FCMap.class); + uniqueTokensCopy = mock(FCMap.class); runningHashLeafCopy = mock(RecordsRunningHashLeaf.class); + uniqueTokenAssociations = mock(FCOneToManyRelation.class); + uniqueTokenAssociationsCopy = mock(FCOneToManyRelation.class); + uniqueOwnershipAssociations = mock(FCOneToManyRelation.class); + uniqueOwnershipAssociationsCopy = mock(FCOneToManyRelation.class); given(topics.copy()).willReturn(topicsCopy); given(storage.copy()).willReturn(storageCopy); @@ -240,6 +258,8 @@ private void setup() { given(diskFs.copy()).willReturn(diskFsCopy); given(scheduledTxs.copy()).willReturn(scheduledTxsCopy); given(runningHashLeaf.copy()).willReturn(runningHashLeafCopy); + given(uniqueTokenAssociations.copy()).willReturn(uniqueTokenAssociationsCopy); + given(uniqueOwnershipAssociations.copy()).willReturn(uniqueOwnershipAssociationsCopy); seqNo = mock(SequenceNumber.class); midnightRates = mock(ExchangeRates.class); @@ -250,6 +270,7 @@ private void setup() { given(networkCtx.seqNo()).willReturn(seqNo); given(networkCtx.getStateVersion()).willReturn(-1); given(ctx.networkCtx()).willReturn(networkCtx); + given(uniqueTokens.copy()).willReturn(uniqueTokensCopy); propertySources = mock(PropertySources.class); @@ -286,6 +307,7 @@ void hasExpectedMinChildCounts() { assertEquals(ServicesState.ChildIndices.NUM_0130_CHILDREN, subject.getMinimumChildCount(RELEASE_0130_VERSION)); assertEquals(ServicesState.ChildIndices.NUM_0140_CHILDREN, subject.getMinimumChildCount(RELEASE_0140_VERSION)); assertEquals(ServicesState.ChildIndices.NUM_0150_CHILDREN, subject.getMinimumChildCount(RELEASE_0150_VERSION)); + assertEquals(ServicesState.ChildIndices.NUM_0160_CHILDREN, subject.getMinimumChildCount(RELEASE_0160_VERSION)); Throwable throwable = assertThrows(IllegalArgumentException.class, () -> subject.getMinimumChildCount(invalidVersion)); @@ -297,7 +319,13 @@ void hasExpectedMinChildCounts() { @Test void fullArgsConstructorUpdatesContext() { // when: - subject = new ServicesState(ctx, self, Collections.emptyList(), new ServicesState()); + subject = new ServicesState( + ctx, + self, + Collections.emptyList(), + uniqueTokenAssociations, + uniqueOwnershipAssociations, + new ServicesState()); // then: verify(ctx).update(subject); @@ -409,6 +437,7 @@ void invokesMigrationsAsApropos() { subject.setChild(ServicesState.ChildIndices.DISK_FS, diskFs); subject.setChild(ServicesState.ChildIndices.SCHEDULE_TXS, scheduledTxs); subject.setChild(ServicesState.ChildIndices.RECORD_STREAM_RUNNING_HASH, runningHashLeaf); + subject.setChild(ServicesState.ChildIndices.UNIQUE_TOKENS, uniqueTokens); // when: subject.init(platform, book); @@ -425,6 +454,27 @@ void invokesMigrationsAsApropos() { verify(networkCtx).updateLastScannedEntity(1000L); } + @Test + void createsUniqueTokensIfMigratingFromRelease0150() { + // given: + subject.setChild(ServicesState.ChildIndices.TOPICS, topics); + subject.setChild(ServicesState.ChildIndices.STORAGE, storage); + subject.setChild(ServicesState.ChildIndices.ACCOUNTS, accounts); + subject.setChild(ServicesState.ChildIndices.ADDRESS_BOOK, book); + subject.setChild(ServicesState.ChildIndices.NETWORK_CTX, networkCtx); + subject.setChild(ServicesState.ChildIndices.TOKENS, tokens); + subject.setChild(ServicesState.ChildIndices.TOKEN_ASSOCIATIONS, tokenAssociations); + subject.setChild(ServicesState.ChildIndices.DISK_FS, diskFs); + subject.setChild(ServicesState.ChildIndices.SCHEDULE_TXS, scheduledTxs); + subject.setChild(ServicesState.ChildIndices.RECORD_STREAM_RUNNING_HASH, runningHashLeaf); + + // when: + subject.initialize(); + + // then: + assertNotNull(subject.uniqueTokens()); + } + @Test void justWarnOnFailedDiskFsMigration() { // setup: @@ -447,6 +497,7 @@ void justWarnOnFailedDiskFsMigration() { subject.setChild(ServicesState.ChildIndices.DISK_FS, diskFs); subject.setChild(ServicesState.ChildIndices.SCHEDULE_TXS, scheduledTxs); subject.setChild(ServicesState.ChildIndices.RECORD_STREAM_RUNNING_HASH, runningHashLeaf); + subject.setChild(ServicesState.ChildIndices.UNIQUE_TOKENS, uniqueTokens); // when: subject.init(platform, book); @@ -460,7 +511,7 @@ void justWarnOnFailedDiskFsMigration() { } @Test - void logsNonNullHashesFromSavedState() { + void rebuildsFcotmrAsExpected() { // setup: var nodeInfo = mock(NodeInfo.class); given(ctx.nodeInfo()).willReturn(nodeInfo); @@ -478,14 +529,42 @@ void logsNonNullHashesFromSavedState() { subject.setChild(ServicesState.ChildIndices.DISK_FS, diskFs); subject.setChild(ServicesState.ChildIndices.SCHEDULE_TXS, scheduledTxs); subject.setChild(ServicesState.ChildIndices.RECORD_STREAM_RUNNING_HASH, runningHashLeaf); + subject.setChild(ServicesState.ChildIndices.UNIQUE_TOKENS, ViewBuilderTest.someUniqueTokens()); + // when: + subject.init(platform, book); + // then: + ViewBuilderTest.assertIsTheExpectedUta(subject.uniqueTokenAssociations()); + ViewBuilderTest.assertIsTheExpectedUtao(subject.uniqueOwnershipAssociations()); + } + + @Test + void logsNonNullHashesFromSavedState() { + // setup: + var nodeInfo = mock(NodeInfo.class); + given(ctx.nodeInfo()).willReturn(nodeInfo); + given(nodeInfo.selfAccount()).willReturn(nodeAccount); + CONTEXTS.store(ctx); + + // and: + subject.setChild(ServicesState.ChildIndices.TOPICS, topics); + subject.setChild(ServicesState.ChildIndices.STORAGE, storage); + subject.setChild(ServicesState.ChildIndices.ACCOUNTS, accounts); + subject.setChild(ServicesState.ChildIndices.ADDRESS_BOOK, book); + subject.setChild(ServicesState.ChildIndices.NETWORK_CTX, networkCtx); + subject.setChild(ServicesState.ChildIndices.TOKENS, tokens); + subject.setChild(ServicesState.ChildIndices.TOKEN_ASSOCIATIONS, tokenAssociations); + subject.setChild(ServicesState.ChildIndices.DISK_FS, diskFs); + subject.setChild(ServicesState.ChildIndices.SCHEDULE_TXS, scheduledTxs); + subject.setChild(ServicesState.ChildIndices.RECORD_STREAM_RUNNING_HASH, runningHashLeaf); + subject.setChild(ServicesState.ChildIndices.UNIQUE_TOKENS, uniqueTokens); // when: subject.init(platform, book); // then: InOrder inOrder = inOrder( scheduledTxs, runningHashLeaf, diskFs, ctx, mockDigest, - accounts, storage, topics, tokens, tokenAssociations, networkCtx, book); + accounts, storage, topics, tokens, tokenAssociations, networkCtx, book, uniqueTokens); inOrder.verify(diskFs).checkHashesAgainstDiskContents(); inOrder.verify(ctx).setRecordsInitialHash(recordsHash); inOrder.verify(accounts).getHash(); @@ -498,6 +577,7 @@ void logsNonNullHashesFromSavedState() { inOrder.verify(networkCtx).getHash(); inOrder.verify(book).getHash(); inOrder.verify(runningHashLeaf).getHash(); + inOrder.verify(uniqueTokens).getHash(); inOrder.verify(ctx).update(subject); // and: assertThat( @@ -527,6 +607,8 @@ void hashesPrintedAsExpected() { Hash hashInRunningHash = new Hash("ttqasdhasdhasdhasdhasdhasdhasdhasdhasdhasdhasdha".getBytes()); // and: Hash overallHash = new Hash("a!dfa!dfa!dfa!dfa!dfa!dfa!dfa!dfa!dfa!dfa!dfa!df".getBytes()); + Hash uniqueTokensRootHash = new Hash("asdhasdhasdhasdhasdhasdhasdhasdhasdhasdhasdhasdh".getBytes()); + // and: subject.setChild(ServicesState.ChildIndices.TOPICS, topics); subject.setChild(ServicesState.ChildIndices.STORAGE, storage); @@ -537,8 +619,8 @@ void hashesPrintedAsExpected() { subject.setChild(ServicesState.ChildIndices.TOKEN_ASSOCIATIONS, tokenAssociations); subject.setChild(ServicesState.ChildIndices.DISK_FS, diskFs); subject.setChild(ServicesState.ChildIndices.SCHEDULE_TXS, scheduledTxs); - subject.setChild(ServicesState.ChildIndices.RECORD_STREAM_RUNNING_HASH, runningHashLeaf); + subject.setChild(ServicesState.ChildIndices.UNIQUE_TOKENS, uniqueTokens); // and: var expected = String.format("[SwirldState Hashes]\n" + " Overall :: %s\n" + @@ -552,7 +634,8 @@ void hashesPrintedAsExpected() { " NetworkContext :: %s\n" + " AddressBook :: %s\n" + " RecordsRunningHashLeaf :: %s\n" + - " ↪ Running hash :: %s", + " ↪ Running hash :: %s\n" + + " UniqueTokens :: %s", overallHash, accountsRootHash, @@ -565,13 +648,15 @@ void hashesPrintedAsExpected() { ctxHash, bookHash, runningHashLeafHash, - hashInRunningHash); + hashInRunningHash, + uniqueTokensRootHash); subject.setHash(overallHash); given(topics.getHash()).willReturn(topicRootHash); given(accounts.getHash()).willReturn(accountsRootHash); given(storage.getHash()).willReturn(storageRootHash); given(tokens.getHash()).willReturn(tokensRootHash); + given(uniqueTokens.getHash()).willReturn(uniqueTokensRootHash); given(tokenAssociations.getHash()).willReturn(tokenRelsRootHash); given(networkCtx.getHash()).willReturn(ctxHash); given(networkCtx.toString()).willReturn("Not really a network context representation!"); @@ -604,6 +689,9 @@ void fastCopyCopiesPrimitives() { subject.setChild(ServicesState.ChildIndices.DISK_FS, diskFs); subject.setChild(ServicesState.ChildIndices.SCHEDULE_TXS, scheduledTxs); subject.setChild(ServicesState.ChildIndices.RECORD_STREAM_RUNNING_HASH, runningHashLeaf); + subject.setChild(ServicesState.ChildIndices.UNIQUE_TOKENS, uniqueTokens); + subject.setUniqueTokenAssociations(uniqueTokenAssociations); + subject.setUniqueOwnershipAssociations(uniqueOwnershipAssociations); subject.nodeId = self; subject.ctx = ctx; @@ -624,6 +712,9 @@ void fastCopyCopiesPrimitives() { assertSame(diskFsCopy, copy.diskFs()); assertSame(scheduledTxsCopy, copy.scheduleTxs()); assertSame(runningHashLeafCopy, copy.runningHashLeaf()); + assertSame(uniqueTokensCopy, copy.uniqueTokens()); + assertSame(uniqueTokenAssociationsCopy, copy.uniqueTokenAssociations()); + assertSame(uniqueOwnershipAssociationsCopy, copy.uniqueOwnershipAssociations()); } @Test diff --git a/hedera-node/src/test/java/com/hedera/services/context/AwareTransactionContextTest.java b/hedera-node/src/test/java/com/hedera/services/context/AwareTransactionContextTest.java index cfbefde1c7a8..c9e12cb9864f 100644 --- a/hedera-node/src/test/java/com/hedera/services/context/AwareTransactionContextTest.java +++ b/hedera-node/src/test/java/com/hedera/services/context/AwareTransactionContextTest.java @@ -581,6 +581,18 @@ void addsExpiringEntities() { assertEquals(subject.expiringEntities(), expected); } + @Test + void setsCreatedSerialNumbersInReceipt() { + // given: + List expected = List.of(1L, 2L, 3L, 4L, 5L, 6L); + var expectedArray = new long[]{1L, 2L, 3L, 4L, 5L, 6L}; + // when: + subject.setCreated(expected); + + // then: + assertArrayEquals(subject.receiptSoFar().build().getSerialNumbers(), expectedArray); + } + @Test void throwsIfAccessorIsAlreadyTriggered() { // given: diff --git a/hedera-node/src/test/java/com/hedera/services/context/ServicesContextTest.java b/hedera-node/src/test/java/com/hedera/services/context/ServicesContextTest.java index c650325e71e5..7eba80111ec1 100644 --- a/hedera-node/src/test/java/com/hedera/services/context/ServicesContextTest.java +++ b/hedera-node/src/test/java/com/hedera/services/context/ServicesContextTest.java @@ -41,12 +41,12 @@ import com.hedera.services.fees.AwareHbarCentExchange; import com.hedera.services.fees.StandardExemptions; import com.hedera.services.fees.TxnRateFeeMultiplierSource; -import com.hedera.services.fees.calculation.utils.AccessorBasedUsages; import com.hedera.services.fees.calculation.AwareFcfsUsagePrices; import com.hedera.services.fees.calculation.UsageBasedFeeCalculator; +import com.hedera.services.fees.calculation.utils.AccessorBasedUsages; import com.hedera.services.fees.calculation.utils.PricedUsageCalculator; -import com.hedera.services.fees.charging.NarratedLedgerCharging; import com.hedera.services.fees.charging.FeeChargingPolicy; +import com.hedera.services.fees.charging.NarratedLedgerCharging; import com.hedera.services.fees.charging.TxnChargingPolicyAgent; import com.hedera.services.files.HFileMeta; import com.hedera.services.files.SysFileCallbacks; @@ -71,8 +71,9 @@ import com.hedera.services.keys.LegacyEd25519KeyReader; import com.hedera.services.ledger.HederaLedger; import com.hedera.services.ledger.PureTransferSemanticChecks; -import com.hedera.services.ledger.accounts.BackingTokenRels; import com.hedera.services.ledger.accounts.BackingAccounts; +import com.hedera.services.ledger.accounts.BackingNfts; +import com.hedera.services.ledger.accounts.BackingTokenRels; import com.hedera.services.ledger.ids.SeqNoEntityIdSource; import com.hedera.services.legacy.handler.FreezeHandler; import com.hedera.services.legacy.handler.SmartContractRequestHandler; @@ -116,7 +117,10 @@ import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; import com.hedera.services.state.merkle.MerkleTopic; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.migration.StdStateMigrations; +import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.state.submerkle.ExchangeRates; import com.hedera.services.state.submerkle.SequenceNumber; import com.hedera.services.state.validation.BasedLedgerValidator; @@ -135,9 +139,9 @@ import com.hedera.services.throttling.HapiThrottling; import com.hedera.services.throttling.TransactionThrottling; import com.hedera.services.throttling.TxnAwareHandleThrottling; -import com.hedera.services.txns.span.ExpandHandleSpan; import com.hedera.services.txns.TransitionLogicLookup; import com.hedera.services.txns.TransitionRunner; +import com.hedera.services.txns.span.ExpandHandleSpan; import com.hedera.services.txns.span.SpanMapManager; import com.hedera.services.txns.submission.BasicSubmissionFlow; import com.hedera.services.txns.submission.PlatformSubmissionManager; @@ -155,6 +159,7 @@ import com.swirlds.common.crypto.Cryptography; import com.swirlds.common.crypto.Hash; import com.swirlds.common.crypto.RunningHash; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.ethereum.db.ServicesRepositoryRoot; import org.junit.jupiter.api.BeforeEach; @@ -182,29 +187,35 @@ import static org.mockito.BDDMockito.verify; import static org.mockito.BDDMockito.when; -public class ServicesContextTest { +class ServicesContextTest { private final long id = 1L; private final NodeId nodeId = new NodeId(false, id); private static final String recordStreamDir = "somePath/recordStream"; - Instant consensusTimeOfLastHandledTxn = Instant.now(); - Platform platform; - SequenceNumber seqNo; - ExchangeRates midnightRates; - MerkleNetworkContext networkCtx; - ServicesState state; - Cryptography crypto; - PropertySource properties; - StandardizedPropertySources propertySources; - FCMap topics; - FCMap tokens; - FCMap accounts; - FCMap storage; - FCMap tokenAssociations; - FCMap schedules; + private Instant consensusTimeOfLastHandledTxn = Instant.now(); + private Platform platform; + private SequenceNumber seqNo; + private ExchangeRates midnightRates; + private MerkleNetworkContext networkCtx; + private ServicesState state; + private Cryptography crypto; + private PropertySource properties; + private StandardizedPropertySources propertySources; + private FCMap topics; + private FCMap tokens; + private FCMap accounts; + private FCMap schedules; + private FCMap storage; + private FCMap uniqueTokens; + private FCMap tokenAssociations; + private FCOneToManyRelation uniqueTokenAssociations; + private FCOneToManyRelation uniqueOwnershipAssociations; @BeforeEach void setup() { + uniqueTokens = mock(FCMap.class); + uniqueTokenAssociations = mock(FCOneToManyRelation.class); + uniqueOwnershipAssociations = mock(FCOneToManyRelation.class); topics = mock(FCMap.class); tokens = mock(FCMap.class); tokenAssociations = mock(FCMap.class); @@ -222,6 +233,9 @@ void setup() { given(state.tokens()).willReturn(tokens); given(state.tokenAssociations()).willReturn(tokenAssociations); given(state.scheduleTxs()).willReturn(schedules); + given(state.uniqueTokens()).willReturn(uniqueTokens); + given(state.uniqueTokenAssociations()).willReturn(uniqueTokenAssociations); + given(state.uniqueOwnershipAssociations()).willReturn(uniqueOwnershipAssociations); crypto = mock(Cryptography.class); platform = mock(Platform.class); given(platform.getSelfId()).willReturn(new NodeId(false, 0L)); @@ -241,6 +255,9 @@ void updatesStateAsExpected() { var newTokens = mock(FCMap.class); var newTokenRels = mock(FCMap.class); var newSchedules = mock(FCMap.class); + var newUniqueTokens = mock(FCMap.class); + var newUniqueTokenAssociations = mock(FCOneToManyRelation.class); + var newUniqueOwnershipAssociations = mock(FCOneToManyRelation.class); given(newState.accounts()).willReturn(newAccounts); given(newState.topics()).willReturn(newTopics); @@ -248,6 +265,9 @@ void updatesStateAsExpected() { given(newState.storage()).willReturn(newStorage); given(newState.tokenAssociations()).willReturn(newTokenRels); given(newState.scheduleTxs()).willReturn(newSchedules); + given(newState.uniqueTokens()).willReturn(newUniqueTokens); + given(newState.uniqueTokenAssociations()).willReturn(newUniqueTokenAssociations); + given(newState.uniqueOwnershipAssociations()).willReturn(newUniqueOwnershipAssociations); // given: var subject = new ServicesContext(nodeId, platform, state, propertySources); // and: @@ -257,6 +277,9 @@ void updatesStateAsExpected() { var tokensRef = subject.queryableTokens(); var tokenRelsRef = subject.queryableTokenAssociations(); var schedulesRef = subject.queryableSchedules(); + var uniqueTokensRef = subject.queryableUniqueTokens(); + var uniqueUtaRef = subject.queryableUniqueTokenAssociations(); + var uniqueUtaoRef = subject.queryableUniqueOwnershipAssociations(); // when: subject.update(newState); @@ -269,6 +292,9 @@ void updatesStateAsExpected() { assertSame(tokensRef, subject.queryableTokens()); assertSame(tokenRelsRef, subject.queryableTokenAssociations()); assertSame(schedulesRef, subject.queryableSchedules()); + assertSame(uniqueTokensRef, subject.queryableUniqueTokens()); + assertSame(uniqueUtaRef, subject.queryableUniqueTokenAssociations()); + assertSame(uniqueUtaoRef, subject.queryableUniqueOwnershipAssociations()); // and: assertSame(newAccounts, subject.queryableAccounts().get()); assertSame(newTopics, subject.queryableTopics().get()); @@ -276,6 +302,21 @@ void updatesStateAsExpected() { assertSame(newTokens, subject.queryableTokens().get()); assertSame(newTokenRels, subject.queryableTokenAssociations().get()); assertSame(newSchedules, subject.queryableSchedules().get()); + assertSame(newUniqueTokens, subject.queryableUniqueTokens().get()); + assertSame(newUniqueTokenAssociations, subject.queryableUniqueTokenAssociations().get()); + assertSame(newUniqueOwnershipAssociations, subject.queryableUniqueOwnershipAssociations().get()); + } + + @Test + void queryableUniqueTokenAssociationsReturnsProperReference() { + var subject = new ServicesContext(nodeId, platform, state, propertySources); + compareFCOTMR(subject.uniqueTokenAssociations(), subject.queryableUniqueTokenAssociations().get()); + } + + @Test + void queryableUniqueTokenAccountOwnershipsReturnsProperReference() { + var subject = new ServicesContext(nodeId, platform, state, propertySources); + compareFCOTMR(subject.uniqueOwnershipAssociations(), subject.queryableUniqueOwnershipAssociations().get()); } @Test @@ -383,6 +424,7 @@ void rebuildsStoreViewsIfNonNull() { @Test void rebuildsBackingAccountsIfNonNull() { // setup: + BackingNfts nfts = mock(BackingNfts.class); BackingTokenRels tokenRels = mock(BackingTokenRels.class); BackingAccounts backingAccounts = mock(BackingAccounts.class); @@ -395,6 +437,7 @@ void rebuildsBackingAccountsIfNonNull() { // and given: ctx.setBackingAccounts(backingAccounts); ctx.setBackingTokenRels(tokenRels); + ctx.setBackingNfts(nfts); // when: ctx.rebuildBackingStoresIfPresent(); @@ -402,6 +445,7 @@ void rebuildsBackingAccountsIfNonNull() { // then: verify(tokenRels).rebuildFromSources(); verify(backingAccounts).rebuildFromSources(); + verify(nfts).rebuildFromSources(); } @Test @@ -472,6 +516,9 @@ void hasExpectedStakedInfrastructure() { assertThat(ctx.applicationPropertiesReloading(), instanceOf(ValidatingCallbackInterceptor.class)); assertThat(ctx.recordsHistorian(), instanceOf(TxnAwareRecordsHistorian.class)); assertThat(ctx.queryableAccounts(), instanceOf(AtomicReference.class)); + assertThat(ctx.queryableUniqueTokens(), instanceOf(AtomicReference.class)); + assertThat(ctx.queryableTokenAssociations(), instanceOf(AtomicReference.class)); + assertThat(ctx.queryableUniqueOwnershipAssociations(), instanceOf(AtomicReference.class)); assertThat(ctx.txnChargingPolicy(), instanceOf(FeeChargingPolicy.class)); assertThat(ctx.txnResponseHelper(), instanceOf(TxnResponseHelper.class)); assertThat(ctx.statusCounts(), instanceOf(ConsensusStatusCounts.class)); @@ -541,6 +588,7 @@ void hasExpectedStakedInfrastructure() { assertThat(ctx.spanMapManager(), instanceOf(SpanMapManager.class)); assertThat(ctx.impliedTransfersMarshal(), instanceOf(ImpliedTransfersMarshal.class)); assertThat(ctx.transferSemanticChecks(), instanceOf(PureTransferSemanticChecks.class)); + assertThat(ctx.backingNfts(), instanceOf(BackingNfts.class)); // and: assertEquals(ServicesNodeType.STAKED_NODE, ctx.nodeType()); // and expect legacy: @@ -669,4 +717,11 @@ void setRecordsInitialHashTest() { // then: verify(recordStreamManager).setInitialHash(initialHash); } + + private void compareFCOTMR(FCOneToManyRelation expected, FCOneToManyRelation actual) { + assertEquals(expected.getKeySet(), actual.getKeySet()); + expected.getKeySet().forEach(key -> { + assertEquals(expected.getList(key), actual.getList(key)); + }); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/context/primitives/StateViewTest.java b/hedera-node/src/test/java/com/hedera/services/context/primitives/StateViewTest.java index 49b7ce477a18..0e5860aee2c4 100644 --- a/hedera-node/src/test/java/com/hedera/services/context/primitives/StateViewTest.java +++ b/hedera-node/src/test/java/com/hedera/services/context/primitives/StateViewTest.java @@ -24,11 +24,18 @@ import com.hedera.services.context.properties.NodeLocalProperties; import com.hedera.services.files.HFileMeta; import com.hedera.services.legacy.core.jproto.JKey; +import com.hedera.services.state.enums.TokenSupplyType; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleDiskFs; +import com.hedera.services.state.merkle.MerkleEntityAssociation; import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleSchedule; import com.hedera.services.state.merkle.MerkleToken; +import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleTopic; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.state.submerkle.RichInstant; import com.hedera.services.store.schedule.ScheduleStore; @@ -39,21 +46,26 @@ import com.hedera.test.extensions.LoggingSubject; import com.hedera.test.factories.accounts.MerkleAccountFactory; import com.hedera.test.factories.scenarios.TxnHandlingScenario; +import com.hedera.test.utils.IdUtils; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.ContractID; +import com.hederahashgraph.api.proto.java.CryptoGetInfoResponse; import com.hederahashgraph.api.proto.java.Duration; import com.hederahashgraph.api.proto.java.FileGetInfoResponse; import com.hederahashgraph.api.proto.java.FileID; import com.hederahashgraph.api.proto.java.Fraction; import com.hederahashgraph.api.proto.java.Key; import com.hederahashgraph.api.proto.java.KeyList; +import com.hederahashgraph.api.proto.java.NftID; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TokenFreezeStatus; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenKycStatus; +import com.hederahashgraph.api.proto.java.TokenNftInfo; import com.hederahashgraph.api.proto.java.TokenRelationship; import com.hederahashgraph.api.proto.java.TransactionBody; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; @@ -64,6 +76,7 @@ import javax.inject.Inject; import java.time.Instant; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -72,10 +85,14 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; +import static com.hedera.services.state.merkle.MerkleEntityAssociation.fromAccountTokenRel; import static com.hedera.services.state.merkle.MerkleScheduleTest.scheduleCreateTxnWith; +import static com.hedera.services.state.submerkle.RichInstant.fromJava; +import static com.hedera.services.store.tokens.TokenStore.MISSING_TOKEN; import static com.hedera.services.utils.EntityIdUtils.asAccount; import static com.hedera.services.utils.EntityIdUtils.asSolidityAddress; import static com.hedera.services.utils.EntityIdUtils.asSolidityAddressHex; +import static com.hedera.services.utils.MiscUtils.asKeyUnchecked; import static com.hedera.test.factories.scenarios.TxnHandlingScenario.COMPLEX_KEY_ACCOUNT_KT; import static com.hedera.test.factories.scenarios.TxnHandlingScenario.MISC_ACCOUNT_KT; import static com.hedera.test.factories.scenarios.TxnHandlingScenario.SCHEDULE_ADMIN_KT; @@ -87,6 +104,7 @@ import static com.hedera.test.utils.IdUtils.asFile; import static com.hedera.test.utils.IdUtils.asSchedule; import static com.hedera.test.utils.IdUtils.asToken; +import static com.hederahashgraph.api.proto.java.TokenType.FUNGIBLE_COMMON; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -113,6 +131,9 @@ class StateViewTest { private TokenID tokenId = asToken("2.4.5"); private TokenID missingTokenId = asToken("3.4.5"); private AccountID payerAccountId = asAccount("9.9.9"); + private AccountID tokenAccountId = asAccount("9.9.10"); + private AccountID nftOwnerId = asAccount("4.4.44"); + private AccountID invalidOwnerId = asAccount("5.5.55"); private ScheduleID scheduleId = asSchedule("6.7.8"); private ScheduleID missingScheduleId = asSchedule("7.8.9"); private ContractID cid = asContract("3.2.1"); @@ -133,15 +154,19 @@ class StateViewTest { private Map attrs; private BiFunction> mockTokenRelsFn; + private FCMap topics; private FCMap contracts; + private FCMap tokenRels; private TokenStore tokenStore; private ScheduleStore scheduleStore; private TransactionBody parentScheduleCreate; private MerkleToken token; private MerkleSchedule schedule; + private MerkleAccount nftOwner; private MerkleAccount contract; private MerkleAccount notContract; + private MerkleAccount tokenAccount; private NodeLocalProperties nodeProps; private MerkleDiskFs diskFs; @@ -177,6 +202,10 @@ private void setup() throws Throwable { notContract = MerkleAccountFactory.newAccount() .isSmartContract(false) .get(); + tokenAccount = MerkleAccountFactory.newAccount() + .isSmartContract(false) + .tokens(tokenId) + .get(); contract = MerkleAccountFactory.newAccount() .memo("Stay cold...") .isSmartContract(true) @@ -190,9 +219,20 @@ private void setup() throws Throwable { .deleted(true) .expirationTime(9_999_999L) .get(); + nftOwner = MerkleAccountFactory.newAccount() + .get(); contracts = (FCMap) mock(FCMap.class); given(contracts.get(MerkleEntityId.fromContractId(cid))).willReturn(contract); + given(contracts.get(MerkleEntityId.fromAccountId(nftOwnerId))).willReturn(nftOwner); given(contracts.get(MerkleEntityId.fromContractId(notCid))).willReturn(notContract); + given(contracts.get(MerkleEntityId.fromAccountId(tokenAccountId))).willReturn(tokenAccount); + + topics = (FCMap) mock(FCMap.class); + + tokenRels = new FCMap<>(); + tokenRels.put( + fromAccountTokenRel(tokenAccountId, tokenId), + new MerkleTokenRelStatus(123L, false, true)); tokenStore = mock(TokenStore.class); token = new MerkleToken( @@ -209,7 +249,10 @@ private void setup() throws Throwable { token.setExpiry(expiry); token.setAutoRenewPeriod(autoRenewPeriod); token.setDeleted(true); + token.setTokenType(TokenType.FUNGIBLE_COMMON); + token.setSupplyType(TokenSupplyType.FINITE); token.setFeeScheduleFrom(grpcCustomFees); + given(tokenStore.resolve(tokenId)).willReturn(tokenId); given(tokenStore.resolve(missingTokenId)).willReturn(TokenStore.MISSING_TOKEN); given(tokenStore.get(tokenId)).willReturn(token); @@ -246,13 +289,24 @@ private void setup() throws Throwable { StateView.tokenRelsFn = mockTokenRelsFn; given(mockTokenRelsFn.apply(any(), any())).willReturn(Collections.emptyList()); + var uniqueTokens = new FCMap(); + uniqueTokens.put(targetNftKey, targetNft); + + final var uniqueTokenAccountOwnerships = new FCOneToManyRelation(); + uniqueTokenAccountOwnerships.associate(EntityId.fromGrpcAccountId(nftOwnerId), new MerkleUniqueTokenId(targetNftKey.tokenId(), 4)); + subject = new StateView( tokenStore, scheduleStore, StateView.EMPTY_TOPICS_SUPPLIER, () -> contracts, - nodeProps, - () -> diskFs); + StateView.EMPTY_STORAGE_SUPPLIER, + () -> uniqueTokens, + () -> tokenRels, + StateView.EMPTY_UNIQUE_TOKEN_ASSOCS_SUPPLIER, + () -> uniqueTokenAccountOwnerships, + () -> diskFs, + nodeProps); subject.fileAttrs = attrs; subject.fileContents = contents; subject.contractBytecode = bytecode; @@ -264,6 +318,30 @@ void cleanup() { StateView.tokenRelsFn = StateView::tokenRels; } + @Test + void infoForAccountNftsWorks() { + var expectedResult = new ArrayList(); + expectedResult.add(TokenNftInfo.newBuilder() + .setAccountID(nftOwnerId) + .setCreationTime(targetNft.getCreationTime().toGrpc()) + .setNftID(NftID.newBuilder() + .setTokenID(targetNftId.getTokenID()) + .setSerialNumber(targetNftId.getSerialNumber()) + .build()) + .setMetadata(ByteString.copyFrom(targetNft.getMetadata())) + .build()); + + var result = subject.infoForAccountNfts(nftOwnerId, 0, 1); + assertFalse(result.isEmpty()); + assertEquals(expectedResult, result.get()); + } + + @Test + void infoForAccountNftsReturnsEmpty() { + var result = subject.infoForAccountNfts(invalidOwnerId, 0, 1); + assertTrue(result.isEmpty()); + } + @Test void tokenExistsWorks() { // expect: @@ -271,6 +349,13 @@ void tokenExistsWorks() { assertFalse(subject.tokenExists(missingTokenId)); } + @Test + void nftExistsWorks() { + // expect: + assertTrue(subject.nftExists(targetNftId)); + assertFalse(subject.nftExists(missingNftId)); + } + @Test void scheduleExistsWorks() { // expect: @@ -339,7 +424,7 @@ void getsScheduleInfoForDeleted() { assertEquals(SCHEDULE_ADMIN_KT.asKey(), info.getAdminKey()); assertEquals(expectedScheduledTxn, info.getScheduledTransactionBody()); assertEquals(schedule.scheduledTransactionId(), info.getScheduledTransactionID()); - assertEquals(RichInstant.fromJava(resolutionTime).toGrpc(), info.getDeletionTime()); + assertEquals(fromJava(resolutionTime).toGrpc(), info.getDeletionTime()); } @Test @@ -350,7 +435,7 @@ void getsScheduleInfoForExecuted() { var info = gotten.get(); // then: - assertEquals(RichInstant.fromJava(resolutionTime).toGrpc(), info.getExecutionTime()); + assertEquals(fromJava(resolutionTime).toGrpc(), info.getExecutionTime()); } @Test @@ -451,6 +536,128 @@ void getsContractInfo() throws Exception { assertEquals(expectedStorage.length + expectedBytecode.length, info.getStorage()); } + @Test + void getTokenRelationship() { + // given: + given(tokenStore.exists(tokenId)).willReturn(true); + given(tokenStore.get(tokenId)).willReturn(token); + + List expectedRels = List.of( + TokenRelationship.newBuilder() + .setTokenId(tokenId) + .setSymbol("UnfrozenToken") + .setBalance(123L) + .setKycStatus(TokenKycStatus.Granted) + .setFreezeStatus(TokenFreezeStatus.Unfrozen) + .setDecimals(1) + .build()); + + // when: + var actualRels = StateView.tokenRels(subject, tokenAccountId); + + // then: + assertEquals(expectedRels, actualRels); + } + + @Test + void getInfoForNftMissing() { + // setup: + var nftID = NftID.newBuilder().setTokenID(tokenId).setSerialNumber(123L).build(); + + // when: + var actualTokenNftInfo = subject.infoForNft(nftID); + + // then: + assertEquals(Optional.empty(), actualTokenNftInfo); + } + + @Test + void getTokenType() { + // setup: + + // when: + var actualTokenType = subject.tokenType(tokenId).get(); + + // then: + assertEquals(FUNGIBLE_COMMON, actualTokenType); + } + + @Test + void getTokenTypeMissing() { + // setup: + given(tokenStore.resolve(tokenId)).willReturn(MISSING_TOKEN); + + // when: + var actualTokenType = subject.tokenType(tokenId); + + // then: + assertEquals(Optional.empty(), actualTokenType); + } + + @Test + void getTokenTypeException() { + // setup: + given(tokenStore.get(tokenId)).willThrow(new RuntimeException()); + + // when: + var actualTokenType = subject.tokenType(tokenId); + + // then: + assertEquals(Optional.empty(), actualTokenType); + } + + @Test + void infoForAccount() { + // setup: + var expectedResponse = CryptoGetInfoResponse.AccountInfo.newBuilder() + .setKey(asKeyUnchecked(tokenAccount.getKey())) + .setAccountID(tokenAccountId) + .setReceiverSigRequired(tokenAccount.isReceiverSigRequired()) + .setDeleted(tokenAccount.isDeleted()) + .setMemo(tokenAccount.getMemo()) + .setAutoRenewPeriod(Duration.newBuilder().setSeconds(tokenAccount.getAutoRenewSecs())) + .setBalance(tokenAccount.getBalance()) + .setExpirationTime(Timestamp.newBuilder().setSeconds(tokenAccount.getExpiry())) + .setContractAccountID(asSolidityAddressHex(tokenAccountId)) + .setOwnedNfts(tokenAccount.getNftsOwned()) + .build(); + + // when: + var actualResponse = subject.infoForAccount(tokenAccountId); + + // then: + assertEquals(expectedResponse, actualResponse.get()); + } + + @Test + void infoForAccountEmpty() { + // setup: + given(contracts.get(MerkleEntityId.fromAccountId(tokenAccountId))).willReturn(null); + + // when: + var actualResponse = subject.infoForAccount(tokenAccountId); + + // then: + assertEquals(Optional.empty(), actualResponse); + } + + @Test + void getTopics() { + // setup: + subject = new StateView( + () -> topics, + () -> contracts, + nodeProps, + () -> diskFs + ); + + // when: + var actualTopics = subject.topics(); + + // then: + assertEquals(topics, actualTopics); + } + @Test void returnsEmptyOptionalIfContractMissing() { given(contracts.get(any())).willReturn(null); @@ -588,6 +795,11 @@ void returnEmptyFileInfoForBinaryObjectNotFoundException() { assertTrue(info.isEmpty()); } + @Test + void accountNftsCountWorks() { + assertEquals(1, subject.accountNftsCount(nftOwnerId)); + } + @Test void returnEmptyFileInfoForBinaryObjectDeletedExceptionAfterRetries() { // setup: @@ -712,6 +924,53 @@ void getsSpecialFileContents() { assertTrue(Arrays.equals(data, stuff.get())); } + @Test + void rejectsMissingNft() { + // when: + final var optionalNftInfo = subject.infoForNft(missingNftId); + + // then: + assertTrue(optionalNftInfo.isEmpty()); + } + + @Test + void getNftsAsExpected() { + // when: + final var optionalNftInfo = subject.infoForNft(targetNftId); + + // then: + assertTrue(optionalNftInfo.isPresent()); + // and: + final var info = optionalNftInfo.get(); + assertEquals(targetNftId, info.getNftID()); + assertEquals(nftOwnerId, info.getAccountID()); + assertEquals(fromJava(nftCreation).toGrpc(), info.getCreationTime()); + assertArrayEquals(nftMeta, info.getMetadata().toByteArray()); + } + + @Test + void emptySuppliersYieldEmptyAssociations() { + assertSame( + StateView.EMPTY_UNIQUE_TOKEN_ASSOCS, + StateView.EMPTY_UNIQUE_TOKEN_ASSOCS_SUPPLIER.get()); + assertSame( + StateView.EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS, + StateView.EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS_SUPPLIER.get()); + } + + private final Instant nftCreation = Instant.ofEpochSecond(1_234_567L, 8); + private final byte[] nftMeta = "abcdefgh".getBytes(); + private final NftID targetNftId = NftID.newBuilder() + .setTokenID(IdUtils.asToken("1.2.3")) + .setSerialNumber(4L) + .build(); + private final NftID missingNftId = NftID.newBuilder() + .setTokenID(IdUtils.asToken("1.7.9")) + .setSerialNumber(5L) + .build(); + private final MerkleUniqueTokenId targetNftKey = new MerkleUniqueTokenId(new EntityId(1, 2, 3), 4); + private final MerkleUniqueToken targetNft = new MerkleUniqueToken(EntityId.fromGrpcAccountId(nftOwnerId), nftMeta, fromJava(nftCreation)); + private CustomFeesOuterClass.FixedFee fixedFeeInTokenUnits = CustomFeesOuterClass.FixedFee.newBuilder() .setDenominatingTokenId(tokenId) .setAmount(100) diff --git a/hedera-node/src/test/java/com/hedera/services/context/properties/BootstrapPropertiesTest.java b/hedera-node/src/test/java/com/hedera/services/context/properties/BootstrapPropertiesTest.java index cb039df1ee67..fcd6e20f5a58 100644 --- a/hedera-node/src/test/java/com/hedera/services/context/properties/BootstrapPropertiesTest.java +++ b/hedera-node/src/test/java/com/hedera/services/context/properties/BootstrapPropertiesTest.java @@ -156,7 +156,13 @@ class BootstrapPropertiesTest { entry("stats.runningAvgHalfLifeSecs", 10.0), entry("stats.hapiOps.speedometerUpdateIntervalMs", 3_000L), entry("stats.speedometerHalfLifeSecs", 10.0), - entry("consensus.message.maxBytesAllowed", 1024) + entry("consensus.message.maxBytesAllowed", 1024), + entry("ledger.nftTransfers.maxLen", 10), + entry("tokens.nfts.maxQueryRange", 100L), + entry("tokens.nfts.maxBatchSizeWipe", 10), + entry("tokens.nfts.maxBatchSizeMint", 10), + entry("tokens.nfts.maxBatchSizeBurn", 10), + entry("tokens.nfts.maxMetadataBytes", 100) ); @BeforeEach diff --git a/hedera-node/src/test/java/com/hedera/services/context/properties/GlobalDynamicPropertiesTest.java b/hedera-node/src/test/java/com/hedera/services/context/properties/GlobalDynamicPropertiesTest.java index 57661c9e1b81..62c9c393ad98 100644 --- a/hedera-node/src/test/java/com/hedera/services/context/properties/GlobalDynamicPropertiesTest.java +++ b/hedera-node/src/test/java/com/hedera/services/context/properties/GlobalDynamicPropertiesTest.java @@ -70,6 +70,20 @@ void constructsFlagsAsExpected() { assertTrue(subject.autoRenewEnabled()); } + @Test + void nftPropertiesTest(){ + givenPropsWithSeed(1); + subject = new GlobalDynamicProperties(numbers, properties); + + assertEquals(36, subject.maxNftTransfersLen()); + assertEquals(37, subject.maxBatchSizeBurn()); + assertEquals(38, subject.maxBatchSizeWipe()); + assertEquals(39, subject.maxBatchSizeMint()); + assertEquals(40, subject.maxNftQueryRange()); + assertEquals(41, subject.maxNftMetadataBytes()); + assertEquals(42, subject.maxTokenNameUtf8Bytes()); + } + @Test void constructsIntsAsExpected() { givenPropsWithSeed(1); @@ -251,6 +265,14 @@ private void givenPropsWithSeed(int i) { given(properties.getLongProperty("autorenew.gracePeriod")).willReturn(i + 32L); given(properties.getLongProperty("rates.midnightCheckInterval")).willReturn(i + 33L); given(properties.getIntProperty("tokens.maxCustomFeesAllowed")).willReturn(i + 34); + + given(properties.getIntProperty("ledger.nftTransfers.maxLen")).willReturn(i + 35); + given(properties.getIntProperty("tokens.nfts.maxBatchSizeBurn")).willReturn(i + 36); + given(properties.getIntProperty("tokens.nfts.maxBatchSizeWipe")).willReturn(i + 37); + given(properties.getIntProperty("tokens.nfts.maxBatchSizeMint")).willReturn(i + 38); + given(properties.getLongProperty("tokens.nfts.maxQueryRange")).willReturn(i + 39L); + given(properties.getIntProperty("tokens.nfts.maxMetadataBytes")).willReturn(i + 40); + given(properties.getIntProperty("tokens.maxTokenNameUtf8Bytes")).willReturn(i + 41); } private AccountID accountWith(long shard, long realm, long num) { diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/AutoRenewCalcsTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/AutoRenewCalcsTest.java index e2c68163997d..e7f368674b57 100644 --- a/hedera-node/src/test/java/com/hedera/services/fees/calculation/AutoRenewCalcsTest.java +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/AutoRenewCalcsTest.java @@ -34,6 +34,7 @@ import com.hederahashgraph.api.proto.java.ExchangeRate; import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.SubType; import org.apache.commons.lang3.tuple.Triple; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; @@ -43,6 +44,9 @@ import javax.inject.Inject; import java.time.Instant; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static com.hedera.test.utils.IdUtils.asToken; import static com.hederahashgraph.api.proto.java.HederaFunctionality.CryptoAccountAutoRenew; @@ -57,7 +61,7 @@ class AutoRenewCalcsTest { private final Instant preCutoff = Instant.ofEpochSecond(1_234_566L); private final Instant cutoff = Instant.ofEpochSecond(1_234_567L); - private Triple cryptoPrices; + private Triple, Instant, Map> cryptoPrices; private MerkleAccount expiredAccount; private final CryptoOpsUsage cryptoOpsUsage = new CryptoOpsUsage(); private final ExchangeRate activeRates = ExchangeRate.newBuilder() @@ -181,7 +185,7 @@ void knowsHowToBuildCtx() { assertEquals(cryptoOpsUsage.cryptoAutoRenewRb(expectedCtx), subject.rbUsedBy(expiredAccount)); } - private Triple frozenPricesFrom( + private Triple, Instant, Map> frozenPricesFrom( String resource, HederaFunctionality autoRenewFunction ) throws Exception { @@ -190,11 +194,30 @@ private Triple frozenPricesFrom( .filter(transactionFeeSchedule -> transactionFeeSchedule.getHederaFunctionality() == autoRenewFunction) .findFirst() .get() - .getFeeData(); - var postPrices = prePrices.toBuilder() - .setServicedata(prePrices.getServicedata().toBuilder().setRbh(2 * prePrices.getServicedata().getRbh())) - .build(); - return Triple.of(prePrices, cutoff, postPrices); + .getFeesList(); + var prePricesMap = toSubTypeMap(prePrices); + + var postPricesMap = toPostPrices(prePricesMap); + return Triple.of(prePricesMap, cutoff, postPricesMap); + } + + private Map toSubTypeMap(List feesList) { + Map result = new HashMap<>(); + for (FeeData feeData : feesList) { + result.put(feeData.getSubType(), feeData); + } + return result; + } + + private Map toPostPrices(Map feeDataMap) { + var changeableMap = new HashMap<>(feeDataMap); + for (FeeData feeData : feeDataMap.values()) { + var postPrices = feeData.toBuilder() + .setServicedata(feeData.getServicedata().toBuilder().setRbh(2 * feeData.getServicedata().getRbh())) + .build(); + changeableMap.put(postPrices.getSubType(), postPrices); + } + return changeableMap; } private void setupAccountWith(long balance) { diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java index 8f35528a7512..bb060cffaf95 100644 --- a/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/AwareFcfsUsagePricesTest.java @@ -35,6 +35,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.FeeSchedule; import com.hederahashgraph.api.proto.java.FileID; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TimestampSeconds; import com.hederahashgraph.api.proto.java.TransactionBody; @@ -48,6 +49,7 @@ import java.io.File; import java.time.Instant; +import java.util.Map; import static com.hedera.services.fees.calculation.AwareFcfsUsagePrices.DEFAULT_USAGE_PRICES; import static com.hederahashgraph.api.proto.java.HederaFunctionality.CryptoTransfer; @@ -89,8 +91,12 @@ class AwareFcfsUsagePricesTest { .setServicedata(nextResourceUsagePrices) .build(); - FeeData nextCryptoTransferUsagePrices = nextUsagePrices; - FeeData currentCryptoTransferUsagePrices = currUsagePrices; + Map currUsagePricesMap = Map.of(SubType.DEFAULT, currUsagePrices); + Map nextUsagePricesMap = Map.of(SubType.DEFAULT, nextUsagePrices); + + Map nextCryptoTransferUsagePrices = currUsagePricesMap; + Map currentCryptoTransferUsagePrices = nextUsagePricesMap; + FeeSchedule nextFeeSchedule, currentFeeSchedule; CurrentAndNextFeeSchedule feeSchedules; @@ -98,7 +104,7 @@ class AwareFcfsUsagePricesTest { TransactionBody cryptoTransferTxn = TransactionBody.newBuilder() .setTransactionID(TransactionID.newBuilder() - .setTransactionValidStart(Timestamp.newBuilder().setSeconds(nextExpiry - 1))) + .setTransactionValidStart(Timestamp.newBuilder().setSeconds(nextExpiry + 1))) .setCryptoTransfer(CryptoTransferTransactionBody.newBuilder() .setTransfers(TxnUtils.withAdjustments( IdUtils.asAccount("1.2.3"), 1, @@ -116,13 +122,13 @@ private void setup() { .setExpiryTime(TimestampSeconds.newBuilder().setSeconds(nextExpiry)) .addTransactionFeeSchedule(TransactionFeeSchedule.newBuilder() .setHederaFunctionality(CryptoTransfer) - .setFeeData(nextCryptoTransferUsagePrices)) + .addFees(nextCryptoTransferUsagePrices.get(SubType.DEFAULT))) .build(); currentFeeSchedule = FeeSchedule.newBuilder() .setExpiryTime(TimestampSeconds.newBuilder().setSeconds(currentExpiry)) .addTransactionFeeSchedule(TransactionFeeSchedule.newBuilder() .setHederaFunctionality(CryptoTransfer) - .setFeeData(currentCryptoTransferUsagePrices)) + .addFees(currentCryptoTransferUsagePrices.get(SubType.DEFAULT))) .build(); feeSchedules = CurrentAndNextFeeSchedule.newBuilder() .setCurrentFeeSchedule(currentFeeSchedule) @@ -161,17 +167,29 @@ void returnsExpectedPriceSequence() { } @Test - void getsActivePrices() throws Exception { + void getsDefaultActivePrices() throws Exception { // given: subject.loadPriceSchedules(); // when: - FeeData actual = subject.activePrices(); + FeeData actual = subject.defaultActivePrices(); // then: assertEquals(nextUsagePrices, actual); } + @Test + void getsActivePrices() throws Exception { + // given: + subject.loadPriceSchedules(); + + // when: + Map actual = subject.activePrices(); + + // then: + assertEquals(nextUsagePricesMap, actual); + } + @Test void getsDefaultPricesIfActiveTxnInvalid() throws Exception { // given: @@ -181,7 +199,7 @@ void getsDefaultPricesIfActiveTxnInvalid() throws Exception { given(accessor.getFunction()).willReturn(UNRECOGNIZED); // when: - FeeData actual = subject.activePrices(); + Map actual = subject.activePrices(); // then: assertEquals(DEFAULT_USAGE_PRICES, actual); @@ -197,7 +215,7 @@ void getsTransferUsagePricesAtCurrent() throws Exception { .build(); // when: - FeeData actual = subject.pricesGiven(CryptoTransfer, at); + Map actual = subject.pricesGiven(CryptoTransfer, at); // then: assertEquals(currentCryptoTransferUsagePrices, actual); @@ -219,7 +237,7 @@ void returnsDefaultUsagePricesForUnsupported() throws Exception { .build(); // when: - FeeData actual = subject.pricesGiven(UNRECOGNIZED, at); + Map actual = subject.pricesGiven(UNRECOGNIZED, at); // then: assertEquals(DEFAULT_USAGE_PRICES, actual); @@ -242,7 +260,7 @@ void getsTransferUsagePricesPastCurrentBeforeNextExpiry() throws Exception { .build(); // when: - FeeData actual = subject.pricesGiven(CryptoTransfer, at); + Map actual = subject.pricesGiven(CryptoTransfer, at); // then: assertEquals(nextCryptoTransferUsagePrices, actual); diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java index 3d19d96bc76d..0913b1722a72 100644 --- a/hedera-node/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java @@ -37,6 +37,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.exception.InvalidTxBodyException; @@ -51,6 +52,7 @@ import java.time.Instant; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; @@ -93,8 +95,9 @@ public class UsageBasedFeeCalculatorTest { .setRbh(3_000_000L) .setSbh(4_000_000L).build(); private FeeData mockFeeData = FeeData.newBuilder() - .setNetworkdata(mockFees).setNodedata(mockFees).setServicedata(mockFees).build(); - private FeeData currentPrices = mockFeeData; + .setNetworkdata(mockFees).setNodedata(mockFees).setServicedata(mockFees).setSubType(SubType.DEFAULT).build(); + private Map currentPrices = Map.of(SubType.DEFAULT, mockFeeData); + private FeeData defaultCurrentPrices = mockFeeData; private FeeData resourceUsage = mockFeeData; private ExchangeRate currentRate = ExchangeRate.newBuilder().setCentEquiv(22).setHbarEquiv(1).build(); private Query query; @@ -183,7 +186,7 @@ void estimatesContractCallPayerBalanceChanges() throws Throwable { accessor = new SignedTxnAccessor(signedTxn); given(exchange.rate(at)).willReturn(currentRate); - given(usagePrices.pricesGiven(ContractCall, at)).willReturn(currentPrices); + given(usagePrices.defaultPricesGiven(ContractCall, at)).willReturn(defaultCurrentPrices); // and: long expectedGasPrice = getTinybarsFromTinyCents(currentRate, mockFees.getGas() / FEE_DIVISOR_FACTOR); @@ -212,6 +215,7 @@ void estimatesContractCreatePayerBalanceChanges() throws Throwable { given(exchange.rate(at)).willReturn(currentRate); given(usagePrices.pricesGiven(ContractCreate, at)).willReturn(currentPrices); + given(usagePrices.defaultPricesGiven(ContractCreate, at)).willReturn(defaultCurrentPrices); // and: long expectedGasPrice = getTinybarsFromTinyCents(currentRate, mockFees.getGas() / FEE_DIVISOR_FACTOR); @@ -252,6 +256,7 @@ void estimatesCryptoTransferPayerBalanceChanges() throws Throwable { void estimatesFutureGasPriceInTinybars() { given(exchange.rate(at)).willReturn(currentRate); given(usagePrices.pricesGiven(CryptoCreate, at)).willReturn(currentPrices); + given(usagePrices.defaultPricesGiven(CryptoCreate, at)).willReturn(defaultCurrentPrices); // and: long expected = getTinybarsFromTinyCents(currentRate, mockFees.getGas() / FEE_DIVISOR_FACTOR); @@ -265,6 +270,7 @@ void estimatesFutureGasPriceInTinybars() { @Test void computesActiveGasPriceInTinybars() { given(exchange.activeRate()).willReturn(currentRate); + given(usagePrices.defaultActivePrices()).willReturn(defaultCurrentPrices); // and: long expected = getTinybarsFromTinyCents(currentRate, mockFees.getGas() / FEE_DIVISOR_FACTOR); @@ -278,7 +284,7 @@ void computesActiveGasPriceInTinybars() { @Test void loadPriceSchedulesOnInit() { // setup: - final var seq = Triple.of(FeeData.getDefaultInstance(), Instant.now(), FeeData.getDefaultInstance()); + final var seq = Triple.of(Map.of(SubType.DEFAULT, FeeData.getDefaultInstance()), Instant.now(), Map.of(SubType.DEFAULT, FeeData.getDefaultInstance())); given(usagePrices.activePricingSequence(CryptoAccountAutoRenew)).willReturn(seq); @@ -322,13 +328,13 @@ void failsWithNseeSansApplicableUsageCalculator() { // expect: assertThrows(NoSuchElementException.class, () -> subject.computeFee(accessor, payerKey, view)); assertThrows(NoSuchElementException.class, - () -> subject.computePayment(query, currentPrices, view, at, Collections.emptyMap())); + () -> subject.computePayment(query, currentPrices.get(SubType.DEFAULT), view, at, Collections.emptyMap())); } @Test void invokesQueryDelegateAsExpected() { // setup: - FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices, resourceUsage, currentRate); + FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices.get(SubType.DEFAULT), resourceUsage, currentRate); given(correctQueryEstimator.applicableTo(query)).willReturn(true); given(incorrectQueryEstimator.applicableTo(query)).willReturn(false); @@ -340,7 +346,7 @@ void invokesQueryDelegateAsExpected() { given(exchange.rate(at)).willReturn(currentRate); // when: - FeeObject fees = subject.computePayment(query, currentPrices, view, at, Collections.emptyMap()); + FeeObject fees = subject.computePayment(query, currentPrices.get(SubType.DEFAULT), view, at, Collections.emptyMap()); // then: assertEquals(fees.getNodeFee(), expectedFees.getNodeFee()); @@ -351,7 +357,7 @@ void invokesQueryDelegateAsExpected() { @Test void invokesQueryDelegateByTypeAsExpected() { // setup: - FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices, resourceUsage, currentRate); + FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices.get(SubType.DEFAULT), resourceUsage, currentRate); given(correctQueryEstimator.applicableTo(query)).willReturn(true); given(incorrectQueryEstimator.applicableTo(query)).willReturn(false); @@ -360,7 +366,7 @@ void invokesQueryDelegateByTypeAsExpected() { given(exchange.rate(at)).willReturn(currentRate); // when: - FeeObject fees = subject.estimatePayment(query, currentPrices, view, at, ANSWER_ONLY); + FeeObject fees = subject.estimatePayment(query, currentPrices.get(SubType.DEFAULT), view, at, ANSWER_ONLY); // then: assertEquals(fees.getNodeFee(), expectedFees.getNodeFee()); @@ -376,7 +382,7 @@ void usesMultiplierAsExpected() throws Exception { FeeBuilder.getSignatureCount(signedTxn), 9, FeeBuilder.getSignatureSize(signedTxn)); - FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices, resourceUsage, currentRate, multiplier); + FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices.get(SubType.DEFAULT), resourceUsage, currentRate, multiplier); suggestedMultiplier.set(multiplier); given(correctOpEstimator.applicableTo(accessor.getTxn())).willReturn(true); @@ -403,7 +409,7 @@ void invokesOpDelegateAsExpectedWithOneOption() throws Exception { FeeBuilder.getSignatureCount(signedTxn), 9, FeeBuilder.getSignatureSize(signedTxn)); - FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices, resourceUsage, currentRate); + FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices.get(SubType.DEFAULT), resourceUsage, currentRate); given(correctOpEstimator.applicableTo(accessor.getTxn())).willReturn(true); given(txnUsageEstimators.apply(CryptoCreate)).willReturn(List.of(correctOpEstimator)); @@ -433,14 +439,14 @@ void invokesAccessorBasedUsagesForCryptoTransferOutsideHandleWithNewAccumulator( .get(); accessor = SignedTxnAccessor.uncheckedFrom(signedTxn); // and: - final var expectedFees = FeeBuilder.getFeeObject(currentPrices, resourceUsage, currentRate); + final var expectedFees = FeeBuilder.getFeeObject(currentPrices.get(SubType.DEFAULT), resourceUsage, currentRate); given(pricedUsageCalculator.supports(CryptoTransfer)).willReturn(true); given(exchange.rate(at)).willReturn(currentRate); given(usagePrices.pricesGiven(CryptoTransfer, at)).willReturn(currentPrices); given(pricedUsageCalculator.extraHandleFees( accessor, - currentPrices, + currentPrices.get(SubType.DEFAULT), currentRate, payerKey )).willReturn(expectedFees); @@ -466,13 +472,13 @@ void invokesAccessorBasedUsagesForCryptoTransferInHandleWithReusedAccumulator() .get(); accessor = SignedTxnAccessor.uncheckedFrom(signedTxn); // and: - final var expectedFees = FeeBuilder.getFeeObject(currentPrices, resourceUsage, currentRate); + final var expectedFees = FeeBuilder.getFeeObject(currentPrices.get(SubType.DEFAULT), resourceUsage, currentRate); given(pricedUsageCalculator.supports(CryptoTransfer)).willReturn(true); given(exchange.activeRate()).willReturn(currentRate); given(pricedUsageCalculator.inHandleFees( accessor, - currentPrices, + currentPrices.get(SubType.DEFAULT), currentRate, payerKey )).willReturn(expectedFees); @@ -493,7 +499,7 @@ void invokesOpDelegateAsExpectedWithTwoOptions() throws Exception { FeeBuilder.getSignatureCount(signedTxn), 9, FeeBuilder.getSignatureSize(signedTxn)); - FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices, resourceUsage, currentRate); + FeeObject expectedFees = FeeBuilder.getFeeObject(currentPrices.get(SubType.DEFAULT), resourceUsage, currentRate); given(correctOpEstimator.applicableTo(accessor.getTxn())).willReturn(true); given(incorrectOpEstimator.applicableTo(accessor.getTxn())).willReturn(false); @@ -524,7 +530,7 @@ void invokesOpDelegateAsExpectedForEstimateOfUnrecognizable() throws Exception { FeeBuilder.getSignatureCount(signedTxn), 9, FeeBuilder.getSignatureSize(signedTxn)); - FeeObject expectedFees = FeeBuilder.getFeeObject(DEFAULT_USAGE_PRICES, resourceUsage, currentRate); + FeeObject expectedFees = FeeBuilder.getFeeObject(DEFAULT_USAGE_PRICES.get(SubType.DEFAULT), resourceUsage, currentRate); given(txnUsageEstimators.apply(CryptoCreate)).willReturn(List.of(correctOpEstimator)); given(correctOpEstimator.applicableTo(accessor.getTxn())).willReturn(true); diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/queries/GetAccountNftInfosResourceUsageTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/queries/GetAccountNftInfosResourceUsageTest.java new file mode 100644 index 000000000000..d7ea6fa13188 --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/queries/GetAccountNftInfosResourceUsageTest.java @@ -0,0 +1,144 @@ +package com.hedera.services.fees.calculation.token.queries; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.usage.token.TokenGetAccountNftInfosUsage; +import com.hedera.test.utils.IdUtils; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.QueryHeader; +import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosQuery; +import com.hederahashgraph.api.proto.java.TokenNftInfo; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; + +import static com.hedera.services.queries.token.GetAccountNftInfosAnswer.ACCOUNT_NFT_INFO_CTX_KEY; +import static com.hederahashgraph.api.proto.java.ResponseType.ANSWER_ONLY; +import static com.hederahashgraph.api.proto.java.ResponseType.COST_ANSWER; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class GetAccountNftInfosResourceUsageTest { + ByteString m1 = ByteString.copyFromUtf8("metadata1"), m2 = ByteString.copyFromUtf8("metadata2"); + List metadata = List.of(m1, m2); + TokenGetAccountNftInfosUsage estimator; + Function factory; + FeeData expected; + AccountID target = IdUtils.asAccount("0.0.123"); + int start = 0, end = 1; + + StateView view; + List info = List.of(TokenNftInfo.newBuilder() + .setMetadata(m1) + .build(), + TokenNftInfo.newBuilder() + .setMetadata(m2) + .build()); + + Query satisfiableAnswerOnly = tokenGetAccountNftInfosQuery(target, start, end, ANSWER_ONLY); + + GetAccountNftInfosResourceUsage subject; + + @BeforeEach + private void setup() throws Throwable { + expected = mock(FeeData.class); + view = mock(StateView.class); + estimator = mock(TokenGetAccountNftInfosUsage.class); + factory = mock(Function.class); + given(factory.apply(any())).willReturn(estimator); + + GetAccountNftInfosResourceUsage.factory = factory; + + given(estimator.givenMetadata(any())).willReturn(estimator); + given(estimator.get()).willReturn(expected); + + given(view.infoForAccountNfts(target, start, end)).willReturn(Optional.of(info)); + + subject = new GetAccountNftInfosResourceUsage(); + } + + @Test + public void recognizesApplicableQuery() { + // given: + var applicable = tokenGetAccountNftInfosQuery(target, start, end, COST_ANSWER); + var inapplicable = Query.getDefaultInstance(); + + // expect: + assertTrue(subject.applicableTo(applicable)); + assertFalse(subject.applicableTo(inapplicable)); + } + + @Test + public void setsInfoInQueryCxtIfPresent() { + // setup: + var queryCtx = new HashMap(); + + // when: + var usage = subject.usageGiven(satisfiableAnswerOnly, view, queryCtx); + + // then: + assertSame(info, queryCtx.get(ACCOUNT_NFT_INFO_CTX_KEY)); + assertSame(expected, usage); + // and: + verify(estimator).givenMetadata(metadata); + } + + @Test + public void onlySetsTokenInfoInQueryCxtIfFound() { + // setup: + var queryCtx = new HashMap(); + + given(view.infoForAccountNfts(target, start, end)).willReturn(Optional.empty()); + + // when: + var usage = subject.usageGiven(satisfiableAnswerOnly, view, queryCtx); + + // then: + assertFalse(queryCtx.containsKey(ACCOUNT_NFT_INFO_CTX_KEY)); + // and: + assertSame(FeeData.getDefaultInstance(), usage); + } + + private Query tokenGetAccountNftInfosQuery(AccountID id, long start, long end, ResponseType type) { + TokenGetAccountNftInfosQuery.Builder op = TokenGetAccountNftInfosQuery.newBuilder() + .setAccountID(id) + .setStart(start) + .setEnd(end) + .setHeader(QueryHeader.newBuilder().setResponseType(type)); + return Query.newBuilder() + .setTokenGetAccountNftInfos(op) + .build(); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/queries/GetTokenNftInfoResourceUsageTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/queries/GetTokenNftInfoResourceUsageTest.java new file mode 100644 index 000000000000..894ae7affc9d --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/queries/GetTokenNftInfoResourceUsageTest.java @@ -0,0 +1,165 @@ +package com.hedera.services.fees.calculation.token.queries; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.usage.token.TokenGetNftInfoUsage; +import com.hedera.test.utils.IdUtils; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.NftID; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.QueryHeader; +import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoQuery; +import com.hederahashgraph.api.proto.java.TokenNftInfo; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; +import java.util.Optional; +import java.util.function.Function; + +import static com.hedera.services.queries.token.GetTokenNftInfoAnswer.NFT_INFO_CTX_KEY; +import static com.hederahashgraph.api.proto.java.ResponseType.ANSWER_ONLY; +import static com.hederahashgraph.api.proto.java.ResponseType.COST_ANSWER; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class GetTokenNftInfoResourceUsageTest { + NftID target = NftID.newBuilder().setTokenID(IdUtils.asToken("0.0.123")).setSerialNumber(1).build(); + FeeData expected; + ByteString metadata = ByteString.copyFromUtf8("LMAO"); + AccountID owner = IdUtils.asAccount("0.0.321321"); + + TokenGetNftInfoUsage estimator; + Function factory; + + StateView view; + TokenNftInfo info = TokenNftInfo.newBuilder() + .setAccountID(owner) + .setMetadata(metadata) + .setNftID(target) + .build(); + + Query satisfiableAnswerOnly = TokenNftInfoQuery(target, ANSWER_ONLY); + + GetTokenNftInfoResourceUsage subject; + + @BeforeEach + private void setup() throws Throwable { + expected = mock(FeeData.class); + view = mock(StateView.class); + estimator = mock(TokenGetNftInfoUsage.class); + factory = mock(Function.class); + given(factory.apply(any())).willReturn(estimator); + + GetTokenNftInfoResourceUsage.factory = factory; + + given(estimator.givenMetadata(metadata.toString())).willReturn(estimator); + given(estimator.get()).willReturn(expected); + + given(view.infoForNft(target)).willReturn(Optional.of(info)); + + subject = new GetTokenNftInfoResourceUsage(); + } + + @Test + public void recognizesApplicableQuery() { + // given: + var applicable = TokenNftInfoQuery(target, COST_ANSWER); + var inapplicable = Query.getDefaultInstance(); + + // expect: + assertTrue(subject.applicableTo(applicable)); + assertFalse(subject.applicableTo(inapplicable)); + } + + @Test + public void setsInfoInQueryCxtIfPresent() { + // setup: + var queryCtx = new HashMap(); + + // when: + var usage = subject.usageGiven(satisfiableAnswerOnly, view, queryCtx); + + // then: + assertSame(info, queryCtx.get(NFT_INFO_CTX_KEY)); + assertSame(expected, usage); + // and: + verify(estimator).givenMetadata(metadata.toString()); + } + + @Test + public void onlySetsTokenNftInfoInQueryCxtIfFound() { + // setup: + var queryCtx = new HashMap(); + + given(view.infoForNft(target)).willReturn(Optional.empty()); + + // when: + var usage = subject.usageGiven(satisfiableAnswerOnly, view, queryCtx); + + // then: + assertFalse(queryCtx.containsKey(NFT_INFO_CTX_KEY)); + // and: + assertSame(FeeData.getDefaultInstance(), usage); + } + + @Test + public void worksWithoutQueryContext() { + // setup: + given(view.infoForNft(target)).willReturn(Optional.empty()); + + // when: + var usage = subject.usageGiven(satisfiableAnswerOnly, view); + + // and: + assertSame(FeeData.getDefaultInstance(), usage); + } + + @Test + public void worksWithNoQueryContext() { + // setup: + given(view.infoForNft(target)).willReturn(Optional.empty()); + + // when: + var usage = subject.usageGivenType(satisfiableAnswerOnly, view, ANSWER_ONLY); + + // and: + assertSame(FeeData.getDefaultInstance(), usage); + } + + private Query TokenNftInfoQuery(NftID id, ResponseType type) { + TokenGetNftInfoQuery.Builder op = TokenGetNftInfoQuery.newBuilder() + .setNftID(id) + .setHeader(QueryHeader.newBuilder().setResponseType(type)); + return Query.newBuilder() + .setTokenGetNftInfo(op) + .build(); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsageTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsageTest.java index 48abbaa8328d..b923cd3ec72d 100644 --- a/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsageTest.java +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenBurnResourceUsageTest.java @@ -24,18 +24,25 @@ import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.token.TokenBurnUsage; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; +import com.hederahashgraph.api.proto.java.TokenBurnTransactionBody; +import com.hederahashgraph.api.proto.java.TokenID; +import com.hederahashgraph.api.proto.java.TokenType; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.fee.SigValueObj; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Optional; import java.util.function.BiFunction; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; +import static org.mockito.Mockito.verify; class TokenBurnResourceUsageTest { private TokenBurnResourceUsage subject; @@ -51,15 +58,22 @@ class TokenBurnResourceUsageTest { TokenBurnUsage usage; BiFunction factory; + TokenID token; + TokenBurnTransactionBody txBody; @BeforeEach private void setup() throws Throwable { expected = mock(FeeData.class); view = mock(StateView.class); + token = mock(TokenID.class); tokenBurnTxn = mock(TransactionBody.class); given(tokenBurnTxn.hasTokenBurn()).willReturn(true); + txBody = mock(TokenBurnTransactionBody.class); + given(tokenBurnTxn.getTokenBurn()).willReturn(txBody); + given(txBody.getToken()).willReturn(token); + nonTokenBurnTxn = mock(TransactionBody.class); given(nonTokenBurnTxn.hasTokenBurn()).willReturn(false); @@ -85,8 +99,20 @@ public void recognizesApplicability() { @Test public void delegatesToCorrectEstimate() throws Exception { // expect: + given(view.tokenType(token)).willReturn(Optional.of(TokenType.FUNGIBLE_COMMON)); + given(factory.apply(any(), any())).willReturn(usage); + given(usage.givenSubType(any())).willReturn(usage); + assertEquals( expected, subject.usageGiven(tokenBurnTxn, obj, view)); + verify(usage).givenSubType(SubType.TOKEN_FUNGIBLE_COMMON); + + given(view.tokenType(token)).willReturn(Optional.of(TokenType.NON_FUNGIBLE_UNIQUE)); + assertEquals( + expected, + subject.usageGiven(tokenBurnTxn, obj, view)); + verify(usage).givenSubType(SubType.TOKEN_NON_FUNGIBLE_UNIQUE); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsageTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsageTest.java index 0e5623b6633a..d561f0de4e85 100644 --- a/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsageTest.java +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/token/txns/TokenMintResourceUsageTest.java @@ -24,18 +24,25 @@ import com.hedera.services.usage.SigUsage; import com.hedera.services.usage.token.TokenMintUsage; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; +import com.hederahashgraph.api.proto.java.TokenID; +import com.hederahashgraph.api.proto.java.TokenMintTransactionBody; +import com.hederahashgraph.api.proto.java.TokenType; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.fee.SigValueObj; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Optional; import java.util.function.BiFunction; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; +import static org.mockito.Mockito.verify; class TokenMintResourceUsageTest { private TransactionBody nonTokenMintTxn; @@ -51,22 +58,29 @@ class TokenMintResourceUsageTest { StateView view; TokenMintUsage usage; TokenMintResourceUsage subject; + TokenMintTransactionBody transactionBody; + TokenID token; @BeforeEach private void setup() throws Throwable { expected = mock(FeeData.class); view = mock(StateView.class); + transactionBody = mock(TokenMintTransactionBody.class); + token = mock(TokenID.class); tokenMintTxn = mock(TransactionBody.class); given(tokenMintTxn.hasTokenMint()).willReturn(true); + given(tokenMintTxn.getTokenMint()).willReturn(transactionBody); + given(transactionBody.getToken()).willReturn(token); nonTokenMintTxn = mock(TransactionBody.class); given(nonTokenMintTxn.hasTokenMint()).willReturn(false); usage = mock(TokenMintUsage.class); + given(usage.givenSubType(SubType.DEFAULT)).willReturn(usage); given(usage.get()).willReturn(expected); - factory = (BiFunction)mock(BiFunction.class); + factory = (BiFunction) mock(BiFunction.class); given(factory.apply(tokenMintTxn, sigUsage)).willReturn(usage); TokenMintResourceUsage.factory = factory; @@ -84,8 +98,20 @@ public void recognizesApplicability() { @Test public void delegatesToCorrectEstimate() throws Exception { // expect: + given(view.tokenType(token)).willReturn(Optional.of(TokenType.FUNGIBLE_COMMON)); + given(factory.apply(any(), any())).willReturn(usage); + given(usage.givenSubType(any())).willReturn(usage); + + assertEquals( + expected, + subject.usageGiven(tokenMintTxn, obj, view)); + verify(usage).givenSubType(SubType.TOKEN_FUNGIBLE_COMMON); + + given(view.tokenType(token)).willReturn(Optional.of(TokenType.NON_FUNGIBLE_UNIQUE)); assertEquals( expected, subject.usageGiven(tokenMintTxn, obj, view)); + verify(usage).givenSubType(SubType.TOKEN_NON_FUNGIBLE_UNIQUE); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/fees/calculation/utils/ResourceUsageSubtypeHelperTest.java b/hedera-node/src/test/java/com/hedera/services/fees/calculation/utils/ResourceUsageSubtypeHelperTest.java new file mode 100644 index 000000000000..67248f88256d --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/fees/calculation/utils/ResourceUsageSubtypeHelperTest.java @@ -0,0 +1,29 @@ +package com.hedera.services.fees.calculation.utils; + +import com.hederahashgraph.api.proto.java.TokenType; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static com.hederahashgraph.api.proto.java.SubType.DEFAULT; +import static com.hederahashgraph.api.proto.java.SubType.TOKEN_FUNGIBLE_COMMON; +import static com.hederahashgraph.api.proto.java.SubType.TOKEN_NON_FUNGIBLE_UNIQUE; +import static org.junit.jupiter.api.Assertions.assertEquals; + +class ResourceUsageSubtypeHelperTest { + private ResourceUsageSubtypeHelper subject = new ResourceUsageSubtypeHelper(); + + @Test + void emptyOptionalIsDefault() { + // expect: + assertEquals(DEFAULT, subject.determineTokenType(Optional.empty())); + } + + @Test + void presentValuesAreAsExpected() { + // expect: + assertEquals(DEFAULT, subject.determineTokenType(Optional.of(TokenType.UNRECOGNIZED))); + assertEquals(TOKEN_FUNGIBLE_COMMON, subject.determineTokenType(Optional.of(TokenType.FUNGIBLE_COMMON))); + assertEquals(TOKEN_NON_FUNGIBLE_UNIQUE, subject.determineTokenType(Optional.of(TokenType.NON_FUNGIBLE_UNIQUE))); + } +} \ No newline at end of file diff --git a/hedera-node/src/test/java/com/hedera/services/grpc/controllers/TokenControllerTest.java b/hedera-node/src/test/java/com/hedera/services/grpc/controllers/TokenControllerTest.java index faf86ce730ec..1529810f948e 100644 --- a/hedera-node/src/test/java/com/hedera/services/grpc/controllers/TokenControllerTest.java +++ b/hedera-node/src/test/java/com/hedera/services/grpc/controllers/TokenControllerTest.java @@ -38,7 +38,9 @@ import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDelete; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenDissociateFromAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenFreezeAccount; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetAccountNftInfos; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetInfo; +import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGetNftInfo; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenGrantKycToAccount; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenMint; import static com.hederahashgraph.api.proto.java.HederaFunctionality.TokenRevokeKycFromAccount; @@ -187,4 +189,22 @@ public void forwardsTokenInfoAsExpected() { // expect: verify(queryResponseHelper).answer(query, queryObserver,null , TokenGetInfo); } + + @Test + public void forwardsTokenNftInfoAsExpected() { + // when: + subject.getTokenNftInfo(query, queryObserver); + + // expect: + verify(queryResponseHelper).answer(query, queryObserver,null , TokenGetNftInfo); + } + + @Test + public void forwardsAccountNftInfosAsExpected() { + // when: + subject.getAccountNftInfos(query, queryObserver); + + // expect: + verify(queryResponseHelper).answer(query, queryObserver,null , TokenGetAccountNftInfos); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshalTest.java b/hedera-node/src/test/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshalTest.java index c2c954be0420..b4d9d3103c6d 100644 --- a/hedera-node/src/test/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshalTest.java +++ b/hedera-node/src/test/java/com/hedera/services/grpc/marshalling/ImpliedTransfersMarshalTest.java @@ -30,6 +30,7 @@ import com.hedera.services.txns.customfees.CustomFeeSchedules; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.CryptoTransferTransactionBody; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenTransferList; import com.hederahashgraph.api.proto.java.TransferList; @@ -49,6 +50,8 @@ import static com.hedera.test.utils.IdUtils.asAccount; import static com.hedera.test.utils.IdUtils.asToken; import static com.hedera.test.utils.IdUtils.hbarChange; +import static com.hedera.test.utils.IdUtils.nftChange; +import static com.hedera.test.utils.IdUtils.nftXfer; import static com.hedera.test.utils.IdUtils.tokenChange; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_PAYER_BALANCE_FOR_CUSTOM_FEE; @@ -93,6 +96,8 @@ class ImpliedTransfersMarshalTest { private final AccountID a = asAccount("1.2.3"); private final AccountID b = asAccount("2.3.4"); private final AccountID c = asAccount("3.4.5"); + private final long serialNumberA = 12; + private final long serialNumberB = 12; private final long aHbarChange = -100L; private final long bHbarChange = +50L; @@ -109,6 +114,11 @@ class ImpliedTransfersMarshalTest { private final int maxExplicitHbarAdjusts = 5; private final int maxExplicitTokenAdjusts = 50; + private final int maxExplicitOwnershipChanges = 12; + final ImpliedTransfersMeta.ValidationProps validationProps = new ImpliedTransfersMeta.ValidationProps( + maxExplicitHbarAdjusts, + maxExplicitTokenAdjusts, + maxExplicitOwnershipChanges); private final EntityId customFeeToken = new EntityId(0, 0, 123); private final EntityId customFeeCollector = new EntityId(0, 0, 124); @@ -134,17 +144,15 @@ void setUp() { void validatesXfers() { setupFixtureOp(); final var expectedMeta = new ImpliedTransfersMeta( - maxExplicitHbarAdjusts, maxExplicitTokenAdjusts, TRANSFER_LIST_SIZE_LIMIT_EXCEEDED, - Collections.emptyList()); + validationProps, TRANSFER_LIST_SIZE_LIMIT_EXCEEDED, Collections.emptyList()); given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); // and: given(transferSemanticChecks.fullPureValidation( - maxExplicitHbarAdjusts, - maxExplicitTokenAdjusts, op.getTransfers(), - op.getTokenTransfersList())).willReturn(TRANSFER_LIST_SIZE_LIMIT_EXCEEDED); + op.getTokenTransfersList(), validationProps)).willReturn(TRANSFER_LIST_SIZE_LIMIT_EXCEEDED); // when: final var result = subject.unmarshalFromGrpc(op, bModel); @@ -171,8 +179,11 @@ void getsExpectedList() { tokenChange(token, cModel, cTokenChange), tokenChange(yetAnotherToken, aModel, aYetAnotherTokenChange), tokenChange(yetAnotherToken, bModel, bYetAnotherTokenChange), + nftChange(yetAnotherToken, a, b, serialNumberA), + nftChange(yetAnotherToken, a, b, serialNumberB), } ); + // and: final List customFee = getFixedCustomFee(); final List>> expectedCustomFeeChanges = List.of(Pair.of(anotherToken, customFee), @@ -184,16 +195,15 @@ void getsExpectedList() { new AssessedCustomFee(EntityId.fromGrpcAccountId(aModel), customFeeChangeToFeeCollector)); // and: - final var expectedMeta = new ImpliedTransfersMeta(maxExplicitHbarAdjusts, maxExplicitTokenAdjusts, - OK, expectedCustomFeeChanges); + final var expectedMeta = new ImpliedTransfersMeta(validationProps, OK, expectedCustomFeeChanges); given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); given(transferSemanticChecks.fullPureValidation( - maxExplicitHbarAdjusts, - maxExplicitTokenAdjusts, op.getTransfers(), - op.getTokenTransfersList())).willReturn(OK); + op.getTokenTransfersList(), + validationProps)).willReturn(OK); given(customFeeSchedules.lookupScheduleFor(any())).willReturn(customFee); // when: @@ -209,14 +219,13 @@ void getsExpectedList() { @Test void metaObjectContractSanityChecks() { // given: - final var oneMeta = new ImpliedTransfersMeta(3, 4, OK, entityCustomFees); - final var twoMeta = new ImpliedTransfersMeta(1, 2, TOKEN_WAS_DELETED, Collections.emptyList()); + final var oneMeta = new ImpliedTransfersMeta(validationProps, OK, entityCustomFees); + final var twoMeta = new ImpliedTransfersMeta(validationProps, TOKEN_WAS_DELETED, Collections.emptyList()); // and: - final var oneRepr = "ImpliedTransfersMeta{code=OK, maxExplicitHbarAdjusts=3, " + - "maxExplicitTokenAdjusts=4, customFeeSchedulesUsedInMarshal=[(Id{shard=0, realm=0, num=123},[])" + - "]}"; - final var twoRepr = "ImpliedTransfersMeta{code=TOKEN_WAS_DELETED, " + - "maxExplicitHbarAdjusts=1, maxExplicitTokenAdjusts=2, customFeeSchedulesUsedInMarshal=[]}"; + final var oneRepr = "ImpliedTransfersMeta{code=OK, maxExplicitHbarAdjusts=5, maxExplicitTokenAdjusts=50, " + + "maxExplicitOwnershipChanges=12, tokenFeeSchedules=[(Id{shard=0, realm=0, num=123},[])]}"; + final var twoRepr = "ImpliedTransfersMeta{code=TOKEN_WAS_DELETED, maxExplicitHbarAdjusts=5, " + + "maxExplicitTokenAdjusts=50, maxExplicitOwnershipChanges=12, tokenFeeSchedules=[]}"; // expect: assertNotEquals(oneMeta, twoMeta); @@ -233,20 +242,17 @@ void impliedXfersObjectContractSanityChecks() { new Id(1, 2, 3), asAccount("4.5.6"), 7)); - final var oneImpliedXfers = ImpliedTransfers.invalid(3, 4, TOKEN_WAS_DELETED); - final var twoImpliedXfers = ImpliedTransfers.valid(1, 100, twoChanges, - entityCustomFees, assessedCustomFees); + final var oneImpliedXfers = ImpliedTransfers.invalid(validationProps, TOKEN_WAS_DELETED); + final var twoImpliedXfers = ImpliedTransfers.valid( + validationProps, twoChanges, entityCustomFees, assessedCustomFees); // and: - final var oneRepr = "ImpliedTransfers{meta=ImpliedTransfersMeta{code=TOKEN_WAS_DELETED, " + - "maxExplicitHbarAdjusts=3, maxExplicitTokenAdjusts=4, customFeeSchedulesUsedInMarshal=[]}, " + - "changes=[]," + - " " + + final var oneRepr = "ImpliedTransfers{meta=ImpliedTransfersMeta{code=TOKEN_WAS_DELETED, maxExplicitHbarAdjusts=5, " + + "maxExplicitTokenAdjusts=50, maxExplicitOwnershipChanges=12, tokenFeeSchedules=[]}, changes=[], " + "tokenFeeSchedules=[], assessedCustomFees=[]}"; - final var twoRepr = "ImpliedTransfers{meta=ImpliedTransfersMeta{code=OK, maxExplicitHbarAdjusts=1, " + - "maxExplicitTokenAdjusts=100, customFeeSchedulesUsedInMarshal=[(Id{shard=0, realm=0, num=123},[])]}," + - " changes=[BalanceChange{token=Id{shard=1, realm=2, num=3}, account=Id{shard=4, realm=5, num=6}," + - " units=7, codeForInsufficientBalance=INSUFFICIENT_TOKEN_BALANCE}], " + - "tokenFeeSchedules=[(Id{shard=0, realm=0, num=123},[])], " + + final var twoRepr = "ImpliedTransfers{meta=ImpliedTransfersMeta{code=OK, maxExplicitHbarAdjusts=5, " + + "maxExplicitTokenAdjusts=50, maxExplicitOwnershipChanges=12, tokenFeeSchedules=[(Id{shard=0, " + + "realm=0, num=123},[])]}, changes=[BalanceChange{token=Id{shard=1, realm=2, num=3}, " + + "account=Id{shard=4, realm=5, num=6}, units=7}], tokenFeeSchedules=[(Id{shard=0, realm=0, num=123},[])], " + "assessedCustomFees=[AssessedCustomFee{token=EntityId{shard=0, realm=0, num=123}, " + "account=EntityId{shard=0, realm=0, num=124}, units=123}]}"; @@ -301,10 +307,11 @@ void propagatesArithmeticExceptionOnOverflow() { @Test void metaRecognizesIdenticalConditions() { // given: - final var meta = new ImpliedTransfersMeta(3, 4, OK, entityCustomFees); + final var meta = new ImpliedTransfersMeta(validationProps, OK, entityCustomFees); - given(dynamicProperties.maxTransferListSize()).willReturn(3); - given(dynamicProperties.maxTokenTransferListSize()).willReturn(4); + given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); + given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); // expect: assertTrue(meta.wasDerivedFrom(dynamicProperties, customFeeSchedules)); @@ -314,15 +321,25 @@ void metaRecognizesIdenticalConditions() { assertFalse(meta.wasDerivedFrom(dynamicProperties, newCustomFeeSchedules)); // and: - given(dynamicProperties.maxTransferListSize()).willReturn(2); - given(dynamicProperties.maxTokenTransferListSize()).willReturn(4); + given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts - 1); + given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); + + // expect: + assertFalse(meta.wasDerivedFrom(dynamicProperties, customFeeSchedules)); + + // and: + given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); + given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts + 1); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); // expect: assertFalse(meta.wasDerivedFrom(dynamicProperties, customFeeSchedules)); // and: - given(dynamicProperties.maxTransferListSize()).willReturn(3); - given(dynamicProperties.maxTokenTransferListSize()).willReturn(3); + given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); + given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges - 1); // expect: assertFalse(meta.wasDerivedFrom(dynamicProperties, customFeeSchedules)); @@ -339,16 +356,15 @@ void translatesOverflowFromExcessiveSumming() { ))).build(); // and: - final var expected = ImpliedTransfers.invalid( - maxExplicitHbarAdjusts, maxExplicitTokenAdjusts, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); + final var expected = ImpliedTransfers.invalid(validationProps, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); given(transferSemanticChecks.fullPureValidation( - maxExplicitHbarAdjusts, - maxExplicitTokenAdjusts, op.getTransfers(), - op.getTokenTransfersList())).willReturn(OK); + op.getTokenTransfersList(), + validationProps)).willReturn(OK); // when: final var actual = subject.unmarshalFromGrpc(op, payer); @@ -369,16 +385,15 @@ void translatesOverflowFromFractionalCalc() { final var customFee = getOverflowingFractionalCustomFee(); // and: - final var expected = ImpliedTransfers.invalid( - maxExplicitHbarAdjusts, maxExplicitTokenAdjusts, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); + final var expected = ImpliedTransfers.invalid(validationProps, CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE); given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); given(transferSemanticChecks.fullPureValidation( - maxExplicitHbarAdjusts, - maxExplicitTokenAdjusts, op.getTransfers(), - op.getTokenTransfersList())).willReturn(OK); + op.getTokenTransfersList(), + validationProps)).willReturn(OK); given(customFeeSchedules.lookupScheduleFor(any())).willReturn(customFee); // when: @@ -411,16 +426,15 @@ void getsExpectedListWithFractionalCustomFee() { expectedFractionalFee)); // and: - final var expectedMeta = new ImpliedTransfersMeta(maxExplicitHbarAdjusts, maxExplicitTokenAdjusts, - OK, expectedCustomFeeChanges); + final var expectedMeta = new ImpliedTransfersMeta(validationProps, OK, expectedCustomFeeChanges); given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); given(transferSemanticChecks.fullPureValidation( - maxExplicitHbarAdjusts, - maxExplicitTokenAdjusts, op.getTransfers(), - op.getTokenTransfersList())).willReturn(OK); + op.getTokenTransfersList(), + validationProps)).willReturn(OK); given(customFeeSchedules.lookupScheduleFor(any())).willReturn(customFee); // when: @@ -470,16 +484,15 @@ void getsExpectedListWithFixedCustomFeeNonNullDenomination() { new AssessedCustomFee(EntityId.fromGrpcAccountId(aModel), token.asEntityId(), 20L)); // and: - final var expectedMeta = new ImpliedTransfersMeta(maxExplicitHbarAdjusts, maxExplicitTokenAdjusts, - OK, expectedCustomFeeChanges); + final var expectedMeta = new ImpliedTransfersMeta(validationProps, OK, expectedCustomFeeChanges); given(dynamicProperties.maxTransferListSize()).willReturn(maxExplicitHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxExplicitTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxExplicitOwnershipChanges); given(transferSemanticChecks.fullPureValidation( - maxExplicitHbarAdjusts, - maxExplicitTokenAdjusts, op.getTransfers(), - op.getTokenTransfersList())).willReturn(OK); + op.getTokenTransfersList(), + validationProps)).willReturn(OK); given(customFeeSchedules.lookupScheduleFor(anotherToken.asEntityId())).willReturn(customFee); // when: @@ -515,6 +528,10 @@ private void setupFixtureOp() { ))) .addTokenTransfers(TokenTransferList.newBuilder() .setToken(yetAnotherId) + .addAllNftTransfers(List.of( + nftXfer(a, b, serialNumberA), + nftXfer(a, b, serialNumberB) + )) .addAllTransfers(List.of( adjustFrom(a, -15), adjustFrom(b, 15) diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/BalanceChangeTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/BalanceChangeTest.java index 4f28bb9d7709..19a7eb1dcb9f 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/BalanceChangeTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/BalanceChangeTest.java @@ -21,12 +21,16 @@ */ import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.NftId; import com.hedera.test.utils.IdUtils; import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.NftTransfer; import org.junit.jupiter.api.Test; import static com.hedera.services.ledger.BalanceChange.NO_TOKEN_FOR_HBAR_ADJUST; +import static com.hedera.services.ledger.BalanceChange.changingNftOwnership; import static com.hedera.test.utils.IdUtils.asAccount; +import static com.hedera.test.utils.IdUtils.nftXfer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -34,20 +38,24 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class BalanceChangeTest { - private final AccountID a = asAccount("1.2.3"); - private final long delta = -1_234L; private final Id t = new Id(1, 2, 3); + private final long delta = -1_234L; + private final long serialNo = 1234L; + private final AccountID a = asAccount("1.2.3"); + private final AccountID b = asAccount("2.3.4"); @Test void objectContractSanityChecks() { // given: final var hbarChange = IdUtils.hbarChange(a, delta); final var tokenChange = IdUtils.tokenChange(t, a, delta); + final var nftChange = changingNftOwnership(t, t.asGrpcToken(), nftXfer(a, b, serialNo)); // and: - final var hbarRepr = "BalanceChange{token=ℏ, account=Id{shard=1, realm=2, num=3}, units=-1234, " + - "codeForInsufficientBalance=INSUFFICIENT_ACCOUNT_BALANCE}"; - final var tokenRepr = "BalanceChange{token=Id{shard=1, realm=2, num=3}, account=Id{shard=1, realm=2, num=3}, " + - "units=-1234, codeForInsufficientBalance=INSUFFICIENT_TOKEN_BALANCE}"; + final var hbarRepr = "BalanceChange{token=ℏ, account=Id{shard=1, realm=2, num=3}, units=-1234}"; + final var tokenRepr = "BalanceChange{token=Id{shard=1, realm=2, num=3}, " + + "account=Id{shard=1, realm=2, num=3}, units=-1234}"; + final var nftRepr = "BalanceChange{nft=Id{shard=1, realm=2, num=3}, serialNo=1234, " + + "from=Id{shard=1, realm=2, num=3}, to=Id{shard=2, realm=3, num=4}}"; // expect: assertNotEquals(hbarChange, tokenChange); @@ -55,6 +63,7 @@ void objectContractSanityChecks() { // and: assertEquals(hbarRepr, hbarChange.toString()); assertEquals(tokenRepr, tokenChange.toString()); + assertEquals(nftRepr, nftChange.toString()); // and: assertSame(a, hbarChange.accountId()); assertEquals(delta, hbarChange.units()); @@ -62,13 +71,16 @@ void objectContractSanityChecks() { } @Test - void recognizesIfForHbar() { + void recognizesFungibleTypes() { // given: final var hbarChange = IdUtils.hbarChange(a, delta); final var tokenChange = IdUtils.tokenChange(t, a, delta); assertTrue(hbarChange.isForHbar()); assertFalse(tokenChange.isForHbar()); + // and: + assertFalse(hbarChange.isForNft()); + assertFalse(tokenChange.isForNft()); } @Test @@ -76,4 +88,26 @@ void noTokenForHbarAdjust() { final var hbarChange = IdUtils.hbarChange(a, delta); assertSame(NO_TOKEN_FOR_HBAR_ADJUST, hbarChange.tokenId()); } + + @Test + void ownershipChangeFactoryWorks() { + // setup: + final var xfer = NftTransfer.newBuilder() + .setSenderAccountID(a) + .setReceiverAccountID(b) + .setSerialNumber(serialNo) + .build(); + + // given: + final var nftChange = changingNftOwnership(t, t.asGrpcToken(), xfer); + + // expect: + assertEquals(a, nftChange.accountId()); + assertEquals(b, nftChange.counterPartyAccountId()); + assertEquals(t.asGrpcToken(), nftChange.tokenId()); + assertEquals(serialNo, nftChange.serialNo()); + // and: + assertTrue(nftChange.isForNft()); + assertEquals(new NftId(t.getShard(), t.getRealm(), t.getNum(), serialNo), nftChange.nftId()); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/BaseHederaLedgerTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/BaseHederaLedgerTest.java index f6b093f77fa5..6a8bacf1d01b 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/BaseHederaLedgerTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/BaseHederaLedgerTest.java @@ -25,6 +25,7 @@ import com.hedera.services.ledger.accounts.HederaAccountCustomizer; import com.hedera.services.ledger.ids.EntityIdSource; import com.hedera.services.ledger.properties.AccountProperty; +import com.hedera.services.ledger.properties.NftProperty; import com.hedera.services.ledger.properties.TokenRelProperty; import com.hedera.services.legacy.core.jproto.JEd25519Key; import com.hedera.services.records.AccountRecordsHistorian; @@ -33,8 +34,9 @@ import com.hedera.services.state.merkle.MerkleAccountTokens; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; import com.hedera.services.state.submerkle.EntityId; -import com.hedera.services.state.submerkle.ExpirableTxnRecord; +import com.hedera.services.store.models.NftId; import com.hedera.services.store.tokens.HederaTokenStore; import com.hedera.services.store.tokens.TokenStore; import com.hedera.services.txns.validation.OptionValidator; @@ -44,7 +46,6 @@ import com.hederahashgraph.api.proto.java.FileID; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.TokenID; -import com.swirlds.fcqueue.FCQueue; import org.apache.commons.lang3.tuple.Pair; import java.util.Collections; @@ -80,6 +81,7 @@ public class BaseHederaLedgerTest { protected EntityIdSource ids; protected ExpiringCreations creator; protected AccountRecordsHistorian historian; + protected TransactionalLedger nftsLedger; protected TransactionalLedger accountsLedger; protected TransactionalLedger, TokenRelProperty, MerkleTokenRelStatus> tokenRelsLedger; protected AccountID misc = AccountID.newBuilder().setAccountNum(1_234).build(); @@ -182,6 +184,7 @@ protected void setupWithMockLedger() { token = mock(MerkleToken.class); given(token.freezeKey()).willReturn(Optional.empty()); + nftsLedger = mock(TransactionalLedger.class); accountsLedger = mock(TransactionalLedger.class); tokenRelsLedger = mock(TransactionalLedger.class); addToLedger(misc, MISC_BALANCE, Map.of( @@ -210,6 +213,7 @@ protected void setupWithMockLedger() { subject = new HederaLedger(tokenStore, ids, creator, validator, historian, dynamicProps, accountsLedger); subject.setTokenRelsLedger(tokenRelsLedger); + subject.setNftsLedger(nftsLedger); } protected void givenAdjustBalanceUpdatingTokenXfers(AccountID misc, TokenID tokenId, long i) { diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/HederLedgerTokensTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/HederLedgerTokensTest.java index ac15e3518348..9c576de85b48 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/HederLedgerTokensTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/HederLedgerTokensTest.java @@ -21,6 +21,7 @@ */ import com.hedera.services.ledger.properties.AccountProperty; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.state.merkle.MerkleAccountTokens; import com.hedera.test.utils.IdUtils; import com.hederahashgraph.api.proto.java.AccountAmount; @@ -199,6 +200,11 @@ void delegatesTokenChangeDrop() { .addAccountAmounts( AccountAmount.newBuilder() .setAccountID(IdUtils.asAccount("0.0.3")))); + // and: + given(tokenStore.get(tokenId)).willReturn(token); + given(tokenStore.get(frozenId).tokenType()).willReturn(TokenType.FUNGIBLE_COMMON); + given(tokenStore.get(tokenId).tokenType()).willReturn(TokenType.FUNGIBLE_COMMON); + // when: subject.dropPendingTokenChanges(); @@ -221,11 +227,12 @@ void onlyRollsbackIfTokenRelsLedgerInTxn() { } @Test - void forwardsTransactionalSemanticsToRelsLedgerIfPresent() { + void forwardsTransactionalSemanticsToTokenLedgersIfPresent() { // setup: - InOrder inOrder = inOrder(tokenRelsLedger); + InOrder inOrder = inOrder(tokenRelsLedger, nftsLedger); given(tokenRelsLedger.isInTransaction()).willReturn(true); + given(nftsLedger.isInTransaction()).willReturn(true); // when: subject.begin(); @@ -235,10 +242,17 @@ void forwardsTransactionalSemanticsToRelsLedgerIfPresent() { // then: inOrder.verify(tokenRelsLedger).begin(); + inOrder.verify(nftsLedger).begin(); inOrder.verify(tokenRelsLedger).isInTransaction(); inOrder.verify(tokenRelsLedger).commit(); + inOrder.verify(nftsLedger).isInTransaction(); + inOrder.verify(nftsLedger).commit(); + // and: inOrder.verify(tokenRelsLedger).begin(); + inOrder.verify(nftsLedger).begin(); inOrder.verify(tokenRelsLedger).isInTransaction(); inOrder.verify(tokenRelsLedger).rollback(); + inOrder.verify(nftsLedger).isInTransaction(); + inOrder.verify(nftsLedger).rollback(); } } diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerLiveTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerLiveTest.java index 73458842fba9..bc0ab4844d39 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerLiveTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerLiveTest.java @@ -24,15 +24,20 @@ import com.hedera.services.exceptions.InconsistentAdjustmentsException; import com.hedera.services.ledger.accounts.BackingTokenRels; import com.hedera.services.ledger.accounts.HashMapBackingAccounts; +import com.hedera.services.ledger.accounts.HashMapBackingNfts; import com.hedera.services.ledger.accounts.HashMapBackingTokenRels; import com.hedera.services.ledger.accounts.HederaAccountCustomizer; import com.hedera.services.ledger.properties.AccountProperty; import com.hedera.services.ledger.properties.ChangeSummaryManager; +import com.hedera.services.ledger.properties.NftProperty; import com.hedera.services.ledger.properties.TokenRelProperty; import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.store.tokens.HederaTokenStore; import com.hedera.test.factories.scenarios.TxnHandlingScenario; import com.hedera.test.mocks.TestContextValidator; @@ -43,6 +48,7 @@ import com.hederahashgraph.api.proto.java.TokenCreateTransactionBody; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenTransferList; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -61,7 +67,6 @@ public class HederaLedgerLiveTest extends BaseHederaLedgerTest { long thisSecond = 1_234_567L; - @BeforeEach void setup() { commonSetup(); @@ -72,6 +77,13 @@ void setup() { new HashMapBackingAccounts(), new ChangeSummaryManager<>()); FCMap tokens = new FCMap<>(); + FCOneToManyRelation uniqueTokenAccountOwnerships = new FCOneToManyRelation<>(); + + nftsLedger = new TransactionalLedger<>( + NftProperty.class, + MerkleUniqueToken::new, + new HashMapBackingNfts(), + new ChangeSummaryManager<>()); tokenRelsLedger = new TransactionalLedger<>( TokenRelProperty.class, MerkleTokenRelStatus::new, @@ -83,7 +95,9 @@ void setup() { TestContextValidator.TEST_VALIDATOR, new MockGlobalDynamicProps(), () -> tokens, - tokenRelsLedger); + () -> uniqueTokenAccountOwnerships, + tokenRelsLedger, + nftsLedger); subject = new HederaLedger(tokenStore, ids, creator, validator, historian, dynamicProps, accountsLedger); } diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerTest.java index a56f971a5f12..4a5230886bfd 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/HederaLedgerTest.java @@ -84,20 +84,26 @@ void delegatesChangeSetIfInTxn() { // setup: String zeroingGenesis = "{0.0.2: [BALANCE -> 0]}"; String creatingTreasury = "{0.0.2 <-> 0.0.1001: [TOKEN_BALANCE -> 1_000_000]}"; + String changingOwner = "{NftId{shard=0, realm=0, num=10000, serialNo=1234}: " + + "[OWNER -> EntityId{shard=3, realm=4, num=5}]}"; given(accountsLedger.isInTransaction()).willReturn(true); given(accountsLedger.changeSetSoFar()).willReturn(zeroingGenesis); given(tokenRelsLedger.changeSetSoFar()).willReturn(creatingTreasury); + given(nftsLedger.changeSetSoFar()).willReturn(changingOwner); // when: String summary = subject.currentChangeSet(); // then: verify(accountsLedger).changeSetSoFar(); - assertEquals(String.format( - "--- ACCOUNTS ---\n%s\n--- TOKEN RELATIONSHIPS ---\n%s", - zeroingGenesis, - creatingTreasury), summary); + final var desired = "--- ACCOUNTS ---\n" + + "{0.0.2: [BALANCE -> 0]}\n" + + "--- TOKEN RELATIONSHIPS ---\n" + + "{0.0.2 <-> 0.0.1001: [TOKEN_BALANCE -> 1_000_000]}\n" + + "--- NFTS ---\n" + + "{NftId{shard=0, realm=0, num=10000, serialNo=1234}: [OWNER -> EntityId{shard=3, realm=4, num=5}]}"; + assertEquals(desired, summary); } @Test diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/LedgerBalanceChangesTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/LedgerBalanceChangesTest.java index 842ca6a9d9a3..891c98bc0ed0 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/LedgerBalanceChangesTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/LedgerBalanceChangesTest.java @@ -24,19 +24,25 @@ import com.hedera.services.ledger.accounts.BackingStore; import com.hedera.services.ledger.accounts.BackingTokenRels; import com.hedera.services.ledger.accounts.HashMapBackingAccounts; +import com.hedera.services.ledger.accounts.HashMapBackingNfts; import com.hedera.services.ledger.accounts.HashMapBackingTokenRels; import com.hedera.services.ledger.ids.EntityIdSource; import com.hedera.services.ledger.properties.AccountProperty; import com.hedera.services.ledger.properties.ChangeSummaryManager; +import com.hedera.services.ledger.properties.NftProperty; import com.hedera.services.ledger.properties.TokenRelProperty; import com.hedera.services.records.AccountRecordsHistorian; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.state.expiry.ExpiringCreations; import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.NftId; import com.hedera.services.store.tokens.HederaTokenStore; import com.hedera.services.store.tokens.TokenStore; import com.hedera.services.txns.validation.OptionValidator; @@ -49,6 +55,7 @@ import com.swirlds.common.constructable.ClassConstructorPair; import com.swirlds.common.constructable.ConstructableRegistry; import com.swirlds.common.constructable.ConstructableRegistryException; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import com.swirlds.fcmap.internal.FCMLeaf; import org.apache.commons.lang3.tuple.Pair; @@ -61,8 +68,11 @@ import java.util.List; +import static com.hedera.services.ledger.BalanceChange.changingNftOwnership; +import static com.hedera.services.state.submerkle.RichInstant.MISSING_INSTANT; import static com.hedera.test.utils.IdUtils.asAccount; import static com.hedera.test.utils.IdUtils.hbarChange; +import static com.hedera.test.utils.IdUtils.nftXfer; import static com.hedera.test.utils.IdUtils.tokenChange; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_DELETED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_EXPIRED_AND_PENDING_REMOVAL; @@ -74,17 +84,19 @@ @ExtendWith(MockitoExtension.class) class LedgerBalanceChangesTest { - - private BackingStore backingAccounts = new HashMapBackingAccounts(); - private BackingStore, MerkleTokenRelStatus> backingRels = new HashMapBackingTokenRels(); + private final BackingStore backingNfts = new HashMapBackingNfts(); + private final BackingStore backingAccounts = new HashMapBackingAccounts(); + private final BackingStore, MerkleTokenRelStatus> backingRels = new HashMapBackingTokenRels(); private TokenStore tokenStore; - private FCMap tokens = new FCMap<>(); + private final FCMap tokens = new FCMap<>(); + private final FCOneToManyRelation uniqueOwnershipAssociations = new FCOneToManyRelation<>(); private TransactionalLedger accountsLedger; private TransactionalLedger< Pair, TokenRelProperty, MerkleTokenRelStatus> tokenRelsLedger; + private TransactionalLedger nftsLedger; @Mock private EntityIdSource ids; @@ -105,14 +117,25 @@ void setUp() throws ConstructableRegistryException { AccountProperty.class, MerkleAccount::new, backingAccounts, new ChangeSummaryManager<>()); tokenRelsLedger = new TransactionalLedger<>( TokenRelProperty.class, MerkleTokenRelStatus::new, backingRels, new ChangeSummaryManager<>()); + nftsLedger = new TransactionalLedger<>( + NftProperty.class, MerkleUniqueToken::new, backingNfts, new ChangeSummaryManager<>()); tokenRelsLedger.setKeyToString(BackingTokenRels::readableTokenRel); ConstructableRegistry.registerConstructable( new ClassConstructorPair(FCMLeaf.class, FCMLeaf::new)); - tokens.put(tokenKey, tokenWithTreasury(aModel)); - tokens.put(anotherTokenKey, tokenWithTreasury(aModel)); - tokens.put(yetAnotherTokenKey, tokenWithTreasury(aModel)); - tokenStore = new HederaTokenStore(ids, validator, dynamicProperties, () -> tokens, tokenRelsLedger); + tokens.put(tokenKey, fungibleTokenWithTreasury(aModel)); + tokens.put(anotherTokenKey, fungibleTokenWithTreasury(aModel)); + tokens.put(yetAnotherTokenKey, fungibleTokenWithTreasury(aModel)); + tokens.put(aNftKey, nonFungibleTokenWithTreasury(aModel)); + tokens.put(bNftKey, nonFungibleTokenWithTreasury(bModel)); + tokenStore = new HederaTokenStore( + ids, + validator, + dynamicProperties, + () -> tokens, + () -> uniqueOwnershipAssociations, + tokenRelsLedger, + nftsLedger); subject = new HederaLedger(tokenStore, ids, creator, validator, historian, dynamicProperties, accountsLedger); subject.setTokenRelsLedger(tokenRelsLedger); @@ -120,7 +143,7 @@ void setUp() throws ConstructableRegistryException { @Test void rejectsContractInAccountAmounts() { - givenInitialBalances(); + givenInitialBalancesAndOwnership(); backingAccounts.getRef(aModel).setSmartContract(true); // when: @@ -138,7 +161,7 @@ void rejectsContractInAccountAmounts() { @Test void rejectsMissingAccount() { - givenInitialBalances(); + givenInitialBalancesAndOwnership(); backingAccounts.remove(aModel); // when: @@ -156,7 +179,7 @@ void rejectsMissingAccount() { @Test void rejectsDetachedAccount() { - givenInitialBalances(); + givenInitialBalancesAndOwnership(); given(dynamicProperties.autoRenewEnabled()).willReturn(true); // when: @@ -174,7 +197,7 @@ void rejectsDetachedAccount() { @Test void rejectsDeletedAccount() { - givenInitialBalances(); + givenInitialBalancesAndOwnership(); // and: backingAccounts.getRef(bModel).setDeleted(true); @@ -194,14 +217,21 @@ void rejectsDeletedAccount() { void rejectsMissingToken() { // setup: tokens.clear(); - tokens.put(anotherTokenKey.copy(), tokenWithTreasury(aModel)); - tokens.put(yetAnotherTokenKey.copy(), tokenWithTreasury(aModel)); - tokenStore = new HederaTokenStore(ids, validator, dynamicProperties, () -> tokens, tokenRelsLedger); + tokens.put(anotherTokenKey.copy(), fungibleTokenWithTreasury(aModel)); + tokens.put(yetAnotherTokenKey.copy(), fungibleTokenWithTreasury(aModel)); + tokenStore = new HederaTokenStore( + ids, + validator, + dynamicProperties, + () -> tokens, + () -> uniqueOwnershipAssociations, + tokenRelsLedger, + nftsLedger); subject = new HederaLedger(tokenStore, ids, creator, validator, historian, dynamicProperties, accountsLedger); subject.setTokenRelsLedger(tokenRelsLedger); - givenInitialBalances(); + givenInitialBalancesAndOwnership(); // when: subject.begin(); @@ -217,7 +247,7 @@ void rejectsMissingToken() { @Test void happyPathRecordsTransfersAndChangesBalancesAsExpected() { - givenInitialBalances(); + givenInitialBalancesAndOwnership(); // when: TransferList inProgress; @@ -273,11 +303,11 @@ void happyPathRecordsTransfersAndChangesBalancesAsExpected() { @Test void understandsTreasuries() { - givenInitialBalances(); + givenInitialBalancesAndOwnership(); // expect: Assertions.assertTrue(subject.isKnownTreasury(aModel)); - Assertions.assertFalse(subject.isKnownTreasury(bModel)); + Assertions.assertFalse(subject.isKnownTreasury(cModel)); } private TransferList expectedXfers() { @@ -291,18 +321,27 @@ private TransferList expectedXfers() { private List expectedTokenXfers() { return List.of( TokenTransferList.newBuilder() - .setToken(token.toGrpcTokenId()) + .setToken(asGprcToken(aNft)) + .addNftTransfers(nftXfer(aModel, bModel, aSerialNo)) + .build(), + TokenTransferList.newBuilder() + .setToken(asGprcToken(bNft)) + .addNftTransfers(nftXfer(bModel, cModel, aSerialNo)) + .addNftTransfers(nftXfer(cModel, aModel, bSerialNo)) + .build(), + TokenTransferList.newBuilder() + .setToken(token.asGrpcToken()) .addTransfers(aaBuilderWith(bModel, bTokenChange)) .addTransfers(aaBuilderWith(cModel, cTokenChange)) .build(), TokenTransferList.newBuilder() - .setToken(anotherToken.toGrpcTokenId()) + .setToken(anotherToken.asGrpcToken()) .addTransfers(aaBuilderWith(aModel, aAnotherTokenChange)) .addTransfers(aaBuilderWith(bModel, bAnotherTokenChange)) .addTransfers(aaBuilderWith(cModel, cAnotherTokenChange)) .build(), TokenTransferList.newBuilder() - .setToken(yetAnotherToken.toGrpcTokenId()) + .setToken(yetAnotherToken.asGrpcToken()) .addTransfers(aaBuilderWith(aModel, aYetAnotherTokenChange)) .addTransfers(aaBuilderWith(bModel, bYetAnotherTokenChange)) .build() @@ -313,10 +352,6 @@ private AccountAmount.Builder aaBuilderWith(AccountID account, long amount) { return AccountAmount.newBuilder().setAccountID(account).setAmount(amount); } - private void assertInitialTokenBalanceUnchanged(long modifiedBTokenBalance) { - assertInitialBalanceUnchanged(aStartBalance, modifiedBTokenBalance); - } - private void assertInitialBalanceUnchanged() { assertInitialBalanceUnchanged(aStartBalance, bTokenStartBalance); } @@ -363,7 +398,7 @@ private void assertInitialBalanceUnchanged(long modifiedABalance, long modifiedB backingRels.getImmutableRef(rel(bModel, yetAnotherToken)).getBalance()); } - private void givenInitialBalances() { + private void givenInitialBalancesAndOwnership() { final var aAccount = MerkleAccountFactory.newAccount().balance(aStartBalance).get(); backingAccounts.put(aModel, aAccount); final var bAccount = MerkleAccountFactory.newAccount().balance(bStartBalance).get(); @@ -392,35 +427,56 @@ private void givenInitialBalances() { Pair bYaTokenKey = rel(bModel, yetAnotherToken); final var bYaTokenRel = new MerkleTokenRelStatus(bYetAnotherTokenBalance, false, true); backingRels.put(bYaTokenKey, bYaTokenRel); - } - private List fixtureChanges() { - final var ans = List.of(new BalanceChange[] { - tokenChange(yetAnotherToken.asId(), aModel, aYetAnotherTokenChange), - hbarChange(aModel, aHbarChange), - hbarChange(bModel, bHbarChange), - tokenChange(anotherToken.asId(), aModel, aAnotherTokenChange), - tokenChange(anotherToken.asId(), cModel, cAnotherTokenChange), - hbarChange(cModel, cHbarChange), - tokenChange(token.asId(), bModel, bTokenChange), - tokenChange(token.asId(), cModel, cTokenChange), - tokenChange(anotherToken.asId(), bModel, bAnotherTokenChange), - tokenChange(yetAnotherToken.asId(), bModel, bYetAnotherTokenChange), - } - ); - return ans; + Pair aaNftTokenKey = rel(aModel, aNft); + final var aaNftTokenRel = new MerkleTokenRelStatus(2, false, true); + backingRels.put(aaNftTokenKey, aaNftTokenRel); + Pair abNftTokenKey = rel(aModel, bNft); + final var abNftTokenRel = new MerkleTokenRelStatus(2, false, true); + backingRels.put(abNftTokenKey, abNftTokenRel); + Pair baNftTokenKey = rel(bModel, aNft); + final var baNftTokenRel = new MerkleTokenRelStatus(2, false, true); + backingRels.put(baNftTokenKey, baNftTokenRel); + Pair bbNftTokenKey = rel(bModel, bNft); + final var bbNftTokenRel = new MerkleTokenRelStatus(2, false, true); + backingRels.put(bbNftTokenKey, bbNftTokenRel); + Pair caNftTokenKey = rel(cModel, aNft); + final var caNftTokenRel = new MerkleTokenRelStatus(2, false, true); + backingRels.put(caNftTokenKey, caNftTokenRel); + Pair cbNftTokenKey = rel(cModel, bNft); + final var cbNftTokenRel = new MerkleTokenRelStatus(2, false, true); + backingRels.put(cbNftTokenKey, cbNftTokenRel); + + backingNfts.put( + aaNft, + new MerkleUniqueToken(EntityId.fromGrpcAccountId(aModel), "aa".getBytes(), MISSING_INSTANT)); + backingNfts.put( + baNft, + new MerkleUniqueToken(EntityId.fromGrpcAccountId(bModel), "ba".getBytes(), MISSING_INSTANT)); + backingNfts.put( + bbNft, + new MerkleUniqueToken(EntityId.fromGrpcAccountId(cModel), "bb".getBytes(), MISSING_INSTANT)); } - private Pair rel(AccountID account, EntityId token) { - return Pair.of(account, token.toGrpcTokenId()); + private List fixtureChanges() { + return List.of( + tokenChange(yetAnotherToken, aModel, aYetAnotherTokenChange), + hbarChange(aModel, aHbarChange), + hbarChange(bModel, bHbarChange), + tokenChange(anotherToken, aModel, aAnotherTokenChange), + tokenChange(anotherToken, cModel, cAnotherTokenChange), + hbarChange(cModel, cHbarChange), + tokenChange(token, bModel, bTokenChange), + tokenChange(token, cModel, cTokenChange), + tokenChange(anotherToken, bModel, bAnotherTokenChange), + tokenChange(yetAnotherToken, bModel, bYetAnotherTokenChange), + changingNftOwnership(aNft, aNft.asGrpcToken(), nftXfer(aModel, bModel, aSerialNo)), + changingNftOwnership(bNft, bNft.asGrpcToken(), nftXfer(bModel, cModel, aSerialNo)), + changingNftOwnership(bNft, bNft.asGrpcToken(), nftXfer(cModel, aModel, bSerialNo))); } - private AccountID asGprcAccount(Id id) { - return AccountID.newBuilder() - .setShardNum(id.getShard()) - .setRealmNum(id.getRealm()) - .setAccountNum(id.getNum()) - .build(); + private Pair rel(AccountID account, Id token) { + return Pair.of(account, token.asGrpcToken()); } private TokenID asGprcToken(Id id) { @@ -431,18 +487,35 @@ private TokenID asGprcToken(Id id) { .build(); } - private MerkleToken tokenWithTreasury(AccountID treasury) { + private MerkleToken fungibleTokenWithTreasury(AccountID treasury) { + final var token = new MerkleToken(); + token.setTreasury(new EntityId(treasury.getShardNum(), treasury.getRealmNum(), treasury.getAccountNum())); + token.setTokenType(TokenType.FUNGIBLE_COMMON); + return token; + } + + private MerkleToken nonFungibleTokenWithTreasury(AccountID treasury) { final var token = new MerkleToken(); token.setTreasury(new EntityId(treasury.getShardNum(), treasury.getRealmNum(), treasury.getAccountNum())); + token.setTokenType(TokenType.NON_FUNGIBLE_UNIQUE); return token; } + private final long aSerialNo = 1_234L; + private final long bSerialNo = 2_234L; private final AccountID aModel = asAccount("1.2.3"); private final AccountID bModel = asAccount("2.3.4"); private final AccountID cModel = asAccount("3.4.5"); - private final EntityId token = new EntityId(0, 0, 75231); - private final EntityId anotherToken = new EntityId(0, 0, 75232); - private final EntityId yetAnotherToken = new EntityId(0, 0, 75233); + private final Id token = new Id(0, 0, 75231); + private final Id anotherToken = new Id(0, 0, 75232); + private final Id yetAnotherToken = new Id(0, 0, 75233); + private final Id aNft = new Id(0, 0, 9999); + private final Id bNft = new Id(0, 0, 10000); + private final NftId aaNft = new NftId(aNft.getShard(), aNft.getRealm(), aNft.getNum(), aSerialNo); + private final NftId baNft = new NftId(bNft.getShard(), bNft.getRealm(), bNft.getNum(), aSerialNo); + private final NftId bbNft = new NftId(bNft.getShard(), bNft.getRealm(), bNft.getNum(), bSerialNo); + private final MerkleEntityId aNftKey = new MerkleEntityId(0, 0, 9999); + private final MerkleEntityId bNftKey = new MerkleEntityId(0, 0, 10000); private final MerkleEntityId tokenKey = new MerkleEntityId(0, 0, 75231); private final MerkleEntityId anotherTokenKey = new MerkleEntityId(0, 0, 75232); private final MerkleEntityId yetAnotherTokenKey = new MerkleEntityId(0, 0, 75233); diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/PureTransferSemanticChecksTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/PureTransferSemanticChecksTest.java index c92bd1137ad0..40093a59c408 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/PureTransferSemanticChecksTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/PureTransferSemanticChecksTest.java @@ -20,6 +20,7 @@ * ‍ */ +import com.hedera.services.grpc.marshalling.ImpliedTransfersMeta; import com.hederahashgraph.api.proto.java.AccountAmount; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.TokenID; @@ -32,8 +33,10 @@ import java.util.List; import static com.hedera.test.utils.TxnUtils.withAdjustments; +import static com.hedera.test.utils.TxnUtils.withOwnershipChanges; import static com.hedera.test.utils.TxnUtils.withTokenAdjustments; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.BATCH_SIZE_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.EMPTY_TOKEN_TRANSFER_ACCOUNT_AMOUNTS; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_AMOUNTS; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; @@ -53,6 +56,9 @@ class PureTransferSemanticChecksTest { final private int maxHbarAdjusts = 5; final private int maxTokenAdjusts = 10; + final private int maxOwnershipChanges = 3; + final ImpliedTransfersMeta.ValidationProps validationProps = new ImpliedTransfersMeta.ValidationProps( + maxHbarAdjusts, maxTokenAdjusts, maxOwnershipChanges); final private AccountID a = AccountID.newBuilder().setAccountNum(9_999L).build(); final private AccountID b = AccountID.newBuilder().setAccountNum(8_999L).build(); final private AccountID c = AccountID.newBuilder().setAccountNum(7_999L).build(); @@ -75,24 +81,20 @@ void preservesTraditionalResponseCodePriority() { given(subject.isNetZeroAdjustment(hbarAdjusts.getAccountAmountsList())).willReturn(true); given(subject.isAcceptableSize(hbarAdjusts.getAccountAmountsList(), maxHbarAdjusts)).willReturn(true); - given(subject.validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts)).willReturn(OK); + given(subject.validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts, maxOwnershipChanges)).willReturn(OK); given(subject.validateTokenTransferSemantics(tokenAdjusts)).willReturn(OK); // and: doCallRealMethod().when(subject) - .fullPureValidation( - maxHbarAdjusts, - maxTokenAdjusts, - hbarAdjusts, - tokenAdjusts); + .fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps); // when: - final var result = subject.fullPureValidation(maxHbarAdjusts, maxTokenAdjusts, hbarAdjusts, tokenAdjusts); + final var result = subject.fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps); // then: inOrder.verify(subject).hasRepeatedAccount(hbarAdjusts.getAccountAmountsList()); inOrder.verify(subject).isNetZeroAdjustment(hbarAdjusts.getAccountAmountsList()); inOrder.verify(subject).isAcceptableSize(hbarAdjusts.getAccountAmountsList(), maxHbarAdjusts); - inOrder.verify(subject).validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts); + inOrder.verify(subject).validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts, maxOwnershipChanges); inOrder.verify(subject).validateTokenTransferSemantics(tokenAdjusts); // and: assertEquals(OK, result); @@ -108,18 +110,14 @@ void rejectsInvalidTokenSizes() { given(subject.isNetZeroAdjustment(hbarAdjusts.getAccountAmountsList())).willReturn(true); given(subject.isAcceptableSize(hbarAdjusts.getAccountAmountsList(), maxHbarAdjusts)).willReturn(true); - given(subject.validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts)) + given(subject.validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts, maxOwnershipChanges)) .willReturn(TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED); // and: doCallRealMethod().when(subject) - .fullPureValidation( - maxHbarAdjusts, - maxTokenAdjusts, - hbarAdjusts, - tokenAdjusts); + .fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps); // when: - final var result = subject.fullPureValidation(maxHbarAdjusts, maxTokenAdjusts, hbarAdjusts, tokenAdjusts); + final var result = subject.fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps); // then: assertEquals(TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED, result); @@ -133,20 +131,18 @@ void rejectsInvalidTokenSemantics() { // and: subject = mock(PureTransferSemanticChecks.class); + final var validationProps = new ImpliedTransfersMeta.ValidationProps( + maxHbarAdjusts, maxTokenAdjusts, maxOwnershipChanges); + // and: given(subject.isNetZeroAdjustment(hbarAdjusts.getAccountAmountsList())).willReturn(true); given(subject.isAcceptableSize(hbarAdjusts.getAccountAmountsList(), maxHbarAdjusts)).willReturn(true); - given(subject.validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts)).willReturn(OK); + given(subject.validateTokenTransferSizes(tokenAdjusts, maxTokenAdjusts, maxOwnershipChanges)).willReturn(OK); given(subject.validateTokenTransferSemantics(tokenAdjusts)).willReturn(TOKEN_ID_REPEATED_IN_TOKEN_LIST); // and: - doCallRealMethod().when(subject) - .fullPureValidation( - maxHbarAdjusts, - maxTokenAdjusts, - hbarAdjusts, - tokenAdjusts); + doCallRealMethod().when(subject).fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps); // when: - final var result = subject.fullPureValidation(maxHbarAdjusts, maxTokenAdjusts, hbarAdjusts, tokenAdjusts); + final var result = subject.fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps); // then: assertEquals(TOKEN_ID_REPEATED_IN_TOKEN_LIST, result); @@ -159,8 +155,9 @@ void rejectsNonNetZeroAccounts() { final var tokenAdjusts = withTokenAdjustments(aTId, a, -1, bTId, b, 2, cTId, c, 3); // expect: - assertEquals(INVALID_ACCOUNT_AMOUNTS, subject.fullPureValidation( - 100, 100, hbarAdjusts, tokenAdjusts)); + assertEquals( + INVALID_ACCOUNT_AMOUNTS, + subject.fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps)); } @Test @@ -170,8 +167,9 @@ void rejectsRepeatedAccounts() { final var tokenAdjusts = withTokenAdjustments(aTId, a, -1, bTId, b, 2, cTId, c, 3); // expect: - assertEquals(ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS, subject.fullPureValidation( - 100, 100, hbarAdjusts, tokenAdjusts)); + assertEquals( + ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS, + subject.fullPureValidation(hbarAdjusts, tokenAdjusts, validationProps)); } @Test @@ -179,10 +177,14 @@ void rejectsOversizeTransfers() { // setup: final var hbarAdjusts = withAdjustments(a, -4L, b, +2L, c, +2L); final var tokenAdjusts = withTokenAdjustments(aTId, a, -1, bTId, b, 2, cTId, c, 3); + // and: + final var strictValProps = new ImpliedTransfersMeta.ValidationProps( + 1, 1, 1); // expect: - assertEquals(TRANSFER_LIST_SIZE_LIMIT_EXCEEDED, subject.fullPureValidation( - 1, 100, hbarAdjusts, tokenAdjusts)); + assertEquals( + TRANSFER_LIST_SIZE_LIMIT_EXCEEDED, + subject.fullPureValidation(hbarAdjusts, tokenAdjusts, strictValProps)); } @Test @@ -200,7 +202,7 @@ void acceptsReasonableTokenTransfersLength() { List wrapper = withTokenAdjustments(aTId, a, -1, bTId, b, 2, cTId, c, 3); // when: - final var result = subject.validateTokenTransferSizes(wrapper, 4); + final var result = subject.validateTokenTransferSizes(wrapper, 4, 2); // expect: assertEquals(OK, result); @@ -209,7 +211,7 @@ void acceptsReasonableTokenTransfersLength() { @Test void acceptsNoTokenTransfers() { // given: - final var result = subject.validateTokenTransferSizes(Collections.emptyList(), 10); + final var result = subject.validateTokenTransferSizes(Collections.emptyList(), 10, 2); // expect: assertEquals(OK, result); @@ -308,15 +310,18 @@ void oksSaneTokenExchange() { } @Test - void rejectsExceedingTokenTransfersLength() { + void rejectsExceedingMaxOwnershipChanges() { // given: - List wrapper = withTokenAdjustments(aTId, a, -1, bTId, b, 2, cTId, c, 3); + List wrapper = withOwnershipChanges( + aTId, a, a, 123, + bTId, b, c, 234, + cTId, c, a, 345); // when: - final var result = subject.validateTokenTransferSizes(wrapper, 2); + final var result = subject.validateTokenTransferSizes(wrapper, 20, 1); // then: - assertEquals(TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED, result); + assertEquals(BATCH_SIZE_LIMIT_EXCEEDED, result); } @Test @@ -325,7 +330,7 @@ void rejectsExceedingTokenTransfersAccountAmountsLength() { List wrapper = withTokenAdjustments(aTId, a, -1, bTId, b, 2, cTId, c, 3, dTId, d, -4); // when: - final var result = subject.validateTokenTransferSizes(wrapper, 4); + final var result = subject.validateTokenTransferSizes(wrapper, 4, 2); // then: assertEquals(TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED, result); @@ -339,7 +344,7 @@ void rejectsEmptyTokenTransferAmounts() { .build()); // when: - final var result = subject.validateTokenTransferSizes(wrapper, 10); + final var result = subject.validateTokenTransferSizes(wrapper, 10, 2); // then: assertEquals(EMPTY_TOKEN_TRANSFER_ACCOUNT_AMOUNTS, result); diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/accounts/BackingNftsTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/accounts/BackingNftsTest.java new file mode 100644 index 000000000000..3606545b4d37 --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/ledger/accounts/BackingNftsTest.java @@ -0,0 +1,147 @@ +package com.hedera.services.ledger.accounts; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.state.submerkle.RichInstant; +import com.hedera.services.store.models.NftId; +import com.swirlds.fcmap.FCMap; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +@ExtendWith(MockitoExtension.class) +class BackingNftsTest { + private NftId aNftId = new NftId(1, 2, 3, 4); + private NftId bNftId = new NftId(2, 3, 4, 5); + private NftId cNftId = new NftId(3, 4, 5, 6); + private MerkleUniqueTokenId aKey = + new MerkleUniqueTokenId(new EntityId(1, 2, 3), 4); + private MerkleUniqueTokenId cKey = + new MerkleUniqueTokenId(new EntityId(3, 4, 5), 6); + private MerkleUniqueToken aValue = new MerkleUniqueToken( + new EntityId(1, 2, 3), + "abcdefgh".getBytes(), + new RichInstant(1_234_567L, 1)); + + @Mock + private FCMap delegate; + + private BackingNfts subject; + + @BeforeEach + void setUp() { + given(delegate.keySet()).willReturn(Set.of( + aKey, + new MerkleUniqueTokenId(new EntityId(2, 3, 4), 5) + )); + + subject = new BackingNfts(() -> delegate); + } + + @Test + void rebuildWorks() { + // when: + subject = new BackingNfts(() -> delegate); + + // expect: + assertEquals(Set.of(aNftId, bNftId), subject.idSet()); + } + + @Test + void containsWorks() { + // expect: + assertTrue(subject.contains(aNftId)); + assertTrue(subject.contains(bNftId)); + assertFalse(subject.contains(cNftId)); + } + + @Test + void getRefDelegatesToGetForModify() { + given(delegate.getForModify(aKey)).willReturn(aValue); + + // when: + final var mutable = subject.getRef(aNftId); + + // then: + assertSame(aValue, mutable); + } + + @Test + void getImmutableRefDelegatesToGet() { + given(delegate.get(aKey)).willReturn(aValue); + + // when: + final var immutable = subject.getImmutableRef(aNftId); + + // then: + assertSame(aValue, immutable); + } + + @Test + void putWorks() { + // when: + subject.put(cNftId, aValue); + subject.put(cNftId, aValue); + + // then: + verify(delegate, times(1)).put(cKey, aValue); + } + + @Test + void removeWorks() { + // when: + subject.remove(aNftId); + + // then: + assertEquals(Set.of(bNftId), subject.idSet()); + verify(delegate).remove(aKey); + } + + @Test + void canAddAndRemoveFromIdSetOnly() { + // when: + subject.removeFromExistingNfts(aNftId); + subject.addToExistingNfts(cNftId); + + // then: + assertEquals(Set.of(bNftId, cNftId), subject.idSet()); + // and: + verify(delegate, never()).put(any(), any()); + verify(delegate, never()).remove(any()); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/accounts/BackingTokenRelsTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/accounts/BackingTokenRelsTest.java index a4df4775f9e6..52dbfb407713 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/accounts/BackingTokenRelsTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/accounts/BackingTokenRelsTest.java @@ -52,22 +52,22 @@ import static org.mockito.BDDMockito.verify; class BackingTokenRelsTest { - long aBalance = 100, bBalance = 200, cBalance = 300; - boolean aFrozen = true, bFrozen = false, cFrozen = true; - boolean aKyc = false, bKyc = true, cKyc = false; - AccountID a = asAccount("1.2.3"); - AccountID b = asAccount("3.2.1"); - AccountID c = asAccount("4.3.0"); - TokenID at = asToken("9.8.7"); - TokenID bt = asToken("9.8.6"); - TokenID ct = asToken("9.8.5"); - - MerkleEntityAssociation aKey = fromAccountTokenRel(a, at); - MerkleEntityAssociation bKey = fromAccountTokenRel(b, bt); - MerkleEntityAssociation cKey = fromAccountTokenRel(c, ct); - MerkleTokenRelStatus aValue = new MerkleTokenRelStatus(aBalance, aFrozen, aKyc); - MerkleTokenRelStatus bValue = new MerkleTokenRelStatus(bBalance, bFrozen, bKyc); - MerkleTokenRelStatus cValue = new MerkleTokenRelStatus(cBalance, cFrozen, cKyc); + private long aBalance = 100, bBalance = 200, cBalance = 300; + private boolean aFrozen = true, bFrozen = false, cFrozen = true; + private boolean aKyc = false, bKyc = true, cKyc = false; + private AccountID a = asAccount("1.2.3"); + private AccountID b = asAccount("3.2.1"); + private AccountID c = asAccount("4.3.0"); + private TokenID at = asToken("9.8.7"); + private TokenID bt = asToken("9.8.6"); + private TokenID ct = asToken("9.8.5"); + + private MerkleEntityAssociation aKey = fromAccountTokenRel(a, at); + private MerkleEntityAssociation bKey = fromAccountTokenRel(b, bt); + private MerkleEntityAssociation cKey = fromAccountTokenRel(c, ct); + private MerkleTokenRelStatus aValue = new MerkleTokenRelStatus(aBalance, aFrozen, aKyc); + private MerkleTokenRelStatus bValue = new MerkleTokenRelStatus(bBalance, bFrozen, bKyc); + private MerkleTokenRelStatus cValue = new MerkleTokenRelStatus(cBalance, cFrozen, cKyc); private FCMap rels; diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/accounts/HashMapBackingNfts.java b/hedera-node/src/test/java/com/hedera/services/ledger/accounts/HashMapBackingNfts.java new file mode 100644 index 000000000000..7c97b6e07cb1 --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/ledger/accounts/HashMapBackingNfts.java @@ -0,0 +1,42 @@ +package com.hedera.services.ledger.accounts; + +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.store.models.NftId; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +public class HashMapBackingNfts implements BackingStore { + private Map nfts = new HashMap<>(); + + @Override + public MerkleUniqueToken getRef(NftId id) { + return nfts.get(id); + } + + @Override + public MerkleUniqueToken getImmutableRef(NftId id) { + return nfts.get(id); + } + + @Override + public void put(NftId id, MerkleUniqueToken nft) { + nfts.put(id, nft); + } + + @Override + public void remove(NftId id) { + nfts.remove(id); + } + + @Override + public boolean contains(NftId id) { + return nfts.containsKey(id); + } + + @Override + public Set idSet() { + return nfts.keySet(); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/ids/SeqNoEntityIdSourceTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/ids/SeqNoEntityIdSourceTest.java index 6ae1677a7144..fcbecafac37b 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/ids/SeqNoEntityIdSourceTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/ids/SeqNoEntityIdSourceTest.java @@ -32,6 +32,7 @@ import static com.hedera.test.utils.IdUtils.asFile; import static com.hedera.test.utils.IdUtils.asToken; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; @@ -103,4 +104,18 @@ void exceptionalSourceAlwaysThrows() { () -> NOOP_ID_SOURCE.newScheduleId(AccountID.getDefaultInstance())); assertThrows(UnsupportedOperationException.class, NOOP_ID_SOURCE::reclaimLastId); } + + @Test + void newScheduleId() { + given(seqNo.getAndIncrement()).willReturn(3L); + var scheduleId = subject.newScheduleId(AccountID.newBuilder() + .setRealmNum(1) + .setShardNum(2) + .setAccountNum(3) + .build()); + assertNotNull(scheduleId); + assertEquals(3, scheduleId.getScheduleNum()); + assertEquals(1, scheduleId.getRealmNum()); + assertEquals(2, scheduleId.getShardNum()); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/properties/MerkleAccountPropertyTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/properties/MerkleAccountPropertyTest.java index 2208b316437f..59a792f41272 100644 --- a/hedera-node/src/test/java/com/hedera/services/ledger/properties/MerkleAccountPropertyTest.java +++ b/hedera-node/src/test/java/com/hedera/services/ledger/properties/MerkleAccountPropertyTest.java @@ -51,6 +51,7 @@ import static com.hedera.services.ledger.properties.AccountProperty.IS_SMART_CONTRACT; import static com.hedera.services.ledger.properties.AccountProperty.KEY; import static com.hedera.services.ledger.properties.AccountProperty.MEMO; +import static com.hedera.services.ledger.properties.AccountProperty.NUM_NFTS_OWNED; import static com.hedera.services.ledger.properties.AccountProperty.PROXY; import static com.hedera.services.ledger.properties.AccountProperty.TOKENS; import static com.hedera.test.factories.scenarios.TxnHandlingScenario.TOKEN_ADMIN_KT; @@ -122,6 +123,7 @@ void gettersAndSettersWork() throws Exception { boolean origIsContract = false; long origBalance = 1L; long origAutoRenew = 1L; + long origNumNfts = 123; long origExpiry = 1L; Key origKey = SignedTxnFactory.DEFAULT_PAYER_KT.asKey(); String origMemo = "a"; @@ -139,6 +141,7 @@ void gettersAndSettersWork() throws Exception { long newBalance = 2L; long newAutoRenew = 2L; long newExpiry = 2L; + long newNumNfts = 321; JKey newKey = new JKeyList(); String newMemo = "b"; EntityId newProxy = new EntityId(0, 0, 2); @@ -153,6 +156,7 @@ void gettersAndSettersWork() throws Exception { .isSmartContract(origIsContract) .isReceiverSigRequired(origIsReceiverSigReq) .customizing(new MerkleAccount()); + account.setNftsOwned(origNumNfts); account.setBalance(origBalance); account.records().offer(origPayerRecords.get(0)); account.records().offer(origPayerRecords.get(1)); @@ -181,6 +185,7 @@ void gettersAndSettersWork() throws Exception { KEY.setter().accept(account, newKey); MEMO.setter().accept(account, newMemo); PROXY.setter().accept(account, newProxy); + NUM_NFTS_OWNED.setter().accept(account, newNumNfts); // then: assertEquals(newIsDeleted, IS_DELETED.getter().apply(account)); @@ -192,6 +197,7 @@ void gettersAndSettersWork() throws Exception { assertEquals(newKey, KEY.getter().apply(account)); assertEquals(newMemo, MEMO.getter().apply(account)); assertEquals(newProxy, PROXY.getter().apply(account)); + assertEquals(newNumNfts, NUM_NFTS_OWNED.getter().apply(account)); } private ExpirableTxnRecord expirableRecord(ResponseCodeEnum status) { diff --git a/hedera-node/src/test/java/com/hedera/services/ledger/properties/NftPropertyTest.java b/hedera-node/src/test/java/com/hedera/services/ledger/properties/NftPropertyTest.java new file mode 100644 index 000000000000..d42538e4734d --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/ledger/properties/NftPropertyTest.java @@ -0,0 +1,60 @@ +package com.hedera.services.ledger.properties; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.state.submerkle.RichInstant; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class NftPropertyTest { + private final byte[] aMeta = "abcdefgh".getBytes(); + private final EntityId aEntity = new EntityId(1, 2, 3); + private final EntityId bEntity = new EntityId(2, 3, 4); + private final RichInstant aInstant = new RichInstant(1_234_567L, 1); + + @Test + void getterWorks() { + // given: + final var aSubject = new MerkleUniqueToken(aEntity, aMeta, aInstant); + // and: + final var getter = NftProperty.OWNER.getter(); + + // expect: + assertEquals(aEntity, getter.apply(aSubject)); + } + + @Test + void setterWorks() { + // given: + final var aSubject = new MerkleUniqueToken(aEntity, aMeta, aInstant); + // and: + final var setter = NftProperty.OWNER.setter(); + + // when: + setter.accept(aSubject, bEntity); + + // expect: + assertSame(bEntity, aSubject.getOwner()); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/legacy/core/jproto/TxnReceiptTest.java b/hedera-node/src/test/java/com/hedera/services/legacy/core/jproto/TxnReceiptTest.java index 5b7f2451bd43..0ee02357ee3d 100644 --- a/hedera-node/src/test/java/com/hedera/services/legacy/core/jproto/TxnReceiptTest.java +++ b/hedera-node/src/test/java/com/hedera/services/legacy/core/jproto/TxnReceiptTest.java @@ -39,6 +39,7 @@ import org.mockito.Mockito; import java.io.IOException; +import java.util.List; import static com.hedera.services.legacy.core.jproto.TxnReceipt.MISSING_RUNNING_HASH; import static com.hedera.services.legacy.core.jproto.TxnReceipt.MISSING_RUNNING_HASH_VERSION; @@ -51,6 +52,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -66,6 +68,7 @@ public class TxnReceiptTest { DomainSerdes serdes; ExchangeRates mockRates; TxnReceipt subject; + private long[] serialNumbers = new long[]{1, 2, 3, 4, 5}; private TopicID getTopicId(long shard, long realm, long num) { return TopicID.newBuilder().setShardNum(shard).setRealmNum(realm).setTopicNum(num).build(); @@ -187,6 +190,18 @@ public void postConsensusTokenMintBurnWipeInterconversionWorks() { assertEquals(receipt, back); } + @Test + public void postConsensusTokenNftInterconversionWorks() { + final var receipt = TransactionReceipt.newBuilder() + .setExchangeRate(new ExchangeRates().toGrpc()) + .addAllSerialNumbers(List.of(1L, 2L, 3L, 4L, 5L)) + .build(); + final var cut = TxnReceipt.fromGrpc(receipt); + final var back = TxnReceipt.convert(cut); + + assertEquals(receipt, back); + } + @Test public void postConsensusTokenCreationInterconversionWorks() { final TokenID.Builder tokenIdBuilder = TokenID.newBuilder().setTokenNum(1001L).setRealmNum(0).setShardNum(0); @@ -365,6 +380,7 @@ public void serializeWorks() throws IOException { .setTopicSequenceNumber(0L) .setNewTotalSupply(100L) .setScheduledTxnId(TxnId.fromGrpc(scheduledTxnId)) + .setSerialNumbers(serialNumbers) .build(); // when: @@ -377,6 +393,7 @@ public void serializeWorks() throws IOException { inOrder.verify(fout).writeBoolean(false); inOrder.verify(fout).writeLong(subject.getNewTotalSupply()); inOrder.verify(serdes).writeNullableSerializable(subject.getScheduledTxnId(), fout); + inOrder.verify(fout).writeLongArray(serialNumbers); } @Test @@ -426,6 +443,56 @@ public void v0120DeserializeWorks() throws IOException { assertEquals(subject.getScheduledTxnId(), txnReceipt.getScheduledTxnId()); } + @Test + public void v0160DeserializeWorks() throws IOException { + final var scheduleId = EntityId.fromGrpcScheduleId(IdUtils.asSchedule("0.0.312")); + SerializableDataInputStream fin = mock(SerializableDataInputStream.class); + + subject = TxnReceipt.newBuilder() + .setStatus("SUCCESS") + .setScheduleId(scheduleId) + .setExchangeRates(mockRates) + .setTopicSequenceNumber(-1) + .setRunningHashVersion(-1) + .setTopicSequenceNumber(0L) + .setNewTotalSupply(0L) + .setScheduledTxnId(TxnId.fromGrpc(scheduledTxnId)) + .setSerialNumbers(new long[] {1, 2, 3, 4, 5}) + .build(); + + + given(fin.readByteArray(MAX_STATUS_BYTES)).willReturn(subject.getStatus().getBytes()); + given(fin.readSerializable(anyBoolean(), any())).willReturn(mockRates); + given(serdes.readNullableSerializable(fin)) + .willReturn(subject.getAccountId()) + .willReturn(subject.getFileId()) + .willReturn(subject.getContractId()) + .willReturn(subject.getTopicId()) + .willReturn(subject.getTokenId()) + .willReturn(subject.getScheduleId()) + .willReturn(subject.getScheduledTxnId()); + given(fin.readBoolean()).willReturn(true); + given(fin.readLong()).willReturn(subject.getTopicSequenceNumber()); + given(fin.readLong()).willReturn(subject.getRunningHashVersion()); + given(fin.readAllBytes()).willReturn(subject.getTopicRunningHash()); + given(fin.readLong()).willReturn(subject.getNewTotalSupply()); + given(fin.readLongArray(anyInt())).willReturn(subject.getSerialNumbers()); + + // and: + TxnReceipt txnReceipt = new TxnReceipt(); + + // when: + txnReceipt.deserialize(fin, TxnReceipt.RELEASE_0160_VERSION); + + // then: + assertEquals(subject.getNewTotalSupply(), txnReceipt.getNewTotalSupply()); + assertEquals(subject.getStatus(), txnReceipt.getStatus()); + assertEquals(subject.getExchangeRates(), txnReceipt.getExchangeRates()); + assertEquals(subject.getTokenId(), txnReceipt.getTokenId()); + assertEquals(subject.getScheduledTxnId(), txnReceipt.getScheduledTxnId()); + assertArrayEquals(subject.getSerialNumbers(), txnReceipt.getSerialNumbers()); + } + @Test public void v0100DeserializeWorks() throws IOException { final var tokenId = EntityId.fromGrpcTokenId( diff --git a/hedera-node/src/test/java/com/hedera/services/legacy/unit/handler/SmartContractRequestHandlerMiscTest.java b/hedera-node/src/test/java/com/hedera/services/legacy/unit/handler/SmartContractRequestHandlerMiscTest.java index ca9df8ec2d2b..a2e71105782f 100644 --- a/hedera-node/src/test/java/com/hedera/services/legacy/unit/handler/SmartContractRequestHandlerMiscTest.java +++ b/hedera-node/src/test/java/com/hedera/services/legacy/unit/handler/SmartContractRequestHandlerMiscTest.java @@ -64,6 +64,7 @@ import com.hederahashgraph.api.proto.java.Query; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.api.proto.java.TransactionBody; @@ -1079,7 +1080,7 @@ private long getTotalBalance() { } public long getContractCreateGasPriceInTinyBars(Timestamp at) { - FeeData usagePrices = TEST_USAGE_PRICES.pricesGiven(HederaFunctionality.ContractCreate, at); + FeeData usagePrices = TEST_USAGE_PRICES.pricesGiven(HederaFunctionality.ContractCreate, at).get(SubType.DEFAULT); long feeInTinyCents = usagePrices.getServicedata().getGas() / 1000; long feeInTinyBars = FeeBuilder.getTinybarsFromTinyCents(rates.getCurrentRate(), feeInTinyCents); return feeInTinyBars == 0 ? 1 : feeInTinyBars; diff --git a/hedera-node/src/test/java/com/hedera/services/properties/SupplierMapPropertySourceTest.java b/hedera-node/src/test/java/com/hedera/services/properties/SupplierMapPropertySourceTest.java index 7de30e0ba301..63f745854352 100644 --- a/hedera-node/src/test/java/com/hedera/services/properties/SupplierMapPropertySourceTest.java +++ b/hedera-node/src/test/java/com/hedera/services/properties/SupplierMapPropertySourceTest.java @@ -27,10 +27,12 @@ import org.junit.jupiter.api.Test; import java.util.Map; +import java.util.Set; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -70,6 +72,13 @@ public void getsParseableAccount() { subject.getAccountProperty(GOOD_ACCOUNT_PROP)); } + @Test + public void allPropertyNames() { + assertNotNull(subject.allPropertyNames()); + var propSet = Set.of("a.double.prop", "a.string.prop", "a.profile.prop", "a.boolean.prop", "a.bad.account", "a.long.prop", "a.good.account", "a.int.prop"); + assertEquals(propSet, subject.allPropertyNames()); + } + @Test public void throwsOnUnparseableAccount() { // setup: diff --git a/hedera-node/src/test/java/com/hedera/services/queries/answering/StakedAnswerFlowTest.java b/hedera-node/src/test/java/com/hedera/services/queries/answering/StakedAnswerFlowTest.java index 4dda3ab30f16..65695baefe98 100644 --- a/hedera-node/src/test/java/com/hedera/services/queries/answering/StakedAnswerFlowTest.java +++ b/hedera-node/src/test/java/com/hedera/services/queries/answering/StakedAnswerFlowTest.java @@ -376,7 +376,7 @@ private void givenComputableCost() { } private void givenAvailableResourcePrices() { - given(resourceCosts.pricesGiven(ConsensusGetTopicInfo, now)).willReturn(usagePrices); + given(resourceCosts.defaultPricesGiven(ConsensusGetTopicInfo, now)).willReturn(usagePrices); } private void givenHappyService() { diff --git a/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountBalanceAnswerTest.java b/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountBalanceAnswerTest.java index 73f5781f1f07..a92b2d0fef6c 100644 --- a/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountBalanceAnswerTest.java +++ b/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountBalanceAnswerTest.java @@ -149,7 +149,10 @@ private void setup() throws ConstructableRegistryException { StateView.EMPTY_TOPICS_SUPPLIER, () -> accounts, StateView.EMPTY_STORAGE_SUPPLIER, + StateView.EMPTY_UNIQUE_TOKENS_SUPPLIER, () -> tokenRels, + StateView.EMPTY_UNIQUE_TOKEN_ASSOCS_SUPPLIER, + StateView.EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS_SUPPLIER, null, nodeProps); diff --git a/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountInfoAnswerTest.java b/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountInfoAnswerTest.java index cacf1d9f4470..39608f907d76 100644 --- a/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountInfoAnswerTest.java +++ b/hedera-node/src/test/java/com/hedera/services/queries/crypto/GetAccountInfoAnswerTest.java @@ -186,7 +186,10 @@ private void setup() throws Throwable { StateView.EMPTY_TOPICS_SUPPLIER, () -> accounts, StateView.EMPTY_STORAGE_SUPPLIER, + StateView.EMPTY_UNIQUE_TOKENS_SUPPLIER, () -> tokenRels, + StateView.EMPTY_UNIQUE_TOKEN_ASSOCS_SUPPLIER, + StateView.EMPTY_UNIQUE_TOKEN_ACCOUNT_OWNERSHIPS_SUPPLIER, null, nodeProps); optionValidator = mock(OptionValidator.class); diff --git a/hedera-node/src/test/java/com/hedera/services/queries/token/GetAccountNftInfosAnswerTest.java b/hedera-node/src/test/java/com/hedera/services/queries/token/GetAccountNftInfosAnswerTest.java new file mode 100644 index 000000000000..c4f33845102c --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/queries/token/GetAccountNftInfosAnswerTest.java @@ -0,0 +1,330 @@ +package com.hedera.services.queries.token; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.state.merkle.MerkleAccount; +import com.hedera.services.state.merkle.MerkleEntityId; +import com.hedera.services.txns.validation.OptionValidator; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.QueryHeader; +import com.hederahashgraph.api.proto.java.Response; +import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosQuery; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosResponse; +import com.hederahashgraph.api.proto.java.TokenNftInfo; +import com.hederahashgraph.api.proto.java.Transaction; +import com.swirlds.fcmap.FCMap; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import static com.hedera.test.factories.scenarios.TxnHandlingScenario.COMPLEX_KEY_ACCOUNT_KT; +import static com.hedera.test.utils.IdUtils.asAccount; +import static com.hedera.test.utils.TxnUtils.payerSponsoredTransfer; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_QUERY_RANGE; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.RESULT_SIZE_LIMIT_EXCEEDED; +import static com.hederahashgraph.api.proto.java.ResponseType.ANSWER_ONLY; +import static com.hederahashgraph.api.proto.java.ResponseType.COST_ANSWER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + +public class GetAccountNftInfosAnswerTest { + GetAccountNftInfosAnswer subject; + Transaction paymentTxn; + StateView view; + private long fee = 1_234L; + + String node = "0.0.3"; + String payer = "0.0.1"; + AccountID accountId = asAccount("0.0.2"); + AccountID invalidAccountId = asAccount("0.0.4"); + FCMap accountMap; + + private List accountNftInfos; + long start = 0, end = 2; + + OptionValidator optionValidator; + + @BeforeEach + public void setup() { + view = mock(StateView.class); + optionValidator = mock(OptionValidator.class); + subject = new GetAccountNftInfosAnswer(optionValidator); + + accountNftInfos = new ArrayList<>(List.of( + TokenNftInfo.newBuilder() + .setMetadata(ByteString.copyFromUtf8("stuff1")) + .build(), + TokenNftInfo.newBuilder() + .setMetadata(ByteString.copyFromUtf8("stuff2")) + .build(), + TokenNftInfo.newBuilder() + .setMetadata(ByteString.copyFromUtf8("stuff3")) + .build() + )); + accountMap = new FCMap<>(); + accountMap.put(new MerkleEntityId( + accountId.getShardNum(), + accountId.getRealmNum(), + accountId.getAccountNum() + ), new MerkleAccount(new ArrayList<>())); + } + + @Test + public void requiresAnswerOnlyPayment() throws Throwable { + // expect: + assertFalse(subject.requiresNodePayment(validQuery(COST_ANSWER, 0, accountId, start, end))); + assertTrue(subject.requiresNodePayment(validQuery(ANSWER_ONLY, 0, accountId, start, end))); + } + + @Test + public void requiresAnswerOnlyCostAsExpected() throws Throwable { + // expect: + assertTrue(subject.needsAnswerOnlyCost(validQuery(COST_ANSWER, 0, accountId, start, end))); + assertFalse(subject.needsAnswerOnlyCost(validQuery(ANSWER_ONLY, 0, accountId, start, end))); + } + + @Test + public void checksValidityProperly() throws Throwable { + // given: + given(view.accountNftsCount(accountId)).willReturn(3L); + given(view.accounts()).willReturn(accountMap); + given(optionValidator.nftMaxQueryRangeCheck(start, end)).willReturn(OK); + given(optionValidator.queryableAccountStatus(accountId, accountMap)).willReturn(OK); + + // when: + var validity = subject.checkValidity(validQuery(ANSWER_ONLY, 0, accountId, start, end), view); + + // then: + assertEquals(OK, validity); + } + + @Test + public void checksExceededQueryRangeProperly() throws Throwable { + // given: + given(optionValidator.nftMaxQueryRangeCheck(start, end)).willReturn(INVALID_QUERY_RANGE); + + // when: + var validity = subject.checkValidity(validQuery(ANSWER_ONLY, 0, accountId, start, end), view); + + // then: + assertEquals(INVALID_QUERY_RANGE, validity); + } + + @Test + public void checksQueryRangeLargerThanNftCount() throws Throwable { + // given: + given(view.accountNftsCount(accountId)).willReturn(1L); + given(view.accounts()).willReturn(accountMap); + given(optionValidator.nftMaxQueryRangeCheck(start, end)).willReturn(OK); + given(optionValidator.queryableAccountStatus(accountId, accountMap)).willReturn(OK); + + // when: + var validity = subject.checkValidity(validQuery(ANSWER_ONLY, 0, accountId, start, end), view); + + // then: + assertEquals(INVALID_QUERY_RANGE, validity); + } + + @Test + public void checksInvalidAccountId() throws Throwable { + // given: + given(view.accountNftsCount(accountId)).willReturn(10L); + given(view.accounts()).willReturn(accountMap); + given(optionValidator.nftMaxQueryRangeCheck(start, end)).willReturn(OK); + given(optionValidator.queryableAccountStatus(accountId, accountMap)).willReturn(INVALID_ACCOUNT_ID); + + // when: + var validity = subject.checkValidity(validQuery(ANSWER_ONLY, 0, accountId, start, end), view); + + // then: + assertEquals(INVALID_ACCOUNT_ID, validity); + } + + @Test + public void properCanonicalFunction() { + assertEquals(HederaFunctionality.TokenGetAccountNftInfos, subject.canonicalFunction()); + } + + @Test + public void getsValidity() { + // given: + Response response = Response.newBuilder().setTokenGetAccountNftInfos( + TokenGetAccountNftInfosResponse.newBuilder() + .setHeader(subject.answerOnlyHeader(RESULT_SIZE_LIMIT_EXCEEDED))).build(); + + // expect: + assertEquals(RESULT_SIZE_LIMIT_EXCEEDED, subject.extractValidityFrom(response)); + } + + @Test + public void getsExpectedPayment() throws Throwable { + // given: + Query query = validQuery(COST_ANSWER, fee, accountId, start, end); + + // expect: + assertEquals(paymentTxn, subject.extractPaymentFrom(query).get().getSignedTxnWrapper()); + } + + @Test + public void checksInvalidRangesProperly() throws Throwable { + // when: + var validity = subject.checkValidity(validQuery(ANSWER_ONLY, 0, accountId, end, start), view); + + // then: + assertEquals(INVALID_QUERY_RANGE, validity); + } + + @Test + public void getsTheInfo() throws Throwable { + // setup: + Query query = validQuery(ANSWER_ONLY, fee, accountId, start, end); + + given(view.infoForAccountNfts(accountId, start, end)).willReturn(Optional.of(accountNftInfos)); + + // when: + Response response = subject.responseGiven(query, view, OK, fee); + + // then: + assertTrue(response.hasTokenGetAccountNftInfos()); + assertTrue(response.getTokenGetAccountNftInfos().hasHeader(), "Missing response header!"); + assertEquals(OK, response.getTokenGetAccountNftInfos().getHeader().getNodeTransactionPrecheckCode()); + assertEquals(ANSWER_ONLY, response.getTokenGetAccountNftInfos().getHeader().getResponseType()); + assertEquals(fee, response.getTokenGetAccountNftInfos().getHeader().getCost()); + // and: + var actual = response.getTokenGetAccountNftInfos().getNftsList(); + assertEquals(accountNftInfos, actual); + } + + @Test + public void getsInfoFromCtxWhenAvailable() throws Throwable { + // setup: + Query sensibleQuery = validQuery(ANSWER_ONLY, 5L, accountId, start, end); + Map ctx = new HashMap<>(); + + // given: + ctx.put(GetAccountNftInfosAnswer.ACCOUNT_NFT_INFO_CTX_KEY, accountNftInfos); + + // when: + Response response = subject.responseGiven(sensibleQuery, view, OK, 0L, ctx); + + // then: + var opResponse = response.getTokenGetAccountNftInfos(); + assertTrue(opResponse.hasHeader(), "Missing response header!"); + assertEquals(OK, opResponse.getHeader().getNodeTransactionPrecheckCode()); + assertEquals(accountNftInfos, opResponse.getNftsList()); + } + + @Test + public void validatesQueryContext() throws Throwable { + // setup: + Query sensibleQuery = validQuery(ANSWER_ONLY, 5L, accountId, start, end); + Map ctx = new HashMap<>(); + + // given: + // when: + Response response = subject.responseGiven(sensibleQuery, view, OK, 0L, ctx); + + // then: + var opResponse = response.getTokenGetAccountNftInfos(); + assertTrue(opResponse.hasHeader(), "Missing response header!"); + assertEquals(INVALID_ACCOUNT_ID, opResponse.getHeader().getNodeTransactionPrecheckCode()); + assertTrue(opResponse.getNftsList().isEmpty()); + } + + @Test + public void getsCostAnswerResponse() throws Throwable { + // setup: + Query query = validQuery(COST_ANSWER, fee, accountId, start, end); + + // when: + Response response = subject.responseGiven(query, view, OK, fee); + + // then: + assertTrue(response.hasTokenGetAccountNftInfos()); + assertEquals(OK, response.getTokenGetAccountNftInfos().getHeader().getNodeTransactionPrecheckCode()); + assertEquals(COST_ANSWER, response.getTokenGetAccountNftInfos().getHeader().getResponseType()); + assertEquals(fee, response.getTokenGetAccountNftInfos().getHeader().getCost()); + } + + @Test + public void setsCorrectHeaderOnFailedValidity() throws Throwable { + // setup: + Query query = validQuery(COST_ANSWER, fee, accountId, start, end); + + // when: + Response response = subject.responseGiven(query, view, INVALID_ACCOUNT_ID, fee); + + // then: + assertTrue(response.hasTokenGetAccountNftInfos()); + assertEquals(INVALID_ACCOUNT_ID, response.getTokenGetAccountNftInfos().getHeader().getNodeTransactionPrecheckCode()); + assertEquals(COST_ANSWER, response.getTokenGetAccountNftInfos().getHeader().getResponseType()); + assertEquals(fee, response.getTokenGetAccountNftInfos().getHeader().getCost()); + } + + @Test + public void failsToGetTheInfo() throws Throwable { + // setup: + Query query = validQuery(ANSWER_ONLY, fee, invalidAccountId, start, end); + + given(view.infoForAccountNfts(invalidAccountId, start, end)).willReturn(Optional.empty()); + + // when: + Response response = subject.responseGiven(query, view, OK, fee); + + // then: + assertTrue(response.hasTokenGetAccountNftInfos()); + assertTrue(response.getTokenGetAccountNftInfos().hasHeader(), "Missing response header!"); + assertEquals(INVALID_ACCOUNT_ID, response.getTokenGetAccountNftInfos().getHeader().getNodeTransactionPrecheckCode()); + assertEquals(ANSWER_ONLY, response.getTokenGetAccountNftInfos().getHeader().getResponseType()); + assertEquals(0, response.getTokenGetAccountNftInfos().getHeader().getCost()); + // and: + var actual = response.getTokenGetAccountNftInfos().getNftsList(); + assertTrue(actual.isEmpty()); + } + + private Query validQuery(ResponseType type, long payment, AccountID id, long start, long end) throws Throwable { + this.paymentTxn = payerSponsoredTransfer(payer, COMPLEX_KEY_ACCOUNT_KT, node, payment); + QueryHeader.Builder header = QueryHeader.newBuilder() + .setPayment(this.paymentTxn) + .setResponseType(type); + TokenGetAccountNftInfosQuery.Builder op = TokenGetAccountNftInfosQuery.newBuilder() + .setHeader(header) + .setStart(start) + .setEnd(end) + .setAccountID(id); + return Query.newBuilder().setTokenGetAccountNftInfos(op).build(); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/queries/token/GetTokenNftInfoAnswerTest.java b/hedera-node/src/test/java/com/hedera/services/queries/token/GetTokenNftInfoAnswerTest.java new file mode 100644 index 000000000000..c5f499a0fee5 --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/queries/token/GetTokenNftInfoAnswerTest.java @@ -0,0 +1,314 @@ +package com.hedera.services.queries.token; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hedera.services.context.primitives.StateView; +import com.hedera.services.txns.validation.OptionValidator; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.NftID; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.QueryHeader; +import com.hederahashgraph.api.proto.java.Response; +import com.hederahashgraph.api.proto.java.ResponseCodeEnum; +import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.Timestamp; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoQuery; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoResponse; +import com.hederahashgraph.api.proto.java.TokenNftInfo; +import com.hederahashgraph.api.proto.java.Transaction; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +import static com.hedera.test.factories.scenarios.TxnHandlingScenario.COMPLEX_KEY_ACCOUNT_KT; +import static com.hedera.test.utils.IdUtils.asAccount; +import static com.hedera.test.utils.IdUtils.asToken; +import static com.hedera.test.utils.TxnUtils.payerSponsoredTransfer; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NFT_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_NFT_SERIAL_NUMBER; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.RESULT_SIZE_LIMIT_EXCEEDED; +import static com.hederahashgraph.api.proto.java.ResponseType.ANSWER_ONLY; +import static com.hederahashgraph.api.proto.java.ResponseType.COST_ANSWER; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +public class GetTokenNftInfoAnswerTest { + private Transaction paymentTxn; + private String node = "0.0.3"; + private String payer = "0.0.12345"; + private NftID nftId = NftID.newBuilder().setTokenID(asToken("1.2.3")).setSerialNumber(2).build(); + private long fee = 1_234L; + private AccountID owner = asAccount("3.4.5"); + private ByteString metadata = ByteString.copyFromUtf8("some metadata"); + + StateView view; + OptionValidator optionValidator; + + TokenNftInfo info; + + GetTokenNftInfoAnswer subject; + + @BeforeEach + public void setup() { + info = TokenNftInfo.newBuilder() + .setNftID(nftId) + .setCreationTime(Timestamp.newBuilder().setSeconds(1).setNanos(2)) + .setAccountID(owner) + .setMetadata(metadata) + .build(); + + view = mock(StateView.class); + optionValidator = mock(OptionValidator.class); + + subject = new GetTokenNftInfoAnswer(); + } + + @Test + public void getsTheInfo() throws Throwable { + // setup: + Query query = validQuery(ANSWER_ONLY, fee, nftId); + + given(view.infoForNft(nftId)).willReturn(Optional.of(info)); + + // when: + Response response = subject.responseGiven(query, view, OK, fee); + + // then: + assertTrue(response.hasTokenGetNftInfo()); + assertTrue(response.getTokenGetNftInfo().hasHeader(), "Missing response header!"); + assertEquals(OK, response.getTokenGetNftInfo().getHeader().getNodeTransactionPrecheckCode()); + assertEquals(ANSWER_ONLY, response.getTokenGetNftInfo().getHeader().getResponseType()); + assertEquals(fee, response.getTokenGetNftInfo().getHeader().getCost()); + // and: + var actual = response.getTokenGetNftInfo().getNft(); + assertEquals(info, actual); + } + + @Test + public void usesViewToValidate() throws Throwable { + // setup: + Query query = validQuery(COST_ANSWER, fee, nftId); + + given(view.nftExists(nftId)).willReturn(false); + + // when: + ResponseCodeEnum validity = subject.checkValidity(query, view); + + // then: + assertEquals(INVALID_NFT_ID, validity); + } + + @Test + public void validatesInexistingTokenId() throws Throwable { + // setup: + nftId = NftID.newBuilder().setSerialNumber(2).build(); + Query query = validQuery(COST_ANSWER, fee, nftId); + + // when: + ResponseCodeEnum validity = subject.checkValidity(query, view); + + // then: + assertEquals(INVALID_TOKEN_ID, validity); + } + + @Test + public void validatesWrongSerialNumber() throws Throwable { + // setup: + nftId = NftID.newBuilder().setTokenID(nftId.getTokenID()).build(); + Query query = validQuery(COST_ANSWER, fee, nftId); + + // when: + ResponseCodeEnum validity = subject.checkValidity(query, view); + + // then: + assertEquals(INVALID_TOKEN_NFT_SERIAL_NUMBER, validity); + } + + @Test + public void getsExpectedPayment() throws Throwable { + // given: + Query query = validQuery(COST_ANSWER, fee, nftId); + + // expect: + assertEquals(paymentTxn, subject.extractPaymentFrom(query).get().getSignedTxnWrapper()); + } + + @Test + public void getsInfoFromCtxWhenAvailable() throws Throwable { + // setup: + Query sensibleQuery = validQuery(ANSWER_ONLY, 5L, nftId); + Map ctx = new HashMap<>(); + + // given: + ctx.put(GetTokenNftInfoAnswer.NFT_INFO_CTX_KEY, info); + + // when: + Response response = subject.responseGiven(sensibleQuery, view, OK, 0L, ctx); + + // then: + var opResponse = response.getTokenGetNftInfo(); + assertTrue(opResponse.hasHeader(), "Missing response header!"); + assertEquals(OK, opResponse.getHeader().getNodeTransactionPrecheckCode()); + assertSame(info, opResponse.getNft()); + // and: + verify(view, never()).infoForNft(any()); + } + + @Test + public void validatesInvalidNftIdInContext() throws Throwable { + // setup: + Query sensibleQuery = validQuery(ANSWER_ONLY, 5L, nftId); + Map ctx = new HashMap<>(); + + // when: + Response response = subject.responseGiven(sensibleQuery, view, OK, 0L, ctx); + + // then: + var opResponse = response.getTokenGetNftInfo(); + assertTrue(opResponse.hasHeader(), "Missing response header!"); + assertEquals(INVALID_NFT_ID, opResponse.getHeader().getNodeTransactionPrecheckCode()); + // and: + verify(view, never()).infoForNft(any()); + } + + @Test + public void doesNotGetInfoWithInvalidValidity() throws Throwable { + // setup: + Query sensibleQuery = validQuery(ANSWER_ONLY, 5L, nftId); + Map ctx = new HashMap<>(); + + // given: + ctx.put(GetTokenNftInfoAnswer.NFT_INFO_CTX_KEY, info); + + // when: + Response response = subject.responseGiven(sensibleQuery, view, INVALID_NFT_ID, 0L, ctx); + + // then: + var opResponse = response.getTokenGetNftInfo(); + assertTrue(opResponse.hasHeader(), "Missing response header!"); + assertEquals(INVALID_NFT_ID, opResponse.getHeader().getNodeTransactionPrecheckCode()); + // and: + verify(view, never()).infoForNft(any()); + } + + @Test + public void doesNotGetInfoWithEmptyContext() throws Throwable { + // setup: + Query sensibleQuery = validQuery(ANSWER_ONLY, 5L, nftId); + + // when: + Response response = subject.responseGiven(sensibleQuery, view, INVALID_NFT_ID, 0L); + + // then: + var opResponse = response.getTokenGetNftInfo(); + assertTrue(opResponse.hasHeader(), "Missing response header!"); + assertEquals(INVALID_NFT_ID, opResponse.getHeader().getNodeTransactionPrecheckCode()); + // and: + verify(view, never()).infoForNft(any()); + } + + @Test + public void validatesEmptyInfo() throws Throwable { + // setup: + Query sensibleQuery = validQuery(ANSWER_ONLY, 5L, nftId); + + given(view.infoForNft(nftId)).willReturn(Optional.empty()); + + // when: + Response response = subject.responseGiven(sensibleQuery, view, OK); + + // then: + var opResponse = response.getTokenGetNftInfo(); + assertTrue(opResponse.hasHeader(), "Missing response header!"); + assertEquals(INVALID_NFT_ID, opResponse.getHeader().getNodeTransactionPrecheckCode()); + } + + @Test + public void getsCostAnswerResponse() throws Throwable { + // setup: + Query query = validQuery(COST_ANSWER, fee, nftId); + + // when: + Response response = subject.responseGiven(query, view, OK, fee); + + // then: + assertTrue(response.hasTokenGetNftInfo()); + assertEquals(OK, response.getTokenGetNftInfo().getHeader().getNodeTransactionPrecheckCode()); + assertEquals(COST_ANSWER, response.getTokenGetNftInfo().getHeader().getResponseType()); + assertEquals(fee, response.getTokenGetNftInfo().getHeader().getCost()); + } + + @Test + public void recognizesFunction() { + // expect: + assertEquals(HederaFunctionality.TokenGetNftInfo, subject.canonicalFunction()); + } + + @Test + public void getsValidity() { + // given: + Response response = Response.newBuilder().setTokenGetNftInfo( + TokenGetNftInfoResponse.newBuilder() + .setHeader(subject.answerOnlyHeader(RESULT_SIZE_LIMIT_EXCEEDED))).build(); + + // expect: + assertEquals(RESULT_SIZE_LIMIT_EXCEEDED, subject.extractValidityFrom(response)); + } + + @Test + public void requiresAnswerOnlyPayment() throws Throwable { + // expect: + assertFalse(subject.requiresNodePayment(validQuery(COST_ANSWER, 0, nftId))); + assertTrue(subject.requiresNodePayment(validQuery(ANSWER_ONLY, 0, nftId))); + } + + @Test + public void requiresAnswerOnlyCostAsExpected() throws Throwable { + // expect: + assertTrue(subject.needsAnswerOnlyCost(validQuery(COST_ANSWER, 0, nftId))); + assertFalse(subject.needsAnswerOnlyCost(validQuery(ANSWER_ONLY, 0, nftId))); + } + + private Query validQuery(ResponseType type, long payment, NftID nftId) throws Throwable { + this.paymentTxn = payerSponsoredTransfer(payer, COMPLEX_KEY_ACCOUNT_KT, node, payment); + QueryHeader.Builder header = QueryHeader.newBuilder() + .setPayment(this.paymentTxn) + .setResponseType(type); + TokenGetNftInfoQuery.Builder op = TokenGetNftInfoQuery.newBuilder() + .setHeader(header) + .setNftID(nftId); + return Query.newBuilder().setTokenGetNftInfo(op).build(); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/queries/token/TokenAnswersTest.java b/hedera-node/src/test/java/com/hedera/services/queries/token/TokenAnswersTest.java index e6c1bcd97442..82c402673f55 100644 --- a/hedera-node/src/test/java/com/hedera/services/queries/token/TokenAnswersTest.java +++ b/hedera-node/src/test/java/com/hedera/services/queries/token/TokenAnswersTest.java @@ -28,16 +28,20 @@ class TokenAnswersTest { GetTokenInfoAnswer tokenInfo; + GetTokenNftInfoAnswer nftInfo; + GetAccountNftInfosAnswer accountNftInfos; @BeforeEach private void setup() { tokenInfo = mock(GetTokenInfoAnswer.class); + nftInfo = mock(GetTokenNftInfoAnswer.class); + accountNftInfos = mock(GetAccountNftInfosAnswer.class); } @Test void getsQueryBalance() { // given: - TokenAnswers subject = new TokenAnswers(tokenInfo); + TokenAnswers subject = new TokenAnswers(tokenInfo, nftInfo, accountNftInfos); // expect: assertSame(tokenInfo, subject.getTokenInfo()); diff --git a/hedera-node/src/test/java/com/hedera/services/records/TransactionRecordServiceTest.java b/hedera-node/src/test/java/com/hedera/services/records/TransactionRecordServiceTest.java index 3649e8e033bc..64d5407312ad 100644 --- a/hedera-node/src/test/java/com/hedera/services/records/TransactionRecordServiceTest.java +++ b/hedera-node/src/test/java/com/hedera/services/records/TransactionRecordServiceTest.java @@ -21,6 +21,7 @@ */ import com.hedera.services.context.TransactionContext; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.store.models.Account; import com.hedera.services.store.models.Id; import com.hedera.services.store.models.Token; @@ -32,13 +33,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.BDDMockito; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -84,8 +83,10 @@ void doesntUpdatesReceiptWithoutNewTotalSupply() { @Test void updatesWithChangedRelationshipBalance() { // setup: + var token = new Token(new Id(0, 0, 2)); + token.setType(TokenType.FUNGIBLE_COMMON); final var tokenRel = new TokenRelationship( - new Token(new Id(0, 0, 2)), + token, new Account(new Id(0, 0, 3))); tokenRel.initBalance(0L); tokenRel.setBalance(246L); diff --git a/hedera-node/src/test/java/com/hedera/services/state/exports/ToStringAccountsExporterTest.java b/hedera-node/src/test/java/com/hedera/services/state/exports/ToStringAccountsExporterTest.java index dfa463168d00..c0b8aa5e2b73 100644 --- a/hedera-node/src/test/java/com/hedera/services/state/exports/ToStringAccountsExporterTest.java +++ b/hedera-node/src/test/java/com/hedera/services/state/exports/ToStringAccountsExporterTest.java @@ -74,7 +74,7 @@ void producesExpectedText() throws Exception { "---\n" + "MerkleAccount{state=MerkleAccountState{key=ed25519: \"first-fake\"\n" + ", expiry=1234567, balance=1, autoRenewSecs=555555, memo=This ecstasy doth unperplex, deleted=false, " + - "smartContract=true, receiverSigRequired=true, proxy=EntityId{shard=0, realm=0, num=0}}, # records=0, " + + "smartContract=true, receiverSigRequired=true, proxy=EntityId{shard=0, realm=0, num=0}, nftsOwned=0}, # records=0, " + "tokens=[3.2.1, 1.2.3]}\n" + "\n" + "0.0.2\n" + @@ -82,7 +82,7 @@ void producesExpectedText() throws Exception { "MerkleAccount{state=MerkleAccountState{key=ed25519: \"second-fake\"\n" + ", expiry=7654321, balance=2, autoRenewSecs=444444, memo=We said, and show us what we love, " + "deleted=true, smartContract=false, receiverSigRequired=false, proxy=EntityId{shard=0, realm=0, " + - "num=0}}, # records=0, tokens=[1234.0.0]}\n"; + "num=0}, nftsOwned=0}, # records=0, tokens=[1234.0.0]}\n"; // given: FCMap accounts = new FCMap<>(); diff --git a/hedera-node/src/test/java/com/hedera/services/state/initialization/ViewBuilderTest.java b/hedera-node/src/test/java/com/hedera/services/state/initialization/ViewBuilderTest.java new file mode 100644 index 000000000000..9334ff71dfdb --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/state/initialization/ViewBuilderTest.java @@ -0,0 +1,60 @@ +package com.hedera.services.state.initialization; + +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; +import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.state.submerkle.RichInstant; +import com.swirlds.fchashmap.FCOneToManyRelation; +import com.swirlds.fcmap.FCMap; +import org.junit.jupiter.api.Test; + +import java.time.Instant; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ViewBuilderTest { + private static final EntityId tokenId = new EntityId(0, 0, 54321); + private static final EntityId ownerId = new EntityId(0, 0, 12345); + + public static FCMap someUniqueTokens() { + final var uniqId = new MerkleUniqueTokenId(tokenId, 2); + final var uniq = new MerkleUniqueToken( + ownerId, + "some-metadata".getBytes(), + RichInstant.fromJava(Instant.ofEpochSecond(1_234_567L, 8))); + final var ans = new FCMap(); + ans.put(uniqId, uniq); + return ans; + } + + public static void assertIsTheExpectedUta(FCOneToManyRelation actual) { + final var uniqId = new MerkleUniqueTokenId(tokenId, 2); + final var expected = new FCOneToManyRelation(); + expected.associate(tokenId, uniqId); + assertEquals(actual.getKeySet(), actual.getKeySet()); + expected.getKeySet().forEach(key -> assertEquals(expected.getList(key), actual.getList(key))); + } + + public static void assertIsTheExpectedUtao(FCOneToManyRelation actual) { + final var uniqId = new MerkleUniqueTokenId(tokenId, 2); + final var expected = new FCOneToManyRelation(); + expected.associate(ownerId, uniqId); + assertEquals(actual.getKeySet(), actual.getKeySet()); + expected.getKeySet().forEach(key -> assertEquals(expected.getList(key), actual.getList(key))); + } + + @Test + void rebuildOwnershipsAndAssociationsWorks() { + // given: + final var actualUta = new FCOneToManyRelation(); + final var actualUtao = new FCOneToManyRelation(); + + // when: + ViewBuilder.rebuildUniqueTokenViews(someUniqueTokens(), actualUta, actualUtao); + + // then: + assertIsTheExpectedUta(actualUta); + assertIsTheExpectedUtao(actualUtao); + } + +} \ No newline at end of file diff --git a/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleAccountStateTest.java b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleAccountStateTest.java index 1c5657ceafc0..1fd868f645c4 100644 --- a/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleAccountStateTest.java +++ b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleAccountStateTest.java @@ -28,7 +28,6 @@ import com.hedera.services.state.serdes.IoWritingConsumer; import com.hedera.services.state.submerkle.EntityId; import com.hedera.services.utils.MiscUtils; -import com.hedera.test.factories.scenarios.TxnHandlingScenario; import com.swirlds.common.MutabilityException; import com.swirlds.common.io.SerializableDataInputStream; import com.swirlds.common.io.SerializableDataOutputStream; @@ -60,6 +59,7 @@ class MerkleAccountStateTest { private long expiry = 1_234_567L; private long balance = 555_555L; private long autoRenewSecs = 234_567L; + private long nftsOwned = 150L; private String memo = "A memo"; private boolean deleted = true; private boolean smartContract = true; @@ -118,7 +118,7 @@ void toStringWorks() { "deleted=" + deleted + ", " + "smartContract=" + smartContract + ", " + "receiverSigRequired=" + receiverSigRequired + ", " + - "proxy=" + proxy + "}", + "proxy=" + proxy + ", nftsOwned=0}", subject.toString()); } @@ -172,6 +172,37 @@ void deserializeWorks() throws IOException { verify(in, times(3)).readLong(); } + @Test + void deserializeV0160Works() throws IOException { + // setup: + var in = mock(SerializableDataInputStream.class); + subject.setNftsOwned(nftsOwned); + // and: + var newSubject = new MerkleAccountState(); + + given(serdes.readNullable(argThat(in::equals), any(IoReadingFunction.class))).willReturn(key); + given(in.readLong()) + .willReturn(expiry) + .willReturn(balance) + .willReturn(autoRenewSecs) + .willReturn(nftsOwned); + given(in.readNormalisedString(anyInt())).willReturn(memo); + given(in.readBoolean()) + .willReturn(deleted) + .willReturn(smartContract) + .willReturn(receiverSigRequired); + given(serdes.readNullableSerializable(in)).willReturn(proxy); + + // when: + newSubject.deserialize(in, MerkleAccountState.RELEASE_0160_VERSION); + + // then: + assertEquals(subject, newSubject); + // and: + verify(in, never()).readLongArray(MAX_CONCEIVABLE_TOKEN_BALANCES_SIZE); + verify(in, times(4)).readLong(); + } + @Test void serializeWorks() throws IOException { // setup: @@ -341,7 +372,7 @@ void equalsWorksForProxy() { @Test void merkleMethodsWork() { // expect; - assertEquals(MerkleAccountState.RELEASE_090_VERSION, subject.getVersion()); + assertEquals(MerkleAccountState.RELEASE_0160_VERSION, subject.getVersion()); assertEquals(MerkleAccountState.RUNTIME_CONSTRUCTABLE_ID, subject.getClassId()); assertTrue(subject.isLeaf()); } diff --git a/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleTokenTest.java b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleTokenTest.java index 61fe7d1a7dab..f9160897431e 100644 --- a/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleTokenTest.java +++ b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleTokenTest.java @@ -22,6 +22,8 @@ import com.hedera.services.legacy.core.jproto.JEd25519Key; import com.hedera.services.legacy.core.jproto.JKey; +import com.hedera.services.state.enums.TokenSupplyType; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.state.serdes.DomainSerdes; import com.hedera.services.state.serdes.IoReadingFunction; import com.hedera.services.state.serdes.IoWritingConsumer; @@ -132,6 +134,22 @@ void setup() { subject = new MerkleToken( expiry, totalSupply, decimals, symbol, name, freezeDefault, accountsKycGrantedByDefault, treasury); setOptionalElements(subject); + subject.setExpiry(expiry); + subject.setTotalSupply(totalSupply); + subject.setAdminKey(adminKey); + subject.setFreezeKey(freezeKey); + subject.setKycKey(kycKey); + subject.setWipeKey(wipeKey); + subject.setSupplyKey(supplyKey); + subject.setDeleted(isDeleted); + subject.setMemo(memo); + subject.setTokenType(TokenType.FUNGIBLE_COMMON); + subject.setSupplyType(TokenSupplyType.INFINITE); + subject.setTreasury(treasury); + subject.setName(name); + subject.setSymbol(symbol); + subject.setAccountsFrozenByDefault(true); + subject.setFeeScheduleFrom(grpcFeeSchedule); serdes = mock(DomainSerdes.class); MerkleToken.serdes = serdes; @@ -180,6 +198,8 @@ void serializeWorks() throws IOException { inOrder.verify(serdes).writeNullable( argThat(wipeKey::equals), argThat(out::equals), any(IoWritingConsumer.class)); inOrder.verify(out).writeNormalisedString(memo); + inOrder.verify(out, times(2)).writeInt(0); + inOrder.verify(out, times(2)).writeLong(0); inOrder.verify(out).writeSerializableList(feeSchedule, true, true); inOrder.verify(out).writeBoolean(subject.isFeeScheduleMutable()); } @@ -221,8 +241,11 @@ void v0120DeserializeWorks() throws IOException { given(fin.readLong()) .willReturn(subject.expiry()) .willReturn(subject.autoRenewPeriod()) - .willReturn(subject.totalSupply()); - given(fin.readInt()).willReturn(subject.decimals()); + .willReturn(subject.totalSupply()) + .willReturn(subject.getLastUsedSerialNumber()); + given(fin.readInt()).willReturn(subject.decimals()) + .willReturn(TokenType.FUNGIBLE_COMMON.ordinal()) + .willReturn(TokenSupplyType.INFINITE.ordinal()); given(fin.readBoolean()) .willReturn(isDeleted) .willReturn(subject.accountsAreFrozenByDefault()); @@ -257,8 +280,13 @@ void v0160DeserializeWorks() throws IOException { given(fin.readLong()) .willReturn(subject.expiry()) .willReturn(subject.autoRenewPeriod()) - .willReturn(subject.totalSupply()); - given(fin.readInt()).willReturn(subject.decimals()); + .willReturn(subject.totalSupply()) + .willReturn(subject.maxSupply()) + .willReturn(subject.getLastUsedSerialNumber()); + given(fin.readInt()) + .willReturn(subject.decimals()) + .willReturn(subject.tokenType().ordinal()) + .willReturn(subject.supplyType().ordinal()); given(fin.readBoolean()) .willReturn(isDeleted) .willReturn(subject.accountsAreFrozenByDefault()) @@ -521,6 +549,54 @@ void objectContractHoldsForDifferentFreezeKeys() { assertNotEquals(subject.hashCode(), other.hashCode()); } + @Test + public void objectContractPropertiesCheck() { + // setup: + + // when: + + // expect: + assertTrue(subject.hasAdminKey()); + // and: + assertEquals(adminKey, subject.adminKey().get()); + // and: + assertEquals(freezeKey, subject.freezeKey().get()); + // and: + assertTrue(subject.hasFreezeKey()); + // and: + assertEquals(kycKey, subject.kycKey().get()); + // and: + assertTrue(subject.hasKycKey()); + // and: + assertEquals(supplyKey, subject.supplyKey().get()); + // and: + assertTrue(subject.hasSupplyKey()); + // and: + assertEquals(wipeKey, subject.wipeKey().get()); + // and: + assertTrue(subject.hasWipeKey()); + // and: + assertTrue(subject.isDeleted()); + // and: + assertEquals(symbol, subject.symbol()); + // and: + assertEquals(name, subject.name()); + // and: + assertTrue(subject.accountsKycGrantedByDefault()); + // and: + assertEquals(autoRenewAccount, subject.autoRenewAccount()); + // and: + assertTrue(subject.hasAutoRenewAccount()); + // and: + assertEquals(supplyKey, subject.getSupplyKey()); + // and: + assertEquals(kycKey, subject.getKycKey()); + // and: + assertEquals(freezeKey, subject.getFreezeKey()); + // and: + assertEquals(memo, subject.memo()); + } + private void setOptionalElements(MerkleToken token) { token.setDeleted(isDeleted); token.setAdminKey(adminKey); @@ -542,12 +618,20 @@ void hashCodeContractMet() { var identicalSubject = new MerkleToken( expiry, totalSupply, decimals, symbol, name, freezeDefault, accountsKycGrantedByDefault, treasury); setOptionalElements(identicalSubject); + identicalSubject.setDeleted(isDeleted); + identicalSubject.setTokenType(TokenType.FUNGIBLE_COMMON); + identicalSubject.setSupplyType(TokenSupplyType.INFINITE); + identicalSubject.setMaxSupply(subject.maxSupply()); + identicalSubject.setLastUsedSerialNumber(subject.getLastUsedSerialNumber()); // and: other = new MerkleToken( otherExpiry, otherTotalSupply, otherDecimals, otherSymbol, otherName, otherFreezeDefault, otherAccountsKycGrantedByDefault, otherTreasury); - + other.setTokenType(TokenType.FUNGIBLE_COMMON); + other.setSupplyType(TokenSupplyType.INFINITE); + other.setMaxSupply(subject.maxSupply()); + other.setLastUsedSerialNumber(subject.getLastUsedSerialNumber()); // expect: assertNotEquals(subject.hashCode(), defaultSubject.hashCode()); assertNotEquals(subject.hashCode(), other.hashCode()); @@ -565,9 +649,10 @@ void equalsWorksWithExtremes() { @Test void toStringWorks() { // setup: - final var desired = "MerkleToken{deleted=true, expiry=1234567, symbol=NotAnHbar, name=NotAnHbarName, " + - "memo=NotAMemo, treasury=1.2.3, totalSupply=1000000, decimals=2, autoRenewAccount=2.3.4, " + - "autoRenewPeriod=1234567, adminKey=ed25519: \"not-a-real-admin-key\"\n" + + final var desired = "MerkleToken{tokenType=FUNGIBLE_COMMON, supplyType=INFINITE, deleted=true, expiry=1234567, " + + "symbol=NotAnHbar, name=NotAnHbarName, memo=NotAMemo, treasury=1.2.3, maxSupply=0, totalSupply=1000000," + + " decimals=2, lastUsedSerialNumber=0, autoRenewAccount=2.3.4, autoRenewPeriod=1234567, " + + "adminKey=ed25519: \"not-a-real-admin-key\"\n" + ", kycKey=ed25519: \"not-a-real-kyc-key\"\n" + ", wipeKey=ed25519: \"not-a-real-wipe-key\"\n" + ", supplyKey=ed25519: \"not-a-real-supply-key\"\n" + @@ -599,6 +684,15 @@ void adjustsTotalSupplyWhenValid() { assertEquals(1_500_000, subject.totalSupply()); } + @Test + void doesNotAdjustTotalSupplyWhenInvalid() { + // when: + subject.setMaxSupply(2); + + // then: + assertThrows(IllegalArgumentException.class, () -> subject.adjustTotalSupplyBy(1_500_000)); + } + @Test void throwsIaeIfTotalSupplyGoesNegative() { // expect: diff --git a/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleUniqueTokenIdTest.java b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleUniqueTokenIdTest.java new file mode 100644 index 000000000000..5d499b28e63c --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleUniqueTokenIdTest.java @@ -0,0 +1,164 @@ +package com.hedera.services.state.merkle; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.store.models.NftId; +import com.swirlds.common.io.SerializableDataInputStream; +import com.swirlds.common.io.SerializableDataOutputStream; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InOrder; + +import java.io.IOException; + +import static com.hedera.services.state.submerkle.EntityId.MISSING_ENTITY_ID; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; + +class MerkleUniqueTokenIdTest { + private MerkleUniqueTokenId subject; + + private EntityId tokenId = MISSING_ENTITY_ID; + private EntityId otherTokenId = MISSING_ENTITY_ID; + private int serialNumber; + private int otherSerialNumber; + + @BeforeEach + void setup() { + tokenId = new EntityId(1, 2, 3); + otherTokenId = new EntityId(1, 2, 4); + serialNumber = 1; + otherSerialNumber = 2; + + subject = new MerkleUniqueTokenId(tokenId, serialNumber); + } + + @AfterEach + void cleanup() { + } + + @Test + void equalsContractWorks() { + // given + var other = new MerkleUniqueTokenId(otherTokenId, serialNumber); + var other2 = new MerkleUniqueTokenId(tokenId, otherSerialNumber); + var identical = new MerkleUniqueTokenId(tokenId, serialNumber); + + // expect + assertNotEquals(subject, other); + assertNotEquals(subject, other2); + assertEquals(subject, identical); + } + + @Test + void hashCodeWorks() { + // given: + var identical = new MerkleUniqueTokenId(tokenId, serialNumber); + var other = new MerkleUniqueTokenId(otherTokenId, otherSerialNumber); + + // expect: + assertNotEquals(subject.hashCode(), other.hashCode()); + assertEquals(subject.hashCode(), identical.hashCode()); + } + + @Test + void toStringWorks() { + // given: + assertEquals("MerkleUniqueTokenId{" + + "tokenId=" + tokenId + ", " + + "serialNumber=" + serialNumber + "}", + subject.toString()); + } + + @Test + void copyWorks() { + // given: + var copyNftId = subject.copy(); + var other = new Object(); + var dup = subject; + + // expect: + assertNotSame(copyNftId, subject); + assertEquals(subject, copyNftId); + assertEquals(subject, dup); + assertNotEquals(subject, other); + } + + @Test + void serializeWorks() throws IOException { + // setup: + var out = mock(SerializableDataOutputStream.class); + // and: + InOrder inOrder = inOrder(out); + + // when: + subject.serialize(out); + + // then: + inOrder.verify(out).writeSerializable(tokenId, true); + inOrder.verify(out).writeLong(serialNumber); + } + + @Test + void deserializeWorks() throws IOException { + // setup: + SerializableDataInputStream in = mock(SerializableDataInputStream.class); + + given(in.readSerializable()).willReturn(tokenId); + given(in.readInt()).willReturn(serialNumber); + + // and: + var read = new MerkleUniqueTokenId(); + + // when: + read.deserialize(in, MerkleUniqueTokenId.MERKLE_VERSION); + + // then: + assertEquals(subject, read); + } + + @Test + void merkleMethodsWork() { + // expect; + assertEquals(MerkleUniqueTokenId.MERKLE_VERSION, subject.getVersion()); + assertEquals(MerkleUniqueTokenId.RUNTIME_CONSTRUCTABLE_ID, subject.getClassId()); + assertTrue(subject.isLeaf()); + } + + @Test + public void fromNftIdWorks() { + // given + var expected = new MerkleUniqueTokenId( + new EntityId(0, 0, 1), + 1 + ); + + // expect: + assertEquals(expected, MerkleUniqueTokenId.fromNftId(new NftId(0, 0, 1, 1))); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleUniqueTokenTest.java b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleUniqueTokenTest.java new file mode 100644 index 000000000000..829beb3239d1 --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/state/merkle/MerkleUniqueTokenTest.java @@ -0,0 +1,178 @@ +package com.hedera.services.state.merkle; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.state.submerkle.RichInstant; +import com.swirlds.common.io.SerializableDataInputStream; +import com.swirlds.common.io.SerializableDataOutputStream; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InOrder; + +import java.io.IOException; +import java.time.Instant; +import java.util.Arrays; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.*; + +public class MerkleUniqueTokenTest { + + private MerkleUniqueToken subject; + + private EntityId owner; + private EntityId otherOwner; + private byte[] metadata; + private byte[] otherMetadata; + private RichInstant timestamp; + private RichInstant otherTimestamp; + + private static long timestampL = 1_234_567L; + + @BeforeEach + public void setup() { + owner = new EntityId(1, 2, 3); + otherOwner = new EntityId(1, 2, 4); + metadata = "Test NFT".getBytes(); + otherMetadata = "Test NFT2".getBytes(); + timestamp = RichInstant.fromJava(Instant.ofEpochSecond(timestampL)); + otherTimestamp = RichInstant.fromJava(Instant.ofEpochSecond(1_234_568L)); + + subject = new MerkleUniqueToken(owner, metadata, timestamp); + } + + @AfterEach + public void cleanup() { + } + + @Test + public void equalsContractWorks() { + // given + var other = new MerkleUniqueToken(owner, metadata, otherTimestamp); + var other2 = new MerkleUniqueToken(owner, otherMetadata, timestamp); + var other3 = new MerkleUniqueToken(otherOwner, metadata, timestamp); + var identical = new MerkleUniqueToken(owner, metadata, timestamp); + + // expect + assertNotEquals(subject, other); + assertNotEquals(subject, other2); + assertNotEquals(subject, other3); + assertEquals(subject, identical); + } + + @Test + public void hashCodeWorks() { + // given: + var identical = new MerkleUniqueToken(owner, metadata, timestamp); + var other = new MerkleUniqueToken(otherOwner, otherMetadata, otherTimestamp); + + // expect: + assertNotEquals(subject.hashCode(), other.hashCode()); + assertEquals(subject.hashCode(), identical.hashCode()); + } + + @Test + public void toStringWorks() { + // given: + assertEquals("MerkleUniqueToken{" + + "owner=" + owner + ", " + + "creationTime=" + timestamp + ", " + + "metadata=" + Arrays.toString(metadata) + "}", + subject.toString()); + } + + @Test + public void copyWorks() { + // given: + var copyNft = subject.copy(); + var other = new Object(); + + // expect: + assertNotSame(copyNft, subject); + assertEquals(subject, copyNft); + assertNotEquals(subject, other); + } + + @Test + public void serializeWorks() throws IOException { + // setup: + var out = mock(SerializableDataOutputStream.class); + // and: + InOrder inOrder = inOrder(out); + + // when: + subject.serialize(out); + + // then: + inOrder.verify(out).writeSerializable(owner, true); + inOrder.verify(out).writeLong(timestamp.getSeconds()); + inOrder.verify(out).writeInt(timestamp.getNanos()); + inOrder.verify(out).writeByteArray(metadata); + + } + + @Test + public void deserializeWorks() throws IOException { + // setup: + SerializableDataInputStream in = mock(SerializableDataInputStream.class); + + given(in.readSerializable()).willReturn(owner); + given(in.readByteArray(anyInt())).willReturn(metadata); + given(in.readLong()).willReturn(timestampL); + given(in.readInt()).willReturn(0); + + // and: + var read = new MerkleUniqueToken(); + + // when: + read.deserialize(in, MerkleUniqueToken.MERKLE_VERSION); + + // then: + assertEquals(subject, read); + } + + @Test + public void merkleMethodsWork() { + // expect; + assertEquals(MerkleUniqueToken.MERKLE_VERSION, subject.getVersion()); + assertEquals(MerkleUniqueToken.RUNTIME_CONSTRUCTABLE_ID, subject.getClassId()); + assertTrue(subject.isLeaf()); + } + + @Test + public void setsAndGetsOwner() { + subject.setOwner(new EntityId(0, 0, 1)); + assertEquals(new EntityId(0, 0, 1), subject.getOwner()); + } + + @Test + public void getsMetadata() { + assertEquals(metadata, subject.getMetadata()); + } + + @Test + public void getsCreationTime() { + assertEquals(timestamp, subject.getCreationTime()); + } +} \ No newline at end of file diff --git a/hedera-node/src/test/java/com/hedera/services/state/submerkle/EntityIdTest.java b/hedera-node/src/test/java/com/hedera/services/state/submerkle/EntityIdTest.java index a1e0e7a71396..9648fc9bf448 100644 --- a/hedera-node/src/test/java/com/hedera/services/state/submerkle/EntityIdTest.java +++ b/hedera-node/src/test/java/com/hedera/services/state/submerkle/EntityIdTest.java @@ -21,6 +21,7 @@ */ import com.hedera.services.state.merkle.MerkleEntityId; +import com.hedera.test.utils.IdUtils; import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.ContractID; import com.hederahashgraph.api.proto.java.FileID; @@ -38,11 +39,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.verify; -public class EntityIdTest { +class EntityIdTest { long shard = 1L, realm = 2L, num = 3L; SerializableDataInputStream in; @@ -84,14 +86,14 @@ public class EntityIdTest { EntityId subject; @BeforeEach - public void setup() { + void setup() { in = mock(SerializableDataInputStream.class); subject = new EntityId(shard, realm, num); } @Test - public void objectContractWorks() { + void objectContractWorks() { // given: var one = subject; var two = EntityId.MISSING_ENTITY_ID; @@ -108,7 +110,7 @@ public void objectContractWorks() { } @Test - public void toStringWorks() { + void toStringWorks() { // expect; assertEquals( "EntityId{shard=" + shard + ", realm=" + realm + ", num=" + num + "}", @@ -116,7 +118,7 @@ public void toStringWorks() { } @Test - public void copyWorks() { + void copyWorks() { // given: var copySubject = subject.copy(); @@ -126,7 +128,7 @@ public void copyWorks() { } @Test - public void gettersWork() { + void gettersWork() { // expect: assertEquals(shard, subject.shard()); assertEquals(realm, subject.realm()); @@ -134,7 +136,7 @@ public void gettersWork() { } @Test - public void factoriesWork() { + void factoriesWork() { // expect: assertThrows(IllegalArgumentException.class, () -> EntityId.fromGrpcAccountId(null)); assertThrows(IllegalArgumentException.class, () -> EntityId.fromGrpcFileId(null)); @@ -152,14 +154,14 @@ public void factoriesWork() { } @Test - public void serializableDetWorks() { + void serializableDetWorks() { // expect; assertEquals(EntityId.MERKLE_VERSION, subject.getVersion()); assertEquals(EntityId.RUNTIME_CONSTRUCTABLE_ID, subject.getClassId()); } @Test - public void deserializeWorks() throws IOException { + void deserializeWorks() throws IOException { // setup: var newSubject = new EntityId(); @@ -176,7 +178,7 @@ public void deserializeWorks() throws IOException { } @Test - public void serializeWorks() throws IOException { + void serializeWorks() throws IOException { // setup: out = mock(SerializableDataOutputStream.class); @@ -190,7 +192,7 @@ public void serializeWorks() throws IOException { } @Test - public void viewsWork() { + void viewsWork() { // expect: assertEquals(accountId, subject.toGrpcAccountId()); assertEquals(contractId, subject.toGrpcContractId()); @@ -198,4 +200,17 @@ public void viewsWork() { assertEquals(scheduleId, subject.toGrpcScheduleId()); assertEquals(merkleId, subject.asMerkle()); } + + @Test + void matcherWorks() { + // setup: + final var diffShard = IdUtils.asAccount("2.2.3"); + final var diffRealm = IdUtils.asAccount("1.3.3"); + final var diffNum = IdUtils.asAccount("1.2.4"); + + assertTrue(subject.matches(subject.toGrpcAccountId())); + assertFalse(subject.matches(diffShard)); + assertFalse(subject.matches(diffRealm)); + assertFalse(subject.matches(diffNum)); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/state/submerkle/ExpirableTxnRecordTest.java b/hedera-node/src/test/java/com/hedera/services/state/submerkle/ExpirableTxnRecordTest.java index 4945587c5c2f..009a8406f8c0 100644 --- a/hedera-node/src/test/java/com/hedera/services/state/submerkle/ExpirableTxnRecordTest.java +++ b/hedera-node/src/test/java/com/hedera/services/state/submerkle/ExpirableTxnRecordTest.java @@ -156,75 +156,6 @@ void fastCopyableWorks() { assertDoesNotThrow(subject::release); } - @Test - void v070DeserializeWorks() throws IOException { - // setup: - subject = subjectRecord(); - SerializableDataInputStream fin = mock(SerializableDataInputStream.class); - - given(serdes.readNullableSerializable(fin)) - .willReturn(subject.getReceipt()) - .willReturn(subject.getTxnId()) - .willReturn(subject.getHbarAdjustments()) - .willReturn(subject.getContractCallResult()) - .willReturn(subject.getContractCreateResult()); - given(fin.readByteArray(ExpirableTxnRecord.MAX_TXN_HASH_BYTES)) - .willReturn(subject.getTxnHash()); - given(serdes.readNullableInstant(fin)) - .willReturn(subject.getConsensusTimestamp()); - given(fin.readLong()).willReturn(subject.getFee()) - .willReturn(subject.getExpiry()) - .willReturn(subject.getSubmittingMember()); - given(serdes.readNullableString(fin, ExpirableTxnRecord.MAX_MEMO_BYTES)) - .willReturn(subject.getMemo()); - // and: - var deserializedRecord = new ExpirableTxnRecord(); - - // when: - deserializedRecord.deserialize(fin, ExpirableTxnRecord.RELEASE_070_VERSION); - - // then: - assertEquals(subject, deserializedRecord); - } - - @Test - void v080DeserializeWorks() throws IOException { - // setup: - subject = subjectRecordWithTokenTransfers(); - SerializableDataInputStream fin = mock(SerializableDataInputStream.class); - - given(serdes.readNullableSerializable(fin)) - .willReturn(subject.getReceipt()) - .willReturn(subject.getTxnId()) - .willReturn(subject.getHbarAdjustments()) - .willReturn(subject.getContractCallResult()) - .willReturn(subject.getContractCreateResult()); - given(fin.readSerializableList(MAX_INVOLVED_TOKENS)) - .willReturn(List.of( - subject.getTokens().get(0), - subject.getTokens().get(1))) - .willReturn(List.of( - subject.getTokenAdjustments().get(0), - subject.getTokenAdjustments().get(1))); - given(fin.readByteArray(ExpirableTxnRecord.MAX_TXN_HASH_BYTES)) - .willReturn(subject.getTxnHash()); - given(serdes.readNullableInstant(fin)) - .willReturn(subject.getConsensusTimestamp()); - given(fin.readLong()).willReturn(subject.getFee()) - .willReturn(subject.getExpiry()) - .willReturn(subject.getSubmittingMember()); - given(serdes.readNullableString(fin, ExpirableTxnRecord.MAX_MEMO_BYTES)) - .willReturn(subject.getMemo()); - // and: - var deserializedRecord = new ExpirableTxnRecord(); - - // when: - deserializedRecord.deserialize(fin, ExpirableTxnRecord.RELEASE_080_VERSION); - - // then: - assertEquals(subject, deserializedRecord); - } - @Test void v0120DeserializeWorks() throws IOException { // setup: @@ -283,7 +214,8 @@ void v0160DeserializeWorks() throws IOException { subject.getTokens().get(1))) .willReturn(List.of( subject.getTokenAdjustments().get(0), - subject.getTokenAdjustments().get(1))); + subject.getTokenAdjustments().get(1))) + .willReturn(null); given(fin.readByteArray(ExpirableTxnRecord.MAX_TXN_HASH_BYTES)) .willReturn(subject.getTxnHash()); given(serdes.readNullableInstant(fin)) @@ -376,16 +308,16 @@ void toStringWorks() { "accountCreated=EntityId{shard=0, realm=0, num=3}, newTotalTokenSupply=0}, " + "txnHash=6e6f742d7265616c6c792d612d68617368, txnId=TxnId{payer=EntityId{shard=0, realm=0, num=0}, " + "validStart=RichInstant{seconds=9999999999, nanos=0}, scheduled=false}, " + - "consensusTimestamp=RichInstant{seconds=9999999999, nanos=0}, expiry=1234567, " + - "submittingMember=1, memo=Alpha bravo charlie, contractCreation=SolidityFnResult{gasUsed=55, bloom=," + - " result=, error=null, contractId=EntityId{shard=4, realm=3, num=2}, createdContractIds=[], " + + "consensusTimestamp=RichInstant{seconds=9999999999, nanos=0}, expiry=1234567, submittingMember=1, " + + "memo=Alpha bravo charlie, contractCreation=SolidityFnResult{gasUsed=55, bloom=, result=, error=null, " + + "contractId=EntityId{shard=4, realm=3, num=2}, createdContractIds=[], " + "logs=[SolidityLog{data=4e6f6e73656e736963616c21, bloom=, contractId=null, topics=[]}]}, " + "hbarAdjustments=CurrencyAdjustments{readable=[0.0.2 -> -4, 0.0.1001 <- +2, 0.0.1002 <- +2]}, " + - "scheduleRef=EntityId{shard=5, realm=6, num=7}, " + - "tokenAdjustments=1.2.3(CurrencyAdjustments{readable=[1.2.5 -> -1, 1.2.6 <- +1, 1.2.7 <- +1000]}), " + - "1.2.4(CurrencyAdjustments{readable=[1.2.5 -> -1, 1.2.6 <- +1, 1.2.7 <- +1000]}), " + - "customFeesCharged=(AssessedCustomFee{token=EntityId{shard=1, realm=2, num=9}, " + - "account=EntityId{shard=1, realm=2, num=8}, units=123})}"; + "scheduleRef=EntityId{shard=5, realm=6, num=7}, tokenAdjustments=1.2.3(CurrencyAdjustments{" + + "readable=[1.2.5 -> -1, 1.2.6 <- +1, 1.2.7 <- +1000]}), 1.2.4(CurrencyAdjustments{" + + "readable=[1.2.5 -> -1, 1.2.6 <- +1, 1.2.7 <- +1000]}), assessedCustomFees=(" + + "AssessedCustomFee{token=EntityId{shard=1, realm=2, num=9}, account=EntityId{shard=1, realm=2, num=8}, " + + "units=123})}"; // expect: assertEquals(desired, subject.toString()); diff --git a/hedera-node/src/test/java/com/hedera/services/state/submerkle/NftAdjustmentsTest.java b/hedera-node/src/test/java/com/hedera/services/state/submerkle/NftAdjustmentsTest.java new file mode 100644 index 000000000000..f39cd86c93c4 --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/state/submerkle/NftAdjustmentsTest.java @@ -0,0 +1,142 @@ +package com.hedera.services.state.submerkle; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.NftTransfer; +import com.swirlds.common.io.SerializableDataInputStream; +import com.swirlds.common.io.SerializableDataOutputStream; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +class NftAdjustmentsTest { + private AccountID sender = AccountID.getDefaultInstance(); + private AccountID recipient = AccountID.newBuilder().setAccountNum(3).setRealmNum(2).setShardNum(1).build(); + + private NftAdjustments subject; + + @BeforeEach + void setUp() { + subject = new NftAdjustments(); + } + + @Test + void getClassId() { + assertEquals(0xd7a02bf45e103466L, subject.getClassId()); + } + + @Test + void getVersion() { + assertEquals(1, subject.getVersion()); + } + + @Test + void deserialize() throws IOException { + SerializableDataInputStream stream = mock(SerializableDataInputStream.class); + given(stream.readSerializableList(eq(NftAdjustments.MAX_NUM_ADJUSTMENTS), anyBoolean(), any())) + .willReturn(Collections.emptyList()); + given(stream.readLongArray(NftAdjustments.MAX_NUM_ADJUSTMENTS)).willReturn(new long[]{1, 2, 3}); + + subject.deserialize(stream, 1); + verify(stream).readLongArray(NftAdjustments.MAX_NUM_ADJUSTMENTS); + verify(stream, times(2)) + .readSerializableList(eq(1024), eq(true), any()); + } + + @Test + void serialize() throws IOException { + givenTransferList(); + SerializableDataOutputStream stream = mock(SerializableDataOutputStream.class); + subject.serialize(stream); + verify(stream).writeLongArray(new long[]{1}); + verify(stream, times(1)).writeSerializableList( + eq(List.of(EntityId.fromGrpcAccountId(sender))), eq(true), eq(true)); + verify(stream, times(1)).writeSerializableList( + eq(List.of(EntityId.fromGrpcAccountId(recipient))), eq(true), eq(true)); + } + + @Test + void testEquals() { + NftAdjustments adjustments = new NftAdjustments(); + assertEquals(adjustments, subject); + assertTrue(subject.equals(subject)); + assertFalse(subject.equals(null)); + } + + @Test + void testHashCode() { + assertEquals(new NftAdjustments().hashCode(), subject.hashCode()); + } + + @Test + void toStringWorks() { + givenTransferList(); + var str = "NftAdjustments{readable=[1 0.0.0 1.2.3]}"; + assertEquals(str, subject.toString()); + } + + @Test + void toGrpc(){ + assertNotNull(subject.toGrpc()); + givenTransferList(); + var grpc = subject.toGrpc(); + var transferList = grpc.getNftTransfersList(); + assertEquals(transferList.get(0).getSerialNumber(), 1); + assertEquals(transferList.get(0).getSenderAccountID(), sender); + assertEquals(transferList.get(0).getReceiverAccountID(), recipient); + } + + @Test + void fromGrpc(){ + givenTransferList(); + var grpc = List.of(NftTransfer.newBuilder() + .setSerialNumber(1) + .setReceiverAccountID(recipient).setSenderAccountID(sender).build()); + + assertEquals(subject, NftAdjustments.fromGrpc(grpc)); + } + + private void givenTransferList(){ + subject = NftAdjustments.fromGrpc(List.of( + NftTransfer + .newBuilder() + .setSerialNumber(1) + .setSenderAccountID(sender) + .setReceiverAccountID(recipient) + .build())); + } +} \ No newline at end of file diff --git a/hedera-node/src/test/java/com/hedera/services/stats/MiscRunningAvgsTest.java b/hedera-node/src/test/java/com/hedera/services/stats/MiscRunningAvgsTest.java index 1c2de6a96d83..db0634034be3 100644 --- a/hedera-node/src/test/java/com/hedera/services/stats/MiscRunningAvgsTest.java +++ b/hedera-node/src/test/java/com/hedera/services/stats/MiscRunningAvgsTest.java @@ -94,22 +94,26 @@ public void recordsToExpectedAvgs() { StatsRunningAverage waitMs = mock(StatsRunningAverage.class); StatsRunningAverage queueSize = mock(StatsRunningAverage.class); StatsRunningAverage submitSizes = mock(StatsRunningAverage.class); + StatsRunningAverage hashS = mock(StatsRunningAverage.class); // and: subject.accountLookupRetries = retries; subject.accountRetryWaitMs = waitMs; subject.handledSubmitMessageSize = submitSizes; subject.writeQueueSizeRecordStream = queueSize; + subject.hashQueueSizeRecordStream = hashS; // when: subject.recordAccountLookupRetries(1); subject.recordAccountRetryWaitMs(2.0); subject.recordHandledSubmitMessageSize(3); subject.writeQueueSizeRecordStream(4); + subject.hashQueueSizeRecordStream(5); // then: verify(retries).recordValue(1.0); verify(waitMs).recordValue(2.0); verify(submitSizes).recordValue(3.0); verify(queueSize).recordValue(4.0); + verify(hashS).recordValue(5); } } diff --git a/hedera-node/src/test/java/com/hedera/services/store/TypedTokenStoreTest.java b/hedera-node/src/test/java/com/hedera/services/store/TypedTokenStoreTest.java index 3fe5c6f329e0..9e56a2f06eb2 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/TypedTokenStoreTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/TypedTokenStoreTest.java @@ -21,6 +21,7 @@ */ import com.hedera.services.exceptions.InvalidTransactionException; +import com.hedera.services.ledger.accounts.BackingNfts; import com.hedera.services.ledger.accounts.BackingTokenRels; import com.hedera.services.legacy.core.jproto.JKey; import com.hedera.services.records.TransactionRecordService; @@ -28,13 +29,20 @@ import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.state.submerkle.RichInstant; import com.hedera.services.store.models.Account; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.NftId; +import com.hedera.services.store.models.OwnershipTracker; import com.hedera.services.store.models.Token; import com.hedera.services.store.models.TokenRelationship; +import com.hedera.services.store.models.UniqueToken; import com.hedera.test.factories.scenarios.TxnHandlingScenario; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -59,11 +67,19 @@ class TypedTokenStoreTest { @Mock private FCMap tokens; @Mock + private FCMap uniqueTokens; + @Mock + private FCOneToManyRelation uniqueTokenOwnerships; + @Mock + private FCOneToManyRelation uniqueTokenAssociations; + @Mock private TransactionRecordService transactionRecordService; @Mock private FCMap tokenRels; @Mock private BackingTokenRels backingTokenRels; + @Mock + private BackingNfts backingNfts; private TypedTokenStore subject; @@ -73,7 +89,15 @@ void setUp() { setupTokenRel(); subject = new TypedTokenStore( - accountStore, transactionRecordService, () -> tokens, () -> tokenRels, backingTokenRels); + accountStore, + transactionRecordService, + () -> tokens, + () -> uniqueTokens, + () -> uniqueTokenOwnerships, + () -> uniqueTokenAssociations, + () -> tokenRels, + backingTokenRels, + backingNfts); } /* --- Token relationship loading --- */ @@ -118,6 +142,13 @@ void persistsExtantTokenRelAsExpected() { verify(transactionRecordService).includeChangesToTokenRel(modelTokenRel); } + @Test + void persistTrackers() { + var ot = new OwnershipTracker(); + subject.persistTrackers(ot); + verify(transactionRecordService).includeOwnershipChanges(ot); + } + @Test void persistsNewTokenRelAsExpected() { // setup: @@ -179,16 +210,30 @@ void failsLoadingDeletedToken() { @Test void savesTokenAsExpected() { // setup: + final var mintedSerialNo = 33L; + final var burnedSerialNo = 33L; + final var nftMeta = "abcdefgh".getBytes(); + final var treasuryId = new EntityId(0, 0, treasuryAccountNum); + final var tokenEntityId = new EntityId(0, 0, tokenNum); + final var creationTime = new RichInstant(1_234_567L, 8); + final var modelTreasuryId = new Id(0, 0, treasuryAccountNum); + final var mintedToken = new UniqueToken(tokenId, mintedSerialNo, creationTime, modelTreasuryId, nftMeta); + final var burnedToken = new UniqueToken(tokenId, burnedSerialNo, creationTime, modelTreasuryId, nftMeta); + // and: final var expectedReplacementToken = new MerkleToken( expiry, tokenSupply * 2, 0, symbol, name, freezeDefault, true, new EntityId(0, 0, autoRenewAccountNum)); - expectedReplacementToken.setAutoRenewAccount(new EntityId(0, 0, treasuryAccountNum)); + expectedReplacementToken.setAutoRenewAccount(treasuryId); expectedReplacementToken.setSupplyKey(supplyKey); expectedReplacementToken.setFreezeKey(freezeKey); expectedReplacementToken.setKycKey(kycKey); expectedReplacementToken.setAccountsFrozenByDefault(!freezeDefault); + // and: + final var expectedNewUniqTokenId = new MerkleUniqueTokenId(tokenEntityId, mintedSerialNo); + final var expectedNewUniqToken = new MerkleUniqueToken(treasuryId, nftMeta, creationTime); + final var expectedPastUniqTokenId = new MerkleUniqueTokenId(tokenEntityId, burnedSerialNo); givenToken(merkleTokenId, merkleToken); givenModifiableToken(merkleTokenId, merkleToken); @@ -200,6 +245,8 @@ void savesTokenAsExpected() { modelToken.setAutoRenewAccount(treasuryAccount); modelToken.setTreasury(autoRenewAccount); modelToken.setFrozenByDefault(!freezeDefault); + modelToken.mintedUniqueTokens().add(mintedToken); + modelToken.burnedUniqueTokens().add(burnedToken); // and: subject.persistToken(modelToken); @@ -208,6 +255,14 @@ void savesTokenAsExpected() { verify(tokens, never()).replace(merkleTokenId, expectedReplacementToken); // and: verify(transactionRecordService).includeChangesToToken(modelToken); + verify(uniqueTokens).put(expectedNewUniqTokenId, expectedNewUniqToken); + verify(uniqueTokens).remove(expectedPastUniqTokenId); + verify(uniqueTokenAssociations).associate(new EntityId(modelToken.getId()), expectedNewUniqTokenId); + verify(uniqueTokenAssociations).disassociate(new EntityId(modelToken.getId()), expectedPastUniqTokenId); + verify(uniqueTokenOwnerships).associate(treasuryId, expectedNewUniqTokenId); + verify(uniqueTokenOwnerships).disassociate(treasuryId, expectedPastUniqTokenId); + verify(backingNfts).addToExistingNfts(new NftId(0, 0, tokenNum, mintedSerialNo)); + verify(backingNfts).removeFromExistingNfts(new NftId(0, 0, tokenNum, burnedSerialNo)); } private void givenRelationship(MerkleEntityAssociation anAssoc, MerkleTokenRelStatus aRelationship) { diff --git a/hedera-node/src/test/java/com/hedera/services/store/models/AccountTest.java b/hedera-node/src/test/java/com/hedera/services/store/models/AccountTest.java index d2beb9dff1d3..86ee6498e888 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/models/AccountTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/models/AccountTest.java @@ -32,6 +32,7 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_ALREADY_ASSOCIATED_TO_ACCOUNT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; class AccountTest { private Id subjectId = new Id(0, 0, 12345); @@ -92,6 +93,50 @@ void canAssociateWithNewToken() { assertEquals(expectedFinalTokens, assocTokens.toReadableIdList()); } + @Test + void accountEqualsCheck() { + // setup: + var account = new Account(subjectId); + account.setAssociatedTokens(assocTokens); + account.setExpiry(1000L); + account.initBalance(100L); + account.setOwnedNfts(1L); + account.incrementOwnedNfts(); + + subject.setExpiry(1000L); + subject.initBalance(100L); + subject.setOwnedNfts(1L); + subject.incrementOwnedNfts(); + + // when: + var actualResult = subject.equals(account); + + // expect: + assertEquals(account.getOwnedNfts(), subject.getOwnedNfts()); + // and: + assertEquals(account.getId(), subject.getId()); + // and: + assertEquals(account.getAssociatedTokens(), subject.getAssociatedTokens()); + // and: + assertTrue(actualResult); + } + + @Test + void accountHashCodeCheck() { + // setup: + var otherSubject = new Account(subjectId); + otherSubject.incrementOwnedNfts(); + otherSubject.setAssociatedTokens(assocTokens); + + subject.incrementOwnedNfts(); + + // when: + var actualResult = subject.hashCode(); + + // expect: + assertEquals(otherSubject.hashCode(), actualResult); + } + private void assertFailsWith(Runnable something, ResponseCodeEnum status) { var ex = assertThrows(InvalidTransactionException.class, something::run); assertEquals(status, ex.getResponseCode()); diff --git a/hedera-node/src/test/java/com/hedera/services/store/models/NftIdTest.java b/hedera-node/src/test/java/com/hedera/services/store/models/NftIdTest.java new file mode 100644 index 000000000000..306c1cead5e9 --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/store/models/NftIdTest.java @@ -0,0 +1,99 @@ +package com.hedera.services.store.models; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hederahashgraph.api.proto.java.TokenID; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class NftIdTest { + private long shard = 1; + private long realm = 2; + private long num = 3; + private long serialNo = 4; + private long bShard = 2; + private long bRealm = 3; + private long bNum = 4; + private long bSerialNo = 5; + + @Test + void objectContractWorks() { + // given: + final var subject = new NftId(shard, realm, num, serialNo); + final var bSubject = new NftId(bShard, realm, num, serialNo); + final var cSubject = new NftId(shard, bRealm, num, serialNo); + final var dSubject = new NftId(shard, realm, bNum, serialNo); + final var eSubject = new NftId(shard, realm, num, bSerialNo); + final var rSubject = new NftId(shard, realm, num, serialNo); + final var sSubject = subject; + + // expect: + assertEquals(subject, rSubject); + assertEquals(subject.hashCode(), rSubject.hashCode()); + assertEquals(subject, sSubject); + assertNotEquals(subject, bSubject); + assertNotEquals(subject.hashCode(), bSubject.hashCode()); + assertNotEquals(subject, cSubject); + assertNotEquals(subject.hashCode(), cSubject.hashCode()); + assertNotEquals(subject, dSubject); + assertNotEquals(subject.hashCode(), dSubject.hashCode()); + assertNotEquals(subject, eSubject); + assertNotEquals(subject.hashCode(), eSubject.hashCode()); + } + + @Test + void toStringWorks() { + // setup: + final var desired = "NftId{shard=1, realm=2, num=3, serialNo=4}"; + + // given: + final var subject = new NftId(shard, realm, num, serialNo); + + // expect: + assertEquals(desired, subject.toString()); + } + + @Test + void gettersWork() { + // given: + final var subject = new NftId(shard, realm, num, serialNo); + TokenID expectedTokenId = TokenID.newBuilder() + .setShardNum(shard) + .setRealmNum(realm) + .setTokenNum(num) + .build(); + + assertEquals(shard, subject.shard()); + assertEquals(realm, subject.realm()); + assertEquals(num, subject.num()); + assertEquals(serialNo, subject.serialNo()); + assertEquals(expectedTokenId, subject.tokenId()); + } + + @Test + void nullEqualsWorks() { + // given: + final var subject = new NftId(shard, realm, num, serialNo); + + assertFalse(subject.equals(null)); + } +} diff --git a/hedera-node/src/test/java/com/hedera/services/store/models/TokenRelationshipTest.java b/hedera-node/src/test/java/com/hedera/services/store/models/TokenRelationshipTest.java index 6fc3686f7747..0a1c475aa139 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/models/TokenRelationshipTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/models/TokenRelationshipTest.java @@ -22,6 +22,7 @@ import com.hedera.services.exceptions.InvalidTransactionException; import com.hedera.services.legacy.core.jproto.JKey; +import com.hedera.services.state.enums.TokenType; import com.hedera.test.factories.scenarios.TxnHandlingScenario; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import org.junit.jupiter.api.BeforeEach; @@ -31,6 +32,7 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_KYC_NOT_GRANTED_FOR_TOKEN; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; class TokenRelationshipTest { private final Id tokenId = new Id(0, 0, 1234); @@ -134,6 +136,23 @@ void canChangeBalanceIfNoKycKey() { assertEquals(1, subject.getBalanceChange()); } + @Test + void givesCorrectRepresentation(){ + subject.getToken().setType(TokenType.NON_FUNGIBLE_UNIQUE); + assertTrue(subject.hasUniqueRepresentation()); + + + subject.getToken().setType(TokenType.FUNGIBLE_COMMON); + assertTrue(subject.hasCommonRepresentation()); + } + + @Test + void testHashCode(){ + var rel = new TokenRelationship(token, account); + rel.initBalance(balance); + assertEquals(rel.hashCode(), subject.hashCode()); + } + private void assertFailsWith(Runnable something, ResponseCodeEnum status) { var ex = assertThrows(InvalidTransactionException.class, something::run); assertEquals(status, ex.getResponseCode()); diff --git a/hedera-node/src/test/java/com/hedera/services/store/models/TokenTest.java b/hedera-node/src/test/java/com/hedera/services/store/models/TokenTest.java index 345ba47bfe43..1e77ed4421f3 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/models/TokenTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/models/TokenTest.java @@ -20,19 +20,34 @@ * ‍ */ +import com.google.protobuf.ByteString; import com.hedera.services.exceptions.InvalidTransactionException; import com.hedera.services.legacy.core.jproto.JKey; +import com.hedera.services.state.enums.TokenSupplyType; +import com.hedera.services.state.enums.TokenType; +import com.hedera.services.state.submerkle.RichInstant; import com.hedera.test.factories.scenarios.TxnHandlingScenario; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.time.Instant; +import java.util.List; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.FAIL_INVALID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_TOKEN_BALANCE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_BURN_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MINT_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_HAS_NO_SUPPLY_KEY; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; class TokenTest { private final JKey someKey = TxnHandlingScenario.TOKEN_SUPPLY_KT.asJKeyUnchecked(); @@ -130,6 +145,8 @@ void cantBurnOrMintNegativeAmounts() { @Test void cantBurnOrMintWithoutSupplyKey() { + subject.setSupplyKey(null); + subject.setType(TokenType.FUNGIBLE_COMMON); assertFailsWith(() -> subject.burn(treasuryRel, 1L), TOKEN_HAS_NO_SUPPLY_KEY); assertFailsWith(() -> subject.mint(treasuryRel, 1L), TOKEN_HAS_NO_SUPPLY_KEY); } @@ -138,6 +155,8 @@ void cantBurnOrMintWithoutSupplyKey() { void cannotChangeTreasuryBalanceToNegative() { // given: subject.setSupplyKey(someKey); + subject.setType(TokenType.FUNGIBLE_COMMON); + subject.initSupplyConstraints(TokenSupplyType.FINITE, 10000); assertFailsWith(() -> subject.burn(treasuryRel, initialTreasuryBalance + 1), INSUFFICIENT_TOKEN_BALANCE); } @@ -149,6 +168,7 @@ void cannotChangeSupplyToNegative() { // given: subject.setSupplyKey(someKey); + subject.setType(TokenType.FUNGIBLE_COMMON); assertFailsWith(() -> subject.mint(treasuryRel, overflowMint), INVALID_TOKEN_MINT_AMOUNT); assertFailsWith(() -> subject.burn(treasuryRel, initialSupply + 1), INVALID_TOKEN_BURN_AMOUNT); @@ -156,6 +176,8 @@ void cannotChangeSupplyToNegative() { @Test void burnsAsExpected() { + subject.setType(TokenType.FUNGIBLE_COMMON); + subject.initSupplyConstraints(TokenSupplyType.FINITE, 20000L); final long burnAmount = 100L; // given: @@ -170,10 +192,41 @@ void burnsAsExpected() { assertEquals(initialTreasuryBalance - burnAmount, treasuryRel.getBalance()); } + @Test + void burnsUniqueAsExpected(){ + subject.setType(TokenType.NON_FUNGIBLE_UNIQUE); + subject.initSupplyConstraints(TokenSupplyType.FINITE, 20000L); + subject.setSupplyKey(someKey); + + var ownershipTracker = mock(OwnershipTracker.class); + subject.burn(ownershipTracker, treasuryRel, List.of(1L)); + assertEquals(initialSupply - 1, subject.getTotalSupply()); + assertEquals(-1, treasuryRel.getBalanceChange()); + verify(ownershipTracker).add(eq(subject.getId()), any()); + assertEquals(true, subject.hasBurnedUniqueTokens()); + assertEquals(1, subject.burnedUniqueTokens().get(0).getSerialNumber()); + } + + @Test + void mintsUniqueAsExpected(){ + subject.setType(TokenType.NON_FUNGIBLE_UNIQUE); + subject.initSupplyConstraints(TokenSupplyType.FINITE, 20000L); + subject.setSupplyKey(someKey); + + var ownershipTracker = mock(OwnershipTracker.class); + subject.mint(ownershipTracker, treasuryRel, List.of(ByteString.copyFromUtf8("memo")), RichInstant.fromJava(Instant.now())); + assertEquals(initialSupply + 1, subject.getTotalSupply()); + assertEquals(1, treasuryRel.getBalanceChange()); + verify(ownershipTracker).add(eq(subject.getId()), Mockito.any()); + assertTrue(subject.hasMintedUniqueTokens()); + assertEquals(1, subject.mintedUniqueTokens().get(0).getSerialNumber()); + } + @Test void mintsAsExpected() { final long mintAmount = 100L; - + subject.setType(TokenType.FUNGIBLE_COMMON); + subject.initSupplyConstraints(TokenSupplyType.FINITE, 100000); // given: subject.setSupplyKey(someKey); diff --git a/hedera-node/src/test/java/com/hedera/services/store/models/UniqueTokenTest.java b/hedera-node/src/test/java/com/hedera/services/store/models/UniqueTokenTest.java new file mode 100644 index 000000000000..45a22a641aea --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/store/models/UniqueTokenTest.java @@ -0,0 +1,52 @@ +package com.hedera.services.store.models; + +/*- + * ‌ + * Hedera Services Node + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.state.submerkle.RichInstant; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class UniqueTokenTest { + + @Test + void objectContractWorks(){ + var subj = new UniqueToken(Id.DEFAULT, 1); + assertEquals(1, subj.getSerialNumber()); + assertEquals(Id.DEFAULT, subj.getTokenId()); + + var metadata = new byte[]{107, 117, 114}; + subj = new UniqueToken(Id.DEFAULT, 1, RichInstant.MISSING_INSTANT, new Id(1, 2, 3), new byte[]{111, 23, 85}); + assertEquals(RichInstant.MISSING_INSTANT, subj.getCreationTime()); + assertEquals(new Id(1,2 ,3), subj.getOwner()); + subj.setSerialNumber(2); + assertEquals(2, subj.getSerialNumber()); + + metadata = new byte[]{1, 2, 3}; + subj.setMetadata(metadata); + assertEquals(metadata, subj.getMetadata()); + subj.setTokenId(Id.DEFAULT); + assertEquals(subj.getTokenId(), Id.DEFAULT); + subj.setCreationTime(RichInstant.MISSING_INSTANT); + assertEquals(RichInstant.MISSING_INSTANT, subj.getCreationTime()); + } + +} \ No newline at end of file diff --git a/hedera-node/src/test/java/com/hedera/services/store/tokens/ExceptionalTokenStoreTest.java b/hedera-node/src/test/java/com/hedera/services/store/tokens/ExceptionalTokenStoreTest.java index 931002aaca77..e9f33ec38552 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/tokens/ExceptionalTokenStoreTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/tokens/ExceptionalTokenStoreTest.java @@ -30,22 +30,43 @@ class ExceptionalTokenStoreTest { @Test public void allButSetAreUse() { // expect: - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.freeze(null, null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.unfreeze(null, null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.adjustBalance(null, null, 0)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.createProvisionally(null, null, 0)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.exists(null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.get(null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.update(null, 0)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.isKnownTreasury(null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.grantKyc(null, null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.revokeKyc(null, null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.apply(null, token -> {})); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.wipe(null,null, 0L, false)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.associate(null, null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.dissociate(null, null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.associationExists(null, null)); - assertThrows(UnsupportedOperationException.class, () -> NOOP_TOKEN_STORE.isTreasuryForToken(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.freeze(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.unfreeze(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.adjustBalance(null, null, 0)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.createProvisionally(null, null, 0)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.changeOwner(null, null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.exists(null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.get(null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.update(null, 0)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.isKnownTreasury(null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.grantKyc(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.revokeKyc(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.apply(null, token -> { })); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.wipe(null, null, 0L, false)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.associate(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.dissociate(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.associationExists(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.isTreasuryForToken(null, null)); + assertThrows(UnsupportedOperationException.class, + () -> NOOP_TOKEN_STORE.listOfTokensServed(null)); + assertThrows(UnsupportedOperationException.class, NOOP_TOKEN_STORE::commitCreation); assertThrows(UnsupportedOperationException.class, NOOP_TOKEN_STORE::rollbackCreation); assertThrows(UnsupportedOperationException.class, NOOP_TOKEN_STORE::isCreationPending); diff --git a/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java b/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java index 5d85a6706f5b..74e19ff21063 100644 --- a/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java +++ b/hedera-node/src/test/java/com/hedera/services/store/tokens/HederaTokenStoreTest.java @@ -26,15 +26,21 @@ import com.hedera.services.ledger.TransactionalLedger; import com.hedera.services.ledger.ids.EntityIdSource; import com.hedera.services.ledger.properties.AccountProperty; +import com.hedera.services.ledger.properties.NftProperty; import com.hedera.services.ledger.properties.TokenRelProperty; import com.hedera.services.legacy.core.jproto.JKey; import com.hedera.services.sigs.utils.ImmutableKeyUtils; +import com.hedera.services.state.enums.TokenSupplyType; +import com.hedera.services.state.enums.TokenType; import com.hedera.services.state.merkle.MerkleAccount; import com.hedera.services.state.merkle.MerkleAccountTokens; import com.hedera.services.state.merkle.MerkleEntityId; import com.hedera.services.state.merkle.MerkleToken; import com.hedera.services.state.merkle.MerkleTokenRelStatus; +import com.hedera.services.state.merkle.MerkleUniqueToken; +import com.hedera.services.state.merkle.MerkleUniqueTokenId; import com.hedera.services.state.submerkle.EntityId; +import com.hedera.services.store.models.NftId; import com.hedera.test.factories.scenarios.TxnHandlingScenario; import com.hedera.test.utils.IdUtils; import com.hederahashgraph.api.proto.java.AccountID; @@ -46,6 +52,7 @@ import com.hederahashgraph.api.proto.java.TokenCreateTransactionBody; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenUpdateTransactionBody; +import com.swirlds.fchashmap.FCOneToManyRelation; import com.swirlds.fcmap.FCMap; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.BeforeEach; @@ -67,6 +74,7 @@ import static com.hedera.services.ledger.accounts.BackingTokenRels.asTokenRel; import static com.hedera.services.ledger.properties.AccountProperty.IS_DELETED; +import static com.hedera.services.ledger.properties.AccountProperty.NUM_NFTS_OWNED; import static com.hedera.services.ledger.properties.TokenRelProperty.IS_FROZEN; import static com.hedera.services.ledger.properties.TokenRelProperty.IS_KYC_GRANTED; import static com.hedera.services.ledger.properties.TokenRelProperty.TOKEN_BALANCE; @@ -91,14 +99,17 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.CUSTOM_FEE_NOT_FULLY_SPECIFIED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.FRACTION_DIVIDES_BY_ZERO; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INSUFFICIENT_TOKEN_BALANCE; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_AUTORENEW_ACCOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_CUSTOM_FEE_COLLECTOR; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_EXPIRATION_TIME; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NFT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_RENEWAL_PERIOD; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID_IN_CUSTOM_FEES; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_WIPING_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.SENDER_DOES_NOT_OWN_NFT_SERIAL_NO; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKENS_PER_ACCOUNT_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_ALREADY_ASSOCIATED_TO_ACCOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_HAS_NO_FREEZE_KEY; @@ -134,11 +145,15 @@ class HederaTokenStoreTest { private EntityIdSource ids; private GlobalDynamicProperties properties; private FCMap tokens; + private FCMap uniqueTokens; + private FCOneToManyRelation uniqueTokenAccountOwnerships; private TransactionalLedger accountsLedger; + private TransactionalLedger nftsLedger; private TransactionalLedger, TokenRelProperty, MerkleTokenRelStatus> tokenRelsLedger; private HederaLedger hederaLedger; private MerkleToken token; + private MerkleToken nonfungibleToken; private Key newKey = TxnHandlingScenario.TOKEN_REPLACE_KT.asKey(); private JKey newFcKey = TxnHandlingScenario.TOKEN_REPLACE_KT.asJKeyUnchecked(); @@ -157,6 +172,7 @@ class HederaTokenStoreTest { private int decimals = 10; private long treasuryBalance = 50_000, sponsorBalance = 1_000; private TokenID misc = IdUtils.asToken("3.2.1"); + private TokenID nonfungible = IdUtils.asToken("4.3.2"); private TokenID anotherMisc = IdUtils.asToken("6.4.2"); private boolean freezeDefault = true; private boolean accountsKycGrantedByDefault = false; @@ -167,6 +183,7 @@ class HederaTokenStoreTest { private AccountID treasury = IdUtils.asAccount("1.2.3"); private AccountID newTreasury = IdUtils.asAccount("3.2.1"); private AccountID sponsor = IdUtils.asAccount("1.2.666"); + private AccountID counterparty = IdUtils.asAccount("1.2.777"); private AccountID feeCollector = treasury; private AccountID anotherFeeCollector = IdUtils.asAccount("1.2.777"); private TokenID created = IdUtils.asToken("1.2.666666"); @@ -175,7 +192,10 @@ class HederaTokenStoreTest { private int MAX_TOKEN_SYMBOL_UTF8_BYTES = 10; private int MAX_TOKEN_NAME_UTF8_BYTES = 100; private Pair sponsorMisc = asTokenRel(sponsor, misc); + private Pair sponsorNft = asTokenRel(sponsor, nonfungible); + private Pair counterpartyNft = asTokenRel(counterparty, nonfungible); private Pair treasuryMisc = asTokenRel(treasury, misc); + private NftId aNft = new NftId(4, 3, 2, 1_234); private Pair anotherFeeCollectorMisc = asTokenRel(anotherFeeCollector, misc); private CustomFeesOuterClass.FixedFee fixedFeeInTokenUnits = CustomFeesOuterClass.FixedFee.newBuilder() .setDenominatingTokenId(misc) @@ -283,24 +303,32 @@ void setup() { given(token.treasury()).willReturn(EntityId.fromGrpcAccountId(treasury)); given(token.isFeeScheduleMutable()).willReturn(true); + nonfungibleToken = new MerkleToken(); + ids = mock(EntityIdSource.class); given(ids.newTokenId(sponsor)).willReturn(created); hederaLedger = mock(HederaLedger.class); - accountsLedger = (TransactionalLedger) mock( - TransactionalLedger.class); + nftsLedger = (TransactionalLedger) mock(TransactionalLedger.class); + given(nftsLedger.get(aNft, NftProperty.OWNER)).willReturn(EntityId.fromGrpcAccountId(sponsor)); + given(nftsLedger.exists(aNft)).willReturn(true); + + accountsLedger = (TransactionalLedger) mock(TransactionalLedger.class); given(accountsLedger.exists(treasury)).willReturn(true); given(accountsLedger.exists(anotherFeeCollector)).willReturn(true); given(accountsLedger.exists(autoRenewAccount)).willReturn(true); given(accountsLedger.exists(newAutoRenewAccount)).willReturn(true); given(accountsLedger.exists(sponsor)).willReturn(true); + given(accountsLedger.exists(counterparty)).willReturn(true); given(accountsLedger.get(treasury, IS_DELETED)).willReturn(false); given(accountsLedger.get(autoRenewAccount, IS_DELETED)).willReturn(false); given(accountsLedger.get(newAutoRenewAccount, IS_DELETED)).willReturn(false); tokenRelsLedger = mock(TransactionalLedger.class); given(tokenRelsLedger.exists(sponsorMisc)).willReturn(true); + given(tokenRelsLedger.exists(sponsorNft)).willReturn(true); + given(tokenRelsLedger.exists(counterpartyNft)).willReturn(true); given(tokenRelsLedger.get(sponsorMisc, TOKEN_BALANCE)).willReturn(sponsorBalance); given(tokenRelsLedger.get(sponsorMisc, IS_FROZEN)).willReturn(false); given(tokenRelsLedger.get(sponsorMisc, IS_KYC_GRANTED)).willReturn(true); @@ -309,12 +337,23 @@ void setup() { given(tokenRelsLedger.get(treasuryMisc, TOKEN_BALANCE)).willReturn(treasuryBalance); given(tokenRelsLedger.get(treasuryMisc, IS_FROZEN)).willReturn(false); given(tokenRelsLedger.get(treasuryMisc, IS_KYC_GRANTED)).willReturn(true); + given(tokenRelsLedger.get(sponsorNft, TOKEN_BALANCE)).willReturn(123L); + given(tokenRelsLedger.get(sponsorNft, IS_FROZEN)).willReturn(false); + given(tokenRelsLedger.get(sponsorNft, IS_KYC_GRANTED)).willReturn(true); + given(tokenRelsLedger.get(counterpartyNft, TOKEN_BALANCE)).willReturn(123L); + given(tokenRelsLedger.get(counterpartyNft, IS_FROZEN)).willReturn(false); + given(tokenRelsLedger.get(counterpartyNft, IS_KYC_GRANTED)).willReturn(true); tokens = (FCMap) mock(FCMap.class); given(tokens.get(fromTokenId(created))).willReturn(token); given(tokens.containsKey(fromTokenId(misc))).willReturn(true); + given(tokens.containsKey(fromTokenId(nonfungible))).willReturn(true); given(tokens.get(fromTokenId(misc))).willReturn(token); given(tokens.getForModify(fromTokenId(misc))).willReturn(token); + given(tokens.get(fromTokenId(nonfungible))).willReturn(nonfungibleToken); + + uniqueTokens = (FCMap) mock(FCMap.class); + uniqueTokenAccountOwnerships = (FCOneToManyRelation) mock(FCOneToManyRelation.class); properties = mock(GlobalDynamicProperties.class); given(properties.maxTokensPerAccount()).willReturn(MAX_TOKENS_PER_ACCOUNT); @@ -322,7 +361,8 @@ void setup() { given(properties.maxTokenNameUtf8Bytes()).willReturn(MAX_TOKEN_NAME_UTF8_BYTES); given(properties.maxCustomFeesAllowed()).willReturn(maxCustomFees); - subject = new HederaTokenStore(ids, TEST_VALIDATOR, properties, () -> tokens, tokenRelsLedger); + subject = new HederaTokenStore( + ids, TEST_VALIDATOR, properties, () -> tokens, () -> uniqueTokenAccountOwnerships, tokenRelsLedger, nftsLedger); subject.setAccountsLedger(accountsLedger); subject.setHederaLedger(hederaLedger); subject.knownTreasuries.put(treasury, new HashSet<>() {{ @@ -365,6 +405,7 @@ void rebuildsAsExpected() { void injectsTokenRelsLedger() { // expect: verify(hederaLedger).setTokenRelsLedger(tokenRelsLedger); + verify(hederaLedger).setNftsLedger(nftsLedger); } @Test @@ -513,7 +554,7 @@ void freezingRejectsMissingAccount() { final var status = subject.freeze(sponsor, misc); // expect: - assertEquals(ResponseCodeEnum.INVALID_ACCOUNT_ID, status); + assertEquals(INVALID_ACCOUNT_ID, status); } @Test @@ -546,7 +587,7 @@ void associatingRejectsMissingAccounts() { final var status = subject.associate(sponsor, List.of(misc)); // expect: - assertEquals(ResponseCodeEnum.INVALID_ACCOUNT_ID, status); + assertEquals(INVALID_ACCOUNT_ID, status); } @Test @@ -811,7 +852,7 @@ void grantingKycRejectsMissingAccount() { final var status = subject.grantKyc(sponsor, misc); // expect: - assertEquals(ResponseCodeEnum.INVALID_ACCOUNT_ID, status); + assertEquals(INVALID_ACCOUNT_ID, status); } @Test @@ -846,7 +887,7 @@ void revokingKycRejectsMissingAccount() { final var status = subject.revokeKyc(sponsor, misc); // expect: - assertEquals(ResponseCodeEnum.INVALID_ACCOUNT_ID, status); + assertEquals(INVALID_ACCOUNT_ID, status); } @Test @@ -857,7 +898,7 @@ void wipingRejectsMissingAccount() { final var status = subject.wipe(sponsor, misc, adjustment, false); // expect: - assertEquals(ResponseCodeEnum.INVALID_ACCOUNT_ID, status); + assertEquals(INVALID_ACCOUNT_ID, status); } @Test @@ -966,7 +1007,81 @@ void adjustingRejectsMissingAccount() { final var status = subject.adjustBalance(sponsor, misc, 1); // expect: - assertEquals(ResponseCodeEnum.INVALID_ACCOUNT_ID, status); + assertEquals(INVALID_ACCOUNT_ID, status); + } + + @Test + void changingOwnerRejectsMissingSender() { + given(accountsLedger.exists(sponsor)).willReturn(false); + + // when: + var status = subject.changeOwner(aNft, sponsor, counterparty); + + // expect: + assertEquals(INVALID_ACCOUNT_ID, status); + } + + @Test + void changingOwnerRejectsMissingNftInstance() { + given(nftsLedger.exists(aNft)).willReturn(false); + + // when: + var status = subject.changeOwner(aNft, sponsor, counterparty); + + // expect: + assertEquals(INVALID_NFT_ID, status); + } + + @Test + void changingOwnerRejectsUnassociatedReceiver() { + given(tokenRelsLedger.exists(counterpartyNft)).willReturn(false); + + // when: + var status = subject.changeOwner(aNft, sponsor, counterparty); + + // expect: + assertEquals(TOKEN_NOT_ASSOCIATED_TO_ACCOUNT, status); + } + + @Test + void changingOwnerRejectsIllegitimateOwner() { + given(nftsLedger.get(aNft, NftProperty.OWNER)).willReturn(EntityId.fromGrpcAccountId(counterparty)); + + // when: + var status = subject.changeOwner(aNft, sponsor, counterparty); + + // expect: + assertEquals(SENDER_DOES_NOT_OWN_NFT_SERIAL_NO, status); + } + + @Test + void changingOwnerDoesTheExpected() { + // setup: + long startSponsorNfts = 5, startCounterpartyNfts = 8; + long startSponsorANfts = 4, startCounterpartyANfts = 1; + var sender = EntityId.fromGrpcAccountId(sponsor); + var receiver = EntityId.fromGrpcAccountId(counterparty); + var muti = new MerkleUniqueTokenId(EntityId.fromGrpcTokenId(aNft.tokenId()), aNft.serialNo()); + + given(accountsLedger.get(sponsor, NUM_NFTS_OWNED)).willReturn(startSponsorNfts); + given(accountsLedger.get(counterparty, NUM_NFTS_OWNED)).willReturn(startCounterpartyNfts); + given(tokenRelsLedger.get(sponsorNft, TOKEN_BALANCE)).willReturn(startSponsorANfts); + given(tokenRelsLedger.get(counterpartyNft, TOKEN_BALANCE)).willReturn(startCounterpartyANfts); + + // when: + var status = subject.changeOwner(aNft, sponsor, counterparty); + + // expect: + assertEquals(OK, status); + verify(nftsLedger).set(aNft, NftProperty.OWNER, receiver); + verify(uniqueTokenAccountOwnerships).disassociate(sender, muti); + verify(uniqueTokenAccountOwnerships).associate(receiver, muti); + verify(accountsLedger).set(sponsor, NUM_NFTS_OWNED, startSponsorNfts - 1); + verify(accountsLedger).set(counterparty, NUM_NFTS_OWNED, startCounterpartyNfts + 1); + verify(accountsLedger).set(counterparty, NUM_NFTS_OWNED, startCounterpartyNfts + 1); + verify(tokenRelsLedger).set(sponsorNft, TOKEN_BALANCE, startSponsorANfts - 1); + verify(tokenRelsLedger).set(counterpartyNft, TOKEN_BALANCE, startCounterpartyANfts + 1); + verify(hederaLedger).updateOwnershipChanges(aNft, sponsor, counterparty); } @Test @@ -1801,6 +1916,8 @@ void happyPathWorksWithAutoRenew() { expected.setKycKey(TOKEN_KYC_KT.asJKeyUnchecked()); expected.setWipeKey(MISC_ACCOUNT_KT.asJKeyUnchecked()); expected.setSupplyKey(COMPLEX_KEY_ACCOUNT_KT.asJKeyUnchecked()); + expected.setTokenType(TokenType.FUNGIBLE_COMMON); + expected.setSupplyType(TokenSupplyType.INFINITE); expected.setMemo(memo); expected.setFeeScheduleFrom(grpcCustomFees); @@ -1839,6 +1956,8 @@ void happyPathWorksWithExplicitExpiry() { expected.setKycKey(TOKEN_KYC_KT.asJKeyUnchecked()); expected.setWipeKey(MISC_ACCOUNT_KT.asJKeyUnchecked()); expected.setSupplyKey(COMPLEX_KEY_ACCOUNT_KT.asJKeyUnchecked()); + expected.setTokenType(TokenType.FUNGIBLE_COMMON); + expected.setSupplyType(TokenSupplyType.INFINITE); expected.setMemo(memo); expected.setFeeScheduleFrom(CustomFeesOuterClass.CustomFees.getDefaultInstance()); diff --git a/hedera-node/src/test/java/com/hedera/services/store/tokens/LegacyTokenStoreTest.java b/hedera-node/src/test/java/com/hedera/services/store/tokens/LegacyTokenStoreTest.java new file mode 100644 index 000000000000..9cc58c8b968c --- /dev/null +++ b/hedera-node/src/test/java/com/hedera/services/store/tokens/LegacyTokenStoreTest.java @@ -0,0 +1,67 @@ +package com.hedera.services.store.tokens; + +import com.hedera.services.ledger.BalanceChange; +import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.NftId; +import com.hederahashgraph.api.proto.java.AccountAmount; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.TokenID; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import static com.hedera.services.ledger.BalanceChange.changingNftOwnership; +import static com.hedera.test.utils.IdUtils.asAccount; +import static com.hedera.test.utils.IdUtils.nftXfer; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.doCallRealMethod; + +class LegacyTokenStoreTest { + private final Id t = new Id(1, 2, 3); + private final TokenID tId = t.asGrpcToken(); + private final long delta = -1_234L; + private final long serialNo = 1234L; + private final AccountID a = asAccount("1.2.3"); + private final AccountID b = asAccount("2.3.4"); + private final NftId tNft = new NftId(1, 2, 3, serialNo); + + @Test + void adaptsBehaviorToFungibleType() { + // setup: + final var aa = AccountAmount.newBuilder().setAccountID(a).setAmount(delta).build(); + final var fungibleChange = BalanceChange.changingFtUnits(t, t.asGrpcToken(), aa); + // and: + final var hybridSubject = Mockito.mock(TokenStore.class); + + // and: + doCallRealMethod().when(hybridSubject).tryTokenChange(fungibleChange); + given(hybridSubject.resolve(tId)).willReturn(tId); + given(hybridSubject.adjustBalance(a, tId, delta)).willReturn(OK); + + // when: + final var result = hybridSubject.tryTokenChange(fungibleChange); + + // then: + Assertions.assertEquals(OK, result); + } + + @Test + void adaptsBehaviorToNonfungibleType() { + // setup: + final var nftChange = changingNftOwnership(t, t.asGrpcToken(), nftXfer(a, b, serialNo)); + // and: + final var hybridSubject = Mockito.mock(TokenStore.class); + + // and: + doCallRealMethod().when(hybridSubject).tryTokenChange(nftChange); + given(hybridSubject.resolve(tId)).willReturn(tId); + given(hybridSubject.changeOwner(tNft, a, b)).willReturn(OK); + + // when: + final var result = hybridSubject.tryTokenChange(nftChange); + + // then: + Assertions.assertEquals(OK, result); + } +} \ No newline at end of file diff --git a/hedera-node/src/test/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogicTest.java b/hedera-node/src/test/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogicTest.java index 680e2461fb64..178b67771324 100644 --- a/hedera-node/src/test/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogicTest.java +++ b/hedera-node/src/test/java/com/hedera/services/txns/crypto/CryptoTransferTransitionLogicTest.java @@ -24,6 +24,7 @@ import com.hedera.services.context.properties.GlobalDynamicProperties; import com.hedera.services.grpc.marshalling.ImpliedTransfers; import com.hedera.services.grpc.marshalling.ImpliedTransfersMarshal; +import com.hedera.services.grpc.marshalling.ImpliedTransfersMeta; import com.hedera.services.ledger.HederaLedger; import com.hedera.services.ledger.PureTransferSemanticChecks; import com.hedera.services.state.submerkle.AssessedCustomFee; @@ -71,6 +72,9 @@ class CryptoTransferTransitionLogicTest { final private int maxHbarAdjusts = 5; final private int maxTokenAdjusts = 10; + final private int maxOwnershipChanges = 15; + private final ImpliedTransfersMeta.ValidationProps validationProps = new ImpliedTransfersMeta.ValidationProps( + maxHbarAdjusts, maxTokenAdjusts, maxOwnershipChanges); final private AccountID payer = AccountID.newBuilder().setAccountNum(1_234L).build(); final private AccountID a = AccountID.newBuilder().setAccountNum(9_999L).build(); final private AccountID b = AccountID.newBuilder().setAccountNum(8_999L).build(); @@ -106,7 +110,7 @@ void happyPathUsesLedgerNetZero() { final var a = asAccount("1.2.3"); final var b = asAccount("2.3.4"); final var impliedTransfers = ImpliedTransfers.valid( - maxHbarAdjusts, maxTokenAdjusts, List.of( + validationProps, List.of( hbarChange(a, +100), hbarChange(b, -100) ), @@ -130,7 +134,7 @@ void recomputesImpliedTransfersIfNotAvailableInSpan() { final var a = asAccount("1.2.3"); final var b = asAccount("2.3.4"); final var impliedTransfers = ImpliedTransfers.valid( - maxHbarAdjusts, maxTokenAdjusts, List.of( + validationProps, List.of( hbarChange(a, +100), hbarChange(b, -100) ), @@ -166,7 +170,7 @@ void verifyIfAssessedCustomFeesSet() { final var customFee = List.of(CustomFee.fixedFee(20L, null, a.asEntityId())); final List>> customFees = List.of(Pair.of(c, customFee)); final var impliedTransfers = ImpliedTransfers.valid( - maxHbarAdjusts, maxTokenAdjusts, List.of( + validationProps, List.of( hbarChange(a.asGrpcAccount(), +100), hbarChange(b.asGrpcAccount(), -100) ), @@ -194,7 +198,7 @@ void verifyIfAssessedCustomFeesSet() { @Test void shortCircuitsToImpliedTransfersValidityIfNotAvailableInSpan() { final var impliedTransfers = ImpliedTransfers.invalid( - maxHbarAdjusts, maxTokenAdjusts, TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN); + validationProps, TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN); givenValidTxnCtx(); given(accessor.getTxn()).willReturn(cryptoTransferTxn); @@ -214,7 +218,7 @@ void shortCircuitsToImpliedTransfersValidityIfNotAvailableInSpan() { void reusesPrecomputedFailureIfImpliedTransfersInSpan() { // setup: final var impliedTransfers = ImpliedTransfers.invalid( - maxHbarAdjusts, maxTokenAdjusts, TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN); + validationProps, TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN); given(spanMapAccessor.getImpliedTransfers(accessor)).willReturn(impliedTransfers); @@ -232,14 +236,13 @@ void computesFailureIfImpliedTransfersNotInSpan() { given(dynamicProperties.maxTransferListSize()).willReturn(maxHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxOwnershipChanges); given(accessor.getTxn()).willReturn(pretendXferTxn); given(transferSemanticChecks.fullPureValidation( - maxHbarAdjusts, - maxTokenAdjusts, pretendXferTxn.getCryptoTransfer().getTransfers(), - pretendXferTxn.getCryptoTransfer().getTokenTransfersList()) - ) - .willReturn(TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN); + pretendXferTxn.getCryptoTransfer().getTokenTransfersList(), + validationProps) + ).willReturn(TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN); // when: final var validity = subject.validateSemantics(accessor); diff --git a/hedera-node/src/test/java/com/hedera/services/txns/span/SpanMapManagerTest.java b/hedera-node/src/test/java/com/hedera/services/txns/span/SpanMapManagerTest.java index df1900d59f68..1d330a5bc2c8 100644 --- a/hedera-node/src/test/java/com/hedera/services/txns/span/SpanMapManagerTest.java +++ b/hedera-node/src/test/java/com/hedera/services/txns/span/SpanMapManagerTest.java @@ -23,6 +23,7 @@ import com.hedera.services.context.properties.GlobalDynamicProperties; import com.hedera.services.grpc.marshalling.ImpliedTransfers; import com.hedera.services.grpc.marshalling.ImpliedTransfersMarshal; +import com.hedera.services.grpc.marshalling.ImpliedTransfersMeta; import com.hedera.services.state.submerkle.AssessedCustomFee; import com.hedera.services.state.submerkle.CustomFee; import com.hedera.services.state.submerkle.EntityId; @@ -58,11 +59,16 @@ class SpanMapManagerTest { private final int maxHbarAdjusts = 1; private final int maxTokenAdjusts = 2; + private final int maxOwnershipChanges = 3; + private final ImpliedTransfersMeta.ValidationProps validationProps = new ImpliedTransfersMeta.ValidationProps( + maxHbarAdjusts, maxTokenAdjusts, maxOwnershipChanges); + private final ImpliedTransfersMeta.ValidationProps otherValidationProps = new ImpliedTransfersMeta.ValidationProps( + maxHbarAdjusts, maxTokenAdjusts, maxOwnershipChanges + 1); private final TransactionBody pretendXferTxn = TransactionBody.getDefaultInstance(); private final ImpliedTransfers someImpliedXfers = ImpliedTransfers.invalid( - maxHbarAdjusts, maxTokenAdjusts, ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS); + validationProps, ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS); private final ImpliedTransfers someOtherImpliedXfers = ImpliedTransfers.invalid( - maxHbarAdjusts, maxTokenAdjusts + 1, ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS); + otherValidationProps, ACCOUNT_REPEATED_IN_ACCOUNT_AMOUNTS); private final Id customFeeToken = new Id(0, 0, 123); private final Id customFeeCollector = new Id(0, 0, 124); @@ -81,9 +87,9 @@ class SpanMapManagerTest { private final EntityId tokenID = new EntityId(4, 6, 6); private final ImpliedTransfers validImpliedTransfers = ImpliedTransfers.valid( - maxHbarAdjusts, maxTokenAdjusts, new ArrayList<>(), entityCustomFees, assessedCustomFees); + validationProps, new ArrayList<>(), entityCustomFees, assessedCustomFees); private final ImpliedTransfers feeChangedImpliedTransfers = ImpliedTransfers.valid( - maxHbarAdjusts, maxTokenAdjusts + 1, new ArrayList<>(), newCustomFeeChanges, assessedCustomFees); + otherValidationProps, new ArrayList<>(), newCustomFeeChanges, assessedCustomFees); private final ExpandHandleSpanMapAccessor spanMapAccessor = new ExpandHandleSpanMapAccessor(); @@ -150,6 +156,7 @@ void doesntRecomputeImpliedTransfersIfMetaMatches() { given(accessor.getFunction()).willReturn(CryptoTransfer); given(dynamicProperties.maxTransferListSize()).willReturn(maxHbarAdjusts); given(dynamicProperties.maxTokenTransferListSize()).willReturn(maxTokenAdjusts); + given(dynamicProperties.maxNftTransfersLen()).willReturn(maxOwnershipChanges); spanMapAccessor.setImpliedTransfers(accessor, someImpliedXfers); // when: diff --git a/hedera-node/src/test/java/com/hedera/services/txns/token/TokenBurnTransitionLogicTest.java b/hedera-node/src/test/java/com/hedera/services/txns/token/TokenBurnTransitionLogicTest.java index 6cd247d315ff..5d871c5f4d67 100644 --- a/hedera-node/src/test/java/com/hedera/services/txns/token/TokenBurnTransitionLogicTest.java +++ b/hedera-node/src/test/java/com/hedera/services/txns/token/TokenBurnTransitionLogicTest.java @@ -21,11 +21,15 @@ */ import com.hedera.services.context.TransactionContext; +import com.hedera.services.state.enums.TokenType; +import com.hedera.services.store.AccountStore; import com.hedera.services.store.TypedTokenStore; import com.hedera.services.store.models.Account; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.OwnershipTracker; import com.hedera.services.store.models.Token; import com.hedera.services.store.models.TokenRelationship; +import com.hedera.services.txns.validation.OptionValidator; import com.hedera.services.utils.PlatformTxnAccessor; import com.hedera.test.utils.IdUtils; import com.hederahashgraph.api.proto.java.TokenBurnTransactionBody; @@ -37,15 +41,22 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.LongStream; + +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.BATCH_SIZE_LIMIT_EXCEEDED; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NFT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_BURN_AMOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TRANSACTION_BODY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; import static junit.framework.TestCase.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.mockito.BDDMockito.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.verify; @ExtendWith(MockitoExtension.class) @@ -64,6 +75,10 @@ class TokenBurnTransitionLogicTest { private TransactionContext txnCtx; @Mock private PlatformTxnAccessor accessor; + @Mock + private OptionValidator validator; + @Mock + private AccountStore accountStore; private TokenRelationship treasuryRel; private TransactionBody tokenBurnTxn; @@ -72,11 +87,11 @@ class TokenBurnTransitionLogicTest { @BeforeEach private void setup() { - subject = new TokenBurnTransitionLogic(store, txnCtx); + subject = new TokenBurnTransitionLogic(validator, accountStore, store, txnCtx); } @Test - void followsHappyPath() { + void followsHappyPathForCommon() { // setup: treasuryRel = new TokenRelationship(token, treasury); @@ -86,7 +101,7 @@ void followsHappyPath() { given(store.loadToken(id)).willReturn(token); given(token.getTreasury()).willReturn(treasury); given(store.loadTokenRelationship(token, treasury)).willReturn(treasuryRel); - + given(token.getType()).willReturn(TokenType.FUNGIBLE_COMMON); // when: subject.doStateTransition(); @@ -96,6 +111,30 @@ void followsHappyPath() { verify(store).persistTokenRelationship(treasuryRel); } + @Test + void followsHappyPathForUnique(){ + // setup: + treasuryRel = new TokenRelationship(token, treasury); + + givenValidUniqueTxnCtx(); + given(accessor.getTxn()).willReturn(tokenBurnTxn); + given(txnCtx.accessor()).willReturn(accessor); + given(store.loadToken(id)).willReturn(token); + given(token.getTreasury()).willReturn(treasury); + given(store.loadTokenRelationship(token, treasury)).willReturn(treasuryRel); + given(token.getType()).willReturn(TokenType.NON_FUNGIBLE_UNIQUE); + // when: + subject.doStateTransition(); + + // then: + verify(token).getType(); + verify(token).burn(any(OwnershipTracker.class), eq(treasuryRel), any(List.class)); + verify(store).persistToken(token); + verify(store).persistTokenRelationship(treasuryRel); + verify(store).persistTrackers(any(OwnershipTracker.class)); + verify(accountStore).persistAccount(any(Account.class)); + } + @Test void hasCorrectApplicability() { givenValidTxnCtx(); @@ -137,6 +176,57 @@ void rejectsInvalidZeroAmount() { assertEquals(INVALID_TOKEN_BURN_AMOUNT, subject.semanticCheck().apply(tokenBurnTxn)); } + @Test + void rejectsInvalidTxnBodyWithBothProps(){ + tokenBurnTxn = TransactionBody.newBuilder() + .setTokenBurn( + TokenBurnTransactionBody.newBuilder() + .addAllSerialNumbers(List.of(1L)) + .setAmount(1) + .setToken(grpcId)) + .build(); + + assertEquals(INVALID_TRANSACTION_BODY, subject.semanticCheck().apply(tokenBurnTxn)); + } + + + @Test + void rejectsInvalidTxnBodyWithNoProps(){ + tokenBurnTxn = TransactionBody.newBuilder() + .setTokenBurn( + TokenBurnTransactionBody.newBuilder() + .setToken(grpcId)) + .build(); + + assertEquals(INVALID_TOKEN_BURN_AMOUNT, subject.semanticCheck().apply(tokenBurnTxn)); + } + + @Test + void rejectsInvalidTxnBodyWithInvalidBatch(){ + tokenBurnTxn = TransactionBody.newBuilder() + .setTokenBurn( + TokenBurnTransactionBody.newBuilder() + .addAllSerialNumbers(LongStream.range(-20L, 0L).boxed().collect(Collectors.toList())) + .setToken(grpcId)) + .build(); + + given(validator.maxBatchSizeBurnCheck(tokenBurnTxn.getTokenBurn().getSerialNumbersCount())).willReturn(OK); + assertEquals(INVALID_NFT_ID, subject.semanticCheck().apply(tokenBurnTxn)); + } + + @Test + void propagatesErrorOnBatchSizeExceeded(){ + tokenBurnTxn = TransactionBody.newBuilder() + .setTokenBurn( + TokenBurnTransactionBody.newBuilder() + .addAllSerialNumbers(LongStream.range(1, 5).boxed().collect(Collectors.toList())) + .setToken(grpcId)) + .build(); + + given(validator.maxBatchSizeBurnCheck(tokenBurnTxn.getTokenBurn().getSerialNumbersCount())).willReturn(BATCH_SIZE_LIMIT_EXCEEDED); + assertEquals(BATCH_SIZE_LIMIT_EXCEEDED, subject.semanticCheck().apply(tokenBurnTxn)); + } + private void givenValidTxnCtx() { tokenBurnTxn = TransactionBody.newBuilder() .setTokenBurn(TokenBurnTransactionBody.newBuilder() @@ -145,6 +235,14 @@ private void givenValidTxnCtx() { .build(); } + private void givenValidUniqueTxnCtx() { + tokenBurnTxn = TransactionBody.newBuilder() + .setTokenBurn(TokenBurnTransactionBody.newBuilder() + .setToken(grpcId) + .addAllSerialNumbers(List.of(1L))) + .build(); + } + private void givenMissingToken() { tokenBurnTxn = TransactionBody.newBuilder() .setTokenBurn( diff --git a/hedera-node/src/test/java/com/hedera/services/txns/token/TokenCreateTransitionLogicTest.java b/hedera-node/src/test/java/com/hedera/services/txns/token/TokenCreateTransitionLogicTest.java index 7cb2244277af..b30c0a151314 100644 --- a/hedera-node/src/test/java/com/hedera/services/txns/token/TokenCreateTransitionLogicTest.java +++ b/hedera-node/src/test/java/com/hedera/services/txns/token/TokenCreateTransitionLogicTest.java @@ -36,6 +36,7 @@ import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TokenCreateTransactionBody; import com.hederahashgraph.api.proto.java.TokenID; +import com.hederahashgraph.api.proto.java.TokenSupplyType; import com.hederahashgraph.api.proto.java.TransactionBody; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -54,6 +55,7 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SUPPLY_KEY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_DECIMALS; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_INITIAL_SUPPLY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MAX_SUPPLY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_SYMBOL; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TREASURY_ACCOUNT_FOR_TOKEN; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_WIPE_KEY; @@ -76,6 +78,7 @@ import static org.mockito.BDDMockito.verify; class TokenCreateTransitionLogicTest { + final private Key key = SignedTxnFactory.DEFAULT_PAYER_KT.asKey(); long thisSecond = 1_234_567L; private Instant now = Instant.ofEpochSecond(thisSecond); private int decimals = 2; @@ -85,7 +88,6 @@ class TokenCreateTransitionLogicTest { private AccountID treasury = IdUtils.asAccount("1.2.4"); private AccountID renewAccount = IdUtils.asAccount("1.2.5"); private TokenID created = IdUtils.asToken("1.2.666"); - final private Key key = SignedTxnFactory.DEFAULT_PAYER_KT.asKey(); private TransactionBody tokenCreateTxn; private OptionValidator validator; @@ -529,6 +531,54 @@ void rejectsExpiryInPastInPrecheck() { assertEquals(INVALID_EXPIRATION_TIME, subject.semanticCheck().apply(tokenCreateTxn)); } + @Test + void rejectsInvalidSupplyChecks() { + givenInvalidSupplyTypeAndSupply(); + assertEquals(INVALID_TOKEN_MAX_SUPPLY, subject.semanticCheck().apply(tokenCreateTxn)); + } + + @Test + void rejectsInvalidInitialAndMaxSupply() { + givenTxWithInvalidSupplies(); + assertEquals(INVALID_TOKEN_INITIAL_SUPPLY, subject.semanticCheck().apply(tokenCreateTxn)); + } + + private void givenInvalidSupplyTypeAndSupply() { + final var expiry = Timestamp.newBuilder().setSeconds(thisSecond + thisSecond).build(); + var builder = TransactionBody.newBuilder() + .setTokenCreation(TokenCreateTransactionBody.newBuilder() + .setSupplyType(TokenSupplyType.INFINITE) + .setInitialSupply(0) + .setMaxSupply(1) + .build() + ); + + + tokenCreateTxn = builder.build(); + given(accessor.getTxn()).willReturn(tokenCreateTxn); + given(txnCtx.accessor()).willReturn(accessor); + given(txnCtx.consensusTime()).willReturn(now); + given(store.isCreationPending()).willReturn(true); + given(validator.isValidExpiry(expiry)).willReturn(true); + } + + private void givenTxWithInvalidSupplies() { + final var expiry = Timestamp.newBuilder().setSeconds(thisSecond + thisSecond).build(); + var builder = TransactionBody.newBuilder() + .setTokenCreation(TokenCreateTransactionBody.newBuilder() + .setSupplyType(TokenSupplyType.FINITE) + .setInitialSupply(1000) + .setMaxSupply(1) + .build() + ); + tokenCreateTxn = builder.build(); + given(accessor.getTxn()).willReturn(tokenCreateTxn); + given(txnCtx.accessor()).willReturn(accessor); + given(txnCtx.consensusTime()).willReturn(now); + given(store.isCreationPending()).willReturn(true); + given(validator.isValidExpiry(expiry)).willReturn(true); + } + private void givenValidTxnCtx() { givenValidTxnCtx(false, false, false); } diff --git a/hedera-node/src/test/java/com/hedera/services/txns/token/TokenMintTransitionLogicTest.java b/hedera-node/src/test/java/com/hedera/services/txns/token/TokenMintTransitionLogicTest.java index a3e0ba14c797..828dac09c87a 100644 --- a/hedera-node/src/test/java/com/hedera/services/txns/token/TokenMintTransitionLogicTest.java +++ b/hedera-node/src/test/java/com/hedera/services/txns/token/TokenMintTransitionLogicTest.java @@ -20,12 +20,18 @@ * ‍ */ +import com.google.protobuf.ByteString; import com.hedera.services.context.TransactionContext; +import com.hedera.services.state.enums.TokenType; +import com.hedera.services.state.submerkle.RichInstant; +import com.hedera.services.store.AccountStore; import com.hedera.services.store.TypedTokenStore; import com.hedera.services.store.models.Account; import com.hedera.services.store.models.Id; +import com.hedera.services.store.models.OwnershipTracker; import com.hedera.services.store.models.Token; import com.hedera.services.store.models.TokenRelationship; +import com.hedera.services.txns.validation.OptionValidator; import com.hedera.services.utils.PlatformTxnAccessor; import com.hedera.test.utils.IdUtils; import com.hederahashgraph.api.proto.java.TokenID; @@ -37,15 +43,21 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.time.Instant; +import java.util.List; + +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.BATCH_SIZE_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MINT_AMOUNT; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TRANSACTION_BODY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.METADATA_TOO_LONG; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; import static junit.framework.TestCase.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.any; import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.mock; import static org.mockito.BDDMockito.verify; @ExtendWith(MockitoExtension.class) @@ -64,6 +76,10 @@ class TokenMintTransitionLogicTest { private TransactionContext txnCtx; @Mock private PlatformTxnAccessor accessor; + @Mock + private OptionValidator validator; + @Mock + private AccountStore accountStore; private TokenRelationship treasuryRel; private TransactionBody tokenMintTxn; @@ -72,7 +88,7 @@ class TokenMintTransitionLogicTest { @BeforeEach private void setup() { - subject = new TokenMintTransitionLogic(store, txnCtx); + subject = new TokenMintTransitionLogic(validator, accountStore, store, txnCtx); } @Test @@ -86,7 +102,7 @@ void followsHappyPath() { given(store.loadToken(id)).willReturn(token); given(token.getTreasury()).willReturn(treasury); given(store.loadTokenRelationship(token, treasury)).willReturn(treasuryRel); - + given(token.getType()).willReturn(TokenType.FUNGIBLE_COMMON); // when: subject.doStateTransition(); @@ -96,6 +112,30 @@ void followsHappyPath() { verify(store).persistTokenRelationship(treasuryRel); } + @Test + void followsUniqueHappyPath() { + // setup: + treasuryRel = new TokenRelationship(token, treasury); + + givenValidUniqueTxnCtx(); + given(accessor.getTxn()).willReturn(tokenMintTxn); + given(txnCtx.accessor()).willReturn(accessor); + given(store.loadToken(id)).willReturn(token); + given(token.getTreasury()).willReturn(treasury); + given(store.loadTokenRelationship(token, treasury)).willReturn(treasuryRel); + given(token.getType()).willReturn(TokenType.NON_FUNGIBLE_UNIQUE); + given(txnCtx.consensusTime()).willReturn(Instant.now()); + // when: + subject.doStateTransition(); + + // then: + verify(token).mint(any(OwnershipTracker.class), eq(treasuryRel), any(List.class), any(RichInstant.class)); + verify(store).persistToken(token); + verify(store).persistTokenRelationship(treasuryRel); + verify(store).persistTrackers(any(OwnershipTracker.class)); + verify(accountStore).persistAccount(any(Account.class)); + } + @Test void hasCorrectApplicability() { givenValidTxnCtx(); @@ -137,6 +177,56 @@ void rejectsInvalidZeroAmount() { assertEquals(INVALID_TOKEN_MINT_AMOUNT, subject.semanticCheck().apply(tokenMintTxn)); } + @Test + void rejectsInvalidTxnBody(){ + tokenMintTxn = TransactionBody.newBuilder() + .setTokenMint(TokenMintTransactionBody.newBuilder() + .setToken(grpcId) + .setAmount(amount) + .addAllMetadata(List.of(ByteString.copyFromUtf8("memo")))) + .build(); + + assertEquals(INVALID_TRANSACTION_BODY, subject.semanticCheck().apply(tokenMintTxn)); + } + + @Test + void rejectsInvalidTxnBodyWithNoProps(){ + tokenMintTxn = TransactionBody.newBuilder() + .setTokenMint( + TokenMintTransactionBody.newBuilder() + .setToken(grpcId)) + .build(); + + + assertEquals(INVALID_TOKEN_MINT_AMOUNT, subject.semanticCheck().apply(tokenMintTxn)); + } + + @Test + void propagatesErrorOnBadMetadata(){ + tokenMintTxn = TransactionBody.newBuilder() + .setTokenMint( + TokenMintTransactionBody.newBuilder() + .addAllMetadata(List.of(ByteString.copyFromUtf8(""), ByteString.EMPTY)) + .setToken(grpcId)) + .build(); + given(validator.maxBatchSizeMintCheck(tokenMintTxn.getTokenMint().getMetadataCount())).willReturn(OK); + given(validator.nftMetadataCheck(any())).willReturn(METADATA_TOO_LONG); + assertEquals(METADATA_TOO_LONG, subject.semanticCheck().apply(tokenMintTxn)); + } + + @Test + void propagatesErrorOnMaxBatchSizeReached() { + tokenMintTxn = TransactionBody.newBuilder() + .setTokenMint( + TokenMintTransactionBody.newBuilder() + .addAllMetadata(List.of(ByteString.copyFromUtf8(""))) + .setToken(grpcId)) + .build(); + + given(validator.maxBatchSizeMintCheck(tokenMintTxn.getTokenMint().getMetadataCount())).willReturn(BATCH_SIZE_LIMIT_EXCEEDED); + assertEquals(BATCH_SIZE_LIMIT_EXCEEDED, subject.semanticCheck().apply(tokenMintTxn)); + } + private void givenValidTxnCtx() { tokenMintTxn = TransactionBody.newBuilder() .setTokenMint(TokenMintTransactionBody.newBuilder() @@ -145,6 +235,14 @@ private void givenValidTxnCtx() { .build(); } + private void givenValidUniqueTxnCtx() { + tokenMintTxn = TransactionBody.newBuilder() + .setTokenMint(TokenMintTransactionBody.newBuilder() + .setToken(grpcId) + .addAllMetadata(List.of(ByteString.copyFromUtf8("memo")))) + .build(); + } + private void givenMissingToken() { tokenMintTxn = TransactionBody.newBuilder() .setTokenMint( diff --git a/hedera-node/src/test/java/com/hedera/services/txns/validation/ContextOptionValidatorTest.java b/hedera-node/src/test/java/com/hedera/services/txns/validation/ContextOptionValidatorTest.java index d8f4cc52e9a1..4260eb7e93c7 100644 --- a/hedera-node/src/test/java/com/hedera/services/txns/validation/ContextOptionValidatorTest.java +++ b/hedera-node/src/test/java/com/hedera/services/txns/validation/ContextOptionValidatorTest.java @@ -55,11 +55,14 @@ import java.time.Instant; import java.util.Arrays; import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.LongStream; import static com.hedera.services.state.merkle.MerkleEntityId.fromContractId; import static com.hedera.test.utils.IdUtils.asFile; import static com.hedera.test.utils.TxnUtils.withAdjustments; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_DELETED; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.BATCH_SIZE_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.CONTRACT_DELETED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_CONTRACT_ID; @@ -68,9 +71,11 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TRANSACTION_START; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ZERO_BYTE_IN_STRING; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.MEMO_TOO_LONG; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.METADATA_TOO_LONG; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.MISSING_TOKEN_NAME; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.MISSING_TOKEN_SYMBOL; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_QUERY_RANGE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_NAME_TOO_LONG; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_SYMBOL_TOO_LONG; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TRANSACTION_EXPIRED; @@ -599,4 +604,40 @@ void memoCheckWorks() { assertEquals(MEMO_TOO_LONG, subject.memoCheck(new String(aaa))); assertEquals(INVALID_ZERO_BYTE_IN_STRING, subject.memoCheck("Not s\u0000 ok!")); } + + @Test + void rejectsInvalidBurnBatchSize(){ + given(dynamicProperties.maxBatchSizeBurn()).willReturn(10); + assertEquals(BATCH_SIZE_LIMIT_EXCEEDED, subject.maxBatchSizeBurnCheck(12)); + } + + @Test + void rejectsInvalidNftTransfersSize() { + given(dynamicProperties.maxNftTransfersLen()).willReturn(10); + assertEquals(BATCH_SIZE_LIMIT_EXCEEDED, subject.maxNftTransfersLenCheck(12)); + } + + @Test + void rejectsInvalidWipeBatchSize() { + given(dynamicProperties.maxBatchSizeWipe()).willReturn(10); + assertEquals(BATCH_SIZE_LIMIT_EXCEEDED, subject.maxBatchSizeWipeCheck(12)); + } + + @Test + void rejectsInvalidMintBatchSize() { + given(dynamicProperties.maxBatchSizeMint()).willReturn(10); + assertEquals(BATCH_SIZE_LIMIT_EXCEEDED, subject.maxBatchSizeMintCheck(12)); + } + + @Test + void rejectsInvalidQueryRange() { + given(dynamicProperties.maxNftQueryRange()).willReturn(10L); + assertEquals(INVALID_QUERY_RANGE, subject.nftMaxQueryRangeCheck(0, 11)); + } + + @Test + void rejectsInvalidMetadata() { + given(dynamicProperties.maxNftMetadataBytes()).willReturn(2); + assertEquals(METADATA_TOO_LONG, subject.nftMetadataCheck(new byte[]{1, 2, 3, 4})); + } } diff --git a/hedera-node/src/test/java/com/hedera/services/txns/validation/TokenListChecksTest.java b/hedera-node/src/test/java/com/hedera/services/txns/validation/TokenListChecksTest.java index 78c923e7dccd..4c1a35f8b861 100644 --- a/hedera-node/src/test/java/com/hedera/services/txns/validation/TokenListChecksTest.java +++ b/hedera-node/src/test/java/com/hedera/services/txns/validation/TokenListChecksTest.java @@ -22,11 +22,17 @@ import com.hedera.services.sigs.utils.ImmutableKeyUtils; import com.hederahashgraph.api.proto.java.Key; -import com.hederahashgraph.api.proto.java.ResponseCodeEnum; +import com.hederahashgraph.api.proto.java.TokenSupplyType; +import com.hederahashgraph.api.proto.java.TokenType; import org.junit.jupiter.api.Test; import java.util.function.Predicate; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_DECIMALS; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_INITIAL_SUPPLY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MAX_SUPPLY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.NOT_SUPPORTED; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.BDDMockito.any; import static org.mockito.BDDMockito.given; @@ -50,9 +56,67 @@ void permitsAdminKeyRemoval() { false, Key.getDefaultInstance()); // then: - assertEquals(ResponseCodeEnum.OK, validity); + assertEquals(OK, validity); // cleanup: TokenListChecks.ADMIN_KEY_REMOVAL = ImmutableKeyUtils::signalsKeyRemoval; } + + @Test + void typeChecks() { + // ok common + var validity = TokenListChecks.typeCheck(TokenType.FUNGIBLE_COMMON, 10, 5); + assertEquals(OK, validity); + + // ok unique + validity = TokenListChecks.typeCheck(TokenType.NON_FUNGIBLE_UNIQUE, 0, 0); + assertEquals(OK, validity); + + // fail common + validity = TokenListChecks.typeCheck(TokenType.FUNGIBLE_COMMON, 10, -1); + assertEquals(INVALID_TOKEN_DECIMALS, validity); + validity = TokenListChecks.typeCheck(TokenType.FUNGIBLE_COMMON, -1, 100); + assertEquals(INVALID_TOKEN_INITIAL_SUPPLY, validity); + + // fail unique + validity = TokenListChecks.typeCheck(TokenType.NON_FUNGIBLE_UNIQUE, 1, 0); + assertEquals(INVALID_TOKEN_INITIAL_SUPPLY, validity); + validity = TokenListChecks.typeCheck(TokenType.NON_FUNGIBLE_UNIQUE, 0, 1); + assertEquals(INVALID_TOKEN_DECIMALS, validity); + + // not supported + validity = TokenListChecks.typeCheck(TokenType.UNRECOGNIZED, 0, 0); + assertEquals(NOT_SUPPORTED, validity); + } + + @Test + void suppliesChecks() { + // ok + var validity = TokenListChecks.suppliesCheck(10, 100); + assertEquals(OK, validity); + + validity = TokenListChecks.suppliesCheck(101, 100); + assertEquals(INVALID_TOKEN_INITIAL_SUPPLY, validity); + + } + + @Test + void supplyTypeChecks() { + // ok + var validity = TokenListChecks.supplyTypeCheck(TokenSupplyType.FINITE, 10); + assertEquals(OK, validity); + validity = TokenListChecks.supplyTypeCheck(TokenSupplyType.INFINITE, 0); + assertEquals(OK, validity); + + // not ok + validity = TokenListChecks.supplyTypeCheck(TokenSupplyType.FINITE, 0); + assertEquals(INVALID_TOKEN_MAX_SUPPLY, validity); + validity = TokenListChecks.supplyTypeCheck(TokenSupplyType.INFINITE, 10); + assertEquals(INVALID_TOKEN_MAX_SUPPLY, validity); + + // + validity = TokenListChecks.supplyTypeCheck(TokenSupplyType.UNRECOGNIZED, 10); + assertEquals(NOT_SUPPORTED, validity); + } + } diff --git a/hedera-node/src/test/java/com/hedera/services/utils/MiscUtilsTest.java b/hedera-node/src/test/java/com/hedera/services/utils/MiscUtilsTest.java index dc0338306e28..20e7242ee716 100644 --- a/hedera-node/src/test/java/com/hedera/services/utils/MiscUtilsTest.java +++ b/hedera-node/src/test/java/com/hedera/services/utils/MiscUtilsTest.java @@ -92,10 +92,13 @@ import com.hederahashgraph.api.proto.java.TokenDeleteTransactionBody; import com.hederahashgraph.api.proto.java.TokenDissociateTransactionBody; import com.hederahashgraph.api.proto.java.TokenFreezeAccountTransactionBody; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosQuery; import com.hederahashgraph.api.proto.java.TokenGetInfoQuery; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoQuery; import com.hederahashgraph.api.proto.java.TokenGrantKycTransactionBody; import com.hederahashgraph.api.proto.java.TokenMintTransactionBody; import com.hederahashgraph.api.proto.java.TokenRevokeKycTransactionBody; +import com.hederahashgraph.api.proto.java.TokenTransferList; import com.hederahashgraph.api.proto.java.TokenUnfreezeAccountTransactionBody; import com.hederahashgraph.api.proto.java.TokenUpdateTransactionBody; import com.hederahashgraph.api.proto.java.TokenWipeAccountTransactionBody; @@ -155,10 +158,13 @@ import static com.hedera.services.utils.MiscUtils.functionalityOfQuery; import static com.hedera.services.utils.MiscUtils.getTxnStat; import static com.hedera.services.utils.MiscUtils.lookupInCustomStore; +import static com.hedera.services.utils.MiscUtils.readableNftTransferList; import static com.hedera.services.utils.MiscUtils.readableProperty; import static com.hedera.services.utils.MiscUtils.readableTransferList; import static com.hedera.test.utils.IdUtils.asAccount; +import static com.hedera.test.utils.IdUtils.asToken; import static com.hedera.test.utils.TxnUtils.withAdjustments; +import static com.hedera.test.utils.TxnUtils.withNftAdjustments; import static com.hederahashgraph.api.proto.java.HederaFunctionality.ConsensusCreateTopic; import static com.hederahashgraph.api.proto.java.HederaFunctionality.ConsensusDeleteTopic; import static com.hederahashgraph.api.proto.java.HederaFunctionality.ConsensusGetTopicInfo; @@ -401,6 +407,20 @@ void prettyPrintsTransferList() { assertEquals("[0.1.2 <- +500, 1.0.2 -> -250, 1.2.0 -> -9223372036854775808]", s); } + @Test + void prettyPrintsNFTTransferList() { + // given: + TokenTransferList transfers = withNftAdjustments( + asToken("0.2.3"), asAccount("0.1.2"), asAccount("0.1.3"), 1L, + asAccount("1.0.4"), asAccount("1.0.5"), 2L, + asAccount("1.2.6"), asAccount("1.0.7"), 3L); + + // when: + String s = readableNftTransferList(transfers); + + assertEquals("[1 0.1.2 0.1.3, 2 1.0.4 1.0.5, 3 1.2.6 1.0.7]", s); + } + @Test void prettyPrintsJTransactionRecordFcll() { // given: @@ -1101,6 +1121,26 @@ void worksForGetCryptoInfo() { assertEquals(ANSWER_ONLY, activeHeaderFrom(query).get().getResponseType()); } + @Test + void worksForTokenGetNftInfo() { + var op = TokenGetNftInfoQuery.newBuilder() + .setHeader(QueryHeader.newBuilder().setResponseType(ANSWER_ONLY)); + var query = Query.newBuilder() + .setTokenGetNftInfo(op) + .build(); + assertEquals(ANSWER_ONLY, activeHeaderFrom(query).get().getResponseType()); + } + + @Test + void worksForTokenGetAccountNftInfos() { + var op = TokenGetAccountNftInfosQuery.newBuilder() + .setHeader(QueryHeader.newBuilder().setResponseType(ANSWER_ONLY)); + var query = Query.newBuilder() + .setTokenGetAccountNftInfos(op) + .build(); + assertEquals(ANSWER_ONLY, activeHeaderFrom(query).get().getResponseType()); + } + @Test void worksForGetLiveHash() { var op = CryptoGetLiveHashQuery.newBuilder() diff --git a/hedera-node/src/test/java/com/hedera/test/mocks/TestAutoRenewCalcs.java b/hedera-node/src/test/java/com/hedera/test/mocks/TestAutoRenewCalcs.java index 10eeb479551d..b797e5044b58 100644 --- a/hedera-node/src/test/java/com/hedera/test/mocks/TestAutoRenewCalcs.java +++ b/hedera-node/src/test/java/com/hedera/test/mocks/TestAutoRenewCalcs.java @@ -24,9 +24,11 @@ import com.hedera.services.state.merkle.MerkleAccount; import com.hederahashgraph.api.proto.java.ExchangeRate; import com.hederahashgraph.api.proto.java.FeeData; +import com.hederahashgraph.api.proto.java.SubType; import org.apache.commons.lang3.tuple.Triple; import java.time.Instant; +import java.util.Map; public class TestAutoRenewCalcs extends AutoRenewCalcs { public TestAutoRenewCalcs() { @@ -44,7 +46,7 @@ public AutoRenewCalcs.RenewAssessment maxRenewalAndFeeFor( } @Override - public void setCryptoAutoRenewPriceSeq(Triple cryptoAutoRenewPriceSeq) { + public void setCryptoAutoRenewPriceSeq(Triple, Instant, Map> cryptoAutoRenewPriceSeq) { /* No-op */ } } diff --git a/hedera-node/src/test/java/com/hedera/test/mocks/TestContextValidator.java b/hedera-node/src/test/java/com/hedera/test/mocks/TestContextValidator.java index 1c40fd28ea50..daf3167aa9c9 100644 --- a/hedera-node/src/test/java/com/hedera/test/mocks/TestContextValidator.java +++ b/hedera-node/src/test/java/com/hedera/test/mocks/TestContextValidator.java @@ -85,6 +85,36 @@ public boolean isAcceptableTransfersLength(TransferList accountAmounts) { throw new UnsupportedOperationException(); } + @Override + public ResponseCodeEnum nftMetadataCheck(byte[] metadata) { + throw new UnsupportedOperationException(); + } + + @Override + public ResponseCodeEnum maxBatchSizeMintCheck(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ResponseCodeEnum maxBatchSizeWipeCheck(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ResponseCodeEnum maxBatchSizeBurnCheck(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ResponseCodeEnum maxNftTransfersLenCheck(int length) { + throw new UnsupportedOperationException(); + } + + @Override + public ResponseCodeEnum nftMaxQueryRangeCheck(long start, long end) { + throw new UnsupportedOperationException(); + } + @Override public ResponseCodeEnum queryableTopicStatus(TopicID id, FCMap topics) { throw new UnsupportedOperationException(); diff --git a/hedera-node/src/test/java/com/hedera/test/mocks/TestUsagePricesProvider.java b/hedera-node/src/test/java/com/hedera/test/mocks/TestUsagePricesProvider.java index 53f2ac3f2183..609008171986 100644 --- a/hedera-node/src/test/java/com/hedera/test/mocks/TestUsagePricesProvider.java +++ b/hedera-node/src/test/java/com/hedera/test/mocks/TestUsagePricesProvider.java @@ -28,6 +28,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.FeeSchedule; import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TimestampSeconds; import com.hederahashgraph.api.proto.java.TransactionFeeSchedule; @@ -35,6 +36,7 @@ import java.io.File; import java.time.Instant; +import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -49,8 +51,8 @@ public enum TestUsagePricesProvider implements UsagePricesProvider { Timestamp currFunctionUsagePricesExpiry; Timestamp nextFunctionUsagePricesExpiry; - Map currFunctionUsagePrices; - Map nextFunctionUsagePrices; + Map> currFunctionUsagePrices; + Map> nextFunctionUsagePrices; TestUsagePricesProvider() { loadPriceSchedules(); @@ -67,15 +69,20 @@ public void loadPriceSchedules() { } @Override - public FeeData activePrices() { + public Map activePrices() { throw new UnsupportedOperationException(); } @Override - public FeeData pricesGiven(HederaFunctionality function, Timestamp at) { + public FeeData defaultActivePrices() { + throw new UnsupportedOperationException(); + } + + @Override + public Map pricesGiven(HederaFunctionality function, Timestamp at) { try { - Map functionUsagePrices = applicableUsagePrices(at); - FeeData usagePrices = functionUsagePrices.get(function); + Map> functionUsagePrices = applicableUsagePrices(at); + Map usagePrices = functionUsagePrices.get(function); Objects.requireNonNull(usagePrices); return usagePrices; } catch (Exception ignore) { } @@ -83,14 +90,19 @@ public FeeData pricesGiven(HederaFunctionality function, Timestamp at) { } @Override - public Triple activePricingSequence(HederaFunctionality function) { + public FeeData defaultPricesGiven(HederaFunctionality function, Timestamp at) { + return pricesGiven(function, at).get(SubType.DEFAULT); + } + + @Override + public Triple, Instant, Map> activePricingSequence(HederaFunctionality function) { var now = Instant.now(); var prices = pricesGiven(function, MiscUtils.asTimestamp(now)); return Triple.of(prices, now, prices); } - private Map applicableUsagePrices(Timestamp at) { + private Map> applicableUsagePrices(Timestamp at) { if (onlyNextScheduleApplies(at)) { return nextFunctionUsagePrices; } else { @@ -117,9 +129,16 @@ private Timestamp asTimestamp(TimestampSeconds ts) { return Timestamp.newBuilder().setSeconds(ts.getSeconds()).build(); } - private Map functionUsagePricesFrom(FeeSchedule feeSchedule) { - return feeSchedule.getTransactionFeeScheduleList() - .stream() - .collect(toMap(TransactionFeeSchedule::getHederaFunctionality, TransactionFeeSchedule::getFeeData)); + private Map> functionUsagePricesFrom(FeeSchedule feeSchedule) { + var feeScheduleList = feeSchedule.getTransactionFeeScheduleList(); + Map> feeDataMap = new HashMap<>(); + for (TransactionFeeSchedule fs : feeScheduleList) { + Map subTypeMap = new HashMap<>(); + for (FeeData value : fs.getFeesList()) { + subTypeMap.put(value.getSubType(), value); + } + feeDataMap.put(fs.getHederaFunctionality(), subTypeMap); + } + return feeDataMap; } } diff --git a/hedera-node/src/test/java/com/hedera/test/utils/IdUtils.java b/hedera-node/src/test/java/com/hedera/test/utils/IdUtils.java index b70f5f560b53..2e98b03ac143 100644 --- a/hedera-node/src/test/java/com/hedera/test/utils/IdUtils.java +++ b/hedera-node/src/test/java/com/hedera/test/utils/IdUtils.java @@ -29,6 +29,7 @@ import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.ContractID; import com.hederahashgraph.api.proto.java.FileID; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.TokenBalance; import com.hederahashgraph.api.proto.java.TokenID; @@ -37,7 +38,6 @@ import java.util.stream.Stream; public class IdUtils { - public static TokenID tokenWith(long num) { return TokenID.newBuilder() .setShardNum(0) @@ -128,12 +128,32 @@ public static AccountAmount adjustFrom(AccountID account, long amount) { .build(); } + public static NftTransfer adjustFromNft(AccountID from, AccountID to, long serialNumber) { + return NftTransfer.newBuilder() + .setSenderAccountID(from) + .setReceiverAccountID(to) + .setSerialNumber(serialNumber) + .build(); + } + public static BalanceChange hbarChange(final AccountID account, final long amount) { - return BalanceChange.hbarAdjust(adjustFrom(account, amount)); + return BalanceChange.changingHbar(adjustFrom(account, amount)); } public static BalanceChange tokenChange(final Id token, final AccountID account, final long amount) { - return BalanceChange.tokenAdjust(token, token.asGrpcToken(), adjustFrom(account, amount)); + return BalanceChange.changingFtUnits(token, token.asGrpcToken(), adjustFrom(account, amount)); + } + + public static BalanceChange nftChange(final Id token, final AccountID from, final AccountID to, final long serialNumber) { + return BalanceChange.changingNftOwnership(token, token.asGrpcToken(), adjustFromNft(from, to, serialNumber)); + } + + public static NftTransfer nftXfer(AccountID from, AccountID to, long serialNo) { + return NftTransfer.newBuilder() + .setSenderAccountID(from) + .setReceiverAccountID(to) + .setSerialNumber(serialNo) + .build(); } public static AssessedCustomFee hbarChangeForCustomFees(final AccountID account, final long amount) { @@ -143,4 +163,5 @@ public static AssessedCustomFee hbarChangeForCustomFees(final AccountID account, public static AssessedCustomFee tokenChangeForCustomFees(final EntityId token, final AccountID account, final long amount) { return AssessedCustomFee.assessedHtsFeeFrom(token, adjustFrom(account, amount)); } + } diff --git a/hedera-node/src/test/java/com/hedera/test/utils/TxnUtils.java b/hedera-node/src/test/java/com/hedera/test/utils/TxnUtils.java index e3d7098c5da0..b937bec2e313 100644 --- a/hedera-node/src/test/java/com/hedera/test/utils/TxnUtils.java +++ b/hedera-node/src/test/java/com/hedera/test/utils/TxnUtils.java @@ -29,6 +29,7 @@ import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.Key; import com.hederahashgraph.api.proto.java.KeyList; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenTransferList; @@ -63,6 +64,49 @@ public static TransferList withAdjustments( .build(); } + public static List withOwnershipChanges( + TokenID a, AccountID aId, AccountID aCounterpartyId, long A, + TokenID b, AccountID bId, AccountID bCounterpartyId, long B, + TokenID c, AccountID cId, AccountID cCounterpartyId, long C + ) { + return List.of( + TokenTransferList.newBuilder() + .setToken(a) + .addNftTransfers(IdUtils.nftXfer(aId, aCounterpartyId, A)) + .build(), + TokenTransferList.newBuilder() + .setToken(b) + .addNftTransfers(IdUtils.nftXfer(bId, bCounterpartyId, B)) + .build(), + TokenTransferList.newBuilder() + .setToken(c) + .addNftTransfers(IdUtils.nftXfer(cId, cCounterpartyId, C)) + .build() + ); + } + + public static TokenTransferList withNftAdjustments( + TokenID a, AccountID aSenderId, AccountID aReceiverId, Long aSerialNumber, + AccountID bSenderId, AccountID bReceiverId, Long bSerialNumber, + AccountID cSenderId, AccountID cReceiverId, Long cSerialNumber + ) { + return TokenTransferList.newBuilder() + .setToken(a) + .addNftTransfers(NftTransfer.newBuilder() + .setSenderAccountID(aSenderId) + .setReceiverAccountID(aReceiverId) + .setSerialNumber(aSerialNumber)) + .addNftTransfers(NftTransfer.newBuilder() + .setSenderAccountID(bSenderId) + .setReceiverAccountID(bReceiverId) + .setSerialNumber(bSerialNumber)) + .addNftTransfers(NftTransfer.newBuilder() + .setSenderAccountID(cSenderId) + .setReceiverAccountID(cReceiverId) + .setSerialNumber(cSerialNumber)) + .build(); + } + public static List withTokenAdjustments( TokenID a, AccountID aId, long A, TokenID b, AccountID bId, long B, diff --git a/hedera-node/src/test/resources/R4FeeSchedule.json b/hedera-node/src/test/resources/R4FeeSchedule.json index 23a19dcc9cc0..985b6c3709f8 100644 --- a/hedera-node/src/test/resources/R4FeeSchedule.json +++ b/hedera-node/src/test/resources/R4FeeSchedule.json @@ -4,7 +4,7 @@ { "transactionFeeSchedule": { "hederaFunctionality": "CryptoCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 1094986245, "bpt": 1750555, @@ -41,13 +41,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAccountAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 73351018, "bpt": 117266, @@ -84,13 +84,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 23923923, "bpt": 38247, @@ -127,13 +127,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoTransfer", - "feeData": { + "fees": [{ "nodedata": { "constant": 11425052, "bpt": 18265, @@ -170,13 +170,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 573599715, "bpt": 917014, @@ -213,13 +213,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAddClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 6796440986, "bpt": 10865472, @@ -256,13 +256,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDeleteClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 570086650, "bpt": 911398, @@ -299,13 +299,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 67338, "bpt": 108, @@ -342,13 +342,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 22044, "bpt": 35, @@ -385,13 +385,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountBalance", - "feeData": { + "fees": [{ "nodedata": { "constant": 68774, "bpt": 110, @@ -428,13 +428,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 63990, "bpt": 102, @@ -471,13 +471,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 55191131417, "bpt": 88234080, @@ -514,13 +514,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 2960308152, "bpt": 4732646, @@ -557,13 +557,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -600,13 +600,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCall", - "feeData": { + "fees": [{ "nodedata": { "constant": 4057372722, "bpt": 6486523, @@ -643,13 +643,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71015, "bpt": 114, @@ -686,13 +686,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCallLocal", - "feeData": { + "fees": [{ "nodedata": { "constant": 2610100486, "bpt": 4172769, @@ -729,13 +729,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetBytecode", - "feeData": { + "fees": [{ "nodedata": { "constant": 226589259813, "bpt": 362248325, @@ -772,13 +772,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetBySolidityID", - "feeData": { + "fees": [{ "nodedata": { "constant": 69385, "bpt": 111, @@ -815,13 +815,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 10093, "bpt": 16, @@ -858,13 +858,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 3601717171, "bpt": 5758066, @@ -901,13 +901,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 4449279393, "bpt": 7113064, @@ -944,13 +944,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 44563799, "bpt": 71244, @@ -987,13 +987,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -1030,13 +1030,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileAppend", - "feeData": { + "fees": [{ "nodedata": { "constant": 4477817896, "bpt": 7158689, @@ -1073,13 +1073,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetContents", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -1116,13 +1116,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71080, "bpt": 114, @@ -1159,13 +1159,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusCreateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 1121747737, "bpt": 1793338, @@ -1202,13 +1202,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusUpdateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 24579716, "bpt": 39296, @@ -1245,13 +1245,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusDeleteTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 577156345, "bpt": 922700, @@ -1288,13 +1288,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusSubmitMessage", - "feeData": { + "fees": [{ "nodedata": { "constant": 11252409, "bpt": 17989, @@ -1331,13 +1331,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusGetTopicInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 64253, "bpt": 103, @@ -1374,13 +1374,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetVersionInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -1417,13 +1417,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetReceipt", - "feeData": { + "fees": [{ "nodedata": { "constant": 1, "bpt": 0, @@ -1460,13 +1460,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -1503,13 +1503,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemUndelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -1546,13 +1546,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetRecord", - "feeData": { + "fees": [{ "nodedata": { "constant": 54605, "bpt": 87, @@ -1589,7 +1589,7 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { @@ -1602,7 +1602,7 @@ { "transactionFeeSchedule": { "hederaFunctionality": "CryptoCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 1094986245, "bpt": 1750555, @@ -1639,13 +1639,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAccountAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 73351018, "bpt": 117266, @@ -1682,13 +1682,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 23923923, "bpt": 38247, @@ -1725,13 +1725,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoTransfer", - "feeData": { + "fees": [{ "nodedata": { "constant": 11425052, "bpt": 18265, @@ -1768,13 +1768,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 573599715, "bpt": 917014, @@ -1811,13 +1811,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAddClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 6796440986, "bpt": 10865472, @@ -1854,13 +1854,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDeleteClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 570086650, "bpt": 911398, @@ -1897,13 +1897,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 67338, "bpt": 108, @@ -1940,13 +1940,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 22044, "bpt": 35, @@ -1983,13 +1983,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountBalance", - "feeData": { + "fees": [{ "nodedata": { "constant": 68774, "bpt": 110, @@ -2026,13 +2026,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 63990, "bpt": 102, @@ -2069,13 +2069,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 55191131417, "bpt": 88234080, @@ -2112,13 +2112,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 2960308152, "bpt": 4732646, @@ -2155,13 +2155,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -2198,13 +2198,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCall", - "feeData": { + "fees": [{ "nodedata": { "constant": 4057372722, "bpt": 6486523, @@ -2241,13 +2241,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71015, "bpt": 114, @@ -2284,13 +2284,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCallLocal", - "feeData": { + "fees": [{ "nodedata": { "constant": 2610100486, "bpt": 4172769, @@ -2327,13 +2327,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetBytecode", - "feeData": { + "fees": [{ "nodedata": { "constant": 226589259813, "bpt": 362248325, @@ -2370,13 +2370,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetBySolidityID", - "feeData": { + "fees": [{ "nodedata": { "constant": 69385, "bpt": 111, @@ -2413,13 +2413,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 10093, "bpt": 16, @@ -2456,13 +2456,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 3601717171, "bpt": 5758066, @@ -2499,13 +2499,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 4449279393, "bpt": 7113064, @@ -2542,13 +2542,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 44563799, "bpt": 71244, @@ -2585,13 +2585,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -2628,13 +2628,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileAppend", - "feeData": { + "fees": [{ "nodedata": { "constant": 4477817896, "bpt": 7158689, @@ -2671,13 +2671,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetContents", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -2714,13 +2714,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71080, "bpt": 114, @@ -2757,13 +2757,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusCreateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 1121747737, "bpt": 1793338, @@ -2800,13 +2800,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusUpdateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 24579716, "bpt": 39296, @@ -2843,13 +2843,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusDeleteTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 577156345, "bpt": 922700, @@ -2886,13 +2886,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusSubmitMessage", - "feeData": { + "fees": [{ "nodedata": { "constant": 11252409, "bpt": 17989, @@ -2929,13 +2929,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusGetTopicInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 64253, "bpt": 103, @@ -2972,13 +2972,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetVersionInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -3015,13 +3015,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetReceipt", - "feeData": { + "fees": [{ "nodedata": { "constant": 1, "bpt": 0, @@ -3058,13 +3058,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -3101,13 +3101,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemUndelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -3144,13 +3144,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetRecord", - "feeData": { + "fees": [{ "nodedata": { "constant": 54605, "bpt": 87, @@ -3187,7 +3187,7 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { @@ -3195,4 +3195,4 @@ } ] } -] +] \ No newline at end of file diff --git a/hedera-node/src/test/resources/bootstrap/standard.properties b/hedera-node/src/test/resources/bootstrap/standard.properties index 836f723bf169..ea5f66d2347d 100644 --- a/hedera-node/src/test/resources/bootstrap/standard.properties +++ b/hedera-node/src/test/resources/bootstrap/standard.properties @@ -67,6 +67,7 @@ ledger.keepRecordsInState=false ledger.maxAccountNum=100000000 ledger.transfers.maxLen=10 ledger.tokenTransfers.maxLen=10 +ledger.nftTransfers.maxLen=10 ledger.schedule.txExpiryTimeSecs=1800 rates.intradayChangeLimitPercent=25 rates.midnightCheckInterval=1 @@ -75,6 +76,11 @@ tokens.maxPerAccount=1000 tokens.maxSymbolUtf8Bytes=100 tokens.maxTokenNameUtf8Bytes=100 tokens.maxCustomFeesAllowed=10 +tokens.nfts.maxMetadataBytes=100 +tokens.nfts.maxBatchSizeBurn=10 +tokens.nfts.maxBatchSizeWipe=10 +tokens.nfts.maxBatchSizeMint=10 +tokens.nfts.maxQueryRange=100 consensus.message.maxBytesAllowed=1024 # Node properties (can be overridden via data/config/node.properties) dev.defaultListeningNodeAccount=0.0.3 diff --git a/hedera-node/src/test/resources/fees/feeSchedules.json b/hedera-node/src/test/resources/fees/feeSchedules.json index fda2569bb19e..9694066c5d8d 100644 --- a/hedera-node/src/test/resources/fees/feeSchedules.json +++ b/hedera-node/src/test/resources/fees/feeSchedules.json @@ -2,7 +2,7 @@ "currentFeeSchedule" : [ { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4498129603, "bpt" : 7191161, @@ -39,12 +39,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAccountAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 59972622, "bpt" : 95878, @@ -81,12 +81,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 19649656, "bpt" : 31414, @@ -123,12 +123,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoTransfer", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9390055, "bpt" : 15012, @@ -165,12 +165,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 471427939, "bpt" : 753672, @@ -207,12 +207,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAddLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 5561692202, "bpt" : 8891479, @@ -249,12 +249,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDeleteLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 468546396, "bpt" : 749065, @@ -291,12 +291,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58926, "bpt" : 94, @@ -333,12 +333,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 22044, "bpt" : 35, @@ -375,12 +375,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountBalance", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 68774, "bpt" : 110, @@ -417,12 +417,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 63990, "bpt" : 102, @@ -459,12 +459,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetStakers", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 15251, "bpt" : 24, @@ -501,12 +501,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusCreateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 921577366, "bpt" : 1473326, @@ -543,12 +543,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusUpdateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 20193780, "bpt" : 32284, @@ -585,12 +585,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusDeleteTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 474345144, "bpt" : 758336, @@ -627,12 +627,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusSubmitMessage", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9248442, "bpt" : 14785, @@ -669,12 +669,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusGetTopicInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 64253, "bpt" : 103, @@ -711,12 +711,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 32203636093, "bpt" : 51483964, @@ -753,12 +753,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285588, "bpt" : 150734, @@ -795,12 +795,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 93900697, "bpt" : 150119, @@ -837,12 +837,13 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenMint", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -879,12 +880,52 @@ "min" : 0, "max" : 1000000000000000 } - } + }, + { + "subType": "TOKEN_FUNGIBLE_COMMON", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenBurn", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -921,12 +962,51 @@ "min" : 0, "max" : 1000000000000000 } - } + }, + { + "subType": "TOKEN_FUNGIBLE_COMMON", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAssociateToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4574479485, "bpt" : 7313222, @@ -963,12 +1043,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDissociateFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4714279388, "bpt" : 7536720, @@ -1005,12 +1085,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGrantKycToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1047,12 +1127,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenRevokeKycFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1089,12 +1169,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenFreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1131,12 +1211,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUnfreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -1173,12 +1253,13 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAccountWipe", - "feeData" : { + "fees" : [{ + "subType": "NON_FUNGIBLE_UNIQUE", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -1215,12 +1296,50 @@ "min" : 0, "max" : 1000000000000000 } - } + },{ + "subType": "FUNGIBLE_COMMON", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 61717, "bpt" : 99, @@ -1257,12 +1376,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 563513000, "bpt" : 900888, @@ -1299,12 +1418,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleSign", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58040915, "bpt" : 92790, @@ -1341,12 +1460,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 95360774, "bpt" : 152453, @@ -1383,12 +1502,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 53393, "bpt" : 85, @@ -1425,12 +1544,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 45218052173, "bpt" : 72290115, @@ -1467,12 +1586,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2438037058, "bpt" : 3897691, @@ -1509,12 +1628,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -1551,12 +1670,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCall", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3336515210, "bpt" : 5334088, @@ -1593,12 +1712,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71015, "bpt" : 114, @@ -1635,12 +1754,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCallLocal", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2610100486, "bpt" : 4172769, @@ -1677,12 +1796,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetBytecode", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 226589259813, "bpt" : 362248325, @@ -1719,12 +1838,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetBySolidityID", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69385, "bpt" : 111, @@ -1761,12 +1880,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 10093, "bpt" : 16, @@ -1803,12 +1922,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2934015991, "bpt" : 4690612, @@ -1845,12 +1964,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3657315129, "bpt" : 5846951, @@ -1887,12 +2006,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3663140881, "bpt" : 5856265, @@ -1929,12 +2048,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -1971,12 +2090,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileAppend", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3680730029, "bpt" : 5884384, @@ -2013,12 +2132,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetContents", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69308, "bpt" : 111, @@ -2055,12 +2174,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71080, "bpt" : 114, @@ -2097,12 +2216,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetVersionInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 6519421057, "bpt" : 10422601, @@ -2139,12 +2258,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetByKey", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -2181,12 +2300,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetReceipt", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -2223,12 +2342,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -2265,12 +2384,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemUndelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -2307,12 +2426,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetRecord", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 54605, "bpt" : 87, @@ -2349,7 +2468,7 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "expiryTime" : 1645810078 @@ -2358,7 +2477,7 @@ "nextFeeSchedule" : [ { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4498129603, "bpt" : 7191161, @@ -2395,12 +2514,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAccountAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 59972622, "bpt" : 95878, @@ -2437,12 +2556,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 19649656, "bpt" : 31414, @@ -2479,12 +2598,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoTransfer", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9390055, "bpt" : 15012, @@ -2521,12 +2640,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 471427939, "bpt" : 753672, @@ -2563,12 +2682,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoAddLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 5561692202, "bpt" : 8891479, @@ -2605,12 +2724,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoDeleteLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 468546396, "bpt" : 749065, @@ -2647,12 +2766,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetLiveHash", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58926, "bpt" : 94, @@ -2689,12 +2808,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 22044, "bpt" : 35, @@ -2731,12 +2850,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetAccountBalance", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 68774, "bpt" : 110, @@ -2773,12 +2892,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 63990, "bpt" : 102, @@ -2815,12 +2934,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "CryptoGetStakers", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 15251, "bpt" : 24, @@ -2857,12 +2976,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusCreateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 921577366, "bpt" : 1473326, @@ -2899,12 +3018,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusUpdateTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 20193780, "bpt" : 32284, @@ -2941,12 +3060,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusDeleteTopic", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 474345144, "bpt" : 758336, @@ -2983,12 +3102,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusSubmitMessage", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 9248442, "bpt" : 14785, @@ -3025,12 +3144,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ConsensusGetTopicInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 64253, "bpt" : 103, @@ -3067,12 +3186,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 32203636093, "bpt" : 51483964, @@ -3109,12 +3228,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285588, "bpt" : 150734, @@ -3151,12 +3270,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 93900697, "bpt" : 150119, @@ -3193,12 +3312,13 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenMint", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -3235,12 +3355,52 @@ "min" : 0, "max" : 1000000000000000 } - } + }, + { + "subType": "TOKEN_FUNGIBLE_COMMON", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenBurn", - "feeData" : { + "fees" : [{ + "subType": "TOKEN_NON_FUNGIBLE_UNIQUE", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -3277,12 +3437,51 @@ "min" : 0, "max" : 1000000000000000 } - } + }, + { + "subType": "TOKEN_FUNGIBLE_COMMON", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAssociateToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4574479485, "bpt" : 7313222, @@ -3319,12 +3518,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenDissociateFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 4714279388, "bpt" : 7536720, @@ -3361,12 +3560,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGrantKycToAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3403,12 +3602,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenRevokeKycFromAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3445,12 +3644,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenFreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3487,12 +3686,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenUnfreezeAccount", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 94285551, "bpt" : 150734, @@ -3529,12 +3728,51 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenAccountWipe", - "feeData" : { + "fees" : [{ + "subType": "NON_FUNGIBLE_UNIQUE", + "nodedata" : { + "constant" : 94092119, + "bpt" : 150425, + "vpt" : 376062755, + "rbh" : 100, + "sbh" : 8, + "gas" : 1003, + "bpr" : 150425, + "sbpr" : 3761, + "min" : 0, + "max" : 1000000000000000 + }, + "networkdata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + }, + "servicedata" : { + "constant" : 1505473906, + "bpt" : 2406802, + "vpt" : 6017004081, + "rbh" : 1605, + "sbh" : 120, + "gas" : 16045, + "bpr" : 2406802, + "sbpr" : 60170, + "min" : 0, + "max" : 1000000000000000 + } + },{ + "subType": "FUNGIBLE_COMMON", "nodedata" : { "constant" : 94092119, "bpt" : 150425, @@ -3571,12 +3809,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TokenGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 61717, "bpt" : 99, @@ -3613,12 +3851,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 563513000, "bpt" : 900888, @@ -3655,12 +3893,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleSign", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 58040915, "bpt" : 92790, @@ -3697,12 +3935,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 95360774, "bpt" : 152453, @@ -3739,12 +3977,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ScheduleGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 53393, "bpt" : 85, @@ -3781,12 +4019,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 45218052173, "bpt" : 72290115, @@ -3823,12 +4061,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2438037058, "bpt" : 3897691, @@ -3865,12 +4103,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -3907,12 +4145,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCall", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3336515210, "bpt" : 5334088, @@ -3949,12 +4187,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71015, "bpt" : 114, @@ -3991,12 +4229,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractCallLocal", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2610100486, "bpt" : 4172769, @@ -4033,12 +4271,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetBytecode", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 226589259813, "bpt" : 362248325, @@ -4075,12 +4313,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetBySolidityID", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69385, "bpt" : 111, @@ -4117,12 +4355,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractGetRecords", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 10093, "bpt" : 16, @@ -4159,12 +4397,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "ContractAutoRenew", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 2934015991, "bpt" : 4690612, @@ -4201,12 +4439,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileCreate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3657315129, "bpt" : 5846951, @@ -4243,12 +4481,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileUpdate", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3663140881, "bpt" : 5856265, @@ -4285,12 +4523,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 664083202, "bpt" : 1061670, @@ -4327,12 +4565,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileAppend", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 3680730029, "bpt" : 5884384, @@ -4369,12 +4607,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetContents", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 69308, "bpt" : 111, @@ -4411,12 +4649,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "FileGetInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 71080, "bpt" : 114, @@ -4453,12 +4691,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetVersionInfo", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 6519421057, "bpt" : 10422601, @@ -4495,12 +4733,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "GetByKey", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -4537,12 +4775,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetReceipt", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 1, "bpt" : 0, @@ -4579,12 +4817,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemDelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -4621,12 +4859,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "SystemUndelete", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 0, "bpt" : 0, @@ -4663,12 +4901,12 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "transactionFeeSchedule" : { "hederaFunctionality" : "TransactionGetRecord", - "feeData" : { + "fees" : [{ "nodedata" : { "constant" : 54605, "bpt" : 87, @@ -4705,7 +4943,7 @@ "min" : 0, "max" : 1000000000000000 } - } + }] } }, { "expiryTime" : 1677346078 diff --git a/hedera-node/src/test/resources/testfiles/2020-04-22-FeeSchedule.json b/hedera-node/src/test/resources/testfiles/2020-04-22-FeeSchedule.json index 95cc277aeb83..985b6c3709f8 100644 --- a/hedera-node/src/test/resources/testfiles/2020-04-22-FeeSchedule.json +++ b/hedera-node/src/test/resources/testfiles/2020-04-22-FeeSchedule.json @@ -1,10 +1,10 @@ [ { "currentFeeSchedule": [ - { + { "transactionFeeSchedule": { "hederaFunctionality": "CryptoCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 1094986245, "bpt": 1750555, @@ -41,13 +41,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAccountAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 73351018, "bpt": 117266, @@ -84,13 +84,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 23923923, "bpt": 38247, @@ -127,13 +127,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoTransfer", - "feeData": { + "fees": [{ "nodedata": { "constant": 11425052, "bpt": 18265, @@ -170,13 +170,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 573599715, "bpt": 917014, @@ -213,13 +213,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { - "hederaFunctionality": "CryptoAddLiveHash", - "feeData": { + "hederaFunctionality": "CryptoAddClaim", + "fees": [{ "nodedata": { "constant": 6796440986, "bpt": 10865472, @@ -256,13 +256,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { - "hederaFunctionality": "CryptoDeleteLiveHash", - "feeData": { + "hederaFunctionality": "CryptoDeleteClaim", + "fees": [{ "nodedata": { "constant": 570086650, "bpt": 911398, @@ -299,56 +299,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { - "hederaFunctionality": "CryptoGetLiveHash", - "feeData": { + "hederaFunctionality": "CryptoGetClaim", + "fees": [{ "nodedata": { - "constant": 58926, - "bpt": 94, - "vpt": 235514, + "constant": 67338, + "bpt": 108, + "vpt": 269133, "rbh": 0, "sbh": 0, "gas": 1, - "bpr": 94, - "sbpr": 2, + "bpr": 108, + "sbpr": 3, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 766043, - "bpt": 1225, - "vpt": 3061682, + "constant": 875394, + "bpt": 1399, + "vpt": 3498731, "rbh": 1, "sbh": 0, - "gas": 8, - "bpr": 1225, - "sbpr": 31, + "gas": 9, + "bpr": 1399, + "sbpr": 35, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 766043, - "bpt": 1225, - "vpt": 3061682, + "constant": 875394, + "bpt": 1399, + "vpt": 3498731, "rbh": 1, "sbh": 0, - "gas": 8, - "bpr": 1225, - "sbpr": 31, + "gas": 9, + "bpr": 1399, + "sbpr": 35, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 22044, "bpt": 35, @@ -385,13 +385,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountBalance", - "feeData": { + "fees": [{ "nodedata": { "constant": 68774, "bpt": 110, @@ -428,13 +428,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 63990, "bpt": 102, @@ -471,13 +471,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 55191131417, "bpt": 88234080, @@ -514,56 +514,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractUpdate", - "feeData": { + "fees": [{ "nodedata": { - "constant": 2966532351, - "bpt": 4742596, - "vpt": 11856490631, - "rbh": 3162, + "constant": 2960308152, + "bpt": 4732646, + "vpt": 11831614059, + "rbh": 3155, "sbh": 237, - "gas": 31617, - "bpr": 4742596, - "sbpr": 118565, + "gas": 31551, + "bpr": 4732646, + "sbpr": 118316, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 38564920564, - "bpt": 61653751, - "vpt": 154134378200, - "rbh": 41103, - "sbh": 3083, - "gas": 411025, - "bpr": 61653751, - "sbpr": 1541344, + "constant": 38484005979, + "bpt": 61524393, + "vpt": 153810982763, + "rbh": 41016, + "sbh": 3076, + "gas": 410163, + "bpr": 61524393, + "sbpr": 1538110, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 38564920564, - "bpt": 61653751, - "vpt": 154134378200, - "rbh": 41103, - "sbh": 3083, - "gas": 411025, - "bpr": 61653751, - "sbpr": 1541344, + "constant": 38484005979, + "bpt": 61524393, + "vpt": 153810982763, + "rbh": 41016, + "sbh": 3076, + "gas": 410163, + "bpr": 61524393, + "sbpr": 1538110, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -600,13 +600,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCall", - "feeData": { + "fees": [{ "nodedata": { "constant": 4057372722, "bpt": 6486523, @@ -643,13 +643,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71015, "bpt": 114, @@ -686,13 +686,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCallLocal", - "feeData": { + "fees": [{ "nodedata": { "constant": 2610100486, "bpt": 4172769, @@ -729,13 +729,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetBytecode", - "feeData": { + "fees": [{ "nodedata": { "constant": 226589259813, "bpt": 362248325, @@ -772,13 +772,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetBySolidityID", - "feeData": { + "fees": [{ "nodedata": { "constant": 69385, "bpt": 111, @@ -815,13 +815,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 10093, "bpt": 16, @@ -858,13 +858,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 3601717171, "bpt": 5758066, @@ -901,13 +901,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 4449279393, "bpt": 7113064, @@ -944,56 +944,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileUpdate", - "feeData": { + "fees": [{ "nodedata": { - "constant": 4556605628, - "bpt": 7284647, - "vpt": 18211617318, - "rbh": 4856, - "sbh": 364, - "gas": 48564, - "bpr": 7284647, - "sbpr": 182116, + "constant": 44563799, + "bpt": 71244, + "vpt": 178110399, + "rbh": 47, + "sbh": 4, + "gas": 475, + "bpr": 71244, + "sbpr": 1781, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 59235873168, - "bpt": 94700410, - "vpt": 236751025136, - "rbh": 63134, - "sbh": 4735, - "gas": 631336, - "bpr": 94700410, - "sbpr": 2367510, + "constant": 579329382, + "bpt": 926174, + "vpt": 2315435187, + "rbh": 617, + "sbh": 46, + "gas": 6174, + "bpr": 926174, + "sbpr": 23154, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 59235873168, - "bpt": 94700410, - "vpt": 236751025136, - "rbh": 63134, - "sbh": 4735, - "gas": 631336, - "bpr": 94700410, - "sbpr": 2367510, + "constant": 579329382, + "bpt": 926174, + "vpt": 2315435187, + "rbh": 617, + "sbh": 46, + "gas": 6174, + "bpr": 926174, + "sbpr": 23154, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -1030,13 +1030,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileAppend", - "feeData": { + "fees": [{ "nodedata": { "constant": 4477817896, "bpt": 7158689, @@ -1073,13 +1073,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetContents", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -1116,13 +1116,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71080, "bpt": 114, @@ -1159,13 +1159,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusCreateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 1121747737, "bpt": 1793338, @@ -1202,13 +1202,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusUpdateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 24579716, "bpt": 39296, @@ -1245,13 +1245,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusDeleteTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 577156345, "bpt": 922700, @@ -1288,13 +1288,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusSubmitMessage", - "feeData": { + "fees": [{ "nodedata": { "constant": 11252409, "bpt": 17989, @@ -1331,13 +1331,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusGetTopicInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 64253, "bpt": 103, @@ -1374,56 +1374,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetVersionInfo", - "feeData": { + "fees": [{ "nodedata": { - "constant": 71282, - "bpt": 114, - "vpt": 284898, + "constant": 69308, + "bpt": 111, + "vpt": 277006, "rbh": 0, "sbh": 0, "gas": 1, - "bpr": 114, + "bpr": 111, "sbpr": 3, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 926670, - "bpt": 1481, - "vpt": 3703670, + "constant": 901001, + "bpt": 1440, + "vpt": 3601076, "rbh": 1, "sbh": 0, "gas": 10, - "bpr": 1481, - "sbpr": 37, + "bpr": 1440, + "sbpr": 36, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 926670, - "bpt": 1481, - "vpt": 3703670, + "constant": 901001, + "bpt": 1440, + "vpt": 3601076, "rbh": 1, "sbh": 0, "gas": 10, - "bpr": 1481, - "sbpr": 37, + "bpr": 1440, + "sbpr": 36, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetReceipt", - "feeData": { + "fees": [{ "nodedata": { "constant": 1, "bpt": 0, @@ -1460,13 +1460,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -1503,13 +1503,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemUndelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -1546,13 +1546,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetRecord", - "feeData": { + "fees": [{ "nodedata": { "constant": 54605, "bpt": 87, @@ -1589,20 +1589,20 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { - "expiryTime": 1609394401 + "expiryTime": 1609347689 } ] }, { "nextFeeSchedule": [ - { + { "transactionFeeSchedule": { "hederaFunctionality": "CryptoCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 1094986245, "bpt": 1750555, @@ -1639,13 +1639,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAccountAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 73351018, "bpt": 117266, @@ -1682,13 +1682,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 23923923, "bpt": 38247, @@ -1725,13 +1725,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoTransfer", - "feeData": { + "fees": [{ "nodedata": { "constant": 11425052, "bpt": 18265, @@ -1768,13 +1768,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 573599715, "bpt": 917014, @@ -1811,13 +1811,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { - "hederaFunctionality": "CryptoAddLiveHash", - "feeData": { + "hederaFunctionality": "CryptoAddClaim", + "fees": [{ "nodedata": { "constant": 6796440986, "bpt": 10865472, @@ -1854,13 +1854,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { - "hederaFunctionality": "CryptoDeleteLiveHash", - "feeData": { + "hederaFunctionality": "CryptoDeleteClaim", + "fees": [{ "nodedata": { "constant": 570086650, "bpt": 911398, @@ -1897,56 +1897,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { - "hederaFunctionality": "CryptoGetLiveHash", - "feeData": { + "hederaFunctionality": "CryptoGetClaim", + "fees": [{ "nodedata": { - "constant": 58926, - "bpt": 94, - "vpt": 235514, + "constant": 67338, + "bpt": 108, + "vpt": 269133, "rbh": 0, "sbh": 0, "gas": 1, - "bpr": 94, - "sbpr": 2, + "bpr": 108, + "sbpr": 3, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 766043, - "bpt": 1225, - "vpt": 3061682, + "constant": 875394, + "bpt": 1399, + "vpt": 3498731, "rbh": 1, "sbh": 0, - "gas": 8, - "bpr": 1225, - "sbpr": 31, + "gas": 9, + "bpr": 1399, + "sbpr": 35, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 766043, - "bpt": 1225, - "vpt": 3061682, + "constant": 875394, + "bpt": 1399, + "vpt": 3498731, "rbh": 1, "sbh": 0, - "gas": 8, - "bpr": 1225, - "sbpr": 31, + "gas": 9, + "bpr": 1399, + "sbpr": 35, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 22044, "bpt": 35, @@ -1983,13 +1983,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountBalance", - "feeData": { + "fees": [{ "nodedata": { "constant": 68774, "bpt": 110, @@ -2026,13 +2026,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 63990, "bpt": 102, @@ -2069,13 +2069,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 55191131417, "bpt": 88234080, @@ -2112,56 +2112,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractUpdate", - "feeData": { + "fees": [{ "nodedata": { - "constant": 2966532351, - "bpt": 4742596, - "vpt": 11856490631, - "rbh": 3162, + "constant": 2960308152, + "bpt": 4732646, + "vpt": 11831614059, + "rbh": 3155, "sbh": 237, - "gas": 31617, - "bpr": 4742596, - "sbpr": 118565, + "gas": 31551, + "bpr": 4732646, + "sbpr": 118316, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 38564920564, - "bpt": 61653751, - "vpt": 154134378200, - "rbh": 41103, - "sbh": 3083, - "gas": 411025, - "bpr": 61653751, - "sbpr": 1541344, + "constant": 38484005979, + "bpt": 61524393, + "vpt": 153810982763, + "rbh": 41016, + "sbh": 3076, + "gas": 410163, + "bpr": 61524393, + "sbpr": 1538110, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 38564920564, - "bpt": 61653751, - "vpt": 154134378200, - "rbh": 41103, - "sbh": 3083, - "gas": 411025, - "bpr": 61653751, - "sbpr": 1541344, + "constant": 38484005979, + "bpt": 61524393, + "vpt": 153810982763, + "rbh": 41016, + "sbh": 3076, + "gas": 410163, + "bpr": 61524393, + "sbpr": 1538110, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -2198,13 +2198,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCall", - "feeData": { + "fees": [{ "nodedata": { "constant": 4057372722, "bpt": 6486523, @@ -2241,13 +2241,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71015, "bpt": 114, @@ -2284,13 +2284,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCallLocal", - "feeData": { + "fees": [{ "nodedata": { "constant": 2610100486, "bpt": 4172769, @@ -2327,13 +2327,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetBytecode", - "feeData": { + "fees": [{ "nodedata": { "constant": 226589259813, "bpt": 362248325, @@ -2370,13 +2370,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetBySolidityID", - "feeData": { + "fees": [{ "nodedata": { "constant": 69385, "bpt": 111, @@ -2413,13 +2413,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 10093, "bpt": 16, @@ -2456,13 +2456,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 3601717171, "bpt": 5758066, @@ -2499,13 +2499,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 4449279393, "bpt": 7113064, @@ -2542,56 +2542,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileUpdate", - "feeData": { + "fees": [{ "nodedata": { - "constant": 4556605628, - "bpt": 7284647, - "vpt": 18211617318, - "rbh": 4856, - "sbh": 364, - "gas": 48564, - "bpr": 7284647, - "sbpr": 182116, + "constant": 44563799, + "bpt": 71244, + "vpt": 178110399, + "rbh": 47, + "sbh": 4, + "gas": 475, + "bpr": 71244, + "sbpr": 1781, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 59235873168, - "bpt": 94700410, - "vpt": 236751025136, - "rbh": 63134, - "sbh": 4735, - "gas": 631336, - "bpr": 94700410, - "sbpr": 2367510, + "constant": 579329382, + "bpt": 926174, + "vpt": 2315435187, + "rbh": 617, + "sbh": 46, + "gas": 6174, + "bpr": 926174, + "sbpr": 23154, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 59235873168, - "bpt": 94700410, - "vpt": 236751025136, - "rbh": 63134, - "sbh": 4735, - "gas": 631336, - "bpr": 94700410, - "sbpr": 2367510, + "constant": 579329382, + "bpt": 926174, + "vpt": 2315435187, + "rbh": 617, + "sbh": 46, + "gas": 6174, + "bpr": 926174, + "sbpr": 23154, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -2628,13 +2628,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileAppend", - "feeData": { + "fees": [{ "nodedata": { "constant": 4477817896, "bpt": 7158689, @@ -2671,13 +2671,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetContents", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -2714,13 +2714,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71080, "bpt": 114, @@ -2757,13 +2757,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusCreateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 1121747737, "bpt": 1793338, @@ -2800,13 +2800,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusUpdateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 24579716, "bpt": 39296, @@ -2843,13 +2843,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusDeleteTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 577156345, "bpt": 922700, @@ -2886,13 +2886,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusSubmitMessage", - "feeData": { + "fees": [{ "nodedata": { "constant": 11252409, "bpt": 17989, @@ -2929,13 +2929,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusGetTopicInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 64253, "bpt": 103, @@ -2972,56 +2972,56 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetVersionInfo", - "feeData": { + "fees": [{ "nodedata": { - "constant": 71282, - "bpt": 114, - "vpt": 284898, + "constant": 69308, + "bpt": 111, + "vpt": 277006, "rbh": 0, "sbh": 0, "gas": 1, - "bpr": 114, + "bpr": 111, "sbpr": 3, "min": 0, "max": 1000000000000000 }, "networkdata": { - "constant": 926670, - "bpt": 1481, - "vpt": 3703670, + "constant": 901001, + "bpt": 1440, + "vpt": 3601076, "rbh": 1, "sbh": 0, "gas": 10, - "bpr": 1481, - "sbpr": 37, + "bpr": 1440, + "sbpr": 36, "min": 0, "max": 1000000000000000 }, "servicedata": { - "constant": 926670, - "bpt": 1481, - "vpt": 3703670, + "constant": 901001, + "bpt": 1440, + "vpt": 3601076, "rbh": 1, "sbh": 0, "gas": 10, - "bpr": 1481, - "sbpr": 37, + "bpr": 1440, + "sbpr": 36, "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetReceipt", - "feeData": { + "fees": [{ "nodedata": { "constant": 1, "bpt": 0, @@ -3058,13 +3058,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -3101,13 +3101,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemUndelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -3144,13 +3144,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetRecord", - "feeData": { + "fees": [{ "nodedata": { "constant": 54605, "bpt": 87, @@ -3187,11 +3187,11 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { - "expiryTime": 1640930401 + "expiryTime": 1640894645 } ] } diff --git a/hedera-node/src/test/resources/testfiles/R4FeeSchedule.json b/hedera-node/src/test/resources/testfiles/R4FeeSchedule.json index 23a19dcc9cc0..62877f6cdee4 100644 --- a/hedera-node/src/test/resources/testfiles/R4FeeSchedule.json +++ b/hedera-node/src/test/resources/testfiles/R4FeeSchedule.json @@ -4,7 +4,7 @@ { "transactionFeeSchedule": { "hederaFunctionality": "CryptoCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 1094986245, "bpt": 1750555, @@ -41,56 +41,57 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAccountAutoRenew", - "feeData": { - "nodedata": { - "constant": 73351018, - "bpt": 117266, - "vpt": 293165743, - "rbh": 78, - "sbh": 6, - "gas": 782, - "bpr": 117266, - "sbpr": 2932, - "min": 0, - "max": 1000000000000000 - }, - "networkdata": { - "constant": 953563237, - "bpt": 1524462, - "vpt": 3811154656, - "rbh": 1016, - "sbh": 76, - "gas": 10163, - "bpr": 1524462, - "sbpr": 38112, - "min": 0, - "max": 1000000000000000 - }, - "servicedata": { - "constant": 953563237, - "bpt": 1524462, - "vpt": 3811154656, - "rbh": 1016, - "sbh": 76, - "gas": 10163, - "bpr": 1524462, - "sbpr": 38112, - "min": 0, - "max": 1000000000000000 - } - } + "fees": [ + { + "nodedata": { + "constant": 73351018, + "bpt": 117266, + "vpt": 293165743, + "rbh": 78, + "sbh": 6, + "gas": 782, + "bpr": 117266, + "sbpr": 2932, + "min": 0, + "max": 1000000000000000 + }, + "networkdata": { + "constant": 953563237, + "bpt": 1524462, + "vpt": 3811154656, + "rbh": 1016, + "sbh": 76, + "gas": 10163, + "bpr": 1524462, + "sbpr": 38112, + "min": 0, + "max": 1000000000000000 + }, + "servicedata": { + "constant": 953563237, + "bpt": 1524462, + "vpt": 3811154656, + "rbh": 1016, + "sbh": 76, + "gas": 10163, + "bpr": 1524462, + "sbpr": 38112, + "min": 0, + "max": 1000000000000000 + } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 23923923, "bpt": 38247, @@ -127,13 +128,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoTransfer", - "feeData": { + "fees": [{ "nodedata": { "constant": 11425052, "bpt": 18265, @@ -170,13 +171,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 573599715, "bpt": 917014, @@ -213,13 +214,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAddClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 6796440986, "bpt": 10865472, @@ -256,13 +257,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDeleteClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 570086650, "bpt": 911398, @@ -299,13 +300,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetClaim", - "feeData": { + "fees":[{ "nodedata": { "constant": 67338, "bpt": 108, @@ -342,13 +343,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 22044, "bpt": 35, @@ -385,13 +386,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountBalance", - "feeData": { + "fees": [{ "nodedata": { "constant": 68774, "bpt": 110, @@ -428,13 +429,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 63990, "bpt": 102, @@ -471,13 +472,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 55191131417, "bpt": 88234080, @@ -514,13 +515,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 2960308152, "bpt": 4732646, @@ -557,13 +558,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -600,13 +601,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCall", - "feeData": { + "fees": [{ "nodedata": { "constant": 4057372722, "bpt": 6486523, @@ -643,13 +644,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71015, "bpt": 114, @@ -686,13 +687,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCallLocal", - "feeData": { + "fees": [{ "nodedata": { "constant": 2610100486, "bpt": 4172769, @@ -729,13 +730,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetBytecode", - "feeData": { + "fees": [{ "nodedata": { "constant": 226589259813, "bpt": 362248325, @@ -772,13 +773,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetBySolidityID", - "feeData": { + "fees": [{ "nodedata": { "constant": 69385, "bpt": 111, @@ -815,13 +816,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 10093, "bpt": 16, @@ -858,13 +859,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 3601717171, "bpt": 5758066, @@ -901,13 +902,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 4449279393, "bpt": 7113064, @@ -944,13 +945,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 44563799, "bpt": 71244, @@ -987,13 +988,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -1030,13 +1031,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileAppend", - "feeData": { + "fees": [{ "nodedata": { "constant": 4477817896, "bpt": 7158689, @@ -1073,13 +1074,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetContents", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -1116,13 +1117,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71080, "bpt": 114, @@ -1159,13 +1160,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusCreateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 1121747737, "bpt": 1793338, @@ -1202,13 +1203,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusUpdateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 24579716, "bpt": 39296, @@ -1245,13 +1246,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusDeleteTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 577156345, "bpt": 922700, @@ -1288,13 +1289,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusSubmitMessage", - "feeData": { + "fees": [{ "nodedata": { "constant": 11252409, "bpt": 17989, @@ -1331,13 +1332,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusGetTopicInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 64253, "bpt": 103, @@ -1374,13 +1375,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetVersionInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -1417,13 +1418,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetReceipt", - "feeData": { + "fees": [{ "nodedata": { "constant": 1, "bpt": 0, @@ -1460,13 +1461,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -1503,13 +1504,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemUndelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -1546,13 +1547,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetRecord", - "feeData": { + "fees": [{ "nodedata": { "constant": 54605, "bpt": 87, @@ -1589,7 +1590,7 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { @@ -1602,7 +1603,7 @@ { "transactionFeeSchedule": { "hederaFunctionality": "CryptoCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 1094986245, "bpt": 1750555, @@ -1639,13 +1640,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAccountAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 73351018, "bpt": 117266, @@ -1682,13 +1683,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 23923923, "bpt": 38247, @@ -1725,13 +1726,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoTransfer", - "feeData": { + "fees": [{ "nodedata": { "constant": 11425052, "bpt": 18265, @@ -1768,13 +1769,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 573599715, "bpt": 917014, @@ -1811,13 +1812,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoAddClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 6796440986, "bpt": 10865472, @@ -1854,13 +1855,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoDeleteClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 570086650, "bpt": 911398, @@ -1897,13 +1898,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetClaim", - "feeData": { + "fees": [{ "nodedata": { "constant": 67338, "bpt": 108, @@ -1940,13 +1941,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 22044, "bpt": 35, @@ -1983,13 +1984,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetAccountBalance", - "feeData": { + "fees": [{ "nodedata": { "constant": 68774, "bpt": 110, @@ -2026,13 +2027,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "CryptoGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 63990, "bpt": 102, @@ -2069,13 +2070,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 55191131417, "bpt": 88234080, @@ -2112,13 +2113,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 2960308152, "bpt": 4732646, @@ -2155,13 +2156,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -2198,13 +2199,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCall", - "feeData": { + "fees": [{ "nodedata": { "constant": 4057372722, "bpt": 6486523, @@ -2241,13 +2242,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71015, "bpt": 114, @@ -2284,13 +2285,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractCallLocal", - "feeData": { + "fees": [{ "nodedata": { "constant": 2610100486, "bpt": 4172769, @@ -2327,13 +2328,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetBytecode", - "feeData": { + "fees": [{ "nodedata": { "constant": 226589259813, "bpt": 362248325, @@ -2370,13 +2371,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetBySolidityID", - "feeData": { + "fees": [{ "nodedata": { "constant": 69385, "bpt": 111, @@ -2413,13 +2414,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractGetRecords", - "feeData": { + "fees": [{ "nodedata": { "constant": 10093, "bpt": 16, @@ -2456,13 +2457,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ContractAutoRenew", - "feeData": { + "fees": [{ "nodedata": { "constant": 3601717171, "bpt": 5758066, @@ -2499,13 +2500,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileCreate", - "feeData": { + "fees": [{ "nodedata": { "constant": 4449279393, "bpt": 7113064, @@ -2542,13 +2543,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileUpdate", - "feeData": { + "fees": [{ "nodedata": { "constant": 44563799, "bpt": 71244, @@ -2585,13 +2586,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 808018883, "bpt": 1291780, @@ -2628,13 +2629,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileAppend", - "feeData": { + "fees": [{ "nodedata": { "constant": 4477817896, "bpt": 7158689, @@ -2671,13 +2672,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetContents", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -2714,13 +2715,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "FileGetInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 71080, "bpt": 114, @@ -2757,13 +2758,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusCreateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 1121747737, "bpt": 1793338, @@ -2800,13 +2801,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusUpdateTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 24579716, "bpt": 39296, @@ -2843,13 +2844,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusDeleteTopic", - "feeData": { + "fees": [{ "nodedata": { "constant": 577156345, "bpt": 922700, @@ -2886,13 +2887,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusSubmitMessage", - "feeData": { + "fees": [{ "nodedata": { "constant": 11252409, "bpt": 17989, @@ -2929,13 +2930,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "ConsensusGetTopicInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 64253, "bpt": 103, @@ -2972,13 +2973,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "GetVersionInfo", - "feeData": { + "fees": [{ "nodedata": { "constant": 69308, "bpt": 111, @@ -3015,13 +3016,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetReceipt", - "feeData": { + "fees": [{ "nodedata": { "constant": 1, "bpt": 0, @@ -3058,13 +3059,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemDelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -3101,13 +3102,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "SystemUndelete", - "feeData": { + "fees": [{ "nodedata": { "constant": 0, "bpt": 0, @@ -3144,13 +3145,13 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { "transactionFeeSchedule": { "hederaFunctionality": "TransactionGetRecord", - "feeData": { + "fees": [{ "nodedata": { "constant": 54605, "bpt": 87, @@ -3187,7 +3188,7 @@ "min": 0, "max": 1000000000000000 } - } + }] } }, { @@ -3195,4 +3196,4 @@ } ] } -] +] \ No newline at end of file diff --git a/hedera-node/src/test/resources/testfiles/r4FeeSchedule.bin b/hedera-node/src/test/resources/testfiles/r4FeeSchedule.bin index 67766dcbf8f5..84815f704404 100644 --- a/hedera-node/src/test/resources/testfiles/r4FeeSchedule.bin +++ b/hedera-node/src/test/resources/testfiles/r4FeeSchedule.bin @@ -1,216 +1,216 @@ # - + )Ԑ j(0 8X@[PjX.؃5 (0v8@ P X".؃5 (0v8@ P X" -!~ +!~ &" (0N8@PX) ](൦08L@OP]X) ](൦08L@OP]X -{ +{ %ә (-08@PX(ͦ (08@PXa(ͦ (08@PXa -|x +|x $ َ(0 8@zPَX'F (ه08 @ PX.'F (ه08 @ PX. - + ) 7(ߞ08.@/P7X- (׏o0>8@PX- (׏o0>8@PX - + - (Әe088@PX1 ƤC( 087@9PƤCX1 ƤC( 087@9PƤCX - + ) 7(Ӡ08.@/P7X- (n0=8@PX- (n0=8@PX -_[ +_[  l(Ͷ@PlX5 (0@ P X#5 (0@ P X# -WS +WS  #(P#X (E@PX  (E@PX -_ [ +_ [  n(@PnX6 (0@ P X$6 (0@ P X$ -_[ +_[  f(@PfX2 (0@ P X!2 (0@ P X! - + 1 ఉ*(Ĕߵ08"@#Pఉ*Xц5ʤ (պS0.8@PX 5ʤ (պS0.8@PX - + -ʃ (,08@PX0ۨͮ (08@PX]0ۨͮ (08@PX] - + )ǥ N( 08A@CPNX.' (0W8@PX.' (0W8@PX - + -ڎ (Ĵ<0!8@PX 1 ((ַ08 @"P(XՀ1 ((ַ08 @"P(XՀ -_[ +_[  r(@PrX8 (š0@ P X%8 (š0@ P X% - + - (&08@PX/ڳ~ (񤡚0Ě8@PXR/ڳ~ (񤡚0Ě8@PXR - + 5 ݬ(٭08@PݬXߨ7ݳU (0Ͽ8ů@PXۑ87ݳU (0Ͽ8ů@PXۑ8 -_[ +_[  o(@PoX7 (΄0@ P X$7 (΄0@ P X$ -TP +TP N (P ( @PX ( @PX -" +" - (508@PX0϶ #(08@غP#Xr0϶ #(08@غP#Xr -  +  - 蒲(뿷B0%8@P蒲X 1ȼ ,(ј08$@%P,XŒ1ȼ ,(ј08$@%P,XŒ - } + } % ̬(T0/8@P̬X )溟 8(08.@0P8X)溟 8(08.@0P8X -  +  )ǥ N( 08A@CPNX.' (0W8@PX.' (0W8@PX  - + - (ΟB0%8@PX 1 ,(08$@%P,X1 ,(08$@%P,X -_[ +_[  o(@PoX6 (0@ P X$6 (0@ P X$ -_[ +_[  r(@PrX8 (ܴ0@ P X%8 (ܴ0@ P X% -2 +2 ) m(0 8Z@]PmX.ʩ6 (ޏ0y8 @ P X#.ʩ6 (ޏ0y8 @ P X# -3{ +3{ % (.08@PX( (Ķ08@PXc( (Ķ08@PXc -4 +4 )隓 ̨8(08.@0P̨8X- ݏ(o0>8@PݏX- ݏ(o0>8@PݏX -|6x +|6x $ Ō(0 8@xPŌX'E (08 @ PX-'E (08 @ PX- -_5[ +_5[  g(@PgX2 (0@ P X!2 (0@ P X! -_#[ +_#[  o(@PoX6 (0@ P X$6 (0@ P X$ -+$' ++$'    -%! +%!    -%! +%!    -_[ +_[ ͪ W( @PWX+ (0@PX+ (0@PX# - + )Ԑ j(0 8X@[PjX.؃5 (0v8@ P X".؃5 (0v8@ P X" -!~ +!~ &" (0N8@PX) ](൦08L@OP]X) ](൦08L@OP]X -{ +{ %ә (-08@PX(ͦ (08@PXa(ͦ (08@PXa -|x +|x $ َ(0 8@zPَX'F (ه08 @ PX.'F (ه08 @ PX. - + ) 7(ߞ08.@/P7X- (׏o0>8@PX- (׏o0>8@PX - + - (Әe088@PX1 ƤC( 087@9PƤCX1 ƤC( 087@9PƤCX - + ) 7(Ӡ08.@/P7X- (n0=8@PX- (n0=8@PX -_[ +_[  l(Ͷ@PlX5 (0@ P X#5 (0@ P X# -WS +WS  #(P#X (E@PX  (E@PX -_ [ +_ [  n(@PnX6 (0@ P X$6 (0@ P X$ -_[ +_[  f(@PfX2 (0@ P X!2 (0@ P X! - + 1 ఉ*(Ĕߵ08"@#Pఉ*Xц5ʤ (պS0.8@PX 5ʤ (պS0.8@PX - + -ʃ (,08@PX0ۨͮ (08@PX]0ۨͮ (08@PX] - + )ǥ N( 08A@CPNX.' (0W8@PX.' (0W8@PX - + -ڎ (Ĵ<0!8@PX 1 ((ַ08 @"P(XՀ1 ((ַ08 @"P(XՀ -_[ +_[  r(@PrX8 (š0@ P X%8 (š0@ P X% - + - (&08@PX/ڳ~ (񤡚0Ě8@PXR/ڳ~ (񤡚0Ě8@PXR - + 5 ݬ(٭08@PݬXߨ7ݳU (0Ͽ8ů@PXۑ87ݳU (0Ͽ8ů@PXۑ8 -_[ +_[  o(@PoX7 (΄0@ P X$7 (΄0@ P X$ -TP +TP N (P ( @PX ( @PX -" +" - (508@PX0϶ #(08@غP#Xr0϶ #(08@غP#Xr -  +  - 蒲(뿷B0%8@P蒲X 1ȼ ,(ј08$@%P,XŒ1ȼ ,(ј08$@%P,XŒ - } + } % ̬(T0/8@P̬X )溟 8(08.@0P8X)溟 8(08.@0P8X -  +  )ǥ N( 08A@CPNX.' (0W8@PX.' (0W8@PX  - + - (ΟB0%8@PX 1 ,(08$@%P,X1 ,(08$@%P,X -_[ +_[  o(@PoX6 (0@ P X$6 (0@ P X$ -_[ +_[  r(@PrX8 (ܴ0@ P X%8 (ܴ0@ P X% -2 +2 ) m(0 8Z@]PmX.ʩ6 (ޏ0y8 @ P X#.ʩ6 (ޏ0y8 @ P X# -3{ +3{ % (.08@PX( (Ķ08@PXc( (Ķ08@PXc -4 +4 )隓 ̨8(08.@0P̨8X- ݏ(o0>8@PݏX- ݏ(o0>8@PݏX -|6x +|6x $ Ō(0 8@xPŌX'E (08 @ PX-'E (08 @ PX- -_5[ +_5[  g(@PgX2 (0@ P X!2 (0@ P X! -_#[ +_#[  o(@PoX6 (0@ P X$6 (0@ P X$ -+$' ++$'    -%! +%!    -%! +%!    -_[ +_[ ͪ W( @PWX+ (0@PX+ (0@PX \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2ce8161a77a7..1c4a516c01e0 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ 1.33.0 2.9.10.7 1.3.2 - 0.16.0-alpha.1 + 0.16.0-alpha.2-SNAPSHOT 1 2.13.2 4.1.51.Final diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java index 7451bc32cbff..4af2ab58202f 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/HapiSpecOperation.java @@ -206,6 +206,7 @@ public Optional execFor(HapiApiSpec spec) { updateStateOf(spec); } } catch (Throwable t) { + t.printStackTrace(); if (unavailableNode && t.getMessage().startsWith("UNAVAILABLE")) { log.info("Node {} is unavailable as expected!", HapiPropertySource.asAccountString(node.get())); return Optional.empty(); diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/fees/FeeCalculator.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/fees/FeeCalculator.java index 95ab99ca46c5..07e231f0abc5 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/fees/FeeCalculator.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/fees/FeeCalculator.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,6 +25,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.FeeSchedule; import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.fee.FeeObject; @@ -34,6 +35,7 @@ import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; @@ -47,7 +49,7 @@ public class FeeCalculator { private static final Logger log = LogManager.getLogger(FeeCalculator.class); final private HapiSpecSetup setup; - final private Map opFeeData = new HashMap<>(); + final private Map> opFeeData = new HashMap<>(); final private FeesAndRatesProvider provider; private long fixedFee = Long.MIN_VALUE; @@ -67,47 +69,46 @@ public void init() { return; } FeeSchedule feeSchedule = provider.currentSchedule(); - feeSchedule.getTransactionFeeScheduleList().stream().forEach(feeData -> { - opFeeData.put(feeData.getHederaFunctionality(), feeData.getFeeData()); + feeSchedule.getTransactionFeeScheduleList().forEach(f -> { + opFeeData.put(f.getHederaFunctionality(), feesListToMap(f.getFeesList())); }); tokenTransferUsageMultiplier = setup.feesTokenTransferUsageMultiplier(); } - public long maxFeeTinyBars() { + private Map feesListToMap(List feesList) { + Map feeDataMap = new HashMap<>(); + for (FeeData feeData : feesList) { + feeDataMap.put(feeData.getSubType(), feeData); + } + return feeDataMap; + } + + private long maxFeeTinyBars(SubType subType) { return usingFixedFee ? fixedFee : Arrays .stream(HederaFunctionality.values()) .mapToLong(op -> Optional.ofNullable( - opFeeData.get(op)).map(fd -> - fd.getServicedata().getMax() - + fd.getNodedata().getMax() - + fd.getNetworkdata().getMax()).orElse(0L)) - .max() - .orElse(0L); + opFeeData.get(op) + ).map(fd -> { + final var pricesForSubtype = fd.get(subType); + if (pricesForSubtype == null) { + return 0L; + } else { + return pricesForSubtype.getServicedata().getMax() + + pricesForSubtype.getNodedata().getMax() + + pricesForSubtype.getNetworkdata().getMax(); + } + } + ).orElse(0L) + ).max().orElse(0L); } - public long forOp(HederaFunctionality op, FeeData knownActivity) { - if (usingFixedFee) { - return fixedFee; - } - try { - FeeData activityPrices = opFeeData.get(op); - return getTotalFeeforRequest(activityPrices, knownActivity, provider.rates()); - } catch (Throwable t) { - log.warn("Unable to calculate fee for op {}, using max fee!", op, t); - } - return maxFeeTinyBars(); + public long maxFeeTinyBars() { + return maxFeeTinyBars(SubType.DEFAULT); } - public long forOpWithDetails(HederaFunctionality op, FeeData knownActivity, AtomicReference obs) { - try { - final var activityPrices = opFeeData.get(op); - final var fees = getFeeObject(activityPrices, knownActivity, provider.rates()); - obs.set(fees); - return getTotalFeeforRequest(activityPrices, knownActivity, provider.rates()); - } catch (Throwable t) { - throw new IllegalArgumentException("Calculation not observable!", t); - } + public long forOp(HederaFunctionality op, FeeData knownActivity) { + return forOp(op, SubType.DEFAULT, knownActivity); } @FunctionalInterface @@ -133,7 +134,18 @@ public long forActivityBasedOpWithDetails( AtomicReference obs ) throws Throwable { FeeData activityMetrics = metricsFor(txn, numPayerSigs, metricsCalculator); - return forOpWithDetails(op, activityMetrics, obs); + return forOpWithDetails(op, SubType.DEFAULT, activityMetrics, obs); + } + + public long forActivityBasedOp( + HederaFunctionality op, + SubType subType, + ActivityMetrics metricsCalculator, + Transaction txn, + int numPayerSigs + ) throws Throwable { + FeeData activityMetrics = metricsFor(txn, numPayerSigs, metricsCalculator); + return forOp(op, subType, activityMetrics); } private FeeData metricsFor( @@ -146,6 +158,35 @@ private FeeData metricsFor( return metricsCalculator.compute(body, sigUsage); } + private long forOp(HederaFunctionality op, SubType subType, FeeData knownActivity) { + if (usingFixedFee) { + return fixedFee; + } + try { + Map activityPrices = opFeeData.get(op); + return getTotalFeeforRequest(activityPrices.get(subType), knownActivity, provider.rates()); + } catch (Throwable t) { + log.warn("Unable to calculate fee for op {}, using max fee!", op, t); + } + return maxFeeTinyBars(subType); + } + + public long forOpWithDetails( + HederaFunctionality op, + SubType subType, + FeeData knownActivity, + AtomicReference obs + ) { + try { + final var activityPrices = opFeeData.get(op).get(subType); + final var fees = getFeeObject(activityPrices, knownActivity, provider.rates()); + obs.set(fees); + return getTotalFeeforRequest(activityPrices, knownActivity, provider.rates()); + } catch (Throwable t) { + throw new IllegalArgumentException("Calculation not observable!", t); + } + } + private SigValueObj sigUsageGiven(Transaction txn, int numPayerSigs) { int size = getSignatureSize(txn); int totalNumSigs = getSignatureCount(txn); @@ -155,4 +196,4 @@ private SigValueObj sigUsageGiven(Transaction txn, int numPayerSigs) { public int tokenTransferUsageMultiplier() { return tokenTransferUsageMultiplier; } -} +} \ No newline at end of file diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/infrastructure/HapiSpecRegistry.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/infrastructure/HapiSpecRegistry.java index 18e5933f26c9..4bfd25841ef4 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/infrastructure/HapiSpecRegistry.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/infrastructure/HapiSpecRegistry.java @@ -292,6 +292,8 @@ public void saveExpiry(String name, Long value) { put(name + "Expiry", value, Long.class); } + public void saveCreationTime(String name, Timestamp value) { put(name + "CreationTime", value, Timestamp.class); } + public void saveSupplyKey(String name, Key key) { put(name + "Supply", key, Key.class); } @@ -386,6 +388,8 @@ public Key getKycKey(String name) { public Long getExpiry(String name) { return get(name + "Expiry", Long.class); } + public Timestamp getCreationTime(String name) { return get(name + "CreationTime", Timestamp.class); } + public boolean hasKey(String name) { return hasVia(this::getKey, name); } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/QueryVerbs.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/QueryVerbs.java index 1b06d2c5de1b..935954fcb501 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/QueryVerbs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/QueryVerbs.java @@ -35,7 +35,9 @@ import com.hedera.services.bdd.spec.queries.meta.HapiGetTxnRecord; import com.hedera.services.bdd.spec.queries.meta.HapiGetVersionInfo; import com.hedera.services.bdd.spec.queries.schedule.HapiGetScheduleInfo; +import com.hedera.services.bdd.spec.queries.token.HapiGetAccountNftInfos; import com.hedera.services.bdd.spec.queries.token.HapiGetTokenInfo; +import com.hedera.services.bdd.spec.queries.token.HapiGetTokenNftInfo; import com.hederahashgraph.api.proto.java.TransactionID; import java.util.function.Function; @@ -125,4 +127,12 @@ public static HapiGetTokenInfo getTokenInfo(String token) { public static HapiGetScheduleInfo getScheduleInfo(String schedule) { return new HapiGetScheduleInfo(schedule); } + + public static HapiGetTokenNftInfo getTokenNftInfo(String token, long serialNum) { + return new HapiGetTokenNftInfo(token, serialNum); + } + + public static HapiGetAccountNftInfos getAccountNftInfos(String account, long start, long end) { + return new HapiGetAccountNftInfos(account, start, end); + } } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/crypto/HapiGetAccountInfo.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/crypto/HapiGetAccountInfo.java index 7e3e2b7404c3..b830338f07cc 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/crypto/HapiGetAccountInfo.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/crypto/HapiGetAccountInfo.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -33,6 +33,7 @@ import com.hederahashgraph.api.proto.java.Transaction; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.junit.Assert; import java.util.ArrayList; import java.util.List; @@ -57,6 +58,7 @@ public class HapiGetAccountInfo extends HapiQueryOp { Optional> customLog = Optional.empty(); Optional exposingExpiryTo = Optional.empty(); Optional exposingBalanceTo = Optional.empty(); + Optional ownedNfts = Optional.empty(); public HapiGetAccountInfo(String account) { this.account = account; @@ -71,6 +73,7 @@ public HapiGetAccountInfo has(AccountInfoAsserts provider) { expectations = Optional.of(provider); return this; } + public HapiGetAccountInfo plusCustomLog(BiConsumer custom) { customLog = Optional.of(custom); return this; @@ -101,6 +104,11 @@ public HapiGetAccountInfo hasNoTokenRelationship(String token) { return this; } + public HapiGetAccountInfo hasOwnedNfts(long ownedNftsLen) { + this.ownedNfts = Optional.of(ownedNftsLen); + return this; + } + @Override protected HapiGetAccountInfo self() { return this; @@ -108,17 +116,19 @@ protected HapiGetAccountInfo self() { @Override protected void assertExpectationsGiven(HapiApiSpec spec) throws Throwable { + final var actualInfo = response.getCryptoGetInfo().getAccountInfo(); if (expectations.isPresent()) { - AccountInfo actualInfo = response.getCryptoGetInfo().getAccountInfo(); ErroringAsserts asserts = expectations.get().assertsFor(spec); List errors = asserts.errorsIn(actualInfo); rethrowSummaryError(log, "Bad account info!", errors); } - var actualTokenRels = response.getCryptoGetInfo().getAccountInfo().getTokenRelationshipsList(); + var actualTokenRels = actualInfo.getTokenRelationshipsList(); ExpectedTokenRel.assertExpectedRels(account, relationships, actualTokenRels, spec); ExpectedTokenRel.assertNoUnexpectedRels(account, absentRelationships, actualTokenRels, spec); - } + var actualOwnedNfts = actualInfo.getOwnedNfts(); + ownedNfts.ifPresent(nftsOwned -> Assert.assertEquals((long) nftsOwned, actualOwnedNfts)); + } @Override protected void submitWith(HapiApiSpec spec, Transaction payment) throws Throwable { @@ -138,7 +148,6 @@ protected void submitWith(HapiApiSpec spec, Transaction payment) throws Throwabl if (registryEntry.isPresent()) { spec.registry().saveAccountInfo(registryEntry.get(), response.getCryptoGetInfo().getAccountInfo()); } - } @Override diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetAccountNftInfos.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetAccountNftInfos.java new file mode 100644 index 000000000000..3cc10806fa38 --- /dev/null +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetAccountNftInfos.java @@ -0,0 +1,138 @@ +package com.hedera.services.bdd.spec.queries.token; + +/*- + * ‌ + * Hedera Services Test Clients + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.hedera.services.bdd.spec.HapiApiSpec; +import com.hedera.services.bdd.spec.queries.HapiQueryOp; +import com.hedera.services.bdd.spec.transactions.TxnUtils; +import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.NftID; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.Response; +import com.hederahashgraph.api.proto.java.TokenGetAccountNftInfosQuery; +import com.hederahashgraph.api.proto.java.TokenNftInfo; +import com.hederahashgraph.api.proto.java.Transaction; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.util.Strings; +import org.junit.Assert; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +import static com.hedera.services.bdd.spec.queries.QueryUtils.answerCostHeader; +import static com.hedera.services.bdd.spec.queries.QueryUtils.answerHeader; + +public class HapiGetAccountNftInfos extends HapiQueryOp { + private static final Logger log = LogManager.getLogger(HapiGetAccountNftInfos.class); + + private String account; + private long start; + private long end; + + public HapiGetAccountNftInfos(String account, long start, long end) { + this.account = account; + this.start = start; + this.end = end; + } + + private Optional> expectedNfts = Optional.empty(); + + @Override + public HederaFunctionality type() { + return HederaFunctionality.TokenGetNftInfo; + } + + @Override + protected HapiGetAccountNftInfos self() { + return this; + } + + @Override + protected void assertExpectationsGiven(HapiApiSpec spec) throws Throwable { + var actualInfo = response.getTokenGetAccountNftInfos().getNftsList(); + var expectedInfo = new ArrayList(); + expectedNfts.ifPresent(nfts -> { + for (HapiTokenNftInfo nftInfo : nfts) { + var expectedNftElement = TokenNftInfo.newBuilder(); + var expectedNftId = NftID.newBuilder(); + + nftInfo.getExpectedTokenID().ifPresent(e -> { + expectedNftId.setTokenID(TxnUtils.asTokenId(e, spec)); + expectedNftElement.setCreationTime(spec.registry().getCreationTime(e)); + }); + nftInfo.getExpectedSerialNum().ifPresent(expectedNftId::setSerialNumber); + + expectedNftElement.setNftID(expectedNftId.build()); + nftInfo.getExpectedAccountID().ifPresent(e -> expectedNftElement.setAccountID(TxnUtils.asId(e, spec))); + nftInfo.getExpectedMetadata().ifPresent(expectedNftElement::setMetadata); + + var completedNft = expectedNftElement.build(); + expectedInfo.add(completedNft); + } + Assert.assertEquals(actualInfo, expectedInfo); + }); + } + + @Override + protected void submitWith(HapiApiSpec spec, Transaction payment) { + Query query = getAccountNftInfosQuery(spec, payment, false); + response = spec.clients().getTokenSvcStub(targetNodeFor(spec), useTls).getAccountNftInfos(query); + if (verboseLoggingOn) { + StringBuilder information = new StringBuilder("Nft information for '" + account + "': \n"); + List nfts = response.getTokenGetAccountNftInfos().getNftsList(); + information.append(Strings.join(nfts, '\n')); + log.info(information.toString()); + } + } + + @Override + protected long lookupCostWith(HapiApiSpec spec, Transaction payment) throws Throwable { + Query query = getAccountNftInfosQuery(spec, payment, true); + Response response = spec.clients().getTokenSvcStub(targetNodeFor(spec), useTls).getAccountNftInfos(query); + return costFrom(response); + } + + private Query getAccountNftInfosQuery(HapiApiSpec spec, Transaction payment, boolean costOnly) { + var id = TxnUtils.asId(account, spec); + TokenGetAccountNftInfosQuery getAccountNftInfosQuery = TokenGetAccountNftInfosQuery.newBuilder() + .setHeader(costOnly ? answerCostHeader(payment) : answerHeader(payment)) + .setAccountID(id) + .setStart(start) + .setEnd(end) + .build(); + return Query.newBuilder().setTokenGetAccountNftInfos(getAccountNftInfosQuery).build(); + } + + @Override + protected boolean needsPayment() { + return true; + } + + public HapiGetAccountNftInfos hasNfts(HapiTokenNftInfo...nfts) { + this.expectedNfts = Optional.of(Arrays.asList(nfts)); + return this; + } +} + + diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetTokenInfo.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetTokenInfo.java index 55524d635605..caa58e34bcfc 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetTokenInfo.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetTokenInfo.java @@ -32,6 +32,8 @@ import com.hederahashgraph.api.proto.java.TokenFreezeStatus; import com.hederahashgraph.api.proto.java.TokenGetInfoQuery; import com.hederahashgraph.api.proto.java.TokenKycStatus; +import com.hederahashgraph.api.proto.java.TokenSupplyType; +import com.hederahashgraph.api.proto.java.TokenType; import com.hederahashgraph.api.proto.java.Transaction; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -58,8 +60,11 @@ public HapiGetTokenInfo(String token) { this.token = token; } + private Optional expectedTokenType = Optional.empty(); + private Optional expectedSupplyType = Optional.empty(); private OptionalInt expectedDecimals = OptionalInt.empty(); private OptionalLong expectedTotalSupply = OptionalLong.empty(); + private OptionalLong expectedMaxSupply = OptionalLong.empty(); private Optional expectedMemo = Optional.empty(); private Optional expectedId = Optional.empty(); private Optional expectedSymbol = Optional.empty(); @@ -72,7 +77,7 @@ public HapiGetTokenInfo(String token) { private Optional expectedWipeKey = Optional.empty(); private Optional expectedDeletion = Optional.empty(); private Optional expectedKycDefault = Optional.empty(); - private Optional expectedFreezeDefault = Optional.empty(); + private Optional expectedFreezeDefault = Optional.empty(); private Optional expectedAutoRenewAccount = Optional.empty(); private OptionalLong expectedAutoRenewPeriod = OptionalLong.empty(); private Optional expectedExpiry = Optional.empty(); @@ -89,82 +94,116 @@ protected HapiGetTokenInfo self() { return this; } + public HapiGetTokenInfo hasTokenType(TokenType t) { + expectedTokenType = Optional.of(t); + return this; + } + + public HapiGetTokenInfo hasSupplyType(TokenSupplyType t) { + expectedSupplyType = Optional.of(t); + return this; + } + public HapiGetTokenInfo hasFreezeDefault(TokenFreezeStatus s) { expectedFreezeDefault = Optional.of(s); return this; } + public HapiGetTokenInfo hasKycDefault(TokenKycStatus s) { expectedKycDefault = Optional.of(s); return this; } + public HapiGetTokenInfo hasDecimals(int d) { expectedDecimals = OptionalInt.of(d); return this; } + + public HapiGetTokenInfo hasMaxSupply(long amount) { + expectedMaxSupply = OptionalLong.of(amount); + return this; + } + public HapiGetTokenInfo hasTotalSupply(long amount) { expectedTotalSupply = OptionalLong.of(amount); return this; } + public HapiGetTokenInfo hasRegisteredId(String token) { expectedId = Optional.of(token); return this; } + public HapiGetTokenInfo hasEntityMemo(String memo) { expectedMemo = Optional.of(memo); return this; } + public HapiGetTokenInfo hasAutoRenewPeriod(Long renewPeriod) { expectedAutoRenewPeriod = OptionalLong.of(renewPeriod); return this; } + public HapiGetTokenInfo hasAutoRenewAccount(String account) { expectedAutoRenewAccount = Optional.of(account); return this; } + public HapiGetTokenInfo hasValidExpiry() { expectedExpiry = Optional.of(true); return this; } + public HapiGetTokenInfo hasSymbol(String token) { expectedSymbol = Optional.of(token); return this; } + public HapiGetTokenInfo hasName(String name) { expectedName = Optional.of(name); return this; } + public HapiGetTokenInfo hasTreasury(String name) { expectedTreasury = Optional.of(name); return this; } + public HapiGetTokenInfo hasFreezeKey(String name) { expectedFreezeKey = Optional.of(name); return this; } + public HapiGetTokenInfo hasAdminKey(String name) { expectedAdminKey = Optional.of(name); return this; } + public HapiGetTokenInfo hasKycKey(String name) { expectedKycKey = Optional.of(name); return this; } + public HapiGetTokenInfo hasSupplyKey(String name) { expectedSupplyKey = Optional.of(name); return this; } + public HapiGetTokenInfo hasWipeKey(String name) { expectedWipeKey = Optional.of(name); return this; } + public HapiGetTokenInfo isDeleted() { expectedDeletion = Optional.of(Boolean.TRUE); return this; } + public HapiGetTokenInfo isNotDeleted() { expectedDeletion = Optional.of(Boolean.FALSE); return this; } + public HapiGetTokenInfo hasCustom(BiConsumer feeAssertion) { expectedFees.add(feeAssertion); return this; @@ -178,6 +217,18 @@ public HapiGetTokenInfo hasCustomFeesMutable(boolean customFeesMutable) { protected void assertExpectationsGiven(HapiApiSpec spec) throws Throwable { var actualInfo = response.getTokenGetInfo().getTokenInfo(); + expectedTokenType.ifPresent(tokenType -> Assert.assertEquals( + "Wrong token type!", + tokenType, + actualInfo.getTokenType() + )); + + expectedSupplyType.ifPresent(supplyType -> Assert.assertEquals( + "Wrong supply type!", + supplyType, + actualInfo.getSupplyType() + )); + if (expectedSymbol.isPresent()) { Assert.assertEquals( "Wrong symbol!", @@ -207,6 +258,14 @@ protected void assertExpectationsGiven(HapiApiSpec spec) throws Throwable { actualInfo.getAutoRenewPeriod().getSeconds()); } + if (expectedMaxSupply.isPresent()) { + Assert.assertEquals( + "Wrong max supply!", + expectedMaxSupply.getAsLong(), + actualInfo.getMaxSupply() + ); + } + if (expectedTotalSupply.isPresent()) { Assert.assertEquals( "Wrong total supply!", @@ -283,6 +342,7 @@ protected void assertExpectationsGiven(HapiApiSpec spec) throws Throwable { (n, r) -> r.getKycKey(n), "Wrong token KYC key!", registry); + assertFor( actualInfo.getSupplyKey(), expectedSupplyKey, diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetTokenNftInfo.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetTokenNftInfo.java new file mode 100644 index 000000000000..ffdd6efbc9e6 --- /dev/null +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiGetTokenNftInfo.java @@ -0,0 +1,180 @@ +package com.hedera.services.bdd.spec.queries.token; + +/*- + * ‌ + * Hedera Services Test Clients + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; +import com.hedera.services.bdd.spec.HapiApiSpec; +import com.hedera.services.bdd.spec.infrastructure.HapiSpecRegistry; +import com.hedera.services.bdd.spec.queries.HapiQueryOp; +import com.hedera.services.bdd.spec.transactions.TxnUtils; +import com.hederahashgraph.api.proto.java.HederaFunctionality; +import com.hederahashgraph.api.proto.java.NftID; +import com.hederahashgraph.api.proto.java.Query; +import com.hederahashgraph.api.proto.java.Response; +import com.hederahashgraph.api.proto.java.TokenGetNftInfoQuery; +import com.hederahashgraph.api.proto.java.Transaction; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.Assert; + +import java.util.Optional; +import java.util.OptionalLong; +import java.util.function.BiFunction; + +import static com.hedera.services.bdd.spec.queries.QueryUtils.answerCostHeader; +import static com.hedera.services.bdd.spec.queries.QueryUtils.answerHeader; + +public class HapiGetTokenNftInfo extends HapiQueryOp { + private static final Logger log = LogManager.getLogger(HapiGetTokenNftInfo.class); + + String token; + long serialNum; + + public HapiGetTokenNftInfo(String token, long serialNum) { + this.token = token; + this.serialNum = serialNum; + } + + OptionalLong expectedSerialNum = OptionalLong.empty(); + Optional expectedMetadata = Optional.empty(); + Optional expectedTokenID = Optional.empty(); + Optional expectedAccountID = Optional.empty(); + Optional expectedCreationTime = Optional.empty(); + + public HapiGetTokenNftInfo hasAccountID(String name) { + expectedAccountID = Optional.of(name); + return this; + } + + public HapiGetTokenNftInfo hasTokenID(String token) { + expectedTokenID = Optional.of(token); + return this; + } + + public HapiGetTokenNftInfo hasSerialNum(long serialNum) { + expectedSerialNum = OptionalLong.of(serialNum); + return this; + } + + public HapiGetTokenNftInfo hasMetadata(ByteString metadata) { + expectedMetadata = Optional.of(metadata); + return this; + } + + public HapiGetTokenNftInfo hasValidCreationTime() { + expectedCreationTime = Optional.of(true); + return this; + } + + @Override + public HederaFunctionality type() { + return HederaFunctionality.TokenGetNftInfo; + } + + @Override + protected HapiGetTokenNftInfo self() { + return this; + } + + @Override + protected void assertExpectationsGiven(HapiApiSpec spec) throws Throwable { + var actualInfo = response.getTokenGetNftInfo().getNft(); + + if (expectedSerialNum.isPresent()) { + Assert.assertEquals( + "Wrong serial num!", + expectedSerialNum.getAsLong(), + actualInfo.getNftID().getSerialNumber()); + } + + if (expectedAccountID.isPresent()) { + var id = TxnUtils.asId(expectedAccountID.get(), spec); + Assert.assertEquals( + "Wrong account ID account!", + id, + actualInfo.getAccountID()); + } + + expectedMetadata.ifPresent(bytes -> Assert.assertEquals( + "Wrong metadata!", + bytes, + actualInfo.getMetadata())); + + assertFor( + actualInfo.getCreationTime(), + expectedCreationTime, + (n, r) -> r.getCreationTime(token), + "Wrong creation time!", + spec.registry()); + + var registry = spec.registry(); + assertFor( + actualInfo.getNftID().getTokenID(), + expectedTokenID, + (n, r) -> r.getTokenID(n), + "Wrong token id!", + registry); + } + + private void assertFor( + R actual, + Optional possible, + BiFunction expectedFn, + String error, + HapiSpecRegistry registry + ) { + if (possible.isPresent()) { + var expected = expectedFn.apply(possible.get(), registry); + Assert.assertEquals(error, expected, actual); + } + } + + @Override + protected void submitWith(HapiApiSpec spec, Transaction payment) { + Query query = getTokenNftInfoQuery(spec, payment, false); + response = spec.clients().getTokenSvcStub(targetNodeFor(spec), useTls).getTokenNftInfo(query); + if (verboseLoggingOn) { + log.info("Info for '" + token + "': " + response.getTokenGetNftInfo().getNft()); + } + } + + @Override + protected long lookupCostWith(HapiApiSpec spec, Transaction payment) throws Throwable { + Query query = getTokenNftInfoQuery(spec, payment, true); + Response response = spec.clients().getTokenSvcStub(targetNodeFor(spec), useTls).getTokenNftInfo(query); + return costFrom(response); + } + + private Query getTokenNftInfoQuery(HapiApiSpec spec, Transaction payment, boolean costOnly) { + var id = TxnUtils.asTokenId(token, spec); + TokenGetNftInfoQuery getTokenNftQuery = TokenGetNftInfoQuery.newBuilder() + .setHeader(costOnly ? answerCostHeader(payment) : answerHeader(payment)) + .setNftID(NftID.newBuilder().setTokenID(id).setSerialNumber(serialNum).build()) + .build(); + return Query.newBuilder().setTokenGetNftInfo(getTokenNftQuery).build(); + } + + @Override + protected boolean needsPayment() { + return true; + } + +} \ No newline at end of file diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiTokenNftInfo.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiTokenNftInfo.java new file mode 100644 index 000000000000..25f5e8329108 --- /dev/null +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/queries/token/HapiTokenNftInfo.java @@ -0,0 +1,65 @@ +package com.hedera.services.bdd.spec.queries.token; + +/*- + * ‌ + * Hedera Services Test Clients + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + +import com.google.protobuf.ByteString; + +import java.util.Optional; +import java.util.OptionalLong; + +public class HapiTokenNftInfo { + private OptionalLong expectedSerialNum; + private Optional expectedMetadata; + private Optional expectedTokenID; + private Optional expectedAccountID; + + private HapiTokenNftInfo(Optional tokenId, OptionalLong serialNum, Optional accountId, Optional metadata) { + this.expectedSerialNum = serialNum; + this.expectedMetadata = metadata; + this.expectedTokenID = tokenId; + this.expectedAccountID = accountId; + } + + public static HapiTokenNftInfo newTokenNftInfo(final String tokenId, final long serialNum, final String accountId, final ByteString metadata) { + return new HapiTokenNftInfo( + Optional.of(tokenId), + OptionalLong.of(serialNum), + Optional.of(accountId), + Optional.of(metadata) + ); + } + + public OptionalLong getExpectedSerialNum() { + return expectedSerialNum; + } + + public Optional getExpectedMetadata() { + return expectedMetadata; + } + + public Optional getExpectedTokenID() { + return expectedTokenID; + } + + public Optional getExpectedAccountID() { + return expectedAccountID; + } +} diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnUtils.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnUtils.java index 2769b5eff391..776f518832dc 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnUtils.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnUtils.java @@ -38,6 +38,7 @@ import com.hederahashgraph.api.proto.java.FileID; import com.hederahashgraph.api.proto.java.Key; import com.hederahashgraph.api.proto.java.KeyList; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.ResponseCodeEnum; import com.hederahashgraph.api.proto.java.ScheduleID; import com.hederahashgraph.api.proto.java.ThresholdKey; @@ -368,9 +369,10 @@ public static String randomUppercase(int l) { public static String readableTokenTransfers(List tokenTransfers) { return tokenTransfers.stream() - .map(scopedXfers -> String.format("%s(%s)", + .map(scopedXfers -> String.format("%s(%s)(%s)", asTokenString(scopedXfers.getToken()), - readableTransferList(scopedXfers.getTransfersList()))) + readableTransferList(scopedXfers.getTransfersList()), + readableNftTransferList(scopedXfers.getNftTransfersList()))) .collect(joining(", ")); } @@ -391,6 +393,19 @@ public static String readableTransferList(List adjustments) { .toString(); } + public static String readableNftTransferList(List adjustments) { + return adjustments + .stream() + .map(nftTranfer -> String.format( + "serialNumber:%s senderAccountID:%s receiverAccountId:%s", + nftTranfer.getSerialNumber(), + HapiPropertySource.asAccountString(nftTranfer.getSenderAccountID()), + HapiPropertySource.asAccountString(nftTranfer.getReceiverAccountID()) + )) + .collect(toList()) + .toString(); + } + public static OptionalLong getDeduction(TransferList accountAmounts, AccountID payer) { var deduction = accountAmounts.getAccountAmountsList() .stream() diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java index 4d90c251f5db..4fd86c9b5534 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/TxnVerbs.java @@ -20,6 +20,7 @@ * ‍ */ +import com.google.protobuf.ByteString; import com.hedera.services.bdd.spec.HapiApiSpec; import com.hedera.services.bdd.spec.transactions.consensus.HapiMessageSubmit; import com.hedera.services.bdd.spec.transactions.consensus.HapiTopicCreate; @@ -158,9 +159,18 @@ public static HapiTokenWipe wipeTokenAccount(String token, String account, long public static HapiTokenMint mintToken(String token, long amount) { return new HapiTokenMint(token, amount); } + public static HapiTokenMint mintToken(String token, List meta, String txName) { + return new HapiTokenMint(token, meta, txName); + } + public static HapiTokenMint mintToken(String token, List metadata){ + return new HapiTokenMint(token, metadata); + } public static HapiTokenBurn burnToken(String token, long amount) { return new HapiTokenBurn(token, amount); } + public static HapiTokenBurn burnToken(String token, List serialNumbers){ + return new HapiTokenBurn(token, serialNumbers); + } /* SCHEDULE */ public static > HapiScheduleCreate scheduleCreate(String scheduled, HapiTxnOp txn) { diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/crypto/HapiCryptoTransfer.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/crypto/HapiCryptoTransfer.java index d9a95e5dacf2..afb0edf33155 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/crypto/HapiCryptoTransfer.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/crypto/HapiCryptoTransfer.java @@ -36,6 +36,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.Key; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenTransferList; import com.hederahashgraph.api.proto.java.Transaction; @@ -60,6 +61,7 @@ import java.util.function.BinaryOperator; import java.util.function.Consumer; import java.util.function.Function; +import java.util.function.Predicate; import java.util.stream.Collector; import java.util.stream.Stream; @@ -213,7 +215,7 @@ protected Consumer opBodyDef(HapiApiSpec spec) throws T if (hbarOnlyProvider != MISSING_HBAR_ONLY_PROVIDER) { b.setTransfers(hbarOnlyProvider.apply(spec)); } else { - var xfers = transfersFor(spec); + var xfers = transfersAllFor(spec); for (TokenTransferList scopedXfers : xfers) { if (scopedXfers.getToken() == HBAR_SENTINEL_TOKEN_ID) { b.setTransfers(TransferList.newBuilder() @@ -223,6 +225,7 @@ protected Consumer opBodyDef(HapiApiSpec spec) throws T b.addTokenTransfers(scopedXfers); } } + misconfigureIfRequested(b, spec); } } @@ -368,8 +371,13 @@ private Function> hbarOnlyVariableDefaultSigners() { }; } + private List transfersAllFor(HapiApiSpec spec) { + return Stream.concat(transfersFor(spec).stream(), transfersForNft(spec).stream()).collect(toList()); + } + private List transfersFor(HapiApiSpec spec) { Map> aggregated = tokenAwareProviders.stream() + .filter(TokenMovement::isFungibleToken) .map(p -> p.specializedFor(spec)) .collect(groupingBy( TokenTransferList::getToken, @@ -382,6 +390,21 @@ private List transfersFor(HapiApiSpec spec) { .collect(toList()); } + private List transfersForNft(HapiApiSpec spec) { + Map> aggregated = tokenAwareProviders.stream() + .filter(Predicate.not(TokenMovement::isFungibleToken)) + .map(p -> p.specializedForNft(spec)) + .collect(groupingBy( + TokenTransferList::getToken, + flatMapping(xfers -> xfers.getNftTransfersList().stream(), toList()))); + return aggregated.entrySet().stream() + .map(entry -> TokenTransferList.newBuilder() + .setToken(entry.getKey()) + .addAllNftTransfers(entry.getValue()) + .build() + ).collect(toList()); + } + @Override protected void updateStateOf(HapiApiSpec spec) throws Throwable { if (logResolvedStatus) { diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenBurn.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenBurn.java index 2a0279069ea3..2fb37cd174d4 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenBurn.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenBurn.java @@ -28,6 +28,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.Key; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TokenBurnTransactionBody; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.api.proto.java.TransactionBody; @@ -36,6 +37,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; import java.util.function.Function; @@ -47,6 +49,8 @@ public class HapiTokenBurn extends HapiTxnOp { private long amount; private String token; + private List serialNumbers; + private SubType subType; @Override public HederaFunctionality type() { @@ -56,6 +60,14 @@ public HederaFunctionality type() { public HapiTokenBurn(String token, long amount) { this.token = token; this.amount = amount; + this.serialNumbers = new ArrayList<>(); + this.subType = SubType.TOKEN_FUNGIBLE_COMMON; + } + + public HapiTokenBurn(String token, List serialNumbers) { + this.token = token; + this.serialNumbers = serialNumbers; + this.subType = SubType.TOKEN_NON_FUNGIBLE_UNIQUE; } @Override @@ -66,11 +78,11 @@ protected HapiTokenBurn self() { @Override protected long feeFor(HapiApiSpec spec, Transaction txn, int numPayerKeys) throws Throwable { return spec.fees().forActivityBasedOp( - HederaFunctionality.TokenBurn, this::usageEstimate, txn, numPayerKeys); + HederaFunctionality.TokenBurn, subType, this::usageEstimate, txn, numPayerKeys); } private FeeData usageEstimate(TransactionBody txn, SigValueObj svo) { - return TokenBurnUsage.newEstimate(txn, suFrom(svo)).get(); + return TokenBurnUsage.newEstimate(txn, suFrom(svo)).givenSubType(subType).get(); } @Override @@ -82,6 +94,7 @@ protected Consumer opBodyDef(HapiApiSpec spec) throws T TokenBurnTransactionBody.class, b -> { b.setToken(tId); b.setAmount(amount); + b.addAllSerialNumbers(serialNumbers); }); return b -> b.setTokenBurn(opBody); } @@ -106,7 +119,8 @@ protected void updateStateOf(HapiApiSpec spec) { protected MoreObjects.ToStringHelper toStringHelper() { MoreObjects.ToStringHelper helper = super.toStringHelper() .add("token", token) - .add("amount", amount); + .add("amount", amount) + .add("serialNumbers", serialNumbers); return helper; } } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenCreate.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenCreate.java index 79698b630538..0239f1e7487c 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenCreate.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenCreate.java @@ -33,6 +33,8 @@ import com.hederahashgraph.api.proto.java.Key; import com.hederahashgraph.api.proto.java.Timestamp; import com.hederahashgraph.api.proto.java.TokenCreateTransactionBody; +import com.hederahashgraph.api.proto.java.TokenSupplyType; +import com.hederahashgraph.api.proto.java.TokenType; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.api.proto.java.TransactionResponse; @@ -59,9 +61,12 @@ public class HapiTokenCreate extends HapiTxnOp { private String token; private boolean advertiseCreation = false; + private Optional tokenType = Optional.empty(); + private Optional supplyType = Optional.empty(); private OptionalInt decimals = OptionalInt.empty(); private OptionalLong expiry = OptionalLong.empty(); private OptionalLong initialSupply = OptionalLong.empty(); + private OptionalLong maxSupply = OptionalLong.empty(); private OptionalLong autoRenewPeriod = OptionalLong.empty(); private Optional freezeKey = Optional.empty(); private Optional kycKey = Optional.empty(); @@ -107,6 +112,16 @@ public HapiTokenCreate entityMemo(String memo) { return this; } + public HapiTokenCreate tokenType(TokenType tokenType) { + this.tokenType = Optional.of(tokenType); + return this; + } + + public HapiTokenCreate supplyType(TokenSupplyType supplyType) { + this.supplyType = Optional.of(supplyType); + return this; + } + public HapiTokenCreate advertisingCreation() { advertiseCreation = true; return this; @@ -117,6 +132,11 @@ public HapiTokenCreate initialSupply(long initialSupply) { return this; } + public HapiTokenCreate maxSupply(long maxSupply) { + this.maxSupply = OptionalLong.of(maxSupply); + return this; + } + public HapiTokenCreate decimals(int decimals) { this.decimals = OptionalInt.of(decimals); return this; @@ -219,10 +239,13 @@ protected Consumer opBodyDef(HapiApiSpec spec) throws T .txns() .body( TokenCreateTransactionBody.class, b -> { + tokenType.ifPresent(b::setTokenType); + supplyType.ifPresent(b::setSupplyType); symbol.ifPresent(b::setSymbol); name.ifPresent(b::setName); entityMemo.ifPresent(s -> b.setMemo(s)); initialSupply.ifPresent(b::setInitialSupply); + maxSupply.ifPresent(b::setMaxSupply); decimals.ifPresent(b::setDecimals); freezeDefault.ifPresent(b::setFreezeDefault); adminKey.ifPresent(k -> b.setAdminKey(spec.registry().getKey(k))); diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenMint.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenMint.java index 58d45b47d76c..cd5c1ec9b422 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenMint.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/HapiTokenMint.java @@ -21,6 +21,7 @@ */ import com.google.common.base.MoreObjects; +import com.google.protobuf.ByteString; import com.hedera.services.bdd.spec.HapiApiSpec; import com.hedera.services.bdd.spec.transactions.HapiTxnOp; import com.hedera.services.bdd.spec.transactions.TxnUtils; @@ -28,6 +29,7 @@ import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.Key; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.TokenMintTransactionBody; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.api.proto.java.TransactionBody; @@ -36,17 +38,21 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; import java.util.function.Function; import static com.hedera.services.bdd.spec.transactions.TxnUtils.suFrom; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.SUCCESS; public class HapiTokenMint extends HapiTxnOp { static final Logger log = LogManager.getLogger(HapiTokenMint.class); private long amount; private String token; + private List metadata; + private SubType subType; @Override public HederaFunctionality type() { @@ -56,6 +62,20 @@ public HederaFunctionality type() { public HapiTokenMint(String token, long amount) { this.token = token; this.amount = amount; + this.metadata = new ArrayList<>(); + this.subType = figureSubType(); + } + + public HapiTokenMint(String token, List metadata){ + this.token = token; + this.metadata = metadata; + this.subType = figureSubType(); + } + + public HapiTokenMint(String token, List metadata, String txNamePrefix) { + this.token = token; + this.metadata = metadata; + this.amount = 0; } @Override @@ -66,11 +86,19 @@ protected HapiTokenMint self() { @Override protected long feeFor(HapiApiSpec spec, Transaction txn, int numPayerKeys) throws Throwable { return spec.fees().forActivityBasedOp( - HederaFunctionality.TokenMint, this::usageEstimate, txn, numPayerKeys); + HederaFunctionality.TokenMint, subType, this::usageEstimate, txn, numPayerKeys); + } + + private SubType figureSubType() { + if (metadata.isEmpty()) { + return SubType.TOKEN_FUNGIBLE_COMMON; + } else { + return SubType.TOKEN_NON_FUNGIBLE_UNIQUE; + } } private FeeData usageEstimate(TransactionBody txn, SigValueObj svo) { - return TokenMintUsage.newEstimate(txn, suFrom(svo)).get(); + return TokenMintUsage.newEstimate(txn, suFrom(svo)).givenSubType(subType).get(); } @Override @@ -82,6 +110,7 @@ protected Consumer opBodyDef(HapiApiSpec spec) throws T TokenMintTransactionBody.class, b -> { b.setToken(tId); b.setAmount(amount); + b.addAllMetadata(metadata); }); return b -> b.setTokenMint(opBody); } @@ -99,14 +128,20 @@ protected Function callToUse(HapiApiSpec spec) } @Override - protected void updateStateOf(HapiApiSpec spec) { + protected void updateStateOf(HapiApiSpec spec) throws Throwable { + if (actualStatus != SUCCESS) { + return; + } + lookupSubmissionRecord(spec); + spec.registry().saveCreationTime(token, recordOfSubmission.getConsensusTimestamp()); } @Override protected MoreObjects.ToStringHelper toStringHelper() { MoreObjects.ToStringHelper helper = super.toStringHelper() .add("token", token) - .add("amount", amount); + .add("amount", amount) + .add("metadata", metadata); return helper; } } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/TokenMovement.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/TokenMovement.java index 1c81b79abbe4..921b40a435ec 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/TokenMovement.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/transactions/token/TokenMovement.java @@ -23,6 +23,7 @@ import com.hedera.services.bdd.spec.HapiApiSpec; import com.hedera.services.bdd.suites.HapiApiSuite; import com.hederahashgraph.api.proto.java.AccountAmount; +import com.hederahashgraph.api.proto.java.NftTransfer; import com.hederahashgraph.api.proto.java.TokenID; import com.hederahashgraph.api.proto.java.TokenTransferList; @@ -40,6 +41,7 @@ public class TokenMovement { private final long amount; private final String token; + private long serialNum; private Optional sender; private Optional receiver; private final Optional> receivers; @@ -81,10 +83,33 @@ public class TokenMovement { receivers = Optional.empty(); } + TokenMovement( + String token, + Optional sender, + long amount, + long serialNum, + Optional receiver, + Optional> receivers + ) { + this.token = token; + this.sender = sender; + this.amount = amount; + this.serialNum = serialNum; + this.receiver = receiver; + this.receivers = receivers; + + senderFn = Optional.empty(); + receiverFn = Optional.empty(); + } + public boolean isTrulyToken() { return token != HapiApiSuite.HBAR_TOKEN_SENTINEL; } + public boolean isFungibleToken() { + return serialNum == 0; + } + public List> generallyInvolved() { if (sender.isPresent()) { Map.Entry senderEntry = new AbstractMap.SimpleEntry<>( @@ -92,7 +117,7 @@ public List> generallyInvolved() { -amount); return receiver.isPresent() ? List.of( - senderEntry, + senderEntry, new AbstractMap.SimpleEntry<>( token + "|" + receiver.get(), +amount)) @@ -139,6 +164,17 @@ public TokenTransferList specializedFor(HapiApiSpec spec) { return scopedTransfers.build(); } + public TokenTransferList specializedForNft(HapiApiSpec spec) { + var scopedTransfers = TokenTransferList.newBuilder(); + var id = isTrulyToken() ? asTokenId(token, spec) : HBAR_SENTINEL_TOKEN_ID; + scopedTransfers.setToken(id); + if (sender.isPresent() && receiver.isPresent()) { + scopedTransfers.addNftTransfers(adjustment(sender.get(), receiver.get(), serialNum, spec)); + } + + return scopedTransfers.build(); + } + private AccountAmount adjustment(String name, long value, HapiApiSpec spec) { return AccountAmount.newBuilder() .setAccountID(asId(name, spec)) @@ -146,8 +182,17 @@ private AccountAmount adjustment(String name, long value, HapiApiSpec spec) { .build(); } + private NftTransfer adjustment(String senderName, String receiverName, long value, HapiApiSpec spec) { + return NftTransfer.newBuilder() + .setSenderAccountID(asId(senderName, spec)) + .setReceiverAccountID(asId(receiverName, spec)) + .setSerialNumber(value) + .build(); + } + public static class Builder { private final long amount; + private long serialNum; private final String token; public Builder(long amount, String token) { @@ -155,11 +200,18 @@ public Builder(long amount, String token) { this.amount = amount; } + public Builder(long amount, long serialNum, String token) { + this.amount = amount; + this.serialNum = serialNum; + this.token = token; + } + public TokenMovement between(String sender, String receiver) { return new TokenMovement( token, Optional.of(sender), amount, + serialNum, Optional.of(receiver), Optional.empty()); } @@ -202,6 +254,10 @@ public static Builder moving(long amount, String token) { return new Builder(amount, token); } + public static Builder movingUnique(long serialNum, String token) { + return new Builder(1, serialNum, token); + } + public static Builder movingHbar(long amount) { return new Builder(amount, HapiApiSuite.HBAR_TOKEN_SENTINEL); } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java b/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java index 23d6a962d455..f0e089343dff 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/UtilVerbs.java @@ -62,6 +62,7 @@ import com.hederahashgraph.api.proto.java.AccountID; import com.hederahashgraph.api.proto.java.ContractID; import com.hederahashgraph.api.proto.java.CurrentAndNextFeeSchedule; +import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.FeeSchedule; import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.Setting; @@ -450,15 +451,18 @@ public static HapiSpecOperation reduceFeeFor(HederaFunctionality function, private static void reduceFeeComponentsFor(FeeSchedule.Builder feeSchedule, HederaFunctionality function, long maxNodeFee, long maxNetworkFee, long maxServiceFee) { - var feeData = feeSchedule.getTransactionFeeScheduleBuilderList() + var feesList = feeSchedule.getTransactionFeeScheduleBuilderList() .stream() .filter(tfs -> tfs.getHederaFunctionality() == function) .findAny() .get() - .getFeeDataBuilder(); - feeData.getNodedataBuilder().setMax(maxNodeFee); - feeData.getNetworkdataBuilder().setMax(maxNetworkFee); - feeData.getServicedataBuilder().setMax(maxServiceFee); + .getFeesBuilderList(); + + for (FeeData.Builder builder : feesList) { + builder.getNodedataBuilder().setMax(maxNodeFee); + builder.getNetworkdataBuilder().setMax(maxNetworkFee); + builder.getServicedataBuilder().setMax(maxServiceFee); + } } public static HapiSpecOperation uploadDefaultFeeSchedules(String payer) { diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/file/FetchSystemFiles.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/file/FetchSystemFiles.java index 53f44db53a11..becd81b50f7d 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/file/FetchSystemFiles.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/file/FetchSystemFiles.java @@ -44,7 +44,6 @@ public static void main(String... args) { new FetchSystemFiles().runSuiteSync(); } - final String DEFAULT_DIR = "./system-files"; final String TARGET_DIR = "./remote-system-files"; @Override @@ -57,10 +56,8 @@ protected List getSpecsInSuite() { private HapiApiSpec fetchFiles() { return customHapiSpec("FetchFiles") .withProperties(Map.of( - "client.feeSchedule.fromDisk", "true", - "client.feeSchedule.path", path(DEFAULT_DIR, "feeSchedule.bin"), - "client.exchangeRates.fromDisk", "true", - "client.exchangeRates.path", path(DEFAULT_DIR, "exchangeRates.bin") + "fees.useFixedOffer", "false", + "fees.fixedOffer", "100000000" )).given().when().then( getFileContents(NODE_DETAILS) .saveTo(path("nodeDetails.bin")) @@ -99,7 +96,7 @@ public interface CheckedParser { Object parseFrom(byte[] bytes) throws Exception; } - public static Function unchecked(CheckedParser parser) { + static Function unchecked(CheckedParser parser) { return bytes -> { try { return parser.parseFrom(bytes).toString(); @@ -114,10 +111,6 @@ private String path(String file) { return Path.of(TARGET_DIR, file).toString(); } - private String path(String prefix, String file) { - return Path.of(prefix, file).toString(); - } - @Override protected Logger getResultsLogger() { return log; diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/PerfUtilOps.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/PerfUtilOps.java index 186a6b309ecd..e051983cd18f 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/PerfUtilOps.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/perf/PerfUtilOps.java @@ -73,7 +73,9 @@ public static HapiTxnOp tokenOpsEnablement() { entry("tokenUpdate", "0-*"), entry("tokenGetInfo", "0-*"), entry("tokenAssociateToAccount", "0-*"), - entry("tokenDissociateFromAccount", "0-*") + entry("tokenDissociateFromAccount", "0-*"), + entry("tokenGetNftInfo", "0-*"), + entry("tokenGetAccountNftInfos", "0-*") )); } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java index 75b15770aed5..dc6192ddf6bb 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleDeleteSpecs.java @@ -142,7 +142,7 @@ private HapiApiSpec unauthorizedDeletionFails() { } private HapiApiSpec deletingAlreadyDeletedIsObvious() { - return defaultHapiSpec("DeletingADeletedTxnFails") + return defaultHapiSpec("DeletingAlreadyDeletedIsObvious") .given( cryptoCreate("sender"), cryptoCreate("receiver"), @@ -154,6 +154,7 @@ private HapiApiSpec deletingAlreadyDeletedIsObvious() { .signedBy("admin", DEFAULT_PAYER)) .when().then( scheduleDelete("validScheduledTxn") + .fee(ONE_HBAR) .signedBy("admin", DEFAULT_PAYER) .hasKnownStatus(SCHEDULE_ALREADY_DELETED) ); @@ -163,8 +164,10 @@ private HapiApiSpec deletingNonExistingFails() { return defaultHapiSpec("DeletingNonExistingFails") .given().when().then( scheduleDelete("0.0.534") + .fee(ONE_HBAR) .hasKnownStatus(INVALID_SCHEDULE_ID), scheduleDelete("0.0.0") + .fee(ONE_HBAR) .hasKnownStatus(INVALID_SCHEDULE_ID) ); } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleSignSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleSignSpecs.java index ae575fe84b7f..47287493b1f8 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleSignSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleSignSpecs.java @@ -521,6 +521,7 @@ private HapiApiSpec addingSignaturesToNonExistingTxFails() { newKeyNamed("somebody") ).when().then( scheduleSign("0.0.123321") + .fee(ONE_HBAR) .alsoSigningWith("somebody", "sender") .hasKnownStatus(INVALID_SCHEDULE_ID) ); diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/throttling/PrivilegedOpsSuite.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/throttling/PrivilegedOpsSuite.java index ea64a39b6c95..9248de220f70 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/throttling/PrivilegedOpsSuite.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/throttling/PrivilegedOpsSuite.java @@ -112,7 +112,8 @@ protected List getSpecsInSuite() { private HapiApiSpec freezeAdminPrivilegesAsExpected() { return defaultHapiSpec("FreezeAdminPrivilegesAsExpected") .given( - cryptoCreate("civilian") + cryptoCreate("civilian"), + cryptoTransfer(tinyBarsFromTo(GENESIS, EXCHANGE_RATE_CONTROL, ONE_HUNDRED_HBARS)) ).when( fileUpdate(UPDATE_ZIP_FILE) diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java index a2e6ef1e1e90..194b1406b903 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenAssociationSpecs.java @@ -90,8 +90,8 @@ public static void main(String... args) { } @Override - protected List getSpecsInSuite() { - return List.of(new HapiApiSpec[] { + protected List getSpecsInSuite(){ + return List.of(new HapiApiSpec[]{ treasuryAssociationIsAutomatic(), dissociateHasExpectedSemantics(), associateHasExpectedSemantics(), diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java index 7e61b1adf04d..6cef7d137d30 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenCreateSpecs.java @@ -22,11 +22,14 @@ import com.hedera.services.bdd.spec.HapiApiSpec; import com.hedera.services.bdd.spec.HapiSpecSetup; +import com.hedera.services.bdd.spec.queries.crypto.ExpectedTokenRel; import com.hedera.services.bdd.spec.transactions.TxnUtils; import com.hedera.services.bdd.spec.utilops.UtilVerbs; import com.hedera.services.bdd.suites.HapiApiSuite; import com.hederahashgraph.api.proto.java.TokenFreezeStatus; import com.hederahashgraph.api.proto.java.TokenKycStatus; +import com.hederahashgraph.api.proto.java.TokenSupplyType; +import com.hederahashgraph.api.proto.java.TokenType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -73,6 +76,7 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID_IN_CUSTOM_FEES; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_INITIAL_SUPPLY; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_MAX_SUPPLY; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TREASURY_ACCOUNT_FOR_TOKEN; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ZERO_BYTE_IN_STRING; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.MISSING_TOKEN_NAME; @@ -100,6 +104,8 @@ public static void main(String... args) { @Override protected List getSpecsInSuite() { return List.of(new HapiApiSpec[] { + creationValidatesNonFungiblePrechecks(), + creationValidatesMaxSupply(), creationValidatesMemo(), creationValidatesName(), creationValidatesSymbol(), @@ -246,11 +252,13 @@ public HapiApiSpec creationHappyPath() { newKeyNamed("wipeKey") ).when( tokenCreate("primary") + .supplyType(TokenSupplyType.FINITE) .entityMemo(memo) .name(saltedName) .treasury(TOKEN_TREASURY) .autoRenewAccount("autoRenewAccount") .autoRenewPeriod(A_HUNDRED_SECONDS) + .maxSupply(1000) .initialSupply(500) .decimals(1) .adminKey("adminKey") @@ -258,7 +266,13 @@ public HapiApiSpec creationHappyPath() { .kycKey("kycKey") .supplyKey("supplyKey") .wipeKey("wipeKey") - .via("createTxn") + .via("createTxn"), + tokenCreate("non-fungible-unique-finite") + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.FINITE) + .initialSupply(0) + .maxSupply(100) + .treasury(TOKEN_TREASURY) ).then( UtilVerbs.withOpContext((spec, opLog) -> { var createTxn = getTxnRecord("createTxn"); @@ -270,6 +284,8 @@ public HapiApiSpec creationHappyPath() { .logged() .hasCustomFeesMutable(false) .hasRegisteredId("primary") + .hasTokenType(TokenType.FUNGIBLE_COMMON) + .hasSupplyType(TokenSupplyType.FINITE) .hasEntityMemo(memo) .hasName(saltedName) .hasTreasury(TOKEN_TREASURY) @@ -281,8 +297,15 @@ public HapiApiSpec creationHappyPath() { .hasKycKey("primary") .hasSupplyKey("primary") .hasWipeKey("primary") + .hasMaxSupply(1000) .hasTotalSupply(500) .hasAutoRenewAccount("autoRenewAccount"), + getTokenInfo("non-fungible-unique-finite") + .hasRegisteredId("non-fungible-unique-finite") + .hasTokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .hasSupplyType(TokenSupplyType.FINITE) + .hasTotalSupply(0) + .hasMaxSupply(100), getAccountInfo(TOKEN_TREASURY) .hasToken( relationshipWith("primary") @@ -290,6 +313,12 @@ public HapiApiSpec creationHappyPath() { .kyc(TokenKycStatus.Granted) .freeze(TokenFreezeStatus.Unfrozen) ) + .hasToken( + ExpectedTokenRel.relationshipWith("non-fungible-unique-finite") + .balance(0) + .kyc(TokenKycStatus.KycNotApplicable) + .freeze(TokenFreezeStatus.FreezeNotApplicable) + ) ); } @@ -347,6 +376,51 @@ public HapiApiSpec creationValidatesMemo() { ); } + public HapiApiSpec creationValidatesNonFungiblePrechecks() { + return defaultHapiSpec("CreationValidatesNonFungiblePrechecks") + .given() + .when() + .then( + tokenCreate("primary") + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(1) + .decimals(0) + .hasPrecheck(INVALID_TOKEN_INITIAL_SUPPLY), + tokenCreate("primary") + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .decimals(1) + .hasPrecheck(INVALID_TOKEN_DECIMALS) + ); + } + + public HapiApiSpec creationValidatesMaxSupply() { + return defaultHapiSpec("CreationValidatesMaxSupply") + .given() + .when() + .then( + tokenCreate("primary") + .maxSupply(-1) + .hasPrecheck(INVALID_TOKEN_MAX_SUPPLY), + tokenCreate("primary") + .maxSupply(1) + .hasPrecheck(INVALID_TOKEN_MAX_SUPPLY), + tokenCreate("primary") + .supplyType(TokenSupplyType.FINITE) + .maxSupply(0) + .hasPrecheck(INVALID_TOKEN_MAX_SUPPLY), + tokenCreate("primary") + .supplyType(TokenSupplyType.FINITE) + .maxSupply(-1) + .hasPrecheck(INVALID_TOKEN_MAX_SUPPLY), + tokenCreate("primary") + .supplyType(TokenSupplyType.FINITE) + .initialSupply(2) + .maxSupply(1) + .hasPrecheck(INVALID_TOKEN_INITIAL_SUPPLY) + ); + } + public HapiApiSpec onlyValidCustomFeeScheduleCanBeCreated() { return defaultHapiSpec("OnlyValidCustomFeeScheduleCanBeCreated") .given( diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenManagementSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenManagementSpecs.java index 51ec04314c71..85f46e3213ba 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenManagementSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenManagementSpecs.java @@ -74,17 +74,17 @@ public static void main(String... args) { protected List getSpecsInSuite() { return allOf( List.of(new HapiApiSpec[] { - freezeMgmtFailureCasesWork(), - freezeMgmtSuccessCasesWork(), - kycMgmtFailureCasesWork(), - kycMgmtSuccessCasesWork(), - supplyMgmtSuccessCasesWork(), - wipeAccountFailureCasesWork(), - wipeAccountSuccessCasesWork(), +// freezeMgmtFailureCasesWork(), +// freezeMgmtSuccessCasesWork(), +// kycMgmtFailureCasesWork(), +// kycMgmtSuccessCasesWork(), +// supplyMgmtSuccessCasesWork(), +// wipeAccountFailureCasesWork(), +// wipeAccountSuccessCasesWork(), supplyMgmtFailureCasesWork(), - burnTokenFailsDueToInsufficientTreasuryBalance(), - frozenTreasuryCannotBeMintedOrBurned(), - revokedKYCTreasuryCannotBeMintedOrBurned(), +// burnTokenFailsDueToInsufficientTreasuryBalance(), +// frozenTreasuryCannotBeMintedOrBurned(), +// revokedKYCTreasuryCannotBeMintedOrBurned(), } ) ); diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTotalSupplyAfterMintBurnWipeSuite.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTotalSupplyAfterMintBurnWipeSuite.java index 4efbc5eb649a..2468a8206b15 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTotalSupplyAfterMintBurnWipeSuite.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTotalSupplyAfterMintBurnWipeSuite.java @@ -22,6 +22,7 @@ import com.hedera.services.bdd.spec.HapiApiSpec; import com.hedera.services.bdd.suites.HapiApiSuite; +import com.hederahashgraph.api.proto.java.TokenType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -71,6 +72,7 @@ public HapiApiSpec checkTokenTotalSupplyAfterMintAndBurn() { ).when( tokenCreate(tokenName) .treasury(TOKEN_TREASURY) + .tokenType(TokenType.FUNGIBLE_COMMON) .initialSupply(1000) .decimals(1) .supplyKey("supplyKey") diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java index 5191f6143dfe..65ef42b7ba02 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenTransactSpecs.java @@ -20,8 +20,11 @@ * ‍ */ +import com.google.protobuf.ByteString; import com.hedera.services.bdd.spec.HapiApiSpec; +import com.hedera.services.bdd.spec.queries.token.HapiTokenNftInfo; import com.hedera.services.bdd.suites.HapiApiSuite; +import com.hederahashgraph.api.proto.java.TokenType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,15 +34,19 @@ import static com.hedera.services.bdd.spec.HapiApiSpec.defaultHapiSpec; import static com.hedera.services.bdd.spec.assertions.AccountInfoAsserts.changeFromSnapshot; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountBalance; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountNftInfos; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTokenNftInfo; import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTxnRecord; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoCreate; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoDelete; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoTransfer; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.fileUpdate; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.mintToken; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenAssociate; import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenCreate; import static com.hedera.services.bdd.spec.transactions.token.TokenMovement.moving; import static com.hedera.services.bdd.spec.transactions.token.TokenMovement.movingHbar; +import static com.hedera.services.bdd.spec.transactions.token.TokenMovement.movingUnique; import static com.hedera.services.bdd.spec.utilops.UtilVerbs.balanceSnapshot; import static com.hedera.services.bdd.spec.utilops.UtilVerbs.newKeyNamed; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_DELETED; @@ -52,6 +59,7 @@ import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_SIGNATURE; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_NOT_ASSOCIATED_TO_ACCOUNT; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_TRANSFER_LIST_SIZE_LIMIT_EXCEEDED; import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TRANSFERS_NOT_ZERO_SUM_FOR_TOKEN; @@ -71,7 +79,7 @@ public static void main(String... args) { @Override protected List getSpecsInSuite() { - return List.of(new HapiApiSpec[] { + return List.of(new HapiApiSpec[]{ balancesChangeOnTokenTransfer(), accountsMustBeExplicitlyUnfrozenOnlyIfDefaultFreezeIsTrue(), senderSigsAreValid(), @@ -83,6 +91,12 @@ protected List getSpecsInSuite() { prechecksWork(), missingEntitiesRejected(), allRequiredSigsAreChecked(), + uniqueTokenTxnAccountBalance(), + uniqueTokenTxnWithNoAssociation(), + uniqueTokenTxnWithFrozenAccount(), + uniqueTokenTxnWithSenderNotSigned(), + uniqueTokenTxnWithReceiverNotSigned(), + uniqueTokenTxnsAreAtomic(), } ); } @@ -441,6 +455,191 @@ public HapiApiSpec balancesChangeOnTokenTransfer() { ); } + public HapiApiSpec uniqueTokenTxnAccountBalance() { + return defaultHapiSpec("UniqueTokenTxnAccountBalance") + .given( + newKeyNamed("supplyKey"), + newKeyNamed("signingKeyTreasury"), + newKeyNamed("signingKeyFirstUser"), + cryptoCreate(FIRST_USER).key("signingKeyFirstUser"), + cryptoCreate(TOKEN_TREASURY).key("signingKeyTreasury"), + tokenCreate(A_TOKEN) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .supplyKey("supplyKey") + .treasury(TOKEN_TREASURY), + mintToken(A_TOKEN, List.of(ByteString.copyFromUtf8("memo"))), + tokenAssociate(FIRST_USER, A_TOKEN) + ).when( + cryptoTransfer( + movingUnique(1, A_TOKEN).between(TOKEN_TREASURY, FIRST_USER) + ).signedBy("signingKeyTreasury", "signingKeyFirstUser", DEFAULT_PAYER).via("cryptoTransferTxn") + ).then( + getAccountBalance(TOKEN_TREASURY) + .hasTokenBalance(A_TOKEN, 0), + getAccountBalance(FIRST_USER) + .hasTokenBalance(A_TOKEN, 1), + getTokenNftInfo(A_TOKEN, 1) + .hasSerialNum(1) + .hasMetadata(ByteString.copyFromUtf8("memo")) + .hasTokenID(A_TOKEN) + .hasAccountID(FIRST_USER), + getAccountNftInfos(FIRST_USER, 0, 1) + .hasNfts( + HapiTokenNftInfo.newTokenNftInfo(A_TOKEN, 1, FIRST_USER, ByteString.copyFromUtf8("memo")) + ), + getTxnRecord("cryptoTransferTxn").logged() + ); + } + + public HapiApiSpec uniqueTokenTxnWithNoAssociation() { + return defaultHapiSpec("UniqueTokenTxnWithNoAssociation") + .given( + cryptoCreate(TOKEN_TREASURY), + cryptoCreate(FIRST_USER), + newKeyNamed("supplyKey"), + tokenCreate(A_TOKEN) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .supplyKey("supplyKey") + .treasury(TOKEN_TREASURY) + ) + .when( + mintToken(A_TOKEN, List.of(ByteString.copyFromUtf8("memo"))) + ) + .then( + cryptoTransfer( + movingUnique(1, A_TOKEN).between(TOKEN_TREASURY, FIRST_USER) + + ).hasKnownStatus(TOKEN_NOT_ASSOCIATED_TO_ACCOUNT), + getAccountNftInfos(TOKEN_TREASURY, 0, 1) + .hasNfts( + HapiTokenNftInfo.newTokenNftInfo(A_TOKEN, 1, TOKEN_TREASURY, ByteString.copyFromUtf8("memo")) + ) + ); + } + + public HapiApiSpec uniqueTokenTxnWithFrozenAccount() { + return defaultHapiSpec("UniqueTokenTxnWithFrozenAccount") + .given( + cryptoCreate(TOKEN_TREASURY).balance(0L), + cryptoCreate(FIRST_USER).balance(0L), + newKeyNamed("freezeKey"), + newKeyNamed("supplyKey"), + tokenCreate(A_TOKEN) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .freezeKey("freezeKey") + .freezeDefault(true) + .supplyKey("supplyKey") + .treasury(TOKEN_TREASURY), + tokenAssociate(FIRST_USER, A_TOKEN) + ) + .when( + mintToken(A_TOKEN, List.of(ByteString.copyFromUtf8("memo"))) + ) + .then( + cryptoTransfer( + movingUnique(1, A_TOKEN).between(TOKEN_TREASURY, FIRST_USER) + ) + .hasKnownStatus(ACCOUNT_FROZEN_FOR_TOKEN) + ); + } + + public HapiApiSpec uniqueTokenTxnWithSenderNotSigned() { + return defaultHapiSpec("UniqueTokenTxnWithOwnerNotSigned") + .given( + newKeyNamed("supplyKey"), + newKeyNamed("signingKeyTreasury"), + cryptoCreate(TOKEN_TREASURY).key("signingKeyTreasury"), + cryptoCreate(FIRST_USER), + tokenCreate(A_TOKEN) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .supplyKey("supplyKey") + .treasury(TOKEN_TREASURY), + tokenAssociate(FIRST_USER, A_TOKEN) + ) + .when( + mintToken(A_TOKEN, List.of(ByteString.copyFromUtf8("memo"))) + ) + .then( + cryptoTransfer( + movingUnique(1, A_TOKEN).between(TOKEN_TREASURY, FIRST_USER) + ) + .signedBy(DEFAULT_PAYER) + .hasKnownStatus(INVALID_SIGNATURE) + ); + } + + public HapiApiSpec uniqueTokenTxnWithReceiverNotSigned() { + return defaultHapiSpec("UniqueTokenTxnWithOwnerNotSigned") + .given( + newKeyNamed("supplyKey"), + newKeyNamed("signingKeyTreasury"), + newKeyNamed("signingKeyFirstUser"), + cryptoCreate(TOKEN_TREASURY).key("signingKeyTreasury"), + cryptoCreate(FIRST_USER).key("signingKeyFirstUser").receiverSigRequired(true), + tokenCreate(A_TOKEN) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .supplyKey("supplyKey") + .treasury(TOKEN_TREASURY), + tokenAssociate(FIRST_USER, A_TOKEN) + ) + .when( + mintToken(A_TOKEN, List.of(ByteString.copyFromUtf8("memo"))) + ) + .then( + cryptoTransfer( + movingUnique(1, A_TOKEN).between(TOKEN_TREASURY, FIRST_USER) + ) + .signedBy("signingKeyTreasury", DEFAULT_PAYER) + .hasKnownStatus(INVALID_SIGNATURE) + ); + } + + public HapiApiSpec uniqueTokenTxnsAreAtomic() { + return defaultHapiSpec("UniqueTokenTxnsAreAtomic") + .given( + newKeyNamed("supplyKey"), + newKeyNamed("signingKeyTreasury"), + newKeyNamed("signingKeyFirstUser"), + cryptoCreate(FIRST_USER).key("signingKeyFirstUser"), + cryptoCreate(SECOND_USER), + cryptoCreate(TOKEN_TREASURY).key("signingKeyTreasury"), + tokenCreate(A_TOKEN) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .supplyKey("supplyKey") + .treasury(TOKEN_TREASURY), + tokenCreate(B_TOKEN) + .initialSupply(100) + .treasury(TOKEN_TREASURY), + mintToken(A_TOKEN, List.of(ByteString.copyFromUtf8("memo"))), + tokenAssociate(FIRST_USER, A_TOKEN), + tokenAssociate(FIRST_USER, B_TOKEN), + tokenAssociate(SECOND_USER, A_TOKEN) + ) + .when( + cryptoTransfer( + movingUnique(1, A_TOKEN).between(TOKEN_TREASURY, SECOND_USER), + moving(101, B_TOKEN).between(TOKEN_TREASURY, FIRST_USER) + ) + .hasKnownStatus(INSUFFICIENT_TOKEN_BALANCE) + ) + .then( + getAccountBalance(TOKEN_TREASURY) + .hasTokenBalance(A_TOKEN, 1), + getAccountBalance(TOKEN_TREASURY) + .hasTokenBalance(B_TOKEN, 100), + getAccountBalance(FIRST_USER) + .hasTokenBalance(A_TOKEN, 0), + getAccountBalance(SECOND_USER) + .hasTokenBalance(A_TOKEN, 0) + ); + } + @Override protected Logger getResultsLogger() { return log; diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java index 8d49be8dd532..a90b41cd84ca 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/TokenUpdateSpecs.java @@ -197,15 +197,17 @@ private HapiApiSpec standardImmutabilitySemanticsHold() { } private HapiApiSpec validatesMissingRef() { - return defaultHapiSpec("UpdateValidatesRef") + return defaultHapiSpec("ValidatesMissingRef") .given( cryptoCreate("payer") ).when().then( tokenUpdate("0.0.0") + .fee(ONE_HBAR) .payingWith("payer") .signedBy("payer") .hasKnownStatus(INVALID_TOKEN_ID), tokenUpdate("1.2.3") + .fee(ONE_HBAR) .payingWith("payer") .signedBy("payer") .hasKnownStatus(INVALID_TOKEN_ID) diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/token/UniqueTokenManagementSpecs.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/UniqueTokenManagementSpecs.java new file mode 100644 index 000000000000..b0700decfc41 --- /dev/null +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/token/UniqueTokenManagementSpecs.java @@ -0,0 +1,697 @@ +package com.hedera.services.bdd.suites.token; + +/*- + * ‌ + * Hedera Services Test Clients + * ​ + * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC + * ​ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ‍ + */ + + +import com.google.protobuf.ByteString; +import com.hedera.services.bdd.spec.HapiApiSpec; +import com.hedera.services.bdd.spec.transactions.TxnUtils; +import com.hedera.services.bdd.spec.utilops.UtilVerbs; +import com.hedera.services.bdd.suites.HapiApiSuite; +import com.hederahashgraph.api.proto.java.AccountID; +import com.hederahashgraph.api.proto.java.ResponseCodeEnum; +import com.hederahashgraph.api.proto.java.TokenSupplyType; +import com.hederahashgraph.api.proto.java.TokenType; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.Assert; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.stream.Collectors; +import java.util.stream.LongStream; + +import static com.hedera.services.bdd.spec.HapiApiSpec.defaultHapiSpec; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountBalance; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountInfo; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getAccountNftInfos; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getReceipt; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTokenInfo; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTokenNftInfo; +import static com.hedera.services.bdd.spec.queries.QueryVerbs.getTxnRecord; +import static com.hedera.services.bdd.spec.queries.crypto.ExpectedTokenRel.relationshipWith; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.burnToken; +import static com.hedera.services.bdd.spec.queries.token.HapiTokenNftInfo.newTokenNftInfo; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoCreate; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.cryptoDelete; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.mintToken; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenCreate; +import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenDelete; +import static com.hedera.services.bdd.spec.utilops.CustomSpecAssert.allRunFor; +import static com.hedera.services.bdd.spec.utilops.UtilVerbs.newKeyNamed; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.ACCOUNT_DELETED; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.BATCH_SIZE_LIMIT_EXCEEDED; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_ACCOUNT_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_NFT_ID; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_TOKEN_NFT_SERIAL_NUMBER; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.OK; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.INVALID_QUERY_RANGE; +import static com.hederahashgraph.api.proto.java.ResponseCodeEnum.TOKEN_WAS_DELETED; +import static com.hederahashgraph.api.proto.java.TokenType.NON_FUNGIBLE_UNIQUE; + +public class UniqueTokenManagementSpecs extends HapiApiSuite { + private static final org.apache.logging.log4j.Logger log = LogManager.getLogger(UniqueTokenManagementSpecs.class); + private static final String A_TOKEN = "TokenA"; + private static final String NFT = "nft"; + private static final String FUNGIBLE_TOKEN = "fungible"; + private static final String SUPPLY_KEY = "supplyKey"; + private static final String FIRST_USER = "Client1"; + private static final int BIGGER_THAN_LIMIT = 11; + + public static void main(String... args) { + new UniqueTokenManagementSpecs().runSuiteSync(); + } + + @Override + protected List getSpecsInSuite() { + return List.of(new HapiApiSpec[]{ + getTokenNftInfoWorks(), + uniqueTokenHappyPath(), + tokenMintWorksWhenAccountsAreFrozenByDefault(), + failsWithDeletedToken(), + happyPathWithRepeatedMetadata(), + failsGetTokenNftInfoWithNoNft(), + failsWithDeletedToken(), + failsWithLargeBatchSize(), + failsWithTooLongMetadata(), + failsWithInvalidMetadataFromBatch(), + distinguishesFeeSubTypes(), + burnHappyPath(), + failsOnInvalidSerialNumber(), + respectsBurnBatchConstraints(), + treasuryBalanceCorrectAfterBurn(), + burnWorksWhenAccountsAreFrozenByDefault(), + uniqueTokenMintReceiptCheck(), + associatesNftAsExpected(), + failsWithAccountWithoutNfts(), + validatesQueryOutOfRange(), + failsWithInvalidQueryBoundaries(), + getAccountNftsInfoFailsWithDeletedAccount(), + getAccountNftsInfoFailsWithInexistentAccount() + } + ); + } + + private HapiApiSpec associatesNftAsExpected() { + return defaultHapiSpec("AssociatesNftAsExpected") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .initialSupply(0) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY) + ).when( + mintToken(NFT, List.of( + ByteString.copyFromUtf8("some metadata"), + ByteString.copyFromUtf8("some metadata2"), + ByteString.copyFromUtf8("some metadata3") + )) + ).then( + getAccountNftInfos(TOKEN_TREASURY, 0, 2) + .hasNfts( + newTokenNftInfo(NFT, 1, TOKEN_TREASURY, ByteString.copyFromUtf8("some metadata")), + newTokenNftInfo(NFT, 2, TOKEN_TREASURY, ByteString.copyFromUtf8("some metadata2")) + ) + .logged() + ); + } + + private HapiApiSpec validatesQueryOutOfRange() { + return defaultHapiSpec("ValidatesQueryOutOfRange") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .initialSupply(0) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY) + ).when( + mintToken(NFT, List.of( + ByteString.copyFromUtf8("some metadata"), + ByteString.copyFromUtf8("some metadata2"), + ByteString.copyFromUtf8("some metadata3") + )) + ).then( + getAccountNftInfos(TOKEN_TREASURY, 0, 6) + .hasCostAnswerPrecheck(INVALID_QUERY_RANGE) + ); + } + + private HapiApiSpec failsWithAccountWithoutNfts() { + return defaultHapiSpec("FailsWithAccountWithoutNfts") + .given( + cryptoCreate(FIRST_USER) + ).when().then( + getAccountNftInfos(FIRST_USER, 0, 2) + .hasCostAnswerPrecheck(INVALID_QUERY_RANGE) + ); + } + + private HapiApiSpec getAccountNftsInfoFailsWithDeletedAccount() { + return defaultHapiSpec("GetAccountNftsInfoFailsWithDeletedAccount") + .given( + cryptoCreate(FIRST_USER), + cryptoDelete(FIRST_USER) + ).when().then( + getAccountNftInfos(FIRST_USER, 0, 2) + .hasCostAnswerPrecheck(ACCOUNT_DELETED) + ); + } + + private HapiApiSpec getAccountNftsInfoFailsWithInexistentAccount() { + return defaultHapiSpec("GetAccountNftsInfoFailsWithInexistentAccount") + .given().when().then( + getAccountNftInfos("0.0.123", 0, 2) + .hasCostAnswerPrecheck(INVALID_ACCOUNT_ID) + ); + } + + private HapiApiSpec failsWithInvalidQueryBoundaries() { + return defaultHapiSpec("FailsWithInvalidQueryBoundaries") + .given( + cryptoCreate(FIRST_USER) + ).when().then( + getAccountNftInfos(FIRST_USER, 2, 0) + .hasCostAnswerPrecheck(INVALID_QUERY_RANGE), + getAccountNftInfos(FIRST_USER, 0, 100000000) + .hasCostAnswerPrecheck(INVALID_QUERY_RANGE) + ); + } + + private HapiApiSpec burnWorksWhenAccountsAreFrozenByDefault() { + return defaultHapiSpec("burnWorksWhenAccountsAreFrozenByDefault") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY), + mintToken(NFT, List.of(metadata("memo"))) + ) + .when( + burnToken(NFT, List.of(1L)).via("burnTxn").logged() + ) + .then( + getTxnRecord("burnTxn") + .hasCostAnswerPrecheck(OK), + getTokenNftInfo(NFT, 1) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + getAccountInfo(TOKEN_TREASURY).hasOwnedNfts(0), + getAccountNftInfos(TOKEN_TREASURY, 0, 1).hasCostAnswerPrecheck(INVALID_QUERY_RANGE) + ); + } + + private HapiApiSpec failsOnInvalidSerialNumber() { + return defaultHapiSpec("failsOnInvalidSerialNumber") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY), + mintToken(NFT, List.of(metadata("memo")))) + .when() + .then( + burnToken(NFT, List.of(0L, 1L, 2L)).via("burnTxn").hasPrecheck(INVALID_NFT_ID), + getAccountInfo(TOKEN_TREASURY).hasOwnedNfts(1), + getAccountNftInfos(TOKEN_TREASURY, 0, 1) + .hasNfts( + newTokenNftInfo(NFT, 1, TOKEN_TREASURY, ByteString.copyFromUtf8("memo")) + ) + .logged() + ); + } + + private HapiApiSpec respectsBurnBatchConstraints() { + return defaultHapiSpec("respectsBurnBatchConstraints") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY), + mintToken(NFT, List.of(metadata("memo")))) + .when( + ) + .then( + burnToken(NFT, LongStream.range(0, 1000).boxed().collect(Collectors.toList())).via("burnTxn") + .hasPrecheck(BATCH_SIZE_LIMIT_EXCEEDED) + ); + } + + private HapiApiSpec burnHappyPath() { + return defaultHapiSpec("burnHappyEnd") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY), + mintToken(NFT, List.of(metadata("memo"))) + ).when( + burnToken(NFT, List.of(1L)).via("burnTxn") + ).then( + getTokenNftInfo(NFT, 1) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + getTokenInfo(NFT) + .hasTotalSupply(0), + getAccountBalance(TOKEN_TREASURY) + .hasTokenBalance(NFT, 0), + getAccountInfo(TOKEN_TREASURY).hasToken(relationshipWith(NFT)).hasOwnedNfts(0) + ); + } + + private HapiApiSpec treasuryBalanceCorrectAfterBurn() { + return defaultHapiSpec("burnsExactGivenTokens") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY), + mintToken(NFT, List.of(metadata("1"), metadata("2"), metadata("3"), metadata("4"), metadata("5"))) + ) + .when( + burnToken(NFT, List.of(3L, 4L, 5L)).via("burnTxn") + ) + .then( + getTokenNftInfo(NFT, 1) + .hasSerialNum(1) + .hasCostAnswerPrecheck(OK), + getTokenNftInfo(NFT, 2) + .hasSerialNum(2) + .hasCostAnswerPrecheck(OK), + getTokenNftInfo(NFT, 3) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + getTokenNftInfo(NFT, 4) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + getTokenNftInfo(NFT, 5) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + getTokenInfo(NFT) + .hasTotalSupply(2), + getAccountBalance(TOKEN_TREASURY) + .hasTokenBalance(NFT, 2), + getAccountInfo(TOKEN_TREASURY) + .hasOwnedNfts(2), + getAccountNftInfos(TOKEN_TREASURY, 0, 2) + .hasNfts( + newTokenNftInfo(NFT, 1, TOKEN_TREASURY, metadata("1")), + newTokenNftInfo(NFT, 2, TOKEN_TREASURY, metadata("2")) + ) + .logged() + ); + } + + private HapiApiSpec distinguishesFeeSubTypes() { + return defaultHapiSpec("happyPathFiveMintOneMetadata") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + cryptoCreate("customPayer"), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY), + tokenCreate(FUNGIBLE_TOKEN) + .tokenType(TokenType.FUNGIBLE_COMMON) + .supplyType(TokenSupplyType.FINITE) + .initialSupply(10) + .maxSupply(1100) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY) + ).when( + mintToken(NFT, List.of(ByteString.copyFromUtf8("memo"))).payingWith("customPayer").signedBy("customPayer", "supplyKey").via("mintNFT"), + mintToken(FUNGIBLE_TOKEN, 100L).payingWith("customPayer").signedBy("customPayer", "supplyKey").via("mintFungible") + ).then( + UtilVerbs.withOpContext((spec, opLog) -> { + var mintNFT = getTxnRecord("mintNFT"); + var mintFungible = getTxnRecord("mintFungible"); + allRunFor(spec, mintNFT, mintFungible); + var nftFee = mintNFT.getResponseRecord().getTransactionFee(); + var fungibleFee = mintFungible.getResponseRecord().getTransactionFee(); + Assert.assertNotEquals( + "NFT Fee should NOT equal to the Fungible Fee!", + nftFee, + fungibleFee); + }) + ); + } + + private HapiApiSpec failsWithTooLongMetadata() { + return defaultHapiSpec("failsWithTooLongMetadata") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY) + ).when().then( + mintToken(NFT, List.of( + metadataOfLength(101) + )).hasPrecheck(ResponseCodeEnum.METADATA_TOO_LONG) + ); + } + + private HapiApiSpec failsWithInvalidMetadataFromBatch() { + return defaultHapiSpec("failsWithInvalidMetadataFromBatch") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY) + ).when().then( + mintToken(NFT, List.of( + metadataOfLength(101), + metadataOfLength(1) + )).hasPrecheck(ResponseCodeEnum.METADATA_TOO_LONG) + ); + } + + private HapiApiSpec failsWithLargeBatchSize() { + return defaultHapiSpec("failsWithLargeBatchSize") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY) + ).when().then( + mintToken(NFT, batchOfSize(BIGGER_THAN_LIMIT)) + .hasPrecheck(BATCH_SIZE_LIMIT_EXCEEDED) + ); + } + + private List batchOfSize(int size) { + var batch = new ArrayList(); + for (int i = 0; i < size; i++) { + batch.add(metadata("memo" + i)); + } + return batch; + } + + private ByteString metadataOfLength(int length) { + return ByteString.copyFrom(genRandomBytes(length)); + } + + private ByteString metadata(String contents) { + return ByteString.copyFromUtf8(contents); + } + + private HapiApiSpec uniqueTokenHappyPath() { + return defaultHapiSpec("UniqueTokenHappyPath") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyKey(SUPPLY_KEY) + .supplyType(TokenSupplyType.INFINITE) + .initialSupply(0) + .supplyKey(SUPPLY_KEY) + .treasury(TOKEN_TREASURY) + ).when( + mintToken(NFT, + List.of(metadata("memo"), metadata("memo1"))).via("mintTxn") + ).then( + getReceipt("mintTxn").logged(), + getTokenNftInfo(NFT, 1) + .hasSerialNum(1) + .hasMetadata(ByteString.copyFromUtf8("memo")) + .hasTokenID(NFT) + .hasAccountID(TOKEN_TREASURY) + .hasValidCreationTime(), + + getTokenNftInfo(NFT, 2) + .hasSerialNum(2) + .hasMetadata(metadata("memo1")) + .hasTokenID(NFT) + .hasAccountID(TOKEN_TREASURY) + .hasValidCreationTime(), + + getTokenNftInfo(NFT, 3) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + + getAccountBalance(TOKEN_TREASURY) + .hasTokenBalance(NFT, 2), + + getTokenInfo(NFT) + .hasTreasury(TOKEN_TREASURY) + .hasTotalSupply(2), + + getAccountInfo(TOKEN_TREASURY) + .hasToken(relationshipWith(NFT)).hasOwnedNfts(2), + + getAccountNftInfos(TOKEN_TREASURY, 0, 2) + .hasNfts( + newTokenNftInfo(NFT, 1, TOKEN_TREASURY, metadata("memo")), + newTokenNftInfo(NFT, 2, TOKEN_TREASURY, metadata("memo1")) + ) + .logged() + ); + } + + private HapiApiSpec tokenMintWorksWhenAccountsAreFrozenByDefault() { + return defaultHapiSpec("happyPathWithFrozenToken") + .given( + newKeyNamed(SUPPLY_KEY), + newKeyNamed("tokenFreezeKey"), + cryptoCreate(TOKEN_TREASURY).balance(0L), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyKey(SUPPLY_KEY) + .freezeKey("tokenFreezeKey") + .freezeDefault(true) + .initialSupply(0) + .treasury(TOKEN_TREASURY) + ).when( + mintToken(NFT, List.of(ByteString.copyFromUtf8("memo"))) + .via("mintTxn") + ).then( + getTokenNftInfo(NFT, 1) + .hasTokenID(NFT) + .hasAccountID(TOKEN_TREASURY) + .hasMetadata(ByteString.copyFromUtf8("memo")) + .hasValidCreationTime(), + getAccountInfo(TOKEN_TREASURY).hasOwnedNfts(1), + + getAccountNftInfos(TOKEN_TREASURY, 0, 1) + .hasNfts( + newTokenNftInfo(NFT, 1, TOKEN_TREASURY, metadata("memo")) + ) + .logged() + ); + } + + private HapiApiSpec failsWithDeletedToken() { + return defaultHapiSpec("failsWithDeletedToken").given( + newKeyNamed(SUPPLY_KEY), + newKeyNamed("adminKey"), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .supplyKey(SUPPLY_KEY) + .adminKey("adminKey") + .treasury(TOKEN_TREASURY) + ).when( + tokenDelete(NFT) + ).then( + mintToken(NFT, List.of(ByteString.copyFromUtf8("memo"))) + .via("mintTxn") + .hasKnownStatus(TOKEN_WAS_DELETED), + + getTokenNftInfo(NFT, 1) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + + getTokenInfo(NFT) + .isDeleted() + ); + } + + private HapiApiSpec failsGetTokenNftInfoWithNoNft() { + return defaultHapiSpec("failsGetTokenNftInfoWithNoNft") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY) + ) + .when( + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .supplyKey(SUPPLY_KEY) + .initialSupply(0) + .treasury(TOKEN_TREASURY), + mintToken(NFT, List.of(ByteString.copyFromUtf8("memo"))).via("mintTxn") + ) + .then( + getTokenNftInfo(NFT, 0) + .hasCostAnswerPrecheck(INVALID_TOKEN_NFT_SERIAL_NUMBER), + getTokenNftInfo(NFT, -1) + .hasCostAnswerPrecheck(INVALID_TOKEN_NFT_SERIAL_NUMBER), + getTokenNftInfo(NFT, 2) + .hasCostAnswerPrecheck(INVALID_NFT_ID) + ); + } + + private HapiApiSpec getTokenNftInfoWorks() { + return defaultHapiSpec("getTokenNftInfoWorks") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY) + ).when( + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .supplyKey(SUPPLY_KEY) + .initialSupply(0) + .treasury(TOKEN_TREASURY), + mintToken(NFT, List.of(metadata("memo"))) + ).then( + getTokenNftInfo(NFT, 0) + .hasCostAnswerPrecheck(INVALID_TOKEN_NFT_SERIAL_NUMBER), + getTokenNftInfo(NFT, -1) + .hasCostAnswerPrecheck(INVALID_TOKEN_NFT_SERIAL_NUMBER), + getTokenNftInfo(NFT, 2) + .hasCostAnswerPrecheck(INVALID_NFT_ID), + getTokenNftInfo(NFT, 1) + .hasTokenID(NFT) + .hasAccountID(TOKEN_TREASURY) + .hasMetadata(metadata("memo")) + .hasSerialNum(1) + .hasValidCreationTime() + ); + } + + private HapiApiSpec happyPathWithRepeatedMetadata() { + return defaultHapiSpec("happyPathWithRepeatedMetadata") + .given( + newKeyNamed(SUPPLY_KEY), + cryptoCreate(TOKEN_TREASURY), + tokenCreate(NFT) + .tokenType(NON_FUNGIBLE_UNIQUE) + .supplyType(TokenSupplyType.INFINITE) + .supplyKey(SUPPLY_KEY) + .initialSupply(0) + .treasury(TOKEN_TREASURY) + ).when( + mintToken(NFT, List.of(ByteString.copyFromUtf8("memo"), ByteString.copyFromUtf8("memo"))) + .via("mintTxn") + ).then( + getTokenNftInfo(NFT, 1) + .hasSerialNum(1) + .hasMetadata(ByteString.copyFromUtf8("memo")) + .hasAccountID(TOKEN_TREASURY) + .hasTokenID(NFT) + .hasValidCreationTime(), + + getTokenNftInfo(NFT, 2) + .hasSerialNum(2) + .hasMetadata(ByteString.copyFromUtf8("memo")) + .hasAccountID(TOKEN_TREASURY) + .hasTokenID(NFT) + .hasValidCreationTime(), + getAccountInfo(TOKEN_TREASURY).hasOwnedNfts(2), + + getAccountNftInfos(TOKEN_TREASURY, 0, 2) + .hasNfts( + newTokenNftInfo(NFT, 1, TOKEN_TREASURY, metadata("memo")), + newTokenNftInfo(NFT, 2, TOKEN_TREASURY, metadata("memo")) + ) + .logged() + ); + } + + private HapiApiSpec uniqueTokenMintReceiptCheck() { + return defaultHapiSpec("UniqueTokenMintReceiptCheck") + .given( + cryptoCreate(TOKEN_TREASURY), + cryptoCreate(FIRST_USER), + newKeyNamed("supplyKey"), + tokenCreate(A_TOKEN) + .tokenType(TokenType.NON_FUNGIBLE_UNIQUE) + .initialSupply(0) + .supplyKey("supplyKey") + .treasury(TOKEN_TREASURY) + ) + .when( + mintToken(A_TOKEN, List.of(ByteString.copyFromUtf8("memo"))).via("mintTransferTxn") + ) + .then( + UtilVerbs.withOpContext((spec, opLog) -> { + var mintNft = getTxnRecord("mintTransferTxn"); + allRunFor(spec, mintNft); + var tokenTransferLists = mintNft.getResponseRecord().getTokenTransferListsList(); + Assert.assertEquals(1, tokenTransferLists.size()); + tokenTransferLists.stream().forEach(tokenTransferList -> { + Assert.assertEquals(1, tokenTransferList.getNftTransfersList().size()); + tokenTransferList.getNftTransfersList().stream().forEach(nftTransfers -> { + Assert.assertEquals(AccountID.getDefaultInstance(), nftTransfers.getSenderAccountID()); + Assert.assertEquals(TxnUtils.asId(TOKEN_TREASURY, spec), nftTransfers.getReceiverAccountID()); + Assert.assertEquals(1L, nftTransfers.getSerialNumber()); + }); + }); + }), + getTxnRecord("mintTransferTxn").logged(), + getReceipt("mintTransferTxn").logged() + ); + } + + protected Logger getResultsLogger() { + return log; + } + + private byte[] genRandomBytes(int numBytes) { + byte[] contents = new byte[numBytes]; + (new Random()).nextBytes(contents); + return contents; + } +} \ No newline at end of file diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/FeeScheduleDeJson.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/FeeScheduleDeJson.java index 955b3063384f..408557522816 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/FeeScheduleDeJson.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/FeeScheduleDeJson.java @@ -48,7 +48,7 @@ public class FeeScheduleDeJson { private static String[] FEE_SCHEDULE_KEYS = { "currentFeeSchedule", "nextFeeSchedule" }; private static final String EXPIRY_TIME_KEY = "expiryTime"; private static final String TXN_FEE_SCHEDULE_KEY = "transactionFeeSchedule"; - private static final String FEE_DATA_KEY = "feeData"; + private static final String FEE_DATA_KEY = "fees"; private static final String HEDERA_FUNCTION_KEY = "hederaFunctionality"; private static final String[] FEE_COMPONENT_KEYS = { "nodedata", "networkdata", "servicedata" }; private static final String[] RESOURCE_KEYS = @@ -108,7 +108,11 @@ static TransactionFeeSchedule bindTxnFeeScheduleFrom(Map rawTxnF TransactionFeeSchedule.Builder txnFeeSchedule = TransactionFeeSchedule.newBuilder(); var key = translateClaimFunction((String)rawTxnFeeSchedule.get(HEDERA_FUNCTION_KEY)); txnFeeSchedule.setHederaFunctionality(HederaFunctionality.valueOf(key)); - txnFeeSchedule.setFeeData(bindFeeDataFrom((Map)rawTxnFeeSchedule.get(FEE_DATA_KEY))); + + var feesList = (List)rawTxnFeeSchedule.get(FEE_DATA_KEY); + for (Object o : feesList) { + txnFeeSchedule.addFees(bindFeeDataFrom((Map) o)); + } return txnFeeSchedule.build(); } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScheduleEntryPojo.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScheduleEntryPojo.java index 3059a4092e33..a03397ccb843 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScheduleEntryPojo.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScheduleEntryPojo.java @@ -21,28 +21,40 @@ */ import com.fasterxml.jackson.annotation.JsonInclude; +import com.hederahashgraph.api.proto.java.FeeData; import com.hederahashgraph.api.proto.java.TransactionFeeSchedule; +import java.util.ArrayList; +import java.util.List; + @JsonInclude(JsonInclude.Include.NON_NULL) public class ScheduleEntryPojo { String hederaFunctionality; - ScopedResourcePricesPojo feeData; + List feesList; public static ScheduleEntryPojo from(TransactionFeeSchedule grpc) { var pojo = new ScheduleEntryPojo(); pojo.setHederaFunctionality(grpc.getHederaFunctionality().toString()); - var nodePrices = ResourcePricesPojo.from(grpc.getFeeData().getNodedata()); - var servicePrices = ResourcePricesPojo.from(grpc.getFeeData().getServicedata()); - var networkPrices = ResourcePricesPojo.from(grpc.getFeeData().getNetworkdata()); + List feesList = new ArrayList<>(); + + for (FeeData feeData : grpc.getFeesList()) { + var subType = feeData.getSubType(); + var nodePrices = ResourcePricesPojo.from(feeData.getNodedata()); + var servicePrices = ResourcePricesPojo.from(feeData.getServicedata()); + var networkPrices = ResourcePricesPojo.from(feeData.getNetworkdata()); + + var scopedPrices = new ScopedResourcePricesPojo(); + scopedPrices.setNodedata(nodePrices); + scopedPrices.setNetworkdata(networkPrices); + scopedPrices.setServicedata(servicePrices); + scopedPrices.setSubType(subType); - var scopedPrices = new ScopedResourcePricesPojo(); - scopedPrices.setNodedata(nodePrices); - scopedPrices.setNetworkdata(networkPrices); - scopedPrices.setServicedata(servicePrices); - pojo.setFeeData(scopedPrices); + feesList.add(scopedPrices); + } + pojo.setFeesList(feesList); return pojo; } @@ -54,11 +66,11 @@ public void setHederaFunctionality(String hederaFunctionality) { this.hederaFunctionality = hederaFunctionality; } - public ScopedResourcePricesPojo getFeeData() { - return feeData; + public List getFeesList() { + return feesList; } - public void setFeeData(ScopedResourcePricesPojo feeData) { - this.feeData = feeData; + public void setFeesList(List feeData) { + this.feesList = feeData; } } diff --git a/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScopedResourcePricesPojo.java b/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScopedResourcePricesPojo.java index 699746ceec01..7de87cad4e02 100644 --- a/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScopedResourcePricesPojo.java +++ b/test-clients/src/main/java/com/hedera/services/bdd/suites/utils/sysfiles/ScopedResourcePricesPojo.java @@ -21,11 +21,20 @@ */ import com.fasterxml.jackson.annotation.JsonInclude; +import com.hederahashgraph.api.proto.java.SubType; @JsonInclude(JsonInclude.Include.NON_NULL) public class ScopedResourcePricesPojo { + SubType subType; + ResourcePricesPojo nodedata, networkdata, servicedata; + public SubType getSubType() { return subType; } + + public void setSubType(SubType subType) { + this.subType = subType; + } + public ResourcePricesPojo getNodedata() { return nodedata; } diff --git a/test-clients/src/main/java/com/hedera/services/legacy/core/FeeClient.java b/test-clients/src/main/java/com/hedera/services/legacy/core/FeeClient.java index 2115f8de39c5..bd4b10959fa9 100644 --- a/test-clients/src/main/java/com/hedera/services/legacy/core/FeeClient.java +++ b/test-clients/src/main/java/com/hedera/services/legacy/core/FeeClient.java @@ -28,6 +28,7 @@ import com.hederahashgraph.api.proto.java.HederaFunctionality; import com.hederahashgraph.api.proto.java.KeyList; import com.hederahashgraph.api.proto.java.ResponseType; +import com.hederahashgraph.api.proto.java.SubType; import com.hederahashgraph.api.proto.java.Transaction; import com.hederahashgraph.api.proto.java.TransactionBody; import com.hederahashgraph.api.proto.java.TransactionFeeSchedule; @@ -51,7 +52,7 @@ public class FeeClient { private static int FEE_DIVISOR_TOTINYBARS = 12000; private static ExchangeRate exchangeRate = ExchangeRate.newBuilder().setHbarEquiv(1).setCentEquiv(12).build(); - private static Map feeSchMap = null; + private static Map> feeSchMap = null; private static final Logger log = LogManager.getLogger(FeeClient.class); public static void main(String args[]) { @@ -72,16 +73,25 @@ public static void initialize(int hbarEquiv, int centEquiv, byte[] feeSchBytes) CurrentAndNextFeeSchedule feeSch = CurrentAndNextFeeSchedule.parseFrom(feeSchBytes); List transFeeSchList = feeSch.getCurrentFeeSchedule().getTransactionFeeScheduleList(); - feeSchMap = new HashMap<>(); - for (TransactionFeeSchedule transSch : transFeeSchList) { - feeSchMap.put(transSch.getHederaFunctionality(), transSch.getFeeData()); - } + feeSchMap = feeScheduleListToMap(transFeeSchList); } catch (InvalidProtocolBufferException ex) { System.out.print("ERROR: Exception while decoding Fee file"); } } - public static Map getFeeScheduleMap() { - Map feeSchMap = new HashMap<>(); + private static Map> feeScheduleListToMap(List transFeeSchList) { + for (TransactionFeeSchedule transSch : transFeeSchList) { + feeSchMap.put(transSch.getHederaFunctionality(), FeesListToMap(transSch.getFeesList())); + } + return feeSchMap; + } + private static Map FeesListToMap(List feesList) { + Map resultingMap = new HashMap<>(); + for (FeeData feeData : feesList) { + resultingMap.put(feeData.getSubType(), feeData); + } + return resultingMap; + } + public static Map> getFeeScheduleMap() { try { File feeSchFile = new File("src/main/resource/feeSchedule.txt"); InputStream fis = new FileInputStream(feeSchFile); @@ -91,7 +101,7 @@ public static Map getFeeScheduleMap() { List transFeeSchList = feeSch.getCurrentFeeSchedule().getTransactionFeeScheduleList(); for (TransactionFeeSchedule transSch : transFeeSchList) { - feeSchMap.put(transSch.getHederaFunctionality(), transSch.getFeeData()); + feeSchMap.put(transSch.getHederaFunctionality(), FeesListToMap(transSch.getFeesList())); } } catch (Exception e) { log.info("Exception while reading Fee file: "+e.getMessage()); @@ -101,50 +111,50 @@ public static Map getFeeScheduleMap() { public static long getFeeByID(HederaFunctionality hederaFunctionality) { FeeBuilder crBuilder = new FeeBuilder(); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(hederaFunctionality); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(hederaFunctionality); FeeData feeMatrices = crBuilder.getCostForQueryByIDOnly(); - return crBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + return crBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } public static long getCreateAccountFee(Transaction transaction, int payerAcctSigCount) throws Exception { CryptoFeeBuilder crBuilder = new CryptoFeeBuilder(); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.CryptoCreate); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.CryptoCreate); TransactionBody txBody = CommonUtils.extractTransactionBody(transaction); int totalSignatureCount = FeeBuilder.getSignatureCount(transaction); int signatureSize = FeeBuilder.getSignatureSize(transaction); SigValueObj sigValueObj = new SigValueObj(totalSignatureCount, payerAcctSigCount, signatureSize); FeeData feeMatrices = crBuilder.getCryptoCreateTxFeeMatrices(txBody, sigValueObj); - return crBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + return crBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } public static long getCostForGettingTxRecord() { CryptoFeeBuilder crBuilder = new CryptoFeeBuilder(); FeeData feeMatrices = crBuilder.getCostTransactionRecordQueryFeeMatrices(); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.TransactionGetRecord); - return crBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.TransactionGetRecord); + return crBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } public static long getCostForGettingAccountInfo() { CryptoFeeBuilder crBuilder = new CryptoFeeBuilder(); FeeData feeMatrices = crBuilder.getCostCryptoAccountInfoQueryFeeMatrices(); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.CryptoGetInfo); - return crBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.CryptoGetInfo); + return crBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } public static long getCostContractCallLocalFee(int funcParamSize) { SmartContractFeeBuilder crBuilder = new SmartContractFeeBuilder(); FeeData feeMatrices = crBuilder.getCostContractCallLocalFeeMatrices(funcParamSize); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.ContractCallLocal); - return crBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.ContractCallLocal); + return crBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } public static long getCostContractCallFee(Transaction transaction, int payerAcctSigCount) @@ -156,9 +166,9 @@ public static long getCostContractCallFee(Transaction transaction, int payerAcct SigValueObj sigValueObj = new SigValueObj(totalSignatureCount, payerAcctSigCount, signatureSize); FeeData feeMatrices = crBuilder.getContractCallTxFeeMatrices(txBody, sigValueObj); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.ContractCall); - return crBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.ContractCall); + return crBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } @@ -171,46 +181,47 @@ public static long getContractCreateFee(Transaction transaction, int payerAcctSi SigValueObj sigValueObj = new SigValueObj(totalSignatureCount, payerAcctSigCount, signatureSize); FeeData feeMatrices = crBuilder.getContractCreateTxFeeMatrices(txBody, sigValueObj); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.ContractCreate); - return crBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.ContractCreate); + return crBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } public static long getMaxFee() { // currently all functionalities have same max fee so just taking CryptoCreate - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.CryptoCreate); - return ((feeData.getNodedata().getMax() + feeData.getNetworkdata().getMax() - + feeData.getServicedata().getMax()))/FEE_DIVISOR_TOTINYBARS; + Map> feeSchMap = getFeeScheduleMap(); + Map feeDataMap = feeSchMap.get(HederaFunctionality.CryptoCreate); + var defaultFeeData = feeDataMap.get(SubType.DEFAULT); + return ((defaultFeeData.getNodedata().getMax() + defaultFeeData.getNetworkdata().getMax() + + defaultFeeData.getServicedata().getMax()))/FEE_DIVISOR_TOTINYBARS; } public static long getSystemDeleteFee(Transaction transaction, int payerAcctSigCount) throws Exception { FileFeeBuilder fileFeeBuilder = new FileFeeBuilder(); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.SystemDelete); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.SystemDelete); TransactionBody txBody = CommonUtils.extractTransactionBody(transaction); int totalSignatureCount = FeeBuilder.getSignatureCount(transaction); int signatureSize = FeeBuilder.getSignatureSize(transaction); SigValueObj sigValueObj = new SigValueObj(totalSignatureCount, payerAcctSigCount, signatureSize); FeeData feeMatrices = fileFeeBuilder.getSystemDeleteFileTxFeeMatrices(txBody, sigValueObj); - return (fileFeeBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate)); + return (fileFeeBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate)); } public static long getFileInfoQueryFee(KeyList keys) { FileFeeBuilder fileFeeBuilder = new FileFeeBuilder(); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.FileGetInfo); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.FileGetInfo); FeeData feeMatrices = fileFeeBuilder.getFileInfoQueryFeeMatrices(keys,ResponseType.ANSWER_ONLY); - return fileFeeBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + return fileFeeBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } public static long getFileContentQueryFee(int contentSize) { FileFeeBuilder fileFeeBuilder = new FileFeeBuilder(); - Map feeSchMap = getFeeScheduleMap(); - FeeData feeData = feeSchMap.get(HederaFunctionality.FileGetContents); + Map> feeSchMap = getFeeScheduleMap(); + Map feeData = feeSchMap.get(HederaFunctionality.FileGetContents); FeeData feeMatrices = fileFeeBuilder.getFileContentQueryFeeMatrices(contentSize,ResponseType.ANSWER_ONLY); - return fileFeeBuilder.getTotalFeeforRequest(feeData, feeMatrices,exchangeRate); + return fileFeeBuilder.getTotalFeeforRequest(feeData.get(SubType.DEFAULT), feeMatrices,exchangeRate); } } diff --git a/test-clients/src/main/resource/FeeSchedule.json b/test-clients/src/main/resource/FeeSchedule.json index 9d8df3e2073e..9fec659fd58b 100644 --- a/test-clients/src/main/resource/FeeSchedule.json +++ b/test-clients/src/main/resource/FeeSchedule.json @@ -688,6 +688,92 @@ } } } + }, + { + "transactionFeeSchedule": { + "hederaFunctionality": "TokenGetNftInfo", + "feeData": { + "nodedata": { + "constant": 63990, + "bpt": 102, + "vpt": 255752, + "rbh": 0, + "sbh": 0, + "gas": 1, + "bpr": 102, + "sbpr": 3, + "min": 0, + "max": 1000000000000000 + }, + "networkdata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + }, + "servicedata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + } + } + } + }, + { + "transactionFeeSchedule": { + "hederaFunctionality": "TokenGetAccountNftInfos", + "feeData": { + "nodedata": { + "constant": 63990, + "bpt": 102, + "vpt": 255752, + "rbh": 0, + "sbh": 0, + "gas": 1, + "bpr": 102, + "sbpr": 3, + "min": 0, + "max": 1000000000000000 + }, + "networkdata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + }, + "servicedata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + } + } + } }, { "transactionFeeSchedule": { @@ -3017,6 +3103,92 @@ } } } + }, + { + "transactionFeeSchedule": { + "hederaFunctionality": "TokenGetNftInfo", + "feeData": { + "nodedata": { + "constant": 63990, + "bpt": 102, + "vpt": 255752, + "rbh": 0, + "sbh": 0, + "gas": 1, + "bpr": 102, + "sbpr": 3, + "min": 0, + "max": 1000000000000000 + }, + "networkdata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + }, + "servicedata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + } + } + } + }, + { + "transactionFeeSchedule": { + "hederaFunctionality": "TokenGetAccountNftInfos", + "feeData": { + "nodedata": { + "constant": 63990, + "bpt": 102, + "vpt": 255752, + "rbh": 0, + "sbh": 0, + "gas": 1, + "bpr": 102, + "sbpr": 3, + "min": 0, + "max": 1000000000000000 + }, + "networkdata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + }, + "servicedata": { + "constant": 831871, + "bpt": 1330, + "vpt": 3324781, + "rbh": 1, + "sbh": 0, + "gas": 9, + "bpr": 1330, + "sbpr": 33, + "min": 0, + "max": 1000000000000000 + } + } + } }, { "transactionFeeSchedule": { diff --git a/test-clients/src/main/resource/bootstrap.properties b/test-clients/src/main/resource/bootstrap.properties index 8850274f46cc..cf03a6e584b7 100644 --- a/test-clients/src/main/resource/bootstrap.properties +++ b/test-clients/src/main/resource/bootstrap.properties @@ -68,6 +68,7 @@ ledger.maxAccountNum=100000000 ledger.schedule.txExpiryTimeSecs=1800 ledger.transfers.maxLen=10 ledger.tokenTransfers.maxLen=10 +ledger.nftTransfers.maxLen=10 rates.intradayChangeLimitPercent=25 rates.midnightCheckInterval=1 scheduling.whitelist=ConsensusSubmitMessage,CryptoTransfer @@ -75,6 +76,11 @@ tokens.maxPerAccount=1000 tokens.maxSymbolUtf8Bytes=100 tokens.maxTokenNameUtf8Bytes=100 tokens.maxCustomFeesAllowed=10 +tokens.nfts.maxMetadataBytes=100 +tokens.nfts.maxBatchSizeBurn=10 +tokens.nfts.maxBatchSizeWipe=10 +tokens.nfts.maxBatchSizeMint=10 +tokens.nfts.maxQueryRange=100 consensus.message.maxBytesAllowed=1024 # Node properties (can be overridden via data/config/node.properties) dev.defaultListeningNodeAccount=0.0.3 diff --git a/test-clients/src/main/resource/testSystemFiles/artificial-limits.json b/test-clients/src/main/resource/testSystemFiles/artificial-limits.json index 7a18fcc1dddd..f70f8eff855e 100644 --- a/test-clients/src/main/resource/testSystemFiles/artificial-limits.json +++ b/test-clients/src/main/resource/testSystemFiles/artificial-limits.json @@ -9,7 +9,7 @@ "operations": [ "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", - "TokenGetInfo", + "TokenGetInfo", "TokenGetNftInfo", "TokenGetAccountNftInfos", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", diff --git a/test-clients/src/main/resource/testSystemFiles/throttles-dev.json b/test-clients/src/main/resource/testSystemFiles/throttles-dev.json index 1591a66aab71..9ef0684bd2d6 100644 --- a/test-clients/src/main/resource/testSystemFiles/throttles-dev.json +++ b/test-clients/src/main/resource/testSystemFiles/throttles-dev.json @@ -9,7 +9,7 @@ "operations": [ "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", - "TokenGetInfo", + "TokenGetInfo", "TokenGetNftInfo", "TokenGetAccountNftInfos", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", diff --git a/test-clients/src/main/resource/testSystemFiles/throttles-for-acct-balances-tests.json b/test-clients/src/main/resource/testSystemFiles/throttles-for-acct-balances-tests.json index d4b7c38996fe..ad48f9bbce3f 100644 --- a/test-clients/src/main/resource/testSystemFiles/throttles-for-acct-balances-tests.json +++ b/test-clients/src/main/resource/testSystemFiles/throttles-for-acct-balances-tests.json @@ -9,7 +9,7 @@ "operations": [ "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", - "TokenGetInfo", + "TokenGetInfo", "TokenGetNftInfo", "TokenGetAccountNftInfos", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", diff --git a/test-clients/src/main/resource/testSystemFiles/throttles-sans-mint.json b/test-clients/src/main/resource/testSystemFiles/throttles-sans-mint.json index e027c419dafb..405e9880783c 100644 --- a/test-clients/src/main/resource/testSystemFiles/throttles-sans-mint.json +++ b/test-clients/src/main/resource/testSystemFiles/throttles-sans-mint.json @@ -9,7 +9,7 @@ "operations": [ "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", - "TokenGetInfo", + "TokenGetInfo", "TokenGetNftInfo", "TokenGetAccountNftInfos", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", diff --git a/test-clients/yahcli/run/test/local/assets/throttles-with-under-endowed-bucket.json b/test-clients/yahcli/run/test/local/assets/throttles-with-under-endowed-bucket.json index 4e83b31aab31..04d7edf33af2 100644 --- a/test-clients/yahcli/run/test/local/assets/throttles-with-under-endowed-bucket.json +++ b/test-clients/yahcli/run/test/local/assets/throttles-with-under-endowed-bucket.json @@ -6,7 +6,7 @@ "throttleGroups" : [ { "opsPerSec" : 0, "milliOpsPerSec" : 2, - "operations" : [ "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", "TokenGetInfo", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", "TransactionGetRecord", "GetVersionInfo" ] + "operations" : [ "CryptoCreate", "CryptoTransfer", "CryptoUpdate", "CryptoDelete", "CryptoGetInfo", "CryptoGetAccountRecords", "ConsensusCreateTopic", "ConsensusSubmitMessage", "ConsensusUpdateTopic", "ConsensusDeleteTopic", "ConsensusGetTopicInfo", "TokenGetInfo", "TokenGetAccountNftInfos", "TokenGetNftInfo", "ScheduleDelete", "ScheduleGetInfo", "FileGetContents", "FileGetInfo", "ContractUpdate", "ContractDelete", "ContractGetInfo", "ContractGetBytecode", "ContractGetRecords", "ContractCallLocal", "TransactionGetRecord", "GetVersionInfo" ] }, { "opsPerSec" : 0, "milliOpsPerSec" : 25000,