Merge pull request #329 from Concordium/features-for-mobile

Features for mobile
Concordium · Mar 18, 2024 · 60357e3 · 60357e3
2 parents 17eab40 + c80a3a5
commit 60357e3
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 33 deletions.
diff --git 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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.concordium.sdk</groupId>
         <artifactId>concordium-sdk-base</artifactId>
-        <version>7.0.1-SNAPSHOT</version>
+        <version>7.1.0</version>
     </parent>
 
     <artifactId>concordium-android-sdk</artifactId>

diff --git a/concordium-sdk-examples/pom.xml b/concordium-sdk-examples/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.concordium.sdk</groupId>
             <artifactId>concordium-sdk</artifactId>
-            <version>7.0.1-SNAPSHOT</version>
+            <version>7.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/concordium-sdk/pom.xml b/concordium-sdk/pom.xml
@@ -7,7 +7,7 @@
     <parent>
     <groupId>com.concordium.sdk</groupId>
         <artifactId>concordium-sdk-base</artifactId>
-        <version>7.0.1-SNAPSHOT</version>
+        <version>7.1.0</version>
     </parent>
 
     <groupId>com.concordium.sdk</groupId>

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
@@ -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/...dium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/AttributeList.java b/...dium-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<AttributeType, String> chosenAttributes;

diff --git a/...ium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/identityobject/IdentityObject.java b/...ium-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/...dium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/IdQualifier.java b/...dium-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/.../src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/MembershipStatement.java b/.../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<CredentialAttribute> set;
 

diff --git a/...c/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/NonMembershipStatement.java b/...c/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<CredentialAttribute> set;
 

diff --git a/...sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/RequestStatement.java b/...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/...ium-sdk/src/main/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/SetStatement.java b/...ium-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<CredentialAttribute> getSet();
+}
diff --git a/...n/java/com/concordium/sdk/crypto/wallet/web3Id/Statement/UnqualifiedRequestStatement.java b/...n/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 
     <groupId>com.concordium.sdk</groupId>
     <artifactId>concordium-sdk-base</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.1.0</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/Concordium/concordium-java-sdk</url>