Package change

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "2.0.1"
 }
 
-group = "com.github.unicitynetwork"
+group = "org.unicitylabs"
 // Use version property if provided, otherwise use default
 version = if (project.hasProperty("version")) {
     project.property("version").toString()

src/main/java/org/unicitylabs/sdk/Hashable.java

@@ -0,0 +1,7 @@
+package org.unicitylabs.sdk;
+
+import org.unicitylabs.sdk.hash.DataHash;
+
+public interface Hashable {
+    DataHash getHash();
+}

src/main/java/com/unicity/sdk/StateTransitionClient.java → src/main/java/org/unicitylabs/sdk/StateTransitionClient.java

@@ -1,19 +1,19 @@
 
-package com.unicity.sdk;
+package org.unicitylabs.sdk;
 
-import com.unicity.sdk.api.IAggregatorClient;
-import com.unicity.sdk.api.RequestId;
-import com.unicity.sdk.api.SubmitCommitmentResponse;
-import com.unicity.sdk.token.Token;
-import com.unicity.sdk.token.TokenState;
-import com.unicity.sdk.transaction.Commitment;
-import com.unicity.sdk.transaction.InclusionProof;
-import com.unicity.sdk.transaction.InclusionProofVerificationStatus;
-import com.unicity.sdk.transaction.MintCommitment;
-import com.unicity.sdk.transaction.MintTransactionData;
-import com.unicity.sdk.transaction.Transaction;
-import com.unicity.sdk.transaction.TransferCommitment;
-import com.unicity.sdk.transaction.TransferTransactionData;
+import org.unicitylabs.sdk.api.IAggregatorClient;
+import org.unicitylabs.sdk.api.RequestId;
+import org.unicitylabs.sdk.api.SubmitCommitmentResponse;
+import org.unicitylabs.sdk.token.Token;
+import org.unicitylabs.sdk.token.TokenState;
+import org.unicitylabs.sdk.transaction.Commitment;
+import org.unicitylabs.sdk.transaction.InclusionProof;
+import org.unicitylabs.sdk.transaction.InclusionProofVerificationStatus;
+import org.unicitylabs.sdk.transaction.MintCommitment;
+import org.unicitylabs.sdk.transaction.MintTransactionData;
+import org.unicitylabs.sdk.transaction.Transaction;
+import org.unicitylabs.sdk.transaction.TransferCommitment;
+import org.unicitylabs.sdk.transaction.TransferTransactionData;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;

src/main/java/com/unicity/sdk/address/Address.java → src/main/java/org/unicitylabs/sdk/address/Address.java

@@ -1,5 +1,5 @@
 
-package com.unicity.sdk.address;
+package org.unicitylabs.sdk.address;
 
 public interface Address {
     AddressScheme getScheme();

src/main/java/com/unicity/sdk/address/AddressFactory.java → src/main/java/org/unicitylabs/sdk/address/AddressFactory.java

@@ -1,8 +1,8 @@
-package com.unicity.sdk.address;
+package org.unicitylabs.sdk.address;
 
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.token.TokenId;
-import com.unicity.sdk.util.HexConverter;
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.token.TokenId;
+import org.unicitylabs.sdk.util.HexConverter;
 import java.util.Arrays;
 import java.util.Objects;
 

src/main/java/com/unicity/sdk/address/AddressScheme.java → src/main/java/org/unicitylabs/sdk/address/AddressScheme.java

@@ -1,5 +1,5 @@
 
-package com.unicity.sdk.address;
+package org.unicitylabs.sdk.address;
 
 public enum AddressScheme {
     DIRECT,

src/main/java/com/unicity/sdk/address/DirectAddress.java → src/main/java/org/unicitylabs/sdk/address/DirectAddress.java

@@ -1,9 +1,9 @@
-package com.unicity.sdk.address;
+package org.unicitylabs.sdk.address;
 
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.hash.DataHasher;
-import com.unicity.sdk.hash.HashAlgorithm;
-import com.unicity.sdk.util.HexConverter;
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.hash.DataHasher;
+import org.unicitylabs.sdk.hash.HashAlgorithm;
+import org.unicitylabs.sdk.util.HexConverter;
 
 import java.util.Arrays;
 import java.util.Objects;

src/main/java/com/unicity/sdk/address/ProxyAddress.java → src/main/java/org/unicitylabs/sdk/address/ProxyAddress.java

@@ -1,11 +1,11 @@
-package com.unicity.sdk.address;
-
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.hash.DataHasher;
-import com.unicity.sdk.hash.HashAlgorithm;
-import com.unicity.sdk.token.Token;
-import com.unicity.sdk.token.TokenId;
-import com.unicity.sdk.util.HexConverter;
+package org.unicitylabs.sdk.address;
+
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.hash.DataHasher;
+import org.unicitylabs.sdk.hash.HashAlgorithm;
+import org.unicitylabs.sdk.token.Token;
+import org.unicitylabs.sdk.token.TokenId;
+import org.unicitylabs.sdk.util.HexConverter;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -64,16 +64,12 @@ public static Address resolve(Address inputAddress, List<Token<?>> nametags) {
     Address targetAddress = inputAddress;
     while (targetAddress.getScheme() != AddressScheme.DIRECT) {
       Token<?> nametag = nametagMap.get(targetAddress);
-      if (nametag == null) {
+      if (nametag == null || nametag.getState().getData().isEmpty()) {
         return null;
       }
 
       targetAddress = AddressFactory.createAddress(
-          new String(nametag.getState().getData()
-              .orElseThrow(() ->
-                  new IllegalArgumentException("Invalid nametag target address")
-              ),
-              StandardCharsets.UTF_8));
+          new String(nametag.getState().getData().get(), StandardCharsets.UTF_8));
     }
 
     return targetAddress;

src/main/java/com/unicity/sdk/api/AggregatorClient.java → src/main/java/org/unicitylabs/sdk/api/AggregatorClient.java

@@ -1,8 +1,8 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.jsonrpc.JsonRpcHttpTransport;
-import com.unicity.sdk.transaction.InclusionProof;
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.jsonrpc.JsonRpcHttpTransport;
+import org.unicitylabs.sdk.transaction.InclusionProof;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 

src/main/java/com/unicity/sdk/api/Authenticator.java → src/main/java/org/unicitylabs/sdk/api/Authenticator.java

@@ -1,9 +1,9 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.signing.Signature;
-import com.unicity.sdk.signing.SigningService;
-import com.unicity.sdk.util.HexConverter;
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.signing.Signature;
+import org.unicitylabs.sdk.signing.SigningService;
+import org.unicitylabs.sdk.util.HexConverter;
 import java.util.Arrays;
 import java.util.Objects;
 

src/main/java/com/unicity/sdk/api/BlockHeightResponse.java → src/main/java/org/unicitylabs/sdk/api/BlockHeightResponse.java

@@ -1,4 +1,4 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
 import java.util.Objects;
 

src/main/java/com/unicity/sdk/api/IAggregatorClient.java → src/main/java/org/unicitylabs/sdk/api/IAggregatorClient.java

@@ -1,8 +1,8 @@
 
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.transaction.InclusionProof;
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.transaction.InclusionProof;
 
 import java.util.concurrent.CompletableFuture;
 

src/main/java/com/unicity/sdk/api/InclusionProofRequest.java → src/main/java/org/unicitylabs/sdk/api/InclusionProofRequest.java

@@ -1,4 +1,4 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
 public class InclusionProofRequest {
 

src/main/java/com/unicity/sdk/api/LeafValue.java → src/main/java/org/unicitylabs/sdk/api/LeafValue.java

@@ -1,14 +1,12 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.hash.DataHasher;
-import com.unicity.sdk.hash.HashAlgorithm;
-import com.unicity.sdk.predicate.MaskedPredicateReference;
-import com.unicity.sdk.serializer.UnicityObjectMapper;
-import com.unicity.sdk.serializer.cbor.CborSerializationException;
-import com.unicity.sdk.util.HexConverter;
-import java.io.IOException;
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.hash.DataHasher;
+import org.unicitylabs.sdk.hash.HashAlgorithm;
+import org.unicitylabs.sdk.serializer.UnicityObjectMapper;
+import org.unicitylabs.sdk.serializer.cbor.CborSerializationException;
+import org.unicitylabs.sdk.util.HexConverter;
 import java.util.Arrays;
 import java.util.Objects;
 

src/main/java/com/unicity/sdk/api/RequestId.java → src/main/java/org/unicitylabs/sdk/api/RequestId.java

@@ -1,10 +1,10 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
-import com.unicity.sdk.Hashable;
-import com.unicity.sdk.hash.DataHash;
-import com.unicity.sdk.hash.DataHasher;
-import com.unicity.sdk.hash.HashAlgorithm;
-import com.unicity.sdk.util.BitString;
+import org.unicitylabs.sdk.Hashable;
+import org.unicitylabs.sdk.hash.DataHash;
+import org.unicitylabs.sdk.hash.DataHasher;
+import org.unicitylabs.sdk.hash.HashAlgorithm;
+import org.unicitylabs.sdk.util.BitString;
 
 /**
  * Represents a unique request identifier derived from a public key and state hash.

src/main/java/com/unicity/sdk/api/SubmitCommitmentRequest.java → src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentRequest.java

@@ -1,6 +1,6 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
-import com.unicity.sdk.hash.DataHash;
+import org.unicitylabs.sdk.hash.DataHash;
 
 public class SubmitCommitmentRequest {
 

src/main/java/com/unicity/sdk/api/SubmitCommitmentResponse.java → src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentResponse.java

@@ -1,4 +1,4 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
 public class SubmitCommitmentResponse {
 

src/main/java/com/unicity/sdk/api/SubmitCommitmentStatus.java → src/main/java/org/unicitylabs/sdk/api/SubmitCommitmentStatus.java

@@ -1,4 +1,4 @@
-package com.unicity.sdk.api;
+package org.unicitylabs.sdk.api;
 
 /**
  * Status codes for submit commitment response.

src/main/java/com/unicity/sdk/hash/DataHash.java → src/main/java/org/unicitylabs/sdk/hash/DataHash.java

@@ -1,7 +1,7 @@
 
-package com.unicity.sdk.hash;
+package org.unicitylabs.sdk.hash;
 
-import com.unicity.sdk.util.HexConverter;
+import org.unicitylabs.sdk.util.HexConverter;
 
 import java.util.Arrays;
 import java.util.Objects;

src/main/java/com/unicity/sdk/hash/DataHasher.java → src/main/java/org/unicitylabs/sdk/hash/DataHasher.java

@@ -1,4 +1,4 @@
-package com.unicity.sdk.hash;
+package org.unicitylabs.sdk.hash;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

src/main/java/com/unicity/sdk/hash/HashAlgorithm.java → src/main/java/org/unicitylabs/sdk/hash/HashAlgorithm.java

@@ -1,4 +1,4 @@
-package com.unicity.sdk.hash;
+package org.unicitylabs.sdk.hash;
 
 public enum HashAlgorithm {
     SHA256(0, "SHA-256"),

src/main/java/com/unicity/sdk/hash/UnsupportedHashAlgorithmError.java → src/main/java/org/unicitylabs/sdk/hash/UnsupportedHashAlgorithmError.java

@@ -1,5 +1,5 @@
 
-package com.unicity.sdk.hash;
+package org.unicitylabs.sdk.hash;
 
 public class UnsupportedHashAlgorithmError extends RuntimeException {
     private final HashAlgorithm algorithm;

src/main/java/com/unicity/sdk/jsonrpc/JsonRpcDataError.java → src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcDataError.java

@@ -1,5 +1,5 @@
 
-package com.unicity.sdk.jsonrpc;
+package org.unicitylabs.sdk.jsonrpc;
 
 public class JsonRpcDataError extends Exception {
 

src/main/java/com/unicity/sdk/jsonrpc/JsonRpcError.java → src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcError.java

@@ -1,4 +1,4 @@
-package com.unicity.sdk.jsonrpc;
+package org.unicitylabs.sdk.jsonrpc;
 
 public class JsonRpcError {
 

src/main/java/com/unicity/sdk/jsonrpc/JsonRpcHttpTransport.java → src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcHttpTransport.java

@@ -1,7 +1,7 @@
 
-package com.unicity.sdk.jsonrpc;
+package org.unicitylabs.sdk.jsonrpc;
 
-import com.unicity.sdk.serializer.UnicityObjectMapper;
+import org.unicitylabs.sdk.serializer.UnicityObjectMapper;
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import okhttp3.Call;

src/main/java/com/unicity/sdk/jsonrpc/JsonRpcNetworkError.java → src/main/java/org/unicitylabs/sdk/jsonrpc/JsonRpcNetworkError.java

@@ -1,5 +1,5 @@
 
-package com.unicity.sdk.jsonrpc;
+package org.unicitylabs.sdk.jsonrpc;
 
 public class JsonRpcNetworkError extends Exception {