diff --git a/CHANGELOG.md b/CHANGELOG.md index 5616e44ce..f1775ef20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased changes +## 7.1.0 - Removed unnecessary `amount` parameter from `InvokeInstanceRequest`. - Added utility functions for converting between `CCDAmount` and `Energy`. Present in utility class `Converter`. - Fixed a bug in `CustomEvent`. Removed unnecessary `tag` field. diff --git a/concordium-android-sdk/pom.xml b/concordium-android-sdk/pom.xml index f73afd14e..3eaff4b65 100644 --- a/concordium-android-sdk/pom.xml +++ b/concordium-android-sdk/pom.xml @@ -5,7 +5,7 @@ com.concordium.sdk concordium-sdk-base - 7.0.1-SNAPSHOT + 7.1.0 concordium-android-sdk diff --git a/concordium-sdk-examples/pom.xml b/concordium-sdk-examples/pom.xml index 224f4acf2..b065f20c8 100644 --- a/concordium-sdk-examples/pom.xml +++ b/concordium-sdk-examples/pom.xml @@ -23,7 +23,7 @@ com.concordium.sdk concordium-sdk - 7.0.1-SNAPSHOT + 7.1.0 compile diff --git a/concordium-sdk/pom.xml b/concordium-sdk/pom.xml index 909ddcd2c..f962ff0fd 100644 --- a/concordium-sdk/pom.xml +++ b/concordium-sdk/pom.xml @@ -7,7 +7,7 @@ com.concordium.sdk concordium-sdk-base - 7.0.1-SNAPSHOT + 7.1.0 com.concordium.sdk diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/CryptoJniNative.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/CryptoJniNative.java index 01ad74a37..732257091 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/CryptoJniNative.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/CryptoJniNative.java @@ -8,7 +8,6 @@ import com.concordium.sdk.crypto.wallet.credential.CredentialDeploymentDetails; import com.concordium.sdk.crypto.wallet.credential.CredentialDeploymentSerializationContext; import com.concordium.sdk.crypto.wallet.web3Id.AcceptableRequest; -import com.concordium.sdk.crypto.wallet.web3Id.AttributeCheck; import com.concordium.sdk.exceptions.JNIError; import com.concordium.sdk.transactions.InitName; import com.concordium.sdk.transactions.ReceiveName; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/AttributeList.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/AttributeList.java index de68c4279..7f839540c 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/AttributeList.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/AttributeList.java @@ -9,9 +9,13 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Builder; import lombok.Getter; +import lombok.extern.jackson.Jacksonized; +@Builder @Getter +@Jacksonized public class AttributeList { private Map chosenAttributes; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/IdentityObject.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/IdentityObject.java index 88998845b..c6d786059 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/IdentityObject.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/IdentityObject.java @@ -4,9 +4,13 @@ import com.concordium.sdk.responses.accountinfo.credential.AttributeType; +import lombok.Builder; import lombok.Getter; +import lombok.extern.jackson.Jacksonized; +@Builder @Getter +@Jacksonized public class IdentityObject { private AttributeList attributeList; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/IdQualifier.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/IdQualifier.java index de6c89fb2..c7a49dba9 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/IdQualifier.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/IdQualifier.java @@ -1,6 +1,5 @@ package com.concordium.sdk.crypto.wallet.web3Id.Statement; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/MembershipStatement.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/MembershipStatement.java index e1e52316d..e78b70556 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/MembershipStatement.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/MembershipStatement.java @@ -13,7 +13,7 @@ @Getter @JsonTypeName("AttributeInSet") -public class MembershipStatement extends AtomicStatement { +public class MembershipStatement extends AtomicStatement implements SetStatement { private String attributeTag; private List set; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/NonMembershipStatement.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/NonMembershipStatement.java index 2c6cadd12..64668bb99 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/NonMembershipStatement.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/NonMembershipStatement.java @@ -13,7 +13,7 @@ @Getter @JsonTypeName("AttributeNotInSet") -public class NonMembershipStatement extends AtomicStatement { +public class NonMembershipStatement extends AtomicStatement implements SetStatement { private String attributeTag; private List set; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/RequestStatement.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/RequestStatement.java index 6f6ee22d4..426d93001 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/RequestStatement.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/RequestStatement.java @@ -4,7 +4,6 @@ import java.util.stream.Collectors; import com.concordium.sdk.crypto.wallet.identityobject.IdentityObject; -import com.concordium.sdk.crypto.wallet.web3Id.Statement.did.RequestIdentifier; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/SetStatement.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/SetStatement.java new file mode 100644 index 000000000..b51bba286 --- /dev/null +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/SetStatement.java @@ -0,0 +1,10 @@ +package com.concordium.sdk.crypto.wallet.web3Id.Statement; + +import java.util.List; + +import com.concordium.sdk.crypto.wallet.web3Id.CredentialAttribute; + +public interface SetStatement { + public String getAttributeTag(); + public List getSet(); +} diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/UnqualifiedRequestStatement.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/UnqualifiedRequestStatement.java index 846950b85..688c6009d 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/UnqualifiedRequestStatement.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/UnqualifiedRequestStatement.java @@ -1,7 +1,5 @@ package com.concordium.sdk.crypto.wallet.web3Id.Statement; -import org.apache.commons.codec.binary.Hex; - import com.concordium.sdk.crypto.ed25519.ED25519PublicKey; import com.concordium.sdk.crypto.wallet.Network; import com.concordium.sdk.crypto.wallet.web3Id.Statement.did.AccountRequestIdentifier; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/UnqualifiedRequest.java b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/UnqualifiedRequest.java index b3aba7a2c..c9a1bcf10 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/UnqualifiedRequest.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/UnqualifiedRequest.java @@ -4,6 +4,10 @@ import java.util.stream.Collectors; import com.concordium.sdk.crypto.wallet.web3Id.Statement.QualifiedRequestStatement; import com.concordium.sdk.crypto.wallet.web3Id.Statement.UnqualifiedRequestStatement; +import com.concordium.sdk.serializing.JsonMapper; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; + import lombok.Builder; import lombok.Getter; import lombok.extern.jackson.Jacksonized; @@ -30,4 +34,8 @@ public QualifiedRequest qualify(Qualifier qualifier) { public static interface Qualifier { QualifiedRequestStatement qualify(UnqualifiedRequestStatement statement); } + + public static UnqualifiedRequest fromJson(String raw) throws JsonMappingException, JsonProcessingException { + return JsonMapper.INSTANCE.readValue(raw, UnqualifiedRequest.class); + } } diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureBaker.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureBaker.java index 9540d0f76..72735a2b3 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureBaker.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureBaker.java @@ -1,6 +1,5 @@ package com.concordium.sdk.transactions; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureDelegation.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureDelegation.java index 8eee92a41..f9bd2da5f 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureDelegation.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/ConfigureDelegation.java @@ -1,6 +1,5 @@ package com.concordium.sdk.transactions; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModule.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModule.java index 5d0736b28..a7028496d 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModule.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/DeployModule.java @@ -1,7 +1,6 @@ package com.concordium.sdk.transactions; import com.concordium.sdk.transactions.smartcontracts.WasmModule; -import com.concordium.sdk.types.UInt64; import lombok.Builder; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransfer.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransfer.java index d8450d695..3324b7a39 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransfer.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransfer.java @@ -1,8 +1,6 @@ package com.concordium.sdk.transactions; - import com.concordium.sdk.types.AccountAddress; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemo.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemo.java index a8edbbb6e..ae36217e2 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemo.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/EncryptedTransferWithMemo.java @@ -1,8 +1,6 @@ package com.concordium.sdk.transactions; - import com.concordium.sdk.types.AccountAddress; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitContract.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitContract.java index 98364c2a4..7ea77d979 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitContract.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/InitContract.java @@ -1,7 +1,5 @@ package com.concordium.sdk.transactions; - -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Parameter.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Parameter.java index e23922a18..98699b80c 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Parameter.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Parameter.java @@ -4,9 +4,7 @@ import com.concordium.sdk.responses.ProtocolVersion; import com.concordium.sdk.transactions.smartcontracts.SchemaParameter; import com.concordium.sdk.types.UInt16; -import com.fasterxml.jackson.annotation.JsonCreator; import lombok.EqualsAndHashCode; -import lombok.Getter; import lombok.ToString; import lombok.val; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RawPayload.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RawPayload.java index d8c1d67cc..04a9142cc 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RawPayload.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RawPayload.java @@ -1,6 +1,5 @@ package com.concordium.sdk.transactions; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RegisterData.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RegisterData.java index 6f4c4ca0d..2491e5094 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RegisterData.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/RegisterData.java @@ -1,6 +1,5 @@ package com.concordium.sdk.transactions; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Transfer.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Transfer.java index 1f6971b17..e4765e892 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Transfer.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/Transfer.java @@ -1,7 +1,6 @@ package com.concordium.sdk.transactions; import com.concordium.sdk.types.AccountAddress; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferSchedule.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferSchedule.java index 023f5fcd9..32efd1589 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferSchedule.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferSchedule.java @@ -1,7 +1,6 @@ package com.concordium.sdk.transactions; import com.concordium.sdk.types.AccountAddress; -import com.concordium.sdk.types.UInt16; import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferScheduleWithMemo.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferScheduleWithMemo.java index d1dd3e0ed..c236d15e9 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferScheduleWithMemo.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferScheduleWithMemo.java @@ -1,7 +1,6 @@ package com.concordium.sdk.transactions; import com.concordium.sdk.types.AccountAddress; -import com.concordium.sdk.types.UInt16; import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncrypted.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncrypted.java index 2af95d899..0d87bb38f 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncrypted.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferToEncrypted.java @@ -1,7 +1,5 @@ package com.concordium.sdk.transactions; - -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferTransaction.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferTransaction.java index 78d1f6672..1c3ec031c 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferTransaction.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferTransaction.java @@ -1,6 +1,5 @@ package com.concordium.sdk.transactions; - import com.concordium.sdk.exceptions.TransactionCreationException; import com.concordium.sdk.types.AccountAddress; import com.concordium.sdk.types.Nonce; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferWithMemo.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferWithMemo.java index d3e7a81d8..bf6d06900 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferWithMemo.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/TransferWithMemo.java @@ -1,7 +1,6 @@ package com.concordium.sdk.transactions; import com.concordium.sdk.types.AccountAddress; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/UpdateCredentialKeys.java b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/UpdateCredentialKeys.java index 97f087199..d1fbee1eb 100644 --- a/concordium-sdk/src/main/java/com/concordium/sdk/transactions/UpdateCredentialKeys.java +++ b/concordium-sdk/src/main/java/com/concordium/sdk/transactions/UpdateCredentialKeys.java @@ -1,7 +1,6 @@ package com.concordium.sdk.transactions; import com.concordium.sdk.types.UInt16; -import com.concordium.sdk.types.UInt64; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/pom.xml b/pom.xml index 084d5571b..26c734963 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.concordium.sdk concordium-sdk-base - 7.0.1-SNAPSHOT + 7.1.0 pom https://github.com/Concordium/concordium-java-sdk