syncing with ts SDK. e2e passes

Author: MastaP

src/main/java/com/unicity/sdk/OfflineStateTransitionClient.java

@@ -5,6 +5,7 @@
 import com.unicity.sdk.api.AggregatorClient;
 import com.unicity.sdk.api.Authenticator;
 import com.unicity.sdk.api.RequestId;
+import com.unicity.sdk.api.SubmitCommitmentResponse;
 import com.unicity.sdk.api.SubmitCommitmentStatus;
 import com.unicity.sdk.shared.hash.DataHash;
 import com.unicity.sdk.shared.hash.HashAlgorithm;
@@ -52,7 +53,7 @@ public CompletableFuture<Commitment<TransactionData>> submitTransaction(
     public <T extends ISerializable> CompletableFuture<Transaction<T>> createTransaction(
             Commitment<T> commitment,
             InclusionProof inclusionProof) {
-        return inclusionProof.verify(commitment.getRequestId().toBigInt())
+        return inclusionProof.verify(commitment.getRequestId())
                 .thenCompose(status -> {
                     if (status != InclusionProofVerificationStatus.OK) {
                         return CompletableFuture.failedFuture(new Exception("Inclusion proof verification failed."));
@@ -126,10 +127,9 @@ public CompletableFuture<InclusionProofVerificationStatus> getTokenStatus(
             byte[] publicKey) {
         return RequestId.create(publicKey, token.getState().getHash())
                 .thenCompose(requestId -> aggregatorClient.getInclusionProof(requestId))
-                .thenCompose(inclusionProof -> inclusionProof.verify(
+                .thenCompose(inclusionProof -> 
                         RequestId.create(publicKey, token.getState().getHash())
-                                .thenApply(RequestId::toBigInt)
-                                .join()));
+                                .thenCompose(inclusionProof::verify));
     }
 
     public CompletableFuture<InclusionProof> getInclusionProof(Commitment<?> commitment) {
@@ -192,6 +192,26 @@ private <TD extends ISerializable> CompletableFuture<Commitment<TD>> sendTransac
                 );
     }
 
+    public CompletableFuture<SubmitCommitmentResponse> submitCommitment(Commitment<?> commitment) {
+        DataHash txHash = null;
+        ISerializable transactionData = commitment.getTransactionData();
+        if (transactionData instanceof TransactionData) {
+            txHash = ((TransactionData) transactionData).getHash();
+        } else if (transactionData instanceof MintTransactionData) {
+            txHash = ((MintTransactionData<?>) transactionData).getHash();
+        }
+        
+        if (txHash == null) {
+            return CompletableFuture.failedFuture(new IllegalArgumentException("Cannot get hash from transaction data"));
+        }
+        
+        return aggregatorClient.submitTransaction(
+            commitment.getRequestId(),
+            txHash,
+            commitment.getAuthenticator()
+        );
+    }
+    
     public AggregatorClient getAggregatorClient() {
         return aggregatorClient;
     }

src/main/java/com/unicity/sdk/StateTransitionClient.java

@@ -5,7 +5,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.unicity.sdk.ISerializable;
+import com.unicity.sdk.shared.cbor.CborDecoder;
 import com.unicity.sdk.shared.cbor.CborEncoder;
+import com.unicity.sdk.shared.cbor.CustomCborDecoder;
 import com.unicity.sdk.shared.hash.DataHash;
 import com.unicity.sdk.shared.signing.ISignature;
 import com.unicity.sdk.shared.signing.ISigningService;
@@ -16,6 +18,7 @@
 import com.unicity.sdk.shared.util.HexConverter;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -40,7 +43,7 @@ public static CompletableFuture<Authenticator> create(
             DataHash stateHash) {
 
         // TypeScript SDK signs only the transactionHash, not the concatenation
-        return signingService.sign(transactionHash.getHash())
+        return signingService.sign(transactionHash)
                 .thenApply(signature -> new Authenticator(signature, transactionHash, stateHash, signingService.getPublicKey()));
     }
 
@@ -140,4 +143,38 @@ public byte[] toCBOR() {
             stateHash.toCBOR()
         );
     }
+    
+    /**
+     * Deserialize Authenticator from CBOR.
+     * @param cbor The CBOR-encoded bytes
+     * @return An Authenticator instance
+     */
+    public static Authenticator fromCBOR(byte[] cbor) {
+        try {
+            CustomCborDecoder.DecodeResult result = CustomCborDecoder.decode(cbor, 0);
+            if (!(result.value instanceof List)) {
+                throw new RuntimeException("Expected array for Authenticator");
+            }
+            
+            List<?> array = (List<?>) result.value;
+            if (array.size() < 3) {
+                throw new RuntimeException("Invalid Authenticator array size");
+            }
+            
+            // Deserialize signature
+            Signature signature = Signature.fromCBOR((byte[]) array.get(0));
+            
+            // Deserialize transaction hash
+            DataHash transactionHash = DataHash.fromCBOR((byte[]) array.get(1));
+            
+            // Deserialize state hash
+            DataHash stateHash = DataHash.fromCBOR((byte[]) array.get(2));
+            
+            // Note: address is not stored in CBOR format, it needs to be recovered
+            // from signature if needed
+            return new Authenticator(signature, transactionHash, stateHash, new byte[0]);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to deserialize Authenticator from CBOR", e);
+        }
+    }
 }