Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

feat(TCK): Implement token management transactions #2166

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.exception;

public class JSONRPCParseException extends RuntimeException {
naydenovn marked this conversation as resolved.
Show resolved Hide resolved
public JSONRPCParseException(String message) {
super(message);
}

public JSONRPCParseException(String message, Throwable cause) {
super(message, cause);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import org.hiero.tck.annotation.JSONRPC2Method;
import org.hiero.tck.annotation.JSONRPC2Service;
import org.hiero.tck.methods.AbstractJSONRPC2Service;
import org.hiero.tck.methods.sdk.param.AccountCreateParams;
import org.hiero.tck.methods.sdk.param.AccountDeleteParams;
import org.hiero.tck.methods.sdk.param.AccountUpdateParams;
import org.hiero.tck.methods.sdk.param.account.AccountCreateParams;
import org.hiero.tck.methods.sdk.param.account.AccountDeleteParams;
import org.hiero.tck.methods.sdk.param.account.AccountUpdateParams;
import org.hiero.tck.methods.sdk.response.AccountResponse;
import org.hiero.tck.util.KeyUtils;

Expand Down
283 changes: 217 additions & 66 deletions tck/src/main/java/org/hiero/tck/methods/sdk/TokenService.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import net.minidev.json.JSONObject;
import org.hiero.sdk.*;
import org.hiero.tck.methods.JSONRPC2Param;

@Getter
Expand Down Expand Up @@ -73,13 +77,20 @@ public static class FractionalFee {
private String denominator;
private String minimumAmount;
private String maximumAmount;
private String assessmentMethod;

public static FractionalFee parse(Map<String, Object> jrpcParams) throws Exception {
var numeratorParsed = (String) jrpcParams.get("numerator");
var denominatorParsed = (String) jrpcParams.get("denominator");
var minimumAmountParsed = (String) jrpcParams.get("minimumAmount");
var maximumAmountParsed = (String) jrpcParams.get("maximumAmount");
return new FractionalFee(numeratorParsed, denominatorParsed, minimumAmountParsed, maximumAmountParsed);
var assessmentMethodParsed = (String) jrpcParams.get("assessmentMethod");
return new FractionalFee(
numeratorParsed,
denominatorParsed,
minimumAmountParsed,
maximumAmountParsed,
assessmentMethodParsed);
}
}

Expand All @@ -104,4 +115,60 @@ public static RoyaltyFee parse(Map<String, Object> jrpcParams) throws Exception
return new RoyaltyFee(numeratorParsed, denominatorParsed, fallbackFeeParsed);
}
}

public List<org.hiero.sdk.CustomFee> fillOutCustomFees(@NonNull List<CustomFee> customFees) {
List<org.hiero.sdk.CustomFee> customFeeList = new ArrayList<>();

for (var customFee : customFees) {
customFee.getFixedFee().ifPresent(fixedFee -> {
var sdkFixedFee = new CustomFixedFee()
.setAmount(Long.parseLong(fixedFee.getAmount()))
.setFeeCollectorAccountId(AccountId.fromString(customFee.getFeeCollectorAccountId()))
.setAllCollectorsAreExempt(customFee.getFeeCollectorsExempt());

fixedFee.getDenominatingTokenId()
.ifPresent(tokenId -> sdkFixedFee.setDenominatingTokenId(TokenId.fromString(tokenId)));

customFeeList.add(sdkFixedFee);
});

customFee.getFractionalFee().ifPresent(fractionalFee -> {
var sdkFractionalFee = new CustomFractionalFee()
.setNumerator(Long.parseLong(fractionalFee.getNumerator()))
.setDenominator(Long.parseLong(fractionalFee.getDenominator()))
.setMin(Long.parseLong(fractionalFee.getMinimumAmount()))
.setMax(Long.parseLong(fractionalFee.getMaximumAmount()))
.setFeeCollectorAccountId(AccountId.fromString(customFee.getFeeCollectorAccountId()))
.setAllCollectorsAreExempt(customFee.getFeeCollectorsExempt())
.setAssessmentMethod(
"inclusive".equalsIgnoreCase(fractionalFee.getAssessmentMethod())
? FeeAssessmentMethod.INCLUSIVE
: FeeAssessmentMethod.EXCLUSIVE);

customFeeList.add(sdkFractionalFee);
});

customFee.getRoyaltyFee().ifPresent(royaltyFee -> {
var sdkRoyaltyFee = new CustomRoyaltyFee()
.setDenominator(Long.parseLong(royaltyFee.getDenominator()))
.setNumerator(Long.parseLong(royaltyFee.getNumerator()))
.setFeeCollectorAccountId(AccountId.fromString(customFee.getFeeCollectorAccountId()))
.setAllCollectorsAreExempt(customFee.getFeeCollectorsExempt());

royaltyFee.getFallbackFee().ifPresent(fallbackFee -> {
var fixedFallback = new CustomFixedFee().setAmount(Long.parseLong(fallbackFee.getAmount()));

fallbackFee
.getDenominatingTokenId()
.ifPresent(tokenId -> fixedFallback.setDenominatingTokenId(TokenId.fromString(tokenId)));

sdkRoyaltyFee.setFallbackFee(fixedFallback);
});

customFeeList.add(sdkRoyaltyFee);
});
}

return customFeeList;
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param;
package org.hiero.tck.methods.sdk.param.account;

import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import net.minidev.json.JSONObject;
import org.hiero.tck.methods.JSONRPC2Param;
import org.hiero.tck.methods.sdk.param.CommonTransactionParams;
import org.hiero.tck.util.JSONRPCParamParser;

/**
* AccountCreateParams for account create method
Expand Down Expand Up @@ -42,11 +43,7 @@ public AccountCreateParams parse(Map<String, Object> jrpcParams) throws ClassCas
var parsedStakedNodeId = Optional.ofNullable((Long) jrpcParams.get("stakedNodeId"));
var parsedDeclineStakingReward = Optional.ofNullable((Boolean) jrpcParams.get("declineStakingReward"));
var parsedAlias = Optional.ofNullable((String) jrpcParams.get("alias"));
Optional<CommonTransactionParams> parsedCommonTransactionParams = Optional.empty();
if (jrpcParams.containsKey("commonTransactionParams")) {
JSONObject jsonObject = (JSONObject) jrpcParams.get("commonTransactionParams");
parsedCommonTransactionParams = Optional.of(CommonTransactionParams.parse(jsonObject));
}
var parsedCommonTransactionParams = JSONRPCParamParser.parseCommonTransactionParams(jrpcParams);

return new AccountCreateParams(
parsedKey,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param;
package org.hiero.tck.methods.sdk.param.account;

import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import net.minidev.json.JSONObject;
import org.hiero.tck.methods.JSONRPC2Param;
import org.hiero.tck.methods.sdk.param.CommonTransactionParams;
import org.hiero.tck.util.JSONRPCParamParser;

/**
* AccountDeleteParams for account delete method
Expand All @@ -26,11 +27,7 @@ public AccountDeleteParams parse(Map<String, Object> jrpcParams) throws ClassCas
var parsedDeleteAccountId = Optional.ofNullable((String) jrpcParams.get("deleteAccountId"));
var parsedTransferAccountId = Optional.ofNullable((String) jrpcParams.get("transferAccountId"));

Optional<CommonTransactionParams> parsedCommonTransactionParams = Optional.empty();
if (jrpcParams.containsKey("commonTransactionParams")) {
JSONObject jsonObject = (JSONObject) jrpcParams.get("commonTransactionParams");
parsedCommonTransactionParams = Optional.of(CommonTransactionParams.parse(jsonObject));
}
var parsedCommonTransactionParams = JSONRPCParamParser.parseCommonTransactionParams(jrpcParams);

return new AccountDeleteParams(parsedDeleteAccountId, parsedTransferAccountId, parsedCommonTransactionParams);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param;
package org.hiero.tck.methods.sdk.param.account;

import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import net.minidev.json.JSONObject;
import org.hiero.tck.methods.JSONRPC2Param;
import org.hiero.tck.methods.sdk.param.CommonTransactionParams;
import org.hiero.tck.util.JSONRPCParamParser;

/**
* AccountUpdateParams for account update method
Expand Down Expand Up @@ -42,11 +43,7 @@ public AccountUpdateParams parse(Map<String, Object> jrpcParams) throws ClassCas
var parsedStakedNodeId = Optional.ofNullable((Long) jrpcParams.get("stakedNodeId"));
var parsedExpirationTime = Optional.ofNullable((Long) jrpcParams.get("expirationTime"));
var parsedDeclineStakingReward = Optional.ofNullable((Boolean) jrpcParams.get("declineStakingReward"));
Optional<CommonTransactionParams> parsedCommonTransactionParams = Optional.empty();
if (jrpcParams.containsKey("commonTransactionParams")) {
JSONObject jsonObject = (JSONObject) jrpcParams.get("commonTransactionParams");
parsedCommonTransactionParams = Optional.of(CommonTransactionParams.parse(jsonObject));
}
var parsedCommonTransactionParams = JSONRPCParamParser.parseCommonTransactionParams(jrpcParams);

return new AccountUpdateParams(
parsedKey,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param.token;

import java.util.List;
import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hiero.tck.exception.JSONRPCParseException;
import org.hiero.tck.methods.JSONRPC2Param;
import org.hiero.tck.methods.sdk.param.CommonTransactionParams;
import org.hiero.tck.util.JSONRPCParamParser;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class AssociateDisassociateTokenParams extends JSONRPC2Param {
private Optional<String> accountId;
private Optional<List<String>> tokenIds;
private Optional<CommonTransactionParams> commonTransactionParams;

@Override
public JSONRPC2Param parse(Map<String, Object> jrpcParams) throws Exception {
try {
var parsedAccountId = Optional.ofNullable((String) jrpcParams.get("accountId"));
var parsedTokenIds = Optional.ofNullable((List<String>) jrpcParams.get("tokenIds"));
var parsedCommonTransactionParams = JSONRPCParamParser.parseCommonTransactionParams(jrpcParams);

return new AssociateDisassociateTokenParams(parsedAccountId, parsedTokenIds, parsedCommonTransactionParams);
} catch (ClassCastException e) {
throw new JSONRPCParseException("Invalid parameter type", e);
} catch (JSONRPCParseException e) {
throw e;
} catch (Exception e) {
throw new JSONRPCParseException("Failed to parse AssociateDisassociateToken parameters", e);
}
naydenovn marked this conversation as resolved.
Show resolved Hide resolved
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param.token;

import java.util.List;
import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hiero.tck.exception.JSONRPCParseException;
import org.hiero.tck.methods.JSONRPC2Param;
import org.hiero.tck.methods.sdk.param.CommonTransactionParams;
import org.hiero.tck.util.JSONRPCParamParser;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class BurnTokenParams extends JSONRPC2Param {
private Optional<String> tokenId;
private Optional<String> amount;
private Optional<List<String>> metadata;
private Optional<List<String>> serialNumbers;
private Optional<CommonTransactionParams> commonTransactionParams;

@Override
public JSONRPC2Param parse(Map<String, Object> jrpcParams) throws Exception {
try {
var parsedTokenId = Optional.ofNullable((String) jrpcParams.get("tokenId"));
var parsedAmount = Optional.ofNullable((String) jrpcParams.get("amount"));
var parsedMetadata = Optional.ofNullable((List<String>) jrpcParams.get("metadata"));
var parsedSerialNumbers = Optional.ofNullable((List<String>) jrpcParams.get("serialNumbers"));
var parsedCommonTransactionParams = JSONRPCParamParser.parseCommonTransactionParams(jrpcParams);

return new BurnTokenParams(
parsedTokenId, parsedAmount, parsedMetadata, parsedSerialNumbers, parsedCommonTransactionParams);
} catch (ClassCastException e) {
throw new JSONRPCParseException("Invalid parameter type", e);
} catch (JSONRPCParseException e) {
throw e;
} catch (Exception e) {
throw new JSONRPCParseException("Failed to parse BurnToken parameters", e);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param.token;

import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hiero.tck.exception.JSONRPCParseException;
import org.hiero.tck.methods.JSONRPC2Param;
import org.hiero.tck.methods.sdk.param.CommonTransactionParams;
import org.hiero.tck.util.JSONRPCParamParser;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class FreezeUnfreezeTokenParams extends JSONRPC2Param {
private Optional<String> accountId;
private Optional<String> tokenId;
private Optional<CommonTransactionParams> commonTransactionParams;

@Override
public JSONRPC2Param parse(Map<String, Object> jrpcParams) throws Exception {
try {
var parsedAccountId = Optional.ofNullable((String) jrpcParams.get("accountId"));
var parsedTokenId = Optional.ofNullable((String) jrpcParams.get("tokenId"));
var parsedCommonTransactionParams = JSONRPCParamParser.parseCommonTransactionParams(jrpcParams);

return new FreezeUnfreezeTokenParams(parsedAccountId, parsedTokenId, parsedCommonTransactionParams);
} catch (ClassCastException e) {
throw new JSONRPCParseException("Invalid parameter type", e);
} catch (JSONRPCParseException e) {
throw e;
} catch (Exception e) {
throw new JSONRPCParseException("Failed to parse FreezeUnfreezeToken parameters", e);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// SPDX-License-Identifier: Apache-2.0
package org.hiero.tck.methods.sdk.param.token;

import java.util.Map;
import java.util.Optional;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hiero.tck.exception.JSONRPCParseException;
import org.hiero.tck.methods.JSONRPC2Param;
import org.hiero.tck.methods.sdk.param.CommonTransactionParams;
import org.hiero.tck.util.JSONRPCParamParser;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class GrantRevokeTokenKycParams extends JSONRPC2Param {
private Optional<String> tokenId;
private Optional<String> accountId;
private Optional<CommonTransactionParams> commonTransactionParams;

@Override
public JSONRPC2Param parse(Map<String, Object> jrpcParams) throws Exception {
try {
var parsedTokenId = Optional.ofNullable((String) jrpcParams.get("tokenId"));
var parsedAccountId = Optional.ofNullable((String) jrpcParams.get("accountId"));
var parsedCommonTransactionParams = JSONRPCParamParser.parseCommonTransactionParams(jrpcParams);

return new GrantRevokeTokenKycParams(parsedTokenId, parsedAccountId, parsedCommonTransactionParams);
} catch (ClassCastException e) {
throw new JSONRPCParseException("Invalid parameter type", e);
} catch (JSONRPCParseException e) {
throw e;
} catch (Exception e) {
throw new JSONRPCParseException("Failed to parse GrantRevokeTokenKyc parameters", e);
}
}
}
Loading