#50 Add unicity id support

src/main/java/org/unicitylabs/sdk/api/CertificationData.java

@@ -94,7 +94,7 @@ public static CertificationData fromCbor(byte[] bytes) {
     if (tag.getTag() != CertificationData.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 5);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != CertificationData.VERSION) {
@@ -137,7 +137,6 @@ public static CertificationData fromMintTransaction(MintTransaction transaction)
    * @return certification data
    */
   public static CertificationData fromTransaction(Transaction transaction, UnlockScript unlockScript) {
-    Objects.requireNonNull(transaction, "transaction cannot be null");
     Objects.requireNonNull(unlockScript, "unlockScript cannot be null");
 
     return CertificationData.fromTransaction(transaction, unlockScript.encode());

src/main/java/org/unicitylabs/sdk/api/InclusionProof.java

@@ -74,7 +74,7 @@ public static InclusionProof fromCbor(byte[] bytes) {
     if (tag.getTag() != InclusionProof.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 4);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != InclusionProof.VERSION) {
@@ -120,7 +120,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(InclusionProof.VERSION, this.inclusionCertificate, this.certificationData, this.unicityCertificate);
+    return Objects.hash(this.inclusionCertificate, this.certificationData, this.unicityCertificate);
   }
 
   @Override

src/main/java/org/unicitylabs/sdk/api/InclusionProofResponse.java

@@ -42,7 +42,7 @@ public InclusionProof getInclusionProof() {
    * @return inclusion proof response
    */
   public static InclusionProofResponse fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
     return new InclusionProofResponse(
             CborDeserializer.decodeUnsignedInteger(data.get(0)).asLong(),
             InclusionProof.fromCbor(data.get(1))

src/main/java/org/unicitylabs/sdk/api/JsonRpcAggregatorClient.java

@@ -3,6 +3,7 @@
 import org.unicitylabs.sdk.api.jsonrpc.JsonRpcHttpTransport;
 import org.unicitylabs.sdk.util.HexConverter;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -14,6 +15,7 @@
  * Default aggregator client.
  */
 public class JsonRpcAggregatorClient implements AggregatorClient {
+  private static final String STATE_ID_HEADER = "X-State-ID";
 
   private final JsonRpcHttpTransport transport;
   private final String apiKey;
@@ -54,9 +56,11 @@ public CompletableFuture<CertificationResponse> submitCertificationRequest(
     CertificationRequest request = CertificationRequest.create(
             Objects.requireNonNull(certificationData, "certificationData cannot be null"));
 
-    Map<String, List<String>> headers = this.apiKey == null
-            ? Map.of()
-            : Map.of(AUTHORIZATION, List.of(String.format("Bearer %s", this.apiKey)));
+    Map<String, List<String>> headers = new HashMap<>();
+    headers.put(STATE_ID_HEADER, List.of(HexConverter.encode(request.getStateId().getData())));
+    if (this.apiKey != null) {
+      headers.put(AUTHORIZATION, List.of(String.format("Bearer %s", this.apiKey)));
+    }
 
     return this.transport.request(
             "certification_request",

src/main/java/org/unicitylabs/sdk/api/bft/InputRecord.java

@@ -150,7 +150,7 @@ public static InputRecord fromCbor(byte[] bytes) {
     if (tag.getTag() != InputRecord.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 10);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != InputRecord.VERSION) {
@@ -212,7 +212,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(InputRecord.VERSION, this.roundNumber, this.epoch,
+    return Objects.hash(this.roundNumber, this.epoch,
             Arrays.hashCode(this.previousHash),
             Arrays.hashCode(this.hash), Arrays.hashCode(this.summaryValue), this.timestamp,
             Arrays.hashCode(this.blockHash),

src/main/java/org/unicitylabs/sdk/api/bft/ShardTreeCertificate.java

@@ -64,7 +64,7 @@ public static ShardTreeCertificate fromCbor(byte[] bytes) {
     if (tag.getTag() != ShardTreeCertificate.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 3);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != ShardTreeCertificate.VERSION) {
@@ -111,7 +111,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(ShardTreeCertificate.VERSION, this.shard, this.siblingHashList);
+    return Objects.hash(this.shard, this.siblingHashList);
   }
 
   @Override

src/main/java/org/unicitylabs/sdk/api/bft/UnicityCertificate.java

@@ -173,7 +173,7 @@ public static UnicityCertificate fromCbor(byte[] bytes) {
     if (tag.getTag() != UnicityCertificate.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 7);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != UnicityCertificate.VERSION) {
@@ -226,7 +226,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(UnicityCertificate.VERSION, this.inputRecord, Arrays.hashCode(this.technicalRecordHash),
+    return Objects.hash(this.inputRecord, Arrays.hashCode(this.technicalRecordHash),
             Arrays.hashCode(this.shardConfigurationHash), this.shardTreeCertificate,
             this.unicityTreeCertificate, this.unicitySeal);
   }

src/main/java/org/unicitylabs/sdk/api/bft/UnicitySeal.java

@@ -144,7 +144,7 @@ public static UnicitySeal fromCbor(byte[] bytes) {
     if (tag.getTag() != UnicitySeal.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 8);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != UnicitySeal.VERSION) {
@@ -235,7 +235,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(UnicitySeal.VERSION, this.networkId, this.rootChainRoundNumber, this.epoch,
+    return Objects.hash(this.networkId, this.rootChainRoundNumber, this.epoch,
             this.timestamp,
             Arrays.hashCode(this.previousHash), Arrays.hashCode(this.hash), this.signatures);
   }

src/main/java/org/unicitylabs/sdk/api/bft/UnicityTreeCertificate.java

@@ -68,7 +68,7 @@ public static UnicityTreeCertificate fromCbor(byte[] bytes) {
     if (tag.getTag() != UnicityTreeCertificate.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 3);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != UnicityTreeCertificate.VERSION) {
@@ -112,7 +112,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(UnicityTreeCertificate.VERSION, this.partitionIdentifier, this.steps);
+    return Objects.hash(this.partitionIdentifier, this.steps);
   }
 
   @Override
@@ -160,7 +160,7 @@ public byte[] getHash() {
      * @return hash step
      */
     public static HashStep fromCbor(byte[] bytes) {
-      List<byte[]> data = CborDeserializer.decodeArray(bytes);
+      List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
 
       return new HashStep(
               CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt(),

src/main/java/org/unicitylabs/sdk/payment/SplitAssetProof.java

@@ -79,7 +79,7 @@ public static SplitAssetProof create(
    * @return split reason proof
    */
   public static SplitAssetProof fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 3);
 
     return new SplitAssetProof(
             AssetId.fromCbor(data.get(0)),

src/main/java/org/unicitylabs/sdk/payment/SplitMintJustification.java

@@ -77,7 +77,7 @@ public static SplitMintJustification fromCbor(byte[] bytes) {
     if (tag.getTag() != SplitMintJustification.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 2);
     return SplitMintJustification.create(
             Token.fromCbor(data.get(0)),
             CborDeserializer.decodeArray(data.get(1)).stream().map(SplitAssetProof::fromCbor).collect(Collectors.toSet())

src/main/java/org/unicitylabs/sdk/payment/asset/Asset.java

@@ -56,7 +56,7 @@ public BigInteger getValue() {
    * @return asset
    */
   public static Asset fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
 
     return new Asset(
             AssetId.fromCbor(data.get(0)),

src/main/java/org/unicitylabs/sdk/predicate/EncodedPredicate.java

@@ -41,7 +41,7 @@ public static EncodedPredicate fromCbor(byte[] bytes) {
     if (tag.getTag() != EncodedPredicate.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 3);
     PredicateEngine engine = PredicateEngine.fromId(
             CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt());
 

src/main/java/org/unicitylabs/sdk/predicate/Predicate.java

@@ -1,7 +1,6 @@
 package org.unicitylabs.sdk.predicate;
 
 import java.util.Arrays;
-import java.util.Objects;
 
 /**
  * Base contract for all predicate implementations.

src/main/java/org/unicitylabs/sdk/serializer/cbor/CborDeserializer.java

@@ -85,6 +85,25 @@ public static List<byte[]> decodeArray(byte[] data) {
     return result;
   }
 
+  /**
+   * Read a fixed-size CBOR array from bytes. Throws when the encoded array length does not match
+   * the expected length.
+   *
+   * @param data bytes
+   * @param expectedLength expected number of array elements
+   * @return CBOR element array
+   *
+   * @throws CborSerializationException when the array length differs from {@code expectedLength}
+   */
+  public static List<byte[]> decodeArray(byte[] data, long expectedLength) {
+    List<byte[]> result = decodeArray(data);
+    if (result.size() != expectedLength) {
+      throw new CborSerializationException(
+              String.format("Expected array of %d elements, got %d", expectedLength, result.size()));
+    }
+    return result;
+  }
+
   /**
    * Read elements as raw CBOR element map from CBOR bytes.
    *

src/main/java/org/unicitylabs/sdk/smt/plain/SparseMerkleTreePath.java

@@ -122,7 +122,7 @@ public MerkleTreePathVerificationResult verify(BigInteger stateId) {
    * @return path
    */
   public static SparseMerkleTreePath fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
 
     return new SparseMerkleTreePath(
             DataHash.fromCbor(data.get(0)),

src/main/java/org/unicitylabs/sdk/smt/plain/SparseMerkleTreePathStep.java

@@ -63,7 +63,7 @@ public Optional<byte[]> getData() {
    * @return sparse Merkle tree path step
    */
   public static SparseMerkleTreePathStep fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
 
     return new SparseMerkleTreePathStep(
             BigIntegerConverter.decode(CborDeserializer.decodeByteString(data.get(0))),

src/main/java/org/unicitylabs/sdk/smt/sum/SparseMerkleSumTreePath.java

@@ -132,7 +132,7 @@ public MerkleTreePathVerificationResult verify(BigInteger stateId) {
    * @return path
    */
   public static SparseMerkleSumTreePath fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
 
     return new SparseMerkleSumTreePath(
             DataHash.fromCbor(data.get(0)),
@@ -176,71 +176,4 @@ public int hashCode() {
   public String toString() {
     return String.format("MerkleTreePath{rootHash=%s, steps=%s}", this.rootHash, this.steps);
   }
-
-  /**
-   * Root of the sparse merkle sum tree path.
-   */
-  public static class Root {
-
-    private final DataHash hash;
-    private final BigInteger counter;
-
-    Root(
-            DataHash hash,
-            BigInteger counter
-    ) {
-      this.hash = Objects.requireNonNull(hash, "hash cannot be null");
-      this.counter = Objects.requireNonNull(counter, "counter cannot be null");
-    }
-
-    /**
-     * Get hash of the root.
-     *
-     * @return hash
-     */
-    public DataHash getHash() {
-      return this.hash;
-    }
-
-    /**
-     * Get the counter of the root.
-     *
-     * @return counter
-     */
-    public BigInteger getCounter() {
-      return this.counter;
-    }
-
-    /**
-     * Create root from CBOR bytes.
-     *
-     * @param bytes CBOR bytes
-     * @return root
-     */
-    public static Root fromCbor(byte[] bytes) {
-      List<byte[]> data = CborDeserializer.decodeArray(bytes);
-
-      return new Root(
-              DataHash.fromCbor(data.get(0)),
-              BigIntegerConverter.decode(CborDeserializer.decodeByteString(data.get(1)))
-      );
-    }
-
-    /**
-     * Serialize root to CBOR bytes.
-     *
-     * @return CBOR bytes
-     */
-    public byte[] toCbor() {
-      return CborSerializer.encodeArray(
-              this.hash.toCbor(),
-              CborSerializer.encodeByteString(BigIntegerConverter.encode(this.counter))
-      );
-    }
-
-    @Override
-    public String toString() {
-      return String.format("Root{hash=%s, counter=%s}", this.hash, this.counter);
-    }
-  }
 }

src/main/java/org/unicitylabs/sdk/smt/sum/SparseMerkleSumTreePathStep.java

@@ -67,7 +67,7 @@ public BigInteger getValue() {
    * @return step
    */
   public static SparseMerkleSumTreePathStep fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 3);
 
     return new SparseMerkleSumTreePathStep(
             BigIntegerConverter.decode(CborDeserializer.decodeByteString(data.get(0))),

src/main/java/org/unicitylabs/sdk/transaction/CertifiedMintTransaction.java

@@ -91,7 +91,7 @@ public InclusionProof getInclusionProof() {
    * @return decoded certified mint transaction
    */
   public static CertifiedMintTransaction fromCbor(byte[] bytes) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
     return new CertifiedMintTransaction(MintTransaction.fromCbor(data.get(0)),
             InclusionProof.fromCbor(data.get(1)));
   }

src/main/java/org/unicitylabs/sdk/transaction/CertifiedTransferTransaction.java

@@ -74,7 +74,7 @@ public InclusionProof getInclusionProof() {
    * @return certified transfer transaction
    */
   public static CertifiedTransferTransaction fromCbor(byte[] bytes, Token token) {
-    List<byte[]> data = CborDeserializer.decodeArray(bytes);
+    List<byte[]> data = CborDeserializer.decodeArray(bytes, 2);
 
     return new CertifiedTransferTransaction(
             TransferTransaction.fromCbor(data.get(0), token),

src/main/java/org/unicitylabs/sdk/transaction/MintTransaction.java

@@ -161,7 +161,7 @@ public static MintTransaction fromCbor(byte[] bytes) {
     if (tag.getTag() != MintTransaction.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 6);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != MintTransaction.VERSION) {

src/main/java/org/unicitylabs/sdk/transaction/Token.java

@@ -98,7 +98,7 @@ public static Token fromCbor(byte[] bytes) {
     if (tag.getTag() != Token.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 3);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != Token.VERSION) {

src/main/java/org/unicitylabs/sdk/transaction/TransferTransaction.java

@@ -108,7 +108,7 @@ public static TransferTransaction fromCbor(byte[] bytes, Token token) {
     if (tag.getTag() != TransferTransaction.CBOR_TAG) {
       throw new CborSerializationException(String.format("Invalid CBOR tag: %s", tag.getTag()));
     }
-    List<byte[]> data = CborDeserializer.decodeArray(tag.getData());
+    List<byte[]> data = CborDeserializer.decodeArray(tag.getData(), 4);
 
     int version = CborDeserializer.decodeUnsignedInteger(data.get(0)).asInt();
     if (version != TransferTransaction.VERSION) {